Module: wine Branch: master Commit: 2e1708dc1beffeebef5e9b495046924f47ee1042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1708dc1beffeebef5e9b4950...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Oct 1 23:26:28 2013 +0200
tests: Readying some tests for the compilation with -D__WINESRC__.
---
dlls/atl/tests/atl_ax.c | 4 ++-- dlls/dplayx/tests/dplayx.c | 2 +- dlls/fusion/tests/asmcache.c | 4 ++-- dlls/lz32/tests/lzexpand_main.c | 4 ++-- dlls/pdh/tests/pdh.c | 2 +- dlls/snmpapi/tests/util.c | 2 +- programs/wscript/tests/run.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index ea9ce32..f2dad74 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -51,12 +51,12 @@ static ATOM register_class(void) WNDCLASSA wndclassA;
wndclassA.style = 0; - wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.lpfnWndProc = DefWindowProcA; wndclassA.cbClsExtra = 0; wndclassA.cbWndExtra = 0; wndclassA.hInstance = GetModuleHandleA(NULL); wndclassA.hIcon = NULL; - wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wndclassA.lpszMenuName = NULL; wndclassA.lpszClassName = "WineAtlTestClass"; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 44c9b50..fb76c37 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -667,7 +667,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W
/* IP address string */ addressElements[1].guidDataType = DPAID_INet; - addressElements[1].dwDataSize = lstrlen(strIPAddressString) + 1; + addressElements[1].dwDataSize = lstrlenA(strIPAddressString) + 1; addressElements[1].lpData = (LPVOID) strIPAddressString;
/* Optional Port number */ diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index da39505..6fe72bf 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -944,7 +944,7 @@ static void test_InstallAssembly(void) GetWindowsDirectoryA(dllpath, MAX_PATH); 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");
/* uninstall the assembly from the GAC */ @@ -954,7 +954,7 @@ static void test_InstallAssembly(void) ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, "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");
disp = 0xf00dbad; diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 41792d6..4980cf7 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -83,8 +83,8 @@ static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect if(expect_short) { memcpy(shortname, dst, MAX_PATH); - retval = GetShortPathName(shortname, dst, MAX_PATH-1); - ok(retval > 0, "GetShortPathName returned %d for '%s', GLE=%d\n", + retval = GetShortPathNameA(shortname, dst, MAX_PATH-1); + ok(retval > 0, "GetShortPathNameA returned %d for '%s', GLE=%d\n", retval, dst, GetLastError()); } } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 9690020..f492d5a 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -63,7 +63,7 @@ static BOOL is_lang_english(void)
static void init_function_ptrs( void ) { - pdh = GetModuleHandle( "pdh" ); + pdh = GetModuleHandleA( "pdh" ); GETFUNCPTR( PdhAddEnglishCounterA ) GETFUNCPTR( PdhAddEnglishCounterW ) GETFUNCPTR( PdhCollectQueryDataWithTime ) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 908d5e2..0c517c1 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -32,7 +32,7 @@ static INT (WINAPI *pSnmpUtilOctetsNCmp)(AsnOctetString*, AsnOctetString*, UINT
static void InitFunctionPtrs(void) { - HMODULE hSnmpapi = GetModuleHandle("snmpapi.dll"); + HMODULE hSnmpapi = GetModuleHandleA("snmpapi.dll");
#define SNMPAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hSnmpapi, #func); \ diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 567bf45..75d8f6e 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -366,7 +366,7 @@ static void run_test(const char *file_name) 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; DWORD script_size, size; @@ -418,7 +418,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res;
if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; }