Changeset 2286

Timestamp:

Sep 16, 2008 5:02:48 PM (16 years ago)

Author:

nanang

Message:

Ticket #625: Fixed unicode build issues on Windows platforms (thanks David Parker for the patch).

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/dsound.c (modified) (2 diffs)
• pjsip/src/test-pjsip/msg_test.c (modified) (2 diffs)
• pjsip/src/test-pjsip/transport_test.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/dsound.c

@@ -597 +597 @@
 
 /* DirectSound enum device callback */
-static BOOL CALLBACK DSEnumCallback( LPGUID lpGuid, LPCSTR lpcstrDescription,  
-                                     LPCSTR lpcstrModule, LPVOID lpContext)
+static BOOL CALLBACK DSEnumCallback( LPGUID lpGuid, LPCTSTR lpcstrDescription,  
+                                     LPCTSTR lpcstrModule, LPVOID lpContext)
 {
     unsigned index, max = sizeof(dev_info[index].info.name);
@@ -627 +627 @@
     }
 
+#ifdef UNICODE
+    WideCharToMultiByte(CP_ACP, 0, lpcstrDescription, wcslen(lpcstrDescription), dev_info[index].info.name, max, NULL, NULL);
+#else
     strncpy(dev_info[index].info.name, lpcstrDescription, max);
+#endif
+
     dev_info[index].info.name[max-1] = '\0';
     if (lpGuid == NULL) {

pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

@@ -126 +126 @@
     enum { BUFLEN = 512 };
 
-    entry->len = pj_native_strlen(entry->msg);
+    entry->len = pj_ansi_strlen(entry->msg);
 
     if (var.flag & FLAG_PARSE_ONLY)
@@ -673 +673 @@
         "m=audio 3456 RTP/AVP 0 1 3 99\r\n"
         "a=rtpmap:0 PCMU/8000\r\n";
-    body->len = pj_native_strlen((const char*) body->data);
+    body->len = pj_ansi_strlen((const char*) body->data);
     body->print_body = &pjsip_print_text_body;
 

pjproject/trunk/pjsip/src/test-pjsip/transport_test.c

@@ -543 +543 @@
 
     /* Initialize static test data. */
-    pj_native_strcpy(rt_target_uri, target_url);
+    pj_ansi_strcpy(rt_target_uri, target_url);
     rt_call_id = pj_str("RT-Call-Id/");
     rt_stop = PJ_FALSE;