November 2013 - Wine-Commits

Francois Gouget : kernel32/tests: Remove a couple of incorrect CreateFile() console tests.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 7425d2cac2757b3310cfd67b782081a3cbc18cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7425d2cac2757b3310cfd67b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:36:35 2013 +0100 kernel32/tests: Remove a couple of incorrect CreateFile() console tests. --- dlls/kernel32/tests/console.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5cdfa62..d38315f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1160,14 +1160,13 @@ static void test_CreateFileW(void) {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, {conoutW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, {conoutW, 0, FALSE, OPEN_ALWAYS, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, TRUE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, 0, FALSE}, {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, 0, FALSE}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, 0, FALSE}, + /* TRUNCATE_EXISTING is forbidden starting with Windows 8 */ }; int index;

1 0

Francois Gouget : shell32/tests: Disable a test that crashes on Windows 8.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 0a08c185180efb38150e4683a70d43885c68e1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a08c185180efb38150e4683a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:35:08 2013 +0100 shell32/tests: Disable a test that crashes on Windows 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index af34b8e..0992924 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -232,10 +232,13 @@ static void test_ParseDisplayName(void) /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ if (pSHCreateShellItem) { - /* null name and pidl */ - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, NULL, NULL, NULL, 0); - ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + if (0) + { + /* null name and pidl, also crashes on Windows 8 */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + NULL, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + } /* null name */ newPIDL = (ITEMIDLIST*)0xdeadbeef;

1 0

Francois Gouget : user32/tests: When EnumDisplaySettings() fails unexpectedly, trace how many calls were made.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 790d2e8b21b0c5c97c010941f161d4b1f9b3b3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=790d2e8b21b0c5c97c010941f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:19:16 2013 +0100 user32/tests: When EnumDisplaySettings() fails unexpectedly, trace how many calls were made. --- dlls/user32/tests/sysparams.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 32432f5..59225fe 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2865,13 +2865,14 @@ static void test_EnumDisplaySettings(void) num = 1; while (1) { SetLastError (0xdeadbeef); - if (!EnumDisplaySettingsA(NULL, num++, &devmode)) { + if (!EnumDisplaySettingsA(NULL, num, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d\n", le); + "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d for %d\n", le, num); break; } + num++; } }

1 0

Francois Gouget : kernel32/tests: Windows 8 returns different error codes.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 18a9aba058df1225ed8b88722ebecd8010348b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a9aba058df1225ed8b88722… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:17:16 2013 +0100 kernel32/tests: Windows 8 returns different error codes. --- dlls/kernel32/tests/console.c | 110 +++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18a9aba058df1225ed8b8…

1 0

Henri Verbeet : d3d8/tests: Use color_match() in p8_texture_test().
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 4eb3ce856856096de00fc1e309ccdea55d57973a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb3ce856856096de00fc1e30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:40:58 2013 +0100 d3d8/tests: Use color_match() in p8_texture_test(). --- dlls/d3d8/tests/visual.c | 34 ++++++---------------------------- 1 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b76dca28..6f6b544 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2078,8 +2078,8 @@ static void p8_texture_test(IDirect3DDevice8 *device) IDirect3DTexture8 *texture = NULL, *texture2 = NULL; D3DLOCKED_RECT lr; unsigned char *data; - DWORD color, red, green, blue; PALETTEENTRY table[256]; + D3DCOLOR color; D3DCAPS8 caps; UINT i; float quad[] = { @@ -2193,18 +2193,9 @@ static void p8_texture_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 32, 32); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0xff && blue == 0 && green == 0, - "got color %08x, expected 0x00ff0000\n", color); - + ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 32, 320); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0 && blue == 0xff && green == 0, - "got color %08x, expected 0x000000ff\n", color); + ok(color_match(color, 0x000000ff, 0), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); @@ -2227,11 +2218,7 @@ static void p8_texture_test(IDirect3DDevice8 *device) color = getPixelColor(device, 32, 32); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0 && blue == 0xff && green == 0, - "got color %08x, expected 0x000000ff\n", color); + ok(color_match(color, 0x000000ff, 0), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); @@ -2290,18 +2277,9 @@ static void p8_texture_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 32, 32); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red >= 0x7e && red <= 0x81 && blue == 0 && green == 0, - "got color %08x, expected 0x00800000 or near\n", color); - + ok(color_match(color, 0x00800000, 1), "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 32, 320); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0 && blue >= 0x7e && blue <= 0x81 && green == 0, - "got color %08x, expected 0x00000080 or near\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr);

1 0

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

Nov. 1, 2013

Module: wine Branch: master Commit: a24081a70382741e682c26e65c6fff51b69973bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24081a70382741e682c26e65… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:26 2013 +0100 msiexec: Use BOOL type where appropriate. --- programs/msiexec/msiexec.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 1b688a5..e76b526 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -422,11 +422,12 @@ static int chomp( WCHAR *str ) { enum chomp_state state = cs_token; WCHAR *p, *out; - int count = 1, ignore; + int count = 1; + BOOL ignore; for( p = str, out = str; *p; p++ ) { - ignore = 1; + ignore = TRUE; switch( state ) { case cs_whitespace: @@ -440,7 +441,7 @@ static int chomp( WCHAR *str ) break; default: count++; - ignore = 0; + ignore = FALSE; state = cs_token; } break; @@ -456,7 +457,7 @@ static int chomp( WCHAR *str ) *out++ = 0; break; default: - ignore = 0; + ignore = FALSE; } break; @@ -467,7 +468,7 @@ static int chomp( WCHAR *str ) state = cs_token; break; default: - ignore = 0; + ignore = FALSE; } break; }

1 0

Ken Thomases : winemac: Trace flags of WINDOW_FRAME_CHANGED events.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 8e1fdb845e284f6aad436330bc1bb77506635e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1fdb845e284f6aad436330b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:44 2013 -0500 winemac: Trace flags of WINDOW_FRAME_CHANGED events. --- dlls/winemac.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index feb4166..3d92481 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1689,8 +1689,9 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) parent = GetAncestor(hwnd, GA_PARENT); - TRACE("win %p/%p new Cocoa frame %s\n", hwnd, data->cocoa_window, - wine_dbgstr_cgrect(event->window_frame_changed.frame)); + TRACE("win %p/%p new Cocoa frame %s fullscreen %d in_resize %d\n", hwnd, data->cocoa_window, + wine_dbgstr_cgrect(event->window_frame_changed.frame), + event->window_frame_changed.fullscreen, event->window_frame_changed.in_resize); rect = rect_from_cgrect(event->window_frame_changed.frame); macdrv_mac_to_window_rect(data, &rect);

1 0

Ken Thomases : winemac: Convert the QUERY_RESIZE_END query to an event, WINDOW_RESIZE_ENDED.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 83f6470c0e325f8e25062eeb21fa2ffc0dbaa50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f6470c0e325f8e25062eeb2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:42 2013 -0500 winemac: Convert the QUERY_RESIZE_END query to an event, WINDOW_RESIZE_ENDED. Queries can be run out of order because the main thread is waiting on the response. The main thread didn't really need a response from QUERY_RESIZE_END. It was only a query for symmetry with QUERY_RESIZE_START. --- dlls/winemac.drv/cocoa_window.m | 9 +++------ dlls/winemac.drv/event.c | 9 +++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 25 ++++++++++++------------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 51bcaea..dbac40a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1639,12 +1639,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) windowDidEndLiveResize:(NSNotification *)notification { - macdrv_query* query = macdrv_create_query(); - query->type = QUERY_RESIZE_END; - query->window = (macdrv_window)[self retain]; - - [self.queue query:query timeout:0.3]; - macdrv_release_query(query); + macdrv_event* event = macdrv_create_event(WINDOW_RESIZE_ENDED, self); + [queue postEvent:event]; + macdrv_release_event(event); self.liveResizeDisplayTimer = nil; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 5803ac7..77df582 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -55,6 +55,7 @@ static const char *dbgstr_event(int type) "WINDOW_GOT_FOCUS", "WINDOW_LOST_FOCUS", "WINDOW_MINIMIZE_REQUESTED", + "WINDOW_RESIZE_ENDED", }; if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; @@ -114,6 +115,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); + event_mask |= event_mask_for_type(WINDOW_RESIZE_ENDED); } return event_mask; @@ -152,10 +154,6 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; - case QUERY_RESIZE_END: - TRACE("QUERY_RESIZE_END\n"); - success = query_resize_end(hwnd); - break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); @@ -257,6 +255,9 @@ void macdrv_handle_event(const macdrv_event *event) case WINDOW_MINIMIZE_REQUESTED: macdrv_window_minimize_requested(hwnd); break; + case WINDOW_RESIZE_ENDED: + macdrv_window_resize_ended(hwnd); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 362d5ea..d49a3c0 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -165,7 +165,7 @@ extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; -extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 7bc021c..e0c4f29 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -194,6 +194,7 @@ enum { WINDOW_GOT_FOCUS, WINDOW_LOST_FOCUS, WINDOW_MINIMIZE_REQUESTED, + WINDOW_RESIZE_ENDED, NUM_EVENT_TYPES }; @@ -290,7 +291,6 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, - QUERY_RESIZE_END, QUERY_RESIZE_START, QUERY_MIN_MAX_INFO, NUM_QUERY_TYPES diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 75fd523..feb4166 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1898,6 +1898,18 @@ void macdrv_window_brought_forward(HWND hwnd) } +/*********************************************************************** + * macdrv_window_resize_ended + * + * Handler for WINDOW_RESIZE_ENDED events. + */ +void macdrv_window_resize_ended(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); +} + + struct quit_info { HWND *wins; UINT capacity; @@ -2082,19 +2094,6 @@ BOOL query_resize_start(HWND hwnd) /*********************************************************************** - * query_resize_end - * - * Handler for QUERY_RESIZE_END query. - */ -BOOL query_resize_end(HWND hwnd) -{ - TRACE("hwnd %p\n", hwnd); - SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - return TRUE; -} - - -/*********************************************************************** * query_min_max_info * * Handler for QUERY_MIN_MAX_INFO query.

1 0

Jacek Caban : winhttp: Use netconn_query_data_available in get_available_data when possible.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 92426b5136355200bfbc9561fcd9601ac130c66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92426b5136355200bfbc9561f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 10:59:50 2013 +0100 winhttp: Use netconn_query_data_available in get_available_data when possible. --- dlls/winhttp/net.c | 27 +++++++++++++-------------- dlls/winhttp/request.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6d9b82a..7466d36 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -712,24 +712,23 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd return TRUE; } -BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) +ULONG netconn_query_data_available( netconn_t *conn ) { -#ifdef FIONREAD - int ret; - ULONG unread; -#endif - *available = 0; - if (!netconn_connected( conn )) return FALSE; + if(!netconn_connected(conn)) + return 0; - if (conn->secure) - { - *available = conn->peek_len; - return TRUE; - } + if(conn->secure) { + return conn->peek_len; + }else { #ifdef FIONREAD - if (!(ret = ioctlsocket( conn->socket, FIONREAD, &unread ))) *available = unread; + ULONG unread; + + if(!ioctlsocket(conn->socket, FIONREAD, &unread)) + return unread; #endif - return TRUE; + } + + return 0; } DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 930eb28..db69082 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1955,7 +1955,7 @@ static BOOL start_next_chunk( request_t *request, BOOL notify ) static DWORD get_available_data( request_t *request ) { if (request->read_chunked) return min( request->read_chunked_size, request->read_size ); - return request->read_size; + return request->read_size + netconn_query_data_available( &request->netconn ); } /* check if we have reached the end of the data to read */ diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 12255ed..a149160 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -266,7 +266,7 @@ BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; -BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; +ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN;

1 0

Francois Gouget : kernel32/tests: On Windows 8 IdnToNameprepUnicode() returns a different error for invalid parameters.
by Alexandre Julliard Nov. 1, 2013

Nov. 1, 2013

Module: wine Branch: master Commit: 62ddaf8f6a0bd9c283e232a1448ba12d9e0dc75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ddaf8f6a0bd9c283e232a14… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 1 10:34:01 2013 +0100 kernel32/tests: On Windows 8 IdnToNameprepUnicode() returns a different error for invalid parameters. --- dlls/kernel32/tests/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 918a664..60dea78 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3244,7 +3244,8 @@ static void test_IdnToNameprepUnicode(void) ret = pIdnToNameprepUnicode(4, NULL, 0, NULL, 0); err = GetLastError(); ok(ret == 0, "ret = %d\n", ret); - ok(err == ERROR_INVALID_FLAGS, "err = %d\n", err); + ok(err == ERROR_INVALID_FLAGS || err == ERROR_INVALID_PARAMETER /* Win8 */, + "err = %d\n", err); for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) {

1 0