July 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/listview: A basic test for column width default value.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 76c0d49b52e045b722c27f9a9a21edf54aa014cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c0d49b52e045b722c27f9a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 22:36:50 2009 +0400 comctl32/listview: A basic test for column width default value. --- dlls/comctl32/tests/listview.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c0b272b..6d3a2d2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3753,6 +3753,31 @@ todo_wine { DestroyWindow(hwnd); } +static void test_getcolumnwidth(void) +{ + HWND hwnd; + DWORD ret; + DWORD_PTR style; + LVCOLUMNA col; + + /* default column width */ + hwnd = create_custom_listview_control(0); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + expect(0, ret); + style = GetWindowLong(hwnd, GWL_STYLE); + SetWindowLong(hwnd, GWL_STYLE, style | LVS_LIST); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + todo_wine expect(8, ret); + style = GetWindowLong(hwnd, GWL_STYLE) & ~LVS_LIST; + SetWindowLong(hwnd, GWL_STYLE, style | LVS_REPORT); + col.mask = 0; + ret = SendMessage(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + expect(0, ret); + ret = SendMessage(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + expect(10, ret); + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3807,6 +3832,7 @@ START_TEST(listview) test_notifyformat(); test_indentation(); test_getitemspacing(); + test_getcolumnwidth(); if (!load_v6_module(&ctx_cookie)) {

1 0

Francois Gouget : winefile: Remove space before ellipsis.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 8b93076819f082304b003305f7c2403eb56c9df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b93076819f082304b003305f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 8 07:26:50 2009 +0200 winefile: Remove space before ellipsis. --- programs/winefile/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 8603db3..1b39edc 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -104,7 +104,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "Trier par ta&ille", ID_VIEW_SORT_SIZE MENUITEM "Trier par dat&e", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Trier &par ...", ID_VIEW_FILTER + MENUITEM "Trier &par...", ID_VIEW_FILTER } POPUP "&Options" {

1 0

Henri Verbeet : wined3d: Implement a A8R8G8B8 to X8R8G8B8 surface format converter.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 7089128d2aa8bda04f6074fea6d68b99e6a84dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7089128d2aa8bda04f6074fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:25 2009 +0200 wined3d: Implement a A8R8G8B8 to X8R8G8B8 surface format converter. --- dlls/wined3d/surface_base.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index fd1bb76..5c00b2b 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -724,6 +724,25 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, } } +static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const DWORD *src_line = (const DWORD *)(src + y * pitch_in); + DWORD *dst_line = (DWORD *)(dst + y * pitch_out); + + for (x = 0; x < w; ++x) + { + dst_line[x] = 0xff000000 | (src_line[x] & 0xffffff); + } + } +} + struct d3dfmt_convertor_desc { WINED3DFORMAT from, to; void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); @@ -733,6 +752,7 @@ static const struct d3dfmt_convertor_desc convertors[] = { {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_R5G6B5, WINED3DFMT_X8R8G8B8, convert_r5g6b5_x8r8g8b8}, + {WINED3DFMT_A8R8G8B8, WINED3DFMT_X8R8G8B8, convert_a8r8g8b8_x8r8g8b8}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to)

1 0

Nikolay Sivov : comctl32/listview: Basic LVN_(BEGIN|END)SCROLL tests.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1b2a6a08aaaa77961336691d054b6a71a6066b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2a6a08aaaa77961336691d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 8 00:03:33 2009 +0400 comctl32/listview: Basic LVN_(BEGIN|END)SCROLL tests. --- dlls/comctl32/tests/listview.c | 55 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d3a2d2..b886d86 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -240,6 +240,12 @@ static const struct message editbox_create_pos[] = { { 0 } }; +static const struct message scroll_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_BEGINSCROLL }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ENDSCROLL }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -290,6 +296,15 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP case LVN_ENDLABELEDIT: /* always accept new item text */ return TRUE; + case LVN_BEGINSCROLL: + case LVN_ENDSCROLL: + { + NMLVSCROLL *pScroll = (NMLVSCROLL*)lParam; + + trace("LVN_%sSCROLL: (%d,%d)\n", pScroll->hdr.code == LVN_BEGINSCROLL ? + "BEGIN" : "END", pScroll->dx, pScroll->dy); + } + break; } break; } @@ -3778,6 +3793,45 @@ static void test_getcolumnwidth(void) DestroyWindow(hwnd); } +static void test_scrollnotify(void) +{ + HWND hwnd; + DWORD ret; + + hwnd = create_listview_control(0); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + /* make it scrollable - resize */ + ret = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); + expect(TRUE, ret); + ret = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(100, 0)); + expect(TRUE, ret); + + /* try with dummy call */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, LVM_SCROLL, 0, 0); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, scroll_parent_seq, + "scroll notify 1", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, LVM_SCROLL, 1, 0); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, scroll_parent_seq, + "scroll notify 2", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessage(hwnd, LVM_SCROLL, 1, 1); + expect(TRUE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, scroll_parent_seq, + "scroll notify 3", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3844,6 +3898,7 @@ START_TEST(listview) test_get_set_view(); test_canceleditlabel(); test_mapidindex(); + test_scrollnotify(); unload_v6_module(ctx_cookie);

1 0

Henri Verbeet : wined3d: Avoid destroying the currently active context for non-implicit swapchains.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 6d8e1e52c83edbb3598db90b2e3a4121237fefc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8e1e52c83edbb3598db90b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:26 2009 +0200 wined3d: Avoid destroying the currently active context for non-implicit swapchains. --- dlls/wined3d/swapchain.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3591e83..272a425 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -64,7 +64,24 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB HeapFree(GetProcessHeap(), 0, This->backBuffer); } - for(i = 0; i < This->num_contexts; i++) { + for (i = 0; i < This->num_contexts; ++i) + { + if (This->context[i] == This->wineD3DDevice->activeContext) + { + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->wineD3DDevice->swapchains[0]; + + /* Avoid destroying the currently active context for non-implicit swapchains. */ + if (This != swapchain) + { + TRACE("Would destroy currently active context %p on a non-implicit swapchain.\n", This->context[i]); + + if (swapchain->backBuffer) + ActivateContext(This->wineD3DDevice, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); + else + ActivateContext(This->wineD3DDevice, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); + } + } + DestroyContext(This->wineD3DDevice, This->context[i]); } /* Restore the screen resolution if we rendered in fullscreen

1 0

Henri Verbeet : wined3d: Trace the D3D shader in find_glsl_vshader() / find_glsl_pshader().
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 949cd089d52299b2e56c97313755fdb16c162ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=949cd089d52299b2e56c97313… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 8 09:49:27 2009 +0200 wined3d: Trace the D3D shader in find_glsl_vshader() / find_glsl_pshader(). It's quite useful to know to which D3D shader a GLSL shader corresponds. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 983efb6..bc84737 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3866,7 +3866,7 @@ static GLhandleARB find_glsl_pshader(IWineD3DPixelShaderImpl *shader, const stru } } - TRACE("No matching GL shader found, compiling a new shader\n"); + TRACE("No matching GL shader found for shader %p, compiling a new shader.\n", shader); if(shader_data->shader_array_size == shader_data->num_gl_shaders) { if (shader_data->num_gl_shaders) { @@ -3934,7 +3934,7 @@ static GLhandleARB find_glsl_vshader(IWineD3DVertexShaderImpl *shader, const str } } - TRACE("No matching GL shader found, compiling a new shader\n"); + TRACE("No matching GL shader found for shader %p, compiling a new shader.\n", shader); if(shader_data->shader_array_size == shader_data->num_gl_shaders) { if (shader_data->num_gl_shaders)

1 0

Francois Gouget : notepad: Remove spaces before '\n's.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1e602c57d0aac6019d118c572e36431b7c205e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e602c57d0aac6019d118c572… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 8 07:26:39 2009 +0200 notepad: Remove spaces before '\n's. --- programs/notepad/De.rc | 8 ++++---- programs/notepad/En.rc | 8 ++++---- programs/notepad/Fr.rc | 8 ++++---- programs/notepad/No.rc | 8 ++++---- programs/notepad/Pt.rc | 4 ++-- programs/notepad/Sv.rc | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 51546e3..ed3202d 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -134,9 +134,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 Big-Endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Diese Datei enth�lt Unicode-Zeichen, die verloren gehen, wenn \n\ -Sie die Datei mit %s-Zeichenkodierung speichern. \n\ -Um die Zeichen beizubehalten, klicken Sie Abbrechen und w�hlen \n\ -Sie eine der Unicode-Optionen in der Liste. \n\ +Diese Datei enth�lt Unicode-Zeichen, die verloren gehen, wenn\n\ +Sie die Datei mit %s-Zeichenkodierung speichern.\n\ +Um die Zeichen beizubehalten, klicken Sie Abbrechen und w�hlen\n\ +Sie eine der Unicode-Optionen in der Liste.\n\ M�chten Sie fortfahren?" } diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index 3c4d052..fb774cf 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -133,9 +133,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -This file contains Unicode characters which will be lost if \n\ -you save this file in the %s encoding. \n\ -To keep these characters, click Cancel, and then select \n\ -one of the Unicode options in the Encoding drop down list. \n\ +This file contains Unicode characters which will be lost if\n\ +you save this file in the %s encoding.\n\ +To keep these characters, click Cancel, and then select\n\ +one of the Unicode options in the Encoding drop down list.\n\ Continue?" } diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index 9c8373b..3ec4262 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -137,9 +137,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Ce fichier contient des caractères Unicode qui seront perdus si \n\ -vous le sauvez dans le codage %s. \n\ -Pour conserver ces caractères, cliquez sur Annuler et sélectionnez \n\ -une des alternatives Unicode dans la liste déroulante Codage. \n\ +Ce fichier contient des caractères Unicode qui seront perdus si\n\ +vous le sauvez dans le codage %s.\n\ +Pour conserver ces caractères, cliquez sur Annuler et sélectionnez\n\ +une des alternatives Unicode dans la liste déroulante Codage.\n\ Continuer ?" } diff --git a/programs/notepad/No.rc b/programs/notepad/No.rc index 512fa2d..271e038 100644 --- a/programs/notepad/No.rc +++ b/programs/notepad/No.rc @@ -133,9 +133,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "«%s»\n\ -Denne filen inneholder Unicode-tegn som vil gå tapt hvis \n\ -filen lagres med tegnkodingen %s. \n\ -Trykk Avbryt og velg et av Unicode-valgene fra listen \n\ -hvis du vil beholde tegnene. \n\ +Denne filen inneholder Unicode-tegn som vil gå tapt hvis\n\ +filen lagres med tegnkodingen %s.\n\ +Trykk Avbryt og velg et av Unicode-valgene fra listen\n\ +hvis du vil beholde tegnene.\n\ Fortsette?" } diff --git a/programs/notepad/Pt.rc b/programs/notepad/Pt.rc index eeae39d..194225c 100644 --- a/programs/notepad/Pt.rc +++ b/programs/notepad/Pt.rc @@ -215,8 +215,8 @@ STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ Este ficheiro contém caracteres Unicode que serão perdidos se\n\ -guardar este ficheiro na codificação %s. \n\ +guardar este ficheiro na codificação %s.\n\ Para manter estes caracteres, carregue em Cancelar, e depois seleccione\n\ -uma das opções Unicode na lista de Codificações. \n\ +uma das opções Unicode na lista de Codificações.\n\ Continuar?" } diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index 75d0e59..cfc675f 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -134,9 +134,9 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Denna fil inneh�ller Unicode-tecken vilka kommer att g� \n\ -f�rlorade om du sparar filen under kodningen %s. \n\ -Klicka Avbryt och v�lj sedan ett av Unicode-alternativen \n\ -i teckenkodningslistan f�r att beh�lla dessa tecken. \n\ +Denna fil inneh�ller Unicode-tecken vilka kommer att g�\n\ +f�rlorade om du sparar filen under kodningen %s.\n\ +Klicka Avbryt och v�lj sedan ett av Unicode-alternativen\n\ +i teckenkodningslistan f�r att beh�lla dessa tecken.\n\ Vill du forts�tta?" }

1 0

Alexander Scott-Johns : notepad: Add Cancel button to message box displayed when opening a non-existent file with the command line .
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 0c82108a484b1df670b09714c33f10bd29d9c011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c82108a484b1df670b09714c… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jul 7 19:31:48 2009 +0100 notepad: Add Cancel button to message box displayed when opening a non-existent file with the command line. --- programs/notepad/main.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 104a834..d45fac7 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -607,7 +607,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) LoadStringW(Globals.hInstance, STRING_ERROR, szResource, ARRAY_SIZE(szResource)); nResult = MessageBoxW(Globals.hMainWnd, szMessage, szResource, - MB_ICONEXCLAMATION | MB_YESNO); + MB_ICONEXCLAMATION | MB_YESNOCANCEL); return(nResult); } @@ -707,6 +707,10 @@ static void HandleCommandLine(LPWSTR cmdline) case IDNO: break; + + case IDCANCEL: + DestroyWindow(Globals.hMainWnd); + break; } } }

1 0

Erik Inge Bolsø : wined3d: Fix Nvidia GTX series misdetection.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 48995f33547b2ce09597a8859dd170ba2da3ac0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48995f33547b2ce09597a8859… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Tue Jul 7 18:25:16 2009 +0200 wined3d: Fix Nvidia GTX series misdetection. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 162e9fc..d3f56ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1546,13 +1546,13 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { vidmem = 1024; } /* Geforce 200 - midend high */ - if (strstr(gl_renderer, "GTX 275")) + else if (strstr(gl_renderer, "GTX 275")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX275; vidmem = 896; } /* Geforce 200 - midend */ - if (strstr(gl_renderer, "GTX 260")) + else if (strstr(gl_renderer, "GTX 260")) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_GTX260; vidmem = 1024;

1 0

Paul Vriens : ws2_32/tests: Fix a test failure on NT4.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: b7e147331124bd8d9cfd01a18cbb7a533336a601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e147331124bd8d9cfd01a18… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 7 17:08:04 2009 +0200 ws2_32/tests: Fix a test failure on NT4. --- dlls/ws2_32/tests/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b667008..c90111d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2620,8 +2620,10 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, NULL, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on NULL buffer " - "returned %d + errno %d\n", bret, WSAGetLastError()); + ok(bret == FALSE && + (WSAGetLastError() == WSAEINVAL || + broken(WSAGetLastError() == WSAEFAULT)), /* NT4 */ + "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16,

1 0