November 2013 - Wine-Commits

Francois Gouget : kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: c0dbfebe04bc0c4d1739bea07756325dfcd87085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dbfebe04bc0c4d1739bea07… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:21:15 2013 +0100 kernel32/tests: On Windows 8 DATE_LONGDATE does not output a leading 0 for the day. --- dlls/kernel32/tests/locale.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bbb7d23..918a664 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -662,10 +662,12 @@ static void test_GetDateFormatA(void) if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); - STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */ + SetLastError(0xdeadbeef); buffer[0] = '\0'; /* DATE_LONGDATE */ ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); - EXPECT_LENA; EXPECT_EQA; + ok(strcmp(buffer, "Saturday, May 04, 2002") == 0 || + strcmp(buffer, "Saturday, May 4, 2002") == 0 /* Win 8 */, + "got an unexpected date string '%s'\n", buffer); /* test for expected DATE_YEARMONTH behavior with null format */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */

1 0

Francois Gouget : kernel32/tests: Fix some module tests on Windows 8.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: f399e903060c5acc5341b8c2211a50b235984206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f399e903060c5acc5341b8c22… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:14:44 2013 +0100 kernel32/tests: Fix some module tests on Windows 8. Windows 8 and 8.1 return some different error codes and GetDllDirectory() handles buffer termination a bit differently. --- dlls/kernel32/tests/module.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 6e9ad13..992f0ec 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -261,7 +261,8 @@ static void testLoadLibraryEx(void) hmodule = LoadLibraryExA("", NULL, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); ok(GetLastError() == ERROR_MOD_NOT_FOUND || - GetLastError() == ERROR_DLL_NOT_FOUND, /* win9x */ + GetLastError() == ERROR_DLL_NOT_FOUND /* win9x */ || + GetLastError() == ERROR_INVALID_PARAMETER /* win8 */, "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND, got %d\n", GetLastError()); @@ -438,7 +439,8 @@ static void testGetDllDirectory(void) bufferA[length] = 'A'; bufferA[length + 1] = 'A'; ret = pGetDllDirectoryA(length + 1, bufferA); - ok(ret == length, "i=%d, Expected %u, got %u\n", i, length, ret); + ok(ret == length || broken(ret + 1 == length) /* win8 */, + "i=%d, Expected %u(+1), got %u\n", i, length, ret); ok(bufferA[length + 1] == 'A', "i=%d, Buffer overflow\n", i); ok(strcmp(bufferA, dll_directories[i]) == 0, "i=%d, Wrong path returned: '%s'\n", i, bufferA); @@ -450,13 +452,11 @@ static void testGetDllDirectory(void) ok(cmpStrAW(dll_directories[i], bufferW, length, length), "i=%d, Wrong path returned: %s\n", i, wine_dbgstr_w(bufferW)); - /* zero size buffer - * the A version always null-terminates the buffer, - * the W version doesn't do it on some platforms */ + /* Zero size buffer. The buffer may or may not be terminated depending + * on the Windows version and whether the A or W API is called. */ bufferA[0] = 'A'; ret = pGetDllDirectoryA(0, bufferA); ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); - ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); bufferW[0] = 'A'; ret = pGetDllDirectoryW(0, bufferW); @@ -468,7 +468,8 @@ static void testGetDllDirectory(void) bufferA[0] = 'A'; ret = pGetDllDirectoryA(length, bufferA); ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); - ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); + if (length != 0) + ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); bufferW[0] = 'A'; ret = pGetDllDirectoryW(length, bufferW);

1 0

Ken Thomases : winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: de3fb34af7dbb4a8f73ac4489a02ec2225979d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3fb34af7dbb4a8f73ac4489… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 16:54:53 2013 -0500 winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa. The Mac driver was already sending these events when the user resizes the window by dragging its corner/edges, but there are other occasions when the window frame changes. For example, when the user zooms the window. --- dlls/winemac.drv/cocoa_window.m | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 6 ++++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b81de72..51bcaea 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1718,6 +1718,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif event = macdrv_create_event(WINDOW_FRAME_CHANGED, self); event->window_frame_changed.frame = NSRectToCGRect(frame); event->window_frame_changed.fullscreen = ([self styleMask] & NSFullScreenWindowMask) != 0; + event->window_frame_changed.in_resize = [self inLiveResize]; [queue postEvent:event]; macdrv_release_event(event); diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index f714cc5..7bc021c 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -275,6 +275,7 @@ typedef struct macdrv_event { struct { CGRect frame; int fullscreen; + int in_resize; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4e132fa..75fd523 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1718,7 +1718,13 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (event->window_frame_changed.fullscreen) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) + { + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + } }

1 0

Frédéric Delanoy : imagehlp/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: abd0c343fcee21a36ffe0e6567b6e351b8fc65c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd0c343fcee21a36ffe0e656… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:25 2013 +0100 imagehlp/tests: Use BOOL type where appropriate. --- dlls/imagehlp/tests/integrity.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index c29eea8..025e20f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -178,7 +178,8 @@ static void test_get_certificate(char *cert_data, int index) HANDLE hFile; LPWIN_CERTIFICATE cert; DWORD cert_len = 0; - DWORD err, ret; + DWORD err; + BOOL ret; hFile = CreateFileA(test_dll_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Francois Gouget : winhttp/tests: Fix the test failure messages.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: cd5d1e54e706b8cf08216039c9239ededd1aed53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5d1e54e706b8cf08216039c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:39:24 2013 +0100 winhttp/tests: Fix the test failure messages. Don't claim the API failed when it succeeded, and show the unexpected data. --- dlls/winhttp/tests/url.c | 94 +++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd5d1e54e706b8cf08216…

1 0

Francois Gouget : kernel32/tests: Check that WaitCommEvent() returns immediately in overlapped mode.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: c31280d6e14f19fed7db589891a1688b7a7a3fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31280d6e14f19fed7db58989… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:37:41 2013 +0100 kernel32/tests: Check that WaitCommEvent() returns immediately in overlapped mode. --- dlls/kernel32/tests/comm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 455ee89..db5a369 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -855,6 +855,8 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); + after = GetTickCount(); + ok(after - before < 30, "WaitCommEvent should have returned immediately, took %d ms\n", after - before); res = WaitForSingleObject(ovl_wait.hEvent, 1500); ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); if (res == WAIT_OBJECT_0)

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: ee28dd80ea2ec52847f176519c2cc7f8dd08324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee28dd80ea2ec52847f176519… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:19:40 2013 +0100 Assorted spelling fixes. --- dlls/quartz/tests/filtergraph.c | 7 ++++--- dlls/xmllite/reader.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 68ac884..7a6dd5a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1559,9 +1559,10 @@ static void test_render_filter_priority(void) static const WCHAR wszFilterInstanceName4[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '4', 0 }; - /* Test which renderer of two already added to the graph will be chosen (one is "exact" match, other is - "wildcard" match. Seems to very by order in which filters are added to the graph, thus indicating - no preference given to exact match. */ + /* Test which renderer of two already added to the graph will be chosen + * (one is "exact" match, other is "wildcard" match. Seems to depend + * on the order in which filters are added to the graph, thus indicating + * no preference given to exact match. */ hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) return; diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index dffe226..9ca7370 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -421,7 +421,7 @@ static inline const char* debug_strval(const xmlreader *reader, const strval *v) return debugstr_wn(reader_get_strptr(reader, v), v->len); } -/* used to initalize from constant string */ +/* used to initialize from constant string */ static inline void reader_init_cstrvalue(WCHAR *str, UINT len, strval *v) { v->start = 0;

1 0

Francois Gouget : crypt32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 62122b660ff55df1a9db16c04ed51e9b40b11ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62122b660ff55df1a9db16c04… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:29:15 2013 +0100 crypt32: Remove WINAPI on static functions where not needed. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index bc0f26d..0f14ffb 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -162,7 +162,7 @@ static const context_vtbl_t cert_vtbl = { Cert_clone }; -static BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, +static BOOL add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, DWORD add_disposition, BOOL use_link, PCCERT_CONTEXT *ret_context) { const CERT_CONTEXT *existing = NULL;

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMViewportImpl typedef.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 59dd66df2e89f1b7937ebc028ae91cb1be04bee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59dd66df2e89f1b7937ebc028… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:41:02 2013 +0100 d3drm: Get rid of the IDirect3DRMViewportImpl typedef. --- dlls/d3drm/viewport.c | 713 ++++++++++++++++++++++--------------------------- 1 files changed, 314 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59dd66df2e89f1b7937eb…

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMTextureImpl typedef.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 08eef6dad2fef87d697cabe847709552a1327ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eef6dad2fef87d697cabe84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:41:01 2013 +0100 d3drm: Get rid of the IDirect3DRMTextureImpl typedef. --- dlls/d3drm/texture.c | 632 +++++++++++++++++++++----------------------------- 1 files changed, 262 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08eef6dad2fef87d697ca…

1 0