diff options
| -rw-r--r-- | pjmedia/src/pjmedia/dsound.c | 9 | ||||
| -rw-r--r-- | pjsip/src/test-pjsip/msg_test.c | 4 | ||||
| -rw-r--r-- | pjsip/src/test-pjsip/transport_test.c | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pjmedia/src/pjmedia/dsound.c b/pjmedia/src/pjmedia/dsound.c index 97a28726..56dd97af 100644 --- a/pjmedia/src/pjmedia/dsound.c +++ b/pjmedia/src/pjmedia/dsound.c @@ -596,8 +596,8 @@ on_error: /* 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); pj_bool_t is_capture_device = (lpContext != NULL); @@ -626,7 +626,12 @@ static BOOL CALLBACK DSEnumCallback( LPGUID lpGuid, LPCSTR lpcstrDescription, return FALSE; } +#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) { dev_info[index].lpGuid = NULL; diff --git a/pjsip/src/test-pjsip/msg_test.c b/pjsip/src/test-pjsip/msg_test.c index 629d3cb2..75d0e121 100644 --- a/pjsip/src/test-pjsip/msg_test.c +++ b/pjsip/src/test-pjsip/msg_test.c @@ -125,7 +125,7 @@ static pj_status_t test_entry( pj_pool_t *pool, struct test_msg *entry ) char msgbuf2[PJSIP_MAX_PKT_LEN]; enum { BUFLEN = 512 }; - entry->len = pj_native_strlen(entry->msg); + entry->len = pj_ansi_strlen(entry->msg); if (var.flag & FLAG_PARSE_ONLY) goto parse_msg; @@ -672,7 +672,7 @@ static pjsip_msg *create_msg1(pj_pool_t *pool) "c=IN IP4 pc33.atlanta.com\r\n" "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; return msg; diff --git a/pjsip/src/test-pjsip/transport_test.c b/pjsip/src/test-pjsip/transport_test.c index a7aa8905..769850b9 100644 --- a/pjsip/src/test-pjsip/transport_test.c +++ b/pjsip/src/test-pjsip/transport_test.c @@ -542,7 +542,7 @@ int transport_rt_test( pjsip_transport_type_e tp_type, return -610; /* 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; |