ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert GetBinaryType to unicode.

This commit is contained in:
Dmitry Timoshkov 2003-10-14 01:16:59 +00:00 committed by Alexandre Julliard
parent a03c939a66
commit 45ac9cd287
1 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
loader/module.c
View File

@ -21,13 +21,12 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
@ -38,9 +37,7 @@
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#include "winternl.h" #include "winternl.h"
#include "heap.h"
#include "thread.h" #include "thread.h"
#include "file.h"
#include "module.h" #include "module.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -48,7 +45,6 @@
#include "wine/server.h" #include "wine/server.h"
WINE_DEFAULT_DEBUG_CHANNEL(module); WINE_DEFAULT_DEBUG_CHANNEL(module);
WINE_DECLARE_DEBUG_CHANNEL(win32);
WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(loaddll);
@ -252,8 +248,7 @@ enum binary_type MODULE_GetBinaryType( HANDLE hfile )
} }
/*********************************************************************** /***********************************************************************
* GetBinaryTypeA [KERNEL32.@] * GetBinaryTypeW [KERNEL32.@]
* GetBinaryType [KERNEL32.@]
* *
* Determine whether a file is executable, and if so, what kind. * Determine whether a file is executable, and if so, what kind.
* *
@ -285,13 +280,12 @@ enum binary_type MODULE_GetBinaryType( HANDLE hfile )
* ".com" and ".pif" files are only recognized by their file name extension, * ".com" and ".pif" files are only recognized by their file name extension,
* as per native Windows. * as per native Windows.
*/ */
BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType ) BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType )
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
HANDLE hfile; HANDLE hfile;
char *ptr;
TRACE_(win32)("%s\n", lpApplicationName ); TRACE("%s\n", debugstr_w(lpApplicationName) );
/* Sanity check. /* Sanity check.
*/ */
@ -300,7 +294,7 @@ BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType )
/* Open the file indicated by lpApplicationName for reading. /* Open the file indicated by lpApplicationName for reading.
*/ */
hfile = CreateFileA( lpApplicationName, GENERIC_READ, FILE_SHARE_READ, hfile = CreateFileW( lpApplicationName, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, 0, 0 ); NULL, OPEN_EXISTING, 0, 0 );
if ( hfile == INVALID_HANDLE_VALUE ) if ( hfile == INVALID_HANDLE_VALUE )
return FALSE; return FALSE;
@ -310,20 +304,26 @@ BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType )
switch(MODULE_GetBinaryType( hfile )) switch(MODULE_GetBinaryType( hfile ))
{ {
case BINARY_UNKNOWN: case BINARY_UNKNOWN:
{
static const WCHAR comW[] = { '.','C','O','M',0 };
static const WCHAR pifW[] = { '.','P','I','F',0 };
const WCHAR *ptr;
/* try to determine from file name */ /* try to determine from file name */
ptr = strrchr( lpApplicationName, '.' ); ptr = strrchrW( lpApplicationName, '.' );
if (!ptr) break; if (!ptr) break;
if (!FILE_strcasecmp( ptr, ".COM" )) if (!strcmpiW( ptr, comW ))
{ {
*lpBinaryType = SCS_DOS_BINARY; *lpBinaryType = SCS_DOS_BINARY;
ret = TRUE; ret = TRUE;
} }
else if (!FILE_strcasecmp( ptr, ".PIF" )) else if (!strcmpiW( ptr, pifW ))
{ {
*lpBinaryType = SCS_PIF_BINARY; *lpBinaryType = SCS_PIF_BINARY;
ret = TRUE; ret = TRUE;
} }
break; break;
}
case BINARY_PE_EXE: case BINARY_PE_EXE:
case BINARY_PE_DLL: case BINARY_PE_DLL:
*lpBinaryType = SCS_32BIT_BINARY; *lpBinaryType = SCS_32BIT_BINARY;
@ -352,36 +352,29 @@ BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType )
} }
/*********************************************************************** /***********************************************************************
* GetBinaryTypeW [KERNEL32.@] * GetBinaryTypeA [KERNEL32.@]
* * GetBinaryType [KERNEL32.@]
* Unicode version of GetBinaryTypeA.
*/ */
BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) BOOL WINAPI GetBinaryTypeA( LPCSTR lpApplicationName, LPDWORD lpBinaryType )
{ {
BOOL ret = FALSE; ANSI_STRING app_nameA;
LPSTR strNew = NULL; NTSTATUS status;
TRACE_(win32)("%s\n", debugstr_w(lpApplicationName) ); TRACE("%s\n", debugstr_a(lpApplicationName));
/* Sanity check. /* Sanity check.
*/ */
if ( lpApplicationName == NULL || lpBinaryType == NULL ) if ( lpApplicationName == NULL || lpBinaryType == NULL )
return FALSE; return FALSE;
/* Convert the wide string to a ascii string. RtlInitAnsiString(&app_nameA, lpApplicationName);
*/ status = RtlAnsiStringToUnicodeString(&NtCurrentTeb()->StaticUnicodeString,
strNew = HEAP_strdupWtoA( GetProcessHeap(), 0, lpApplicationName ); &app_nameA, FALSE);
if (!status)
return GetBinaryTypeW(NtCurrentTeb()->StaticUnicodeString.Buffer, lpBinaryType);
if ( strNew != NULL ) SetLastError(RtlNtStatusToDosError(status));
{ return FALSE;
ret = GetBinaryTypeA( strNew, lpBinaryType );
/* Free the allocated string.
*/
HeapFree( GetProcessHeap(), 0, strNew );
}
return ret;
} }