wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Ilya Shpigor : user32: Destroy EDITSTATE structure in the WM_NCDESTROY message processing.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: da9c52371edd7e2d03907df939e7e8c7109fb4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9c52371edd7e2d03907df93… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Sun Nov 15 13:33:38 2009 +0300 user32: Destroy EDITSTATE structure in the WM_NCDESTROY message processing. --- dlls/user32/edit.c | 10 +++++----- dlls/user32/tests/edit.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 190e9c6..f4143b1 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4691,10 +4691,10 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) /********************************************************************* * - * WM_DESTROY + * WM_NCDESTROY * */ -static LRESULT EDIT_WM_Destroy(EDITSTATE *es) +static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) { LINEDEF *pc, *pp; @@ -4762,7 +4762,7 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); - if (es && (msg != WM_DESTROY)) EDIT_LockBuffer(es); + if (es && (msg != WM_NCDESTROY)) EDIT_LockBuffer(es); switch (msg) { case EM_GETSEL16: @@ -5102,8 +5102,8 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, result = EDIT_WM_NCCreate(hwnd, (LPCREATESTRUCTW)lParam, unicode); break; - case WM_DESTROY: - result = EDIT_WM_Destroy(es); + case WM_NCDESTROY: + result = EDIT_WM_NCDestroy(es); es = NULL; break; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 5ca012e..e42127f 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1239,6 +1239,45 @@ static void test_edit_control_5(void) DestroyWindow(hWnd); } +/* Test WM_GETTEXT processing + * after destroy messages + */ +static void test_edit_control_6(void) +{ + static const char *str = "test\r\ntest"; + char buf[MAXLEN]; + LONG ret; + HWND hWnd; + + hWnd = CreateWindowEx(0, + "EDIT", + "Test", + 0, + 10, 10, 1, 1, + NULL, NULL, hinst, NULL); + assert(hWnd); + + ret = SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str); + ok(ret == TRUE, "Expected %d, got %d\n", TRUE, ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == lstrlen(str), "Expected %s, got len %d\n", str, ret); + ok(!lstrcmp(buf, str), "Expected %s, got %s\n", str, buf); + buf[0] = 0; + ret = SendMessageA(hWnd, WM_DESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == lstrlen(str), "Expected %s, got len %d\n", str, ret); + ok(!lstrcmp(buf, str), "Expected %s, got %s\n", str, buf); + buf[0] = 0; + ret = SendMessageA(hWnd, WM_NCDESTROY, 0, 0); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = SendMessageA(hWnd, WM_GETTEXT, MAXLEN, (LPARAM)buf); + ok(ret == 0, "Expected 0, got len %d\n", ret); + ok(!lstrcmp(buf, ""), "Expected empty string, got %s\n", buf); + + DestroyWindow(hWnd); +} + static void test_edit_control_limittext(void) { HWND hwEdit; @@ -2270,6 +2309,7 @@ START_TEST(edit) test_edit_control_3(); test_edit_control_4(); test_edit_control_5(); + test_edit_control_6(); test_edit_control_limittext(); test_margins(); test_margins_font_change();

1 0

Andrew Nguyen : msvcrt: Implement and test _wcsupr_s.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 1eb077567099197f39de13f8e2a3937bfc917051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb077567099197f39de13f8e… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 15 19:09:17 2009 -0600 msvcrt: Implement and test _wcsupr_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/tests/string.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 29 ++++++++++++++ 3 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ad8fa94..92d1731 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -548,6 +548,7 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) @ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime32(ptr) MSVCRT__wctime32 @ cdecl _wctime64(ptr) MSVCRT__wctime64 diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index fc2ad3c..8544735 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -51,6 +51,7 @@ static int (__cdecl *pstrcpy_s)(char *dst, size_t len, const char *src); static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); +static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -597,6 +598,93 @@ static void test_wcscpy_s(void) ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); } +static void test__wcsupr_s(void) +{ + static const WCHAR mixedString[] = {'M', 'i', 'X', 'e', 'D', 'l', 'o', 'w', + 'e', 'r', 'U', 'P', 'P', 'E', 'R', 0}; + static const WCHAR expectedString[] = {'M', 'I', 'X', 'E', 'D', 'L', 'O', + 'W', 'E', 'R', 'U', 'P', 'P', 'E', + 'R', 0}; + WCHAR testBuffer[2*sizeof(mixedString)/sizeof(WCHAR)]; + int ret; + + if (!p_wcsupr_s) + { + win_skip("_wcsupr_s not found\n"); + return; + } + + /* Test NULL input string and invalid size. */ + errno = EBADF; + ret = p_wcsupr_s(NULL, 0); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + /* Test NULL input string and valid size. */ + errno = EBADF; + ret = p_wcsupr_s(NULL, sizeof(testBuffer)/sizeof(WCHAR)); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + /* Test empty string with zero size. */ + errno = EBADF; + testBuffer[0] = '\0'; + ret = p_wcsupr_s(testBuffer, 0); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(testBuffer[0] == '\0', "Expected the buffer to be unchanged\n"); + + /* Test empty string with size of one. */ + testBuffer[0] = '\0'; + ret = p_wcsupr_s(testBuffer, 1); + ok(ret == 0, "Expected _wcsupr_s to succeed, got %d\n", ret); + ok(testBuffer[0] == '\0', "Expected the buffer to be unchanged\n"); + + /* Test one-byte buffer with zero size. */ + errno = EBADF; + testBuffer[0] = 'x'; + ret = p_wcsupr_s(testBuffer, 0); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(testBuffer[0] == '\0', "Expected the first buffer character to be null\n"); + + /* Test one-byte buffer with size of one. */ + errno = EBADF; + testBuffer[0] = 'x'; + ret = p_wcsupr_s(testBuffer, 1); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(testBuffer[0] == '\0', "Expected the first buffer character to be null\n"); + + /* Test invalid size. */ + wcscpy(testBuffer, mixedString); + errno = EBADF; + ret = p_wcsupr_s(testBuffer, 0); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(testBuffer[0] == '\0', "Expected the first buffer character to be null\n"); + + /* Test normal string uppercasing. */ + wcscpy(testBuffer, mixedString); + ret = p_wcsupr_s(testBuffer, sizeof(mixedString)/sizeof(WCHAR)); + ok(ret == 0, "Expected _wcsupr_s to succeed, got %d\n", ret); + ok(!wcscmp(testBuffer, expectedString), "Expected the string to be fully upper-case\n"); + + /* Test uppercasing with a shorter buffer size count. */ + wcscpy(testBuffer, mixedString); + errno = EBADF; + ret = p_wcsupr_s(testBuffer, sizeof(mixedString)/sizeof(WCHAR) - 1); + ok(ret == EINVAL, "Expected _wcsupr_s to fail with EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + ok(testBuffer[0] == '\0', "Expected the first buffer character to be null\n"); + + /* Test uppercasing with a longer buffer size count. */ + wcscpy(testBuffer, mixedString); + ret = p_wcsupr_s(testBuffer, sizeof(testBuffer)/sizeof(WCHAR)); + ok(ret == 0, "Expected _wcsupr_s to succeed, got %d\n", ret); + ok(!wcscmp(testBuffer, expectedString), "Expected the string to be fully upper-case\n"); +} + static void test_mbcjisjms(void) { /* List of value-pairs to test. The test assumes the last pair to be {0, ..} */ @@ -721,6 +809,7 @@ START_TEST(string) pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); + p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -746,5 +835,6 @@ START_TEST(string) test_mbcjisjms(); test_strtok(); test_wcscpy_s(); + test__wcsupr_s(); test_strtol(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d83dd94..0f3e9ee 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -90,6 +90,35 @@ MSVCRT_wchar_t* CDECL _wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c ) return ret; } +/****************************************************************** + * _wcsupr_s (MSVCRT.@) + * + */ +INT CDECL MSVCRT__wcsupr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) +{ + MSVCRT_wchar_t* ptr = str; + + if (!str || !n) + { + if (str) *str = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + while (n--) + { + if (!*ptr) return 0; + *ptr = toupperW(*ptr); + ptr++; + } + + /* MSDN claims that the function should return and set errno to + * ERANGE, which doesn't seem to be true based on the tests. */ + *str = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; +} + /********************************************************************* * wcstod (MSVCRT.@) */

1 0

Andrew Nguyen : dbghelp: Stub SymRefreshModuleList.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 44ac91d78dc19787f454685ea27ed34571b5332a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ac91d78dc19787f454685ea… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 15 19:02:48 2009 -0600 dbghelp: Stub SymRefreshModuleList. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/module.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 63a107c..825493a 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -144,7 +144,7 @@ @ stub SymNextW @ stub SymPrev @ stub SymPrevW -@ stub SymRefreshModuleList +@ stdcall SymRefreshModuleList(long) @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterCallback64(long ptr double) @ stdcall SymRegisterCallbackW64(long ptr double) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6199b58..7d2ad7f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1052,3 +1052,12 @@ void module_reset_debug_info(struct module* module) module->sources_used = module->sources_alloc = 0; module->sources = NULL; } + +/****************************************************************** + * SymRefreshModuleList (DBGHELP.@) + */ +BOOL WINAPI SymRefreshModuleList(HANDLE hProcess) +{ + FIXME("(%p) stub\n", hProcess); + return FALSE; +}

1 0

André Hentschel : winedump: Add ARM support.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 0c652a5a5c4988e365eb660d1acbc572bb2f1f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c652a5a5c4988e365eb660d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 16 14:31:59 2009 +0100 winedump: Add ARM support. --- tools/winedump/minidump.c | 3 +++ tools/winedump/pe.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 76aaa58..2ea4c54 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -284,6 +284,9 @@ void mdmp_dump(void) case PROCESSOR_ARCHITECTURE_PPC: str = "PowerPC"; break; + case PROCESSOR_ARCHITECTURE_ARM: + str = "ARM"; + break; default: str = "???"; break; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 077109d..9761215 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -61,6 +61,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_POWERPC: return "PowerPC"; case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; + case IMAGE_FILE_MACHINE_ARM: return "ARM"; } return "???"; }

1 0

Jörg Höhle : winmm: Enable more MCI waveaudio tests.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 7ade23e300d4bbe1a88b64b6f60c5c0bc711bb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ade23e300d4bbe1a88b64b6f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Oct 22 08:53:30 2009 +0200 winmm: Enable more MCI waveaudio tests. --- dlls/winmm/tests/mci.c | 140 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 116 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ade23e300d4bbe1a88b6…

1 0

Jörg Höhle : winmm/tests: Print symbolic MCIERR_ names.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 18971c94b6bd14888cc2c415d34fde97301e7862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18971c94b6bd14888cc2c415d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 14 17:51:41 2009 +0100 winmm/tests: Print symbolic MCIERR_ names. --- dlls/winmm/tests/mci.c | 198 ++++++++++++++++++++++++----------------------- 1 files changed, 101 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18971c94b6bd14888cc2c…

1 0

Jörg Höhle : winmm: MCI_ALL_DEVICE_ID(MCIDEVICEID ) is not a 16bit entity in MCI32.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 65011132e5347cbce7a51c291286effde651f85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65011132e5347cbce7a51c291… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 14 14:40:04 2009 +0100 winmm: MCI_ALL_DEVICE_ID(MCIDEVICEID) is not a 16bit entity in MCI32. --- dlls/winmm/mci.c | 8 ++++---- include/mmsystem.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 9198f87..c46c4c5 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -99,7 +99,7 @@ static inline LPWSTR str_dup_upper( LPCWSTR str ) /************************************************************************** * MCI_GetDriver [internal] */ -static LPWINE_MCIDRIVER MCI_GetDriver(UINT16 wDevID) +static LPWINE_MCIDRIVER MCI_GetDriver(UINT wDevID) { LPWINE_MCIDRIVER wmd = 0; @@ -1669,7 +1669,7 @@ errCleanUp: /************************************************************************** * MCI_Close [internal] */ -static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { DWORD dwRet; LPWINE_MCIDRIVER wmd; @@ -1677,7 +1677,7 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwParam, lpParms); /* Every device must handle MCI_NOTIFY on its own. */ - if (wDevID == MCI_ALL_DEVICE_ID) { + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { while (MciDrivers) { /* Retrieve the device ID under lock, but send the message without, * the driver might be calling some winmm functions from another @@ -1894,7 +1894,7 @@ DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dw dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2); break; default: - if (wDevID == MCI_ALL_DEVICE_ID) { + if ((UINT16)wDevID == (UINT16)MCI_ALL_DEVICE_ID) { FIXME("unhandled MCI_ALL_DEVICE_ID\n"); dwRet = MCIERR_CANNOT_USE_ALL; } else { diff --git a/include/mmsystem.h b/include/mmsystem.h index 39f70a1..dd9723a 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -1809,7 +1809,7 @@ YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,DWORD*); #define MCI_USER_MESSAGES (0x400 + DRV_MCI_FIRST) -#define MCI_ALL_DEVICE_ID 0xFFFF +#define MCI_ALL_DEVICE_ID 0xFFFFFFFF #define MCI_DEVTYPE_VCR (MCI_STRING_OFFSET + 1) #define MCI_DEVTYPE_VIDEODISC (MCI_STRING_OFFSET + 2)

1 0

Paul Vriens : advapi32/tests: Fix a test failure with Wow64.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: e32218fd3c78eb2eb8cde18d70c25b671ae3076f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32218fd3c78eb2eb8cde18d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 16 11:59:57 2009 +0100 advapi32/tests: Fix a test failure with Wow64. --- dlls/advapi32/tests/eventlog.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d7e2dba..f94b0a7 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -31,13 +31,19 @@ static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static void init_function_pointers(void) { HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + + pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64RevertWow64FsRedirection"); } static void create_backup(const char *filename) @@ -945,6 +951,7 @@ static void test_autocreation(void) char *p; char sources[sizeof(eventsources)]; char sysdir[MAX_PATH]; + void *redir = 0; RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); RegOpenKeyA(key, eventlogname, &eventkey); @@ -974,6 +981,10 @@ static void test_autocreation(void) RegCloseKey(eventkey); RegCloseKey(key); + /* The directory that holds the eventlog files could be redirected */ + if (pWow64DisableWow64FsRedirection) + pWow64DisableWow64FsRedirection(&redir); + /* On Windows we also automatically get an eventlog file */ GetSystemDirectoryA(sysdir, sizeof(sysdir)); @@ -994,6 +1005,9 @@ static void test_autocreation(void) ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); + + if (pWow64RevertWow64FsRedirection) + pWow64RevertWow64FsRedirection(redir); } static void cleanup_eventlog(void)

1 0

Paul Vriens : advapi32/tests: Fix some test failures on 64bit systems.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: f852d98ee1cb69537a8090c4d90271040819ef68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f852d98ee1cb69537a8090c4d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 16 11:27:27 2009 +0100 advapi32/tests: Fix some test failures on 64bit systems. --- dlls/advapi32/tests/eventlog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index c989d4a..d7e2dba 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -870,7 +870,7 @@ static void test_readwrite(void) /* We are already DWORD aligned, there should still be some padding */ if ((((UINT_PTR)buf + calculated_sidoffset) % sizeof(DWORD)) == 0) - ok(*(DWORD_PTR *)((BYTE *)buf + calculated_sidoffset) == 0, "Expected 0\n"); + ok(*(DWORD *)((BYTE *)buf + calculated_sidoffset) == 0, "Expected 0\n"); ok((((UINT_PTR)buf + record->UserSidOffset) % sizeof(DWORD)) == 0, "Expected DWORD alignment\n"); } @@ -894,7 +894,7 @@ static void test_readwrite(void) ptr += lstrlenA(ptr) + 1; } - ok(record->Length == *(DWORD_PTR *)((BYTE *)buf + record->Length - sizeof(DWORD)), + ok(record->Length == *(DWORD *)((BYTE *)buf + record->Length - sizeof(DWORD)), "Expected the closing DWORD to contain the length of the record\n"); HeapFree(GetProcessHeap(), 0, buf);

1 0

Nikolay Sivov : comctl32/imagelist: Make ImageList_Destroy just decrease refcount. Move actual destruction to ::Release.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 7caa61fde648ad7c3275e9d4358ec10b182c2e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7caa61fde648ad7c3275e9d43… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Nov 15 15:13:48 2009 +0300 comctl32/imagelist: Make ImageList_Destroy just decrease refcount. Move actual destruction to ::Release. --- dlls/comctl32/imagelist.c | 34 +++++++++++++++------------------- dlls/comctl32/tests/imagelist.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a49622c..cc92486 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -692,25 +692,6 @@ ImageList_Destroy (HIMAGELIST himl) if (!is_valid(himl)) return FALSE; - /* delete image bitmaps */ - if (himl->hbmImage) - DeleteObject (himl->hbmImage); - if (himl->hbmMask) - DeleteObject (himl->hbmMask); - - /* delete image & mask DCs */ - if (himl->hdcImage) - DeleteDC(himl->hdcImage); - if (himl->hdcMask) - DeleteDC(himl->hdcMask); - - /* delete blending brushes */ - if (himl->hbrBlend25) - DeleteObject (himl->hbrBlend25); - if (himl->hbrBlend50) - DeleteObject (himl->hbrBlend50); - - /* Free the IImageList instance */ IImageList_Release((IImageList *) himl); return TRUE; } @@ -2972,7 +2953,22 @@ static ULONG WINAPI ImageListImpl_Release(IImageList *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + /* delete image bitmaps */ + if (This->hbmImage) DeleteObject (This->hbmImage); + if (This->hbmMask) DeleteObject (This->hbmMask); + + /* delete image & mask DCs */ + if (This->hdcImage) DeleteDC (This->hdcImage); + if (This->hdcMask) DeleteDC (This->hdcMask); + + /* delete blending brushes */ + if (This->hbrBlend25) DeleteObject (This->hbrBlend25); + if (This->hbrBlend50) DeleteObject (This->hbrBlend50); + + This->lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This); + } return ref; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a931e9c..b97ca9a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1251,8 +1251,36 @@ static void test_iimagelist(void) IImageList *imgl; HIMAGELIST himl; HRESULT hr; + ULONG ret; - if (!pImageList_CoCreateInstance || !pHIMAGELIST_QueryInterface) + if (!pHIMAGELIST_QueryInterface) + { + win_skip("XP imagelist functions not available\n"); + return; + } + + /* test reference counting on destruction */ + imgl = (IImageList*)createImageList(32, 32); + ret = IUnknown_AddRef(imgl); + ok(ret == 2, "Expected 2, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + imgl = (IImageList*)createImageList(32, 32); + ret = IUnknown_AddRef(imgl); + ok(ret == 2, "Expected 2, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ret = IImageList_Release(imgl); + ok(ret == 0, "Expected 0, got %d\n", ret); + ret = ImageList_Destroy((HIMAGELIST)imgl); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + if (!pImageList_CoCreateInstance) { win_skip("Vista imagelist functions not available\n"); return;

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009