Marcus Meissner : dplayx: Remove currently unused unicode code (Coverity).
Alexandre Julliard
julliard at winehq.org
Thu Jan 14 11:33:36 CST 2010
Module: wine
Branch: master
Commit: 44ab484af80255e09dea0eba45202f83adb247c2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ab484af80255e09dea0eba45202f83adb247c2
Author: Marcus Meissner <meissner at suse.de>
Date: Wed Jan 13 18:08:53 2010 +0100
dplayx: Remove currently unused unicode code (Coverity).
---
dlls/dplayx/name_server.c | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index 65d36ef..0acdc5f 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -362,21 +362,13 @@ void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,
DWORD dwVariableSize;
DWORD dwVariableLen;
/* LPCDPMSG_ENUMSESSIONSREQUEST msg = (LPDPMSG_ENUMSESSIONSREQUEST)lpcMsg; */
- BOOL bAnsi = TRUE; /* FIXME: This needs to be in the DPLAY interface */
- FIXME( ": few fixed + need to check request for response\n" );
-
- if (bAnsi)
- {
- dwVariableLen = MultiByteToWideChar( CP_ACP, 0,
- lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA,
- -1, NULL, 0 );
- }
- else
- {
- dwVariableLen = strlenW( lpDP->dp2->lpSessionDesc->u1.lpszSessionName ) + 1;
- }
+ /* FIXME: Should handle ANSI or WIDECHAR input. Currently just ANSI input */
+ FIXME( ": few fixed + need to check request for response, might need UNICODE input ability.\n" );
+ dwVariableLen = MultiByteToWideChar( CP_ACP, 0,
+ lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA,
+ -1, NULL, 0 );
dwVariableSize = dwVariableLen * sizeof( WCHAR );
*lpdwReplySize = lpDP->dp2->spData.dwSPHeaderSize +
@@ -394,13 +386,6 @@ void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,
CopyMemory( &rmsg->sd, lpDP->dp2->lpSessionDesc,
lpDP->dp2->lpSessionDesc->dwSize );
rmsg->dwUnknown = 0x0000005c;
- if( bAnsi )
- {
- MultiByteToWideChar( CP_ACP, 0, lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, -1,
- (LPWSTR)(rmsg+1), dwVariableLen );
- }
- else
- {
- strcpyW( (LPWSTR)(rmsg+1), lpDP->dp2->lpSessionDesc->u1.lpszSessionName );
- }
+ MultiByteToWideChar( CP_ACP, 0, lpDP->dp2->lpSessionDesc->u1.lpszSessionNameA, -1,
+ (LPWSTR)(rmsg+1), dwVariableLen );
}
More information about the wine-cvs
mailing list