system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-23 06:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Readying some tests for the compilation with -D__WINESRC__.

Browse source
This commit is contained in:
Michael Stefaniuc 2013-10-01 23:26:28 +02:00 committed by Alexandre Julliard
parent 2720e81504
commit 2e1708dc1b
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/atl/tests/atl_ax.c
View file

@ -51,12 +51,12 @@ static ATOM register_class(void)
WNDCLASSA wndclassA; WNDCLASSA wndclassA;
wndclassA.style = 0; wndclassA.style = 0;
wndclassA.lpfnWndProc = DefWindowProc; wndclassA.lpfnWndProc = DefWindowProcA;
wndclassA.cbClsExtra = 0; wndclassA.cbClsExtra = 0;
wndclassA.cbWndExtra = 0; wndclassA.cbWndExtra = 0;
wndclassA.hInstance = GetModuleHandleA(NULL); wndclassA.hInstance = GetModuleHandleA(NULL);
wndclassA.hIcon = NULL; wndclassA.hIcon = NULL;
wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW);
wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
wndclassA.lpszMenuName = NULL; wndclassA.lpszMenuName = NULL;
wndclassA.lpszClassName = "WineAtlTestClass"; wndclassA.lpszClassName = "WineAtlTestClass";

2
dlls/dplayx/tests/dplayx.c
View file

@ -667,7 +667,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W
/* IP address string */ /* IP address string */
addressElements[1].guidDataType = DPAID_INet; addressElements[1].guidDataType = DPAID_INet;
addressElements[1].dwDataSize = lstrlen(strIPAddressString) + 1; addressElements[1].dwDataSize = lstrlenA(strIPAddressString) + 1;
addressElements[1].lpData = (LPVOID) strIPAddressString; addressElements[1].lpData = (LPVOID) strIPAddressString;
/* Optional Port number */ /* Optional Port number */

4
dlls/fusion/tests/asmcache.c
View file

@ -944,7 +944,7 @@ static void test_InstallAssembly(void)
GetWindowsDirectoryA(dllpath, MAX_PATH); GetWindowsDirectoryA(dllpath, MAX_PATH);
strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll");
attr = GetFileAttributes(dllpath); attr = GetFileAttributesA(dllpath);
ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n"); ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n");
/* uninstall the assembly from the GAC */ /* uninstall the assembly from the GAC */
@ -954,7 +954,7 @@ static void test_InstallAssembly(void)
ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED,
"Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp);
attr = GetFileAttributes(dllpath); attr = GetFileAttributesA(dllpath);
ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n");
disp = 0xf00dbad; disp = 0xf00dbad;

4
dlls/lz32/tests/lzexpand_main.c
View file

@ -83,8 +83,8 @@ static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect
if(expect_short) if(expect_short)
{ {
memcpy(shortname, dst, MAX_PATH); memcpy(shortname, dst, MAX_PATH);
retval = GetShortPathName(shortname, dst, MAX_PATH-1); retval = GetShortPathNameA(shortname, dst, MAX_PATH-1);
ok(retval > 0, "GetShortPathName returned %d for '%s', GLE=%d\n", ok(retval > 0, "GetShortPathNameA returned %d for '%s', GLE=%d\n",
retval, dst, GetLastError()); retval, dst, GetLastError());
} }
} }

2
dlls/pdh/tests/pdh.c
View file

@ -63,7 +63,7 @@ static BOOL is_lang_english(void)
static void init_function_ptrs( void ) static void init_function_ptrs( void )
{ {
pdh = GetModuleHandle( "pdh" ); pdh = GetModuleHandleA( "pdh" );
GETFUNCPTR( PdhAddEnglishCounterA ) GETFUNCPTR( PdhAddEnglishCounterA )
GETFUNCPTR( PdhAddEnglishCounterW ) GETFUNCPTR( PdhAddEnglishCounterW )
GETFUNCPTR( PdhCollectQueryDataWithTime ) GETFUNCPTR( PdhCollectQueryDataWithTime )

2
dlls/snmpapi/tests/util.c
View file

@ -32,7 +32,7 @@ static INT (WINAPI *pSnmpUtilOctetsNCmp)(AsnOctetString*, AsnOctetString*, UINT
static void InitFunctionPtrs(void) static void InitFunctionPtrs(void)
{ {
HMODULE hSnmpapi = GetModuleHandle("snmpapi.dll"); HMODULE hSnmpapi = GetModuleHandleA("snmpapi.dll");
#define SNMPAPI_GET_PROC(func) \ #define SNMPAPI_GET_PROC(func) \
p ## func = (void*)GetProcAddress(hSnmpapi, #func); \ p ## func = (void*)GetProcAddress(hSnmpapi, #func); \

4
programs/wscript/tests/run.c
View file

@ -366,7 +366,7 @@ static void run_test(const char *file_name)
CHECK_CALLED(reportSuccess); CHECK_CALLED(reportSuccess);
} }
static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG_PTR param) static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param)
{ {
const char *script_data, *ext; const char *script_data, *ext;
DWORD script_size, size; DWORD script_size, size;
@ -418,7 +418,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init)
DWORD res; DWORD res;
if(!init) { if(!init) {
RegDeleteKey(HKEY_CLASSES_ROOT, key_name); RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name);
return TRUE; return TRUE;
} }