October 2013 - Wine-Commits

Alexandre Julliard : winex11: Use an init once function to register IME classes.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 7cc272cdefaa19ff2b6f0d2e961abdd840bce204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc272cdefaa19ff2b6f0d2e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:05:34 2013 +0200 winex11: Use an init once function to register IME classes. --- dlls/winex11.drv/ime.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index aa6c7dd..cd40f77 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -122,14 +122,10 @@ static BOOL UnlockRealIMC(HIMC hIMC) return FALSE; } -static void IME_RegisterClasses(void) +static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **context ) { - static BOOL done = FALSE; WNDCLASSW wndClass; - if (done) return; - done = TRUE; - ZeroMemory(&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; wndClass.lpfnWndProc = IME_WindowProc; @@ -151,6 +147,7 @@ static void IME_RegisterClasses(void) WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + return TRUE; } static HIMCC ImeCreateBlankCompStr(void) @@ -561,8 +558,10 @@ static void IME_AddToSelected(HIMC hIMC) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + TRACE("\n"); - IME_RegisterClasses(); + InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE;

1 0

Dmitry Timoshkov : kernel32/tests: Fix module tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: f1a6bf70bfa3c18ced2ff0d7b2bea2c503050438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a6bf70bfa3c18ced2ff0d7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:15 2013 +0900 kernel32/tests: Fix module tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/module.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index e8d51e1..6e9ad13 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -46,7 +46,7 @@ static void testGetModuleFileName(const char* name) WCHAR bufW[MAX_PATH]; DWORD len1A, len1W = 0, len2A, len2W = 0; - hMod = (name) ? GetModuleHandle(name) : NULL; + hMod = (name) ? GetModuleHandleA(name) : NULL; /* first test, with enough space in buffer */ memset(bufA, '-', sizeof(bufA)); @@ -157,7 +157,7 @@ static void testNestedLoadLibraryA(void) * - it must not already be loaded * - it must not have a 16-bit counterpart */ - GetWindowsDirectory(path1, sizeof(path1)); + GetWindowsDirectoryA(path1, sizeof(path1)); strcat(path1, "\\system\\"); strcat(path1, dllname); hModule1 = LoadLibraryA(path1); @@ -167,7 +167,7 @@ static void testNestedLoadLibraryA(void) return; } - GetWindowsDirectory(path2, sizeof(path2)); + GetWindowsDirectoryA(path2, sizeof(path2)); strcat(path2, "\\system32\\"); strcat(path2, dllname); hModule2 = LoadLibraryA(path2); @@ -189,7 +189,7 @@ static void testNestedLoadLibraryA(void) ok(FreeLibrary(hModule3), "FreeLibrary() failed\n"); ok(FreeLibrary(hModule2), "FreeLibrary() failed\n"); ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); - ok(GetModuleHandle(dllname) == NULL, "%s was not fully unloaded\n", dllname); + ok(GetModuleHandleA(dllname) == NULL, "%s was not fully unloaded\n", dllname); /* Try to load the dll again, if refcounting is ok, this should work */ hModule1 = LoadLibraryA(path1);

1 0

Alexandre Julliard : winemac: Use an init once function to register IME classes.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 639c202ea7113f6e2b49733dd7041bc158284943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639c202ea7113f6e2b49733dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:05:39 2013 +0200 winemac: Use an init once function to register IME classes. --- dlls/winemac.drv/ime.c | 50 +++++++++++++++++++++++--------------------- dlls/winemac.drv/macdrv.h | 2 - 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 53a10f3..2c74f6e 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -563,25 +563,6 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) UnlockRealIMC(hIMC); } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) -{ - TRACE("\n"); - IME_RegisterClasses( macdrv_module ); - lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); - lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; - lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; - lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; - lpIMEInfo->fdwUICaps = UI_CAP_2700; - /* Tell App we cannot accept ImeSetCompositionString calls */ - /* FIXME: Can we? */ - lpIMEInfo->fdwSCSCaps = 0; - lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; - - lstrcpyW(lpszUIClass, UI_CLASS_NAME); - - return TRUE; -} - BOOL WINAPI ImeConfigure(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData); @@ -1394,10 +1375,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return rc; } - -/* Interfaces to other parts of the Mac driver */ - -void IME_RegisterClasses(HINSTANCE hImeInst) +static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **context ) { WNDCLASSW wndClass; ZeroMemory(&wndClass, sizeof(WNDCLASSW)); @@ -1405,7 +1383,7 @@ void IME_RegisterClasses(HINSTANCE hImeInst) wndClass.lpfnWndProc = (WNDPROC) IME_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); - wndClass.hInstance = hImeInst; + wndClass.hInstance = macdrv_module; wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); @@ -1421,8 +1399,32 @@ void IME_RegisterClasses(HINSTANCE hImeInst) WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + return TRUE; } +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + TRACE("\n"); + InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); + lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); + lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; + lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; + lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; + lpIMEInfo->fdwUICaps = UI_CAP_2700; + /* Tell App we cannot accept ImeSetCompositionString calls */ + /* FIXME: Can we? */ + lpIMEInfo->fdwSCSCaps = 0; + lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; + + lstrcpyW(lpszUIClass, UI_CLASS_NAME); + + return TRUE; +} + +/* Interfaces to other parts of the Mac driver */ + /*********************************************************************** * macdrv_im_set_text */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 24c3f65..98ecb90 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -210,8 +210,6 @@ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HI * Mac IME driver */ -extern void IME_RegisterClasses(HINSTANCE hImeInst) DECLSPEC_HIDDEN; - extern BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : kernel32/tests: Fix mailslot tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 9d5ddd25e1fdfe9398d6a418525297c03e9dbb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5ddd25e1fdfe9398d6a4185… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:11 2013 +0900 kernel32/tests: Fix mailslot tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/mailslot.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 4171504..da595e9 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -42,24 +42,24 @@ static int mailslot_test(void) &dwMsgCount, &dwTimeout ), "getmailslotinfo succeeded\n"); /* open a mailslot that doesn't exist */ - hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter == INVALID_HANDLE_VALUE, "nonexistent mailslot\n"); /* open a mailslot without the right name */ - hSlot = CreateMailslot( "blah", 0, 0, NULL ); + hSlot = CreateMailslotA( "blah", 0, 0, NULL ); ok( hSlot == INVALID_HANDLE_VALUE, "Created mailslot with invalid name\n"); ok( GetLastError() == ERROR_INVALID_NAME, "error should be ERROR_INVALID_NAME\n"); /* open a mailslot with a null name */ - hSlot = CreateMailslot( NULL, 0, 0, NULL ); + hSlot = CreateMailslotA( NULL, 0, 0, NULL ); ok( hSlot == INVALID_HANDLE_VALUE, "Created mailslot with invalid name\n"); ok( GetLastError() == ERROR_PATH_NOT_FOUND, "error should be ERROR_PATH_NOT_FOUND\n"); /* valid open, but with wacky parameters ... then check them */ - hSlot = CreateMailslot( szmspath, -1, -1, NULL ); + hSlot = CreateMailslotA( szmspath, -1, -1, NULL ); ok( hSlot != INVALID_HANDLE_VALUE , "mailslot with valid name failed\n"); dwMax = dwNext = dwMsgCount = dwTimeout = 0; ok( GetMailslotInfo( hSlot, &dwMax, &dwNext, &dwMsgCount, &dwTimeout ), @@ -73,7 +73,7 @@ static int mailslot_test(void) ok( CloseHandle(hSlot), "failed to close mailslot\n"); /* now open it for real */ - hSlot = CreateMailslot( szmspath, 0, 0, NULL ); + hSlot = CreateMailslotA( szmspath, 0, 0, NULL ); ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); /* try and read/write to it */ @@ -103,14 +103,14 @@ todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); /* now try and open the client, but with the wrong sharing mode */ - hWriter = CreateFile(szmspath, GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE /* vista */ || GetLastError() == ERROR_SHARING_VIOLATION, "error should be ERROR_SHARING_VIOLATION got %p / %u\n", hWriter, GetLastError()); if (hWriter != INVALID_HANDLE_VALUE) CloseHandle( hWriter ); /* now open the client with the correct sharing mode */ - hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot err %u\n", GetLastError()); @@ -156,25 +156,25 @@ todo_wine else ok( count == 0, "wrong count %u\n", count ); /* now try open another writer... should fail */ - hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a reader ... also fails */ - hWriter2 = CreateFile(szmspath, GENERIC_READ, + hWriter2 = CreateFileA(szmspath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a writer ... still fails */ - hWriter2 = CreateFile(szmspath, GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now open another one */ - hSlot2 = CreateMailslot( szmspath, 0, 0, NULL ); + hSlot2 = CreateMailslotA( szmspath, 0, 0, NULL ); ok( hSlot2 == INVALID_HANDLE_VALUE , "opened two mailslots\n"); /* close the client again */ @@ -184,7 +184,7 @@ todo_wine * now try reopen it with slightly different permissions ... * shared writing */ - hWriter = CreateFile(szmspath, GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE, "sharing writer\n"); @@ -192,13 +192,13 @@ todo_wine * now try open another as a writer ... * but don't share with the first ... fail */ - hWriter2 = CreateFile(szmspath, GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a writer ... and share with the first */ - hWriter2 = CreateFile(szmspath, GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter2 != INVALID_HANDLE_VALUE, "2nd sharing writer\n"); @@ -316,7 +316,7 @@ todo_wine ok( CloseHandle( hSlot ), "closing the mailslot\n"); /* test timeouts */ - hSlot = CreateMailslot( szmspath, 0, 1000, NULL ); + hSlot = CreateMailslotA( szmspath, 0, 1000, NULL ); ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); count = 0; memset(buffer, 0, sizeof buffer);

1 0

Dmitry Timoshkov : kernel32/tests: Fix thread tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: abbe8b3d02cadbe98290254b454855559c15b65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbe8b3d02cadbe98290254b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:45 2013 +0900 kernel32/tests: Fix thread tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/thread.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 33797d8..964ad02 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -25,12 +25,15 @@ #include <stdarg.h> #include <stdio.h> -#include "wine/test.h" +/* the tests intentionally pass invalid pointers and need an exception handler */ +#define WINE_NO_INLINE_STRING + #include <windef.h> #include <winbase.h> #include <winnt.h> #include <winerror.h> #include <winnls.h> +#include "wine/test.h" /* Specify the number of simultaneous threads to test */ #define NUM_THREADS 4 @@ -86,12 +89,12 @@ static HANDLE create_target_process(const char *arg) char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; BOOL ret; - STARTUPINFO si = { 0 }; + STARTUPINFOA si = { 0 }; si.cb = sizeof(si); winetest_get_mainargs( &argv ); sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); - ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "error: %u\n", GetLastError()); ret = CloseHandle(pi.hThread); ok(ret, "error %u\n", GetLastError()); @@ -116,9 +119,9 @@ static LONG num_synced; static void init_thread_sync_helpers(void) { - start_event = CreateEvent(NULL, TRUE, FALSE, NULL); + start_event = CreateEventW(NULL, TRUE, FALSE, NULL); ok(start_event != NULL, "CreateEvent failed\n"); - stop_event = CreateEvent(NULL, TRUE, FALSE, NULL); + stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); ok(stop_event != NULL, "CreateEvent failed\n"); num_synced = -1; } @@ -298,10 +301,10 @@ static void create_function_addr_events(HANDLE events[2]) char buffer[256]; sprintf(buffer, "threadFunc_SetEvent %p", threadFunc_SetEvent); - events[0] = CreateEvent(NULL, FALSE, FALSE, buffer); + events[0] = CreateEventA(NULL, FALSE, FALSE, buffer); sprintf(buffer, "threadFunc_CloseHandle %p", threadFunc_CloseHandle); - events[1] = CreateEvent(NULL, FALSE, FALSE, buffer); + events[1] = CreateEventA(NULL, FALSE, FALSE, buffer); } /* check CreateRemoteThread */ @@ -325,7 +328,7 @@ static VOID test_CreateRemoteThread(void) } ok(ret == WAIT_OBJECT_0 || broken(ret == WAIT_OBJECT_0+1 /* nt4,w2k */), "WaitForAllObjects 2 events %d\n", ret); - hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); ok(hEvent != NULL, "Can't create event, err=%u\n", GetLastError()); ret = DuplicateHandle(GetCurrentProcess(), hEvent, hProcess, &hRemoteEvent, 0, FALSE, DUPLICATE_SAME_ACCESS); @@ -953,7 +956,7 @@ static void test_SetThreadContext(void) BOOL ret; SetLastError(0xdeadbeef); - event = CreateEvent( NULL, TRUE, FALSE, NULL ); + event = CreateEventW( NULL, TRUE, FALSE, NULL ); thread = CreateThread( NULL, 0, threadFunc6, (void *)2, 0, &threadid ); ok( thread != NULL, "CreateThread failed : (%d)\n", GetLastError() ); if (!thread) @@ -1034,7 +1037,7 @@ static void test_QueueUserWorkItem(void) /* QueueUserWorkItem not present on win9x */ if (!pQueueUserWorkItem) return; - finish_event = CreateEvent(NULL, TRUE, FALSE, NULL); + finish_event = CreateEventW(NULL, TRUE, FALSE, NULL); before = GetTickCount(); @@ -1082,8 +1085,8 @@ static void test_RegisterWaitForSingleObject(void) /* test signaled case */ - handle = CreateEvent(NULL, TRUE, TRUE, NULL); - complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); + handle = CreateEventW(NULL, TRUE, TRUE, NULL); + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); ret = pRegisterWaitForSingleObject(&wait_handle, handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); @@ -1426,7 +1429,7 @@ static WORD get_thread_fpu_cw(void) DWORD tid, res; HANDLE thread; - ctx.finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ctx.finished = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!ctx.finished, "Failed to create event, last error %#x.\n", GetLastError()); thread = CreateThread(NULL, 0, fpu_thread, &ctx, 0, &tid); @@ -1598,7 +1601,7 @@ static void test_thread_actctx(void) static void init_funcs(void) { - HMODULE hKernel32 = GetModuleHandle("kernel32"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); /* Neither Cygwin nor mingW export OpenThread, so do a dynamic check so that the compile passes */

1 0

Dmitry Timoshkov : kernel32/tests: Fix synchronization tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: 31917bfa73f11d2ce66f99c215e77d14d18867d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31917bfa73f11d2ce66f99c21… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:35 2013 +0900 kernel32/tests: Fix synchronization tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/sync.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index a040c59..b98d7c4 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -54,7 +54,7 @@ static void test_signalandwait(void) DWORD r; HANDLE event[2], semaphore[2], file; - kernel32 = GetModuleHandle("kernel32"); + kernel32 = GetModuleHandleA("kernel32.dll"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); if (!pSignalObjectAndWait) @@ -69,8 +69,8 @@ static void test_signalandwait(void) } ok( r == WAIT_FAILED, "should fail\n"); - event[0] = CreateEvent(NULL, 0, 0, NULL); - event[1] = CreateEvent(NULL, 1, 1, NULL); + event[0] = CreateEventW(NULL, 0, 0, NULL); + event[1] = CreateEventW(NULL, 1, 1, NULL); ok( event[0] && event[1], "failed to create event flags\n"); @@ -105,8 +105,8 @@ static void test_signalandwait(void) CloseHandle(event[1]); /* semaphores */ - semaphore[0] = CreateSemaphore( NULL, 0, 1, NULL ); - semaphore[1] = CreateSemaphore( NULL, 1, 1, NULL ); + semaphore[0] = CreateSemaphoreW( NULL, 0, 1, NULL ); + semaphore[1] = CreateSemaphoreW( NULL, 1, 1, NULL ); ok( semaphore[0] && semaphore[1], "failed to create semaphore\n"); r = pSignalObjectAndWait(semaphore[0], semaphore[1], 0, FALSE); @@ -125,7 +125,7 @@ static void test_signalandwait(void) CloseHandle(semaphore[1]); /* try a registry key */ - file = CreateFile("x", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + file = CreateFileA("x", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); r = pSignalObjectAndWait(file, file, 0, FALSE); ok( r == WAIT_FAILED, "should fail\n"); @@ -143,23 +143,23 @@ static void test_mutex(void) DWORD failed = 0; SetLastError(0xdeadbeef); - hOpened = OpenMutex(0, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); ok(hOpened == NULL, "OpenMutex succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hCreated = CreateMutex(NULL, FALSE, "WineTestMutex"); + hCreated = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(hCreated != NULL, "CreateMutex failed with error %d\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = OpenMutex(0, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); todo_wine ok(hOpened == NULL, "OpenMutex succeeded\n"); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(GENERIC_EXECUTE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); @@ -172,7 +172,7 @@ todo_wine } SetLastError(0xdeadbeef); - hOpened = OpenMutex(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); @@ -181,7 +181,7 @@ todo_wine for (i = 0; i < 32; i++) { SetLastError(0xdeadbeef); - hOpened = OpenMutex(0x1 << i, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(0x1 << i, FALSE, "WineTestMutex"); if(hOpened != NULL) { SetLastError(0xdeadbeef); @@ -211,23 +211,23 @@ todo_wine /* test case sensitivity */ SetLastError(0xdeadbeef); - hOpened = OpenMutex(READ_CONTROL, FALSE, "WINETESTMUTEX"); + hOpened = OpenMutexA(READ_CONTROL, FALSE, "WINETESTMUTEX"); ok(!hOpened, "OpenMutex succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = OpenMutex(READ_CONTROL, FALSE, "winetestmutex"); + hOpened = OpenMutexA(READ_CONTROL, FALSE, "winetestmutex"); ok(!hOpened, "OpenMutex succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = CreateMutex(NULL, FALSE, "WineTestMutex"); + hOpened = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); ok(GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); CloseHandle(hOpened); SetLastError(0xdeadbeef); - hOpened = CreateMutex(NULL, FALSE, "WINETESTMUTEX"); + hOpened = CreateMutexA(NULL, FALSE, "WINETESTMUTEX"); ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); ok(GetLastError() == 0, "wrong error %u\n", GetLastError()); CloseHandle(hOpened); @@ -254,7 +254,7 @@ static void test_slist(void) PSLIST_ENTRY (WINAPI *pInterlockedPushEntrySList)(PSLIST_HEADER,PSLIST_ENTRY); HMODULE kernel32; - kernel32 = GetModuleHandle("KERNEL32.DLL"); + kernel32 = GetModuleHandleA("KERNEL32.DLL"); pInitializeSListHead = (void*) GetProcAddress(kernel32, "InitializeSListHead"); pQueryDepthSList = (void*) GetProcAddress(kernel32, "QueryDepthSList"); pInterlockedFlushSList = (void*) GetProcAddress(kernel32, "InterlockedFlushSList"); @@ -536,7 +536,7 @@ static void test_iocp_callback(void) return; } - sem = CreateSemaphore(NULL, 0, 1, NULL); + sem = CreateSemaphoreW(NULL, 0, 1, NULL); ok(sem != INVALID_HANDLE_VALUE, "Creating a semaphore failed\n"); ret = GetTempPathA(MAX_PATH, temp_path); @@ -813,9 +813,9 @@ static void test_timer_queue(void) ok(n5 == 1, "Timer callback 5 expected 1 got %d\n", n5); /* Test synchronous deletion of the timer/queue with event trigger. */ - e = CreateEvent(NULL, TRUE, FALSE, NULL); - et1 = CreateEvent(NULL, TRUE, FALSE, NULL); - et2 = CreateEvent(NULL, TRUE, FALSE, NULL); + e = CreateEventW(NULL, TRUE, FALSE, NULL); + et1 = CreateEventW(NULL, TRUE, FALSE, NULL); + et2 = CreateEventW(NULL, TRUE, FALSE, NULL); if (!e || !et1 || !et2) { skip("Failed to create timer queue descruction event\n"); @@ -1123,7 +1123,7 @@ static void test_WaitForMultipleObjects(void) * we can wait on that many */ for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) { - maxevents[i] = CreateEvent(NULL, i==0, TRUE, NULL); + maxevents[i] = CreateEventW(NULL, i==0, TRUE, NULL); ok( maxevents[i] != 0, "should create enough events\n"); } @@ -1653,7 +1653,7 @@ static void test_condvars_base(void) { START_TEST(sync) { - HMODULE hdll = GetModuleHandle("kernel32"); + HMODULE hdll = GetModuleHandleA("kernel32.dll"); pChangeTimerQueueTimer = (void*)GetProcAddress(hdll, "ChangeTimerQueueTimer"); pCreateTimerQueue = (void*)GetProcAddress(hdll, "CreateTimerQueue"); pCreateTimerQueueTimer = (void*)GetProcAddress(hdll, "CreateTimerQueueTimer");

1 0

Dmitry Timoshkov : kernel32/tests: Fix resource tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: a18087e5d1005ce769093e75a33d26f29c949b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18087e5d1005ce769093e75a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:31 2013 +0900 kernel32/tests: Fix resource tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/resource.c | 70 ++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index a85e6d2..f94fed6 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -255,7 +255,7 @@ static int build_exe( const sec_build* sec_descr ) file_size = phys_end_of_section; } - file = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok (file != INVALID_HANDLE_VALUE, "failed to create file\n"); /* write out the header */ @@ -279,7 +279,7 @@ static void update_missing_exe( void ) HANDLE res; SetLastError(0xdeadbeef); - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); GLE = GetLastError(); ok( res == NULL, "BeginUpdateResource should fail\n"); } @@ -289,29 +289,29 @@ static void update_empty_exe( void ) HANDLE file, res, test; BOOL r; - file = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok (file != INVALID_HANDLE_VALUE, "failed to create file\n"); CloseHandle( file ); - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); if ( res != NULL || GetLastError() != ERROR_FILE_INVALID ) { ok( res != NULL, "BeginUpdateResource failed\n"); /* check if it's possible to open the file now */ - test = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + test = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok (test != INVALID_HANDLE_VALUE, "failed to create file\n"); CloseHandle( test ); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r == FALSE, "EndUpdateResource failed\n"); } else skip( "Can't update resource in empty file\n" ); - res = BeginUpdateResource( filename, FALSE ); + res = BeginUpdateResourceA( filename, FALSE ); ok( res == NULL, "BeginUpdateResource failed\n"); } @@ -320,10 +320,10 @@ static void update_resources_none( void ) HMODULE res; BOOL r; - res = BeginUpdateResource( filename, FALSE ); + res = BeginUpdateResourceA( filename, FALSE ); ok( res != NULL, "BeginUpdateResource failed\n"); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); } @@ -332,10 +332,10 @@ static void update_resources_delete( void ) HMODULE res; BOOL r; - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); } @@ -345,27 +345,27 @@ static void update_resources_version( void ) BOOL r; char foo[] = "red and white"; - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); if (0) /* this causes subsequent tests to fail on Vista */ { - r = UpdateResource( res, - MAKEINTRESOURCE(0x1230), - MAKEINTRESOURCE(0x4567), + r = UpdateResourceA( res, + MAKEINTRESOURCEA(0x1230), + MAKEINTRESOURCEA(0x4567), 0xabcd, NULL, 0 ); ok( r == FALSE, "UpdateResource failed\n"); } - r = UpdateResource( res, - MAKEINTRESOURCE(0x1230), - MAKEINTRESOURCE(0x4567), + r = UpdateResourceA( res, + MAKEINTRESOURCEA(0x1230), + MAKEINTRESOURCEA(0x4567), 0xabcd, foo, sizeof foo ); ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed: %d\n", GetLastError()); } @@ -375,17 +375,17 @@ static void update_resources_bigdata( void ) BOOL r; char foo[2*page_size] = "foobar"; - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); ok( res != NULL, "BeginUpdateResource succeeded\n"); - r = UpdateResource( res, - MAKEINTRESOURCE(0x3012), - MAKEINTRESOURCE(0x5647), + r = UpdateResourceA( res, + MAKEINTRESOURCEA(0x3012), + MAKEINTRESOURCEA(0x5647), 0xcdba, foo, sizeof foo ); ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); } @@ -399,13 +399,13 @@ static void check_exe( const sec_verify *verify ) HANDLE file, mapping; DWORD length, sec_count = 0; - file = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok (file != INVALID_HANDLE_VALUE, "failed to create file (%d)\n", GetLastError()); length = GetFileSize( file, NULL ); ok( length >= verify->length, "file size wrong\n"); - mapping = CreateFileMapping( file, NULL, PAGE_READONLY, 0, 0, NULL ); + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 0, NULL ); ok (mapping != NULL, "failed to create file\n"); dos = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); @@ -458,33 +458,33 @@ static void test_find_resource(void) { HRSRC rsrc; - rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(1), (LPCWSTR)RT_MENU ); + rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(1), (LPCWSTR)RT_MENU ); ok( rsrc != 0, "resource not found\n" ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL )); ok( rsrc != 0, "resource not found\n" ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_GERMAN, SUBLANG_DEFAULT )); ok( rsrc != 0, "resource not found\n" ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(1), (LPCWSTR)RT_DIALOG ); + rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(1), (LPCWSTR)RT_DIALOG ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(2), (LPCWSTR)RT_MENU ); + rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(2), (LPCWSTR)RT_MENU ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_FRENCH, SUBLANG_DEFAULT ) ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); @@ -494,7 +494,7 @@ START_TEST(resource) { DWORD i; - DeleteFile( filename ); + DeleteFileA( filename ); update_missing_exe(); if (GLE == ERROR_CALL_NOT_IMPLEMENTED) @@ -517,7 +517,7 @@ START_TEST(resource) check_exe( &sec->chk_version ); update_resources_bigdata(); check_exe( &sec->chk_bigdata ); - DeleteFile( filename ); + DeleteFileA( filename ); } test_find_resource(); }

1 0

Dmitry Timoshkov : kernel32/tests: Fix profile tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 22, 2013

Oct. 22, 2013

Module: wine Branch: master Commit: f776e879fd19174404ffafad903909bccfb2cd79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f776e879fd19174404ffafad9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:27 2013 +0900 kernel32/tests: Fix profile tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/profile.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 211d0c6..9b83e85 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -382,19 +382,19 @@ static void test_profile_existing(void) for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) { - h = CreateFile(testfile1, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, + h = CreateFileA(testfile1, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); - ret = WritePrivateProfileString(SECTION, KEY, "12345", testfile1); + ret = WritePrivateProfileStringA(SECTION, KEY, "12345", testfile1); if (!pe[i].write_error) { if (!ret) ok( broken(GetLastError() == pe[i].broken_error), "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() ); CloseHandle(h); - size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); + size = GetPrivateProfileStringA(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); if (ret) ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size ); else @@ -408,21 +408,21 @@ static void test_profile_existing(void) ok( err == pe[i].write_error, "%d: WritePrivateProfileString failed with error %u/%u\n", i, err, pe[i].write_error ); CloseHandle(h); - size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); + size = GetPrivateProfileStringA(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); ok( !size, "%d: test failed, number of characters copied: %d instead of 0\n", i, size ); } - ok( DeleteFile(testfile1), "delete failed\n" ); + ok( DeleteFileA(testfile1), "delete failed\n" ); } - h = CreateFile(testfile2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileA(testfile2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); sprintf( buffer, "[%s]\r\n%s=123\r\n", SECTION, KEY ); ok( WriteFile( h, buffer, strlen(buffer), &size, NULL ), "failed to write\n" ); CloseHandle( h ); for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) { - h = CreateFile(testfile2, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, + h = CreateFileA(testfile2, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); @@ -436,7 +436,7 @@ static void test_profile_existing(void) ok( !ret, "%d: GetPrivateProfileString succeeded\n", i ); CloseHandle(h); } - ok( DeleteFile(testfile2), "delete failed\n" ); + ok( DeleteFileA(testfile2), "delete failed\n" ); } static void test_profile_delete_on_close(void) @@ -446,14 +446,14 @@ static void test_profile_delete_on_close(void) DWORD size, res; static const char contents[] = "[" SECTION "]\n" KEY "=123\n"; - h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); res = WriteFile( h, contents, sizeof contents - 1, &size, NULL ); ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 0, testfile); ok( res == 123 || broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ "Got %d instead of 123\n", res); @@ -470,14 +470,14 @@ static void test_profile_refresh(void) static const char contents1[] = "[" SECTION "]\n" KEY "=123\n"; static const char contents2[] = "[" SECTION "]\n" KEY "=124\n"; - h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); res = WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ); ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents1 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 0, testfile); ok( res == 123 || broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ "Got %d instead of 123\n", res); @@ -486,14 +486,14 @@ static void test_profile_refresh(void) /* Test proper invalidation of wine's profile file cache */ - h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); res = WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ); ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents2 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 0, testfile); ok( res == 124 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 124\n", res); @@ -503,7 +503,7 @@ static void test_profile_refresh(void) /* Cache must be invalidated if file no longer exists and default must be returned */ SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 421, testfile); ok( res == 421 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 421\n", res);

1 0

Piotr Caban : msvcrt: Make the first call to fwrite buffered.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: afec0b00bd6250fe21e8deccbc8116a4aca6a7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afec0b00bd6250fe21e8deccb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 21 16:11:31 2013 +0200 msvcrt: Make the first call to fwrite buffered. --- dlls/msvcrt/file.c | 133 +++++++++++++++++++++++++-------------------------- 1 files changed, 65 insertions(+), 68 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1594c33..89ac94c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3499,6 +3499,45 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f } /********************************************************************* + * _flsbuf (MSVCRT.@) + */ +int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) +{ + /* Flush output buffer */ + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + msvcrt_alloc_buffer(file); + } + if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) + file->_flag |= MSVCRT__IOWRT; + else + return MSVCRT_EOF; + } + if(file->_bufsiz) { + int res = 0; + + if(file->_cnt <= 0) + res = msvcrt_flush_buffer(file); + if(!res) { + *file->_ptr++ = c; + file->_cnt--; + } + + return res ? res : c&0xff; + } else { + unsigned char cc=c; + int len; + /* set _cnt to 0 for unbuffered FILEs */ + file->_cnt = 0; + len = MSVCRT__write(file->_file, &cc, 1); + if (len == 1) + return c & 0xff; + file->_flag |= MSVCRT__IOERR; + return MSVCRT_EOF; + } +} + +/********************************************************************* * fwrite (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) @@ -3509,38 +3548,36 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si return 0; MSVCRT__lock_file(file); - if(file->_cnt) { - int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; - memcpy(file->_ptr, ptr, pcnt); - file->_cnt -= pcnt; - file->_ptr += pcnt; - written = pcnt; - wrcnt -= pcnt; - ptr = (const char*)ptr + pcnt; - } else if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) { - file->_flag |= MSVCRT__IOWRT; - } else { - MSVCRT__unlock_file(file); - return 0; - } - } - if(wrcnt) { - int res; - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) - msvcrt_alloc_buffer(file); + while(wrcnt) { + if(file->_cnt) { + int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; + memcpy(file->_ptr, ptr, pcnt); + file->_cnt -= pcnt; + file->_ptr += pcnt; + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; + } else if(!file->_bufsiz && (file->_flag & MSVCRT__IONBF)) { + if(!(file->_flag & MSVCRT__IOWRT)) { + if(file->_flag & MSVCRT__IORW) + file->_flag |= MSVCRT__IOWRT; + else + break; + } - /* Flush buffer */ - res=msvcrt_flush_buffer(file); - if(!res) { - int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); - if (pwritten <= 0) - { + if(MSVCRT__write(file->_file, ptr, wrcnt) <= 0) { file->_flag |= MSVCRT__IOERR; - pwritten=0; + break; } - written += pwritten; + written += wrcnt; + wrcnt = 0; + } else { + if(MSVCRT__flsbuf(*(const char*)ptr, file) == MSVCRT_EOF) + break; + written++; + wrcnt--; + ptr = (const char*)ptr + 1; } } @@ -3700,46 +3737,6 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, } /********************************************************************* - * _flsbuf (MSVCRT.@) - */ -int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) -{ - /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { - msvcrt_alloc_buffer(file); - } - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else - return MSVCRT_EOF; - } - if(file->_bufsiz) { - int res = 0; - - if(file->_cnt <= 0) - res = msvcrt_flush_buffer(file); - if(!res) { - *file->_ptr++ = c; - file->_cnt--; - res = msvcrt_flush_buffer(file); - } - - return res ? res : c&0xff; - } else { - unsigned char cc=c; - int len; - /* set _cnt to 0 for unbuffered FILEs */ - file->_cnt = 0; - len = MSVCRT__write(file->_file, &cc, 1); - if (len == 1) - return c & 0xff; - file->_flag |= MSVCRT__IOERR; - return MSVCRT_EOF; - } -} - -/********************************************************************* * fputc (MSVCRT.@) */ int CDECL MSVCRT_fputc(int c, MSVCRT_FILE* file)

1 0

Akihiro Sagawa : gdi32: Adjust fake bold outline font metrics.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: cab2cacb8e3828c9e451475d68ca550f092072f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab2cacb8e3828c9e451475d6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 17 21:25:08 2013 +0900 gdi32: Adjust fake bold outline font metrics. --- dlls/gdi32/freetype.c | 5 ++++- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b39f2ed..45723d3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7330,8 +7330,11 @@ static BOOL get_outline_text_metrics(GdiFont *font) } TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); TM.tmWeight = FW_REGULAR; - if (font->fake_bold) + if (font->fake_bold) { + TM.tmAveCharWidth++; + TM.tmMaxCharWidth++; TM.tmWeight = FW_BOLD; + } else { if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 854d68b..17608ce 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5693,9 +5693,9 @@ static void test_fake_bold_font(void) ok(tm[0].tmHeight == tm[1].tmHeight, "expected %d, got %d\n", tm[0].tmHeight, tm[1].tmHeight); ok(tm[0].tmAscent == tm[1].tmAscent, "expected %d, got %d\n", tm[0].tmAscent, tm[1].tmAscent); ok(tm[0].tmDescent == tm[1].tmDescent, "expected %d, got %d\n", tm[0].tmDescent, tm[1].tmDescent); - todo_wine ok((tm[0].tmAveCharWidth + 1) == tm[1].tmAveCharWidth, + ok((tm[0].tmAveCharWidth + 1) == tm[1].tmAveCharWidth, "expected %d, got %d\n", tm[0].tmAveCharWidth + 1, tm[1].tmAveCharWidth); - todo_wine ok((tm[0].tmMaxCharWidth + 1) == tm[1].tmMaxCharWidth, + ok((tm[0].tmMaxCharWidth + 1) == tm[1].tmMaxCharWidth, "expected %d, got %d\n", tm[0].tmMaxCharWidth + 1, tm[1].tmMaxCharWidth); ok(tm[0].tmOverhang == tm[1].tmOverhang, "expected %d, got %d\n", tm[0].tmOverhang, tm[1].tmOverhang); w[0] = abc[0].abcA + abc[0].abcB + abc[0].abcC;

1 0