January 2007 - Wine-commits

Stefan Dösinger : wined3d: Move debugging fixmes from drawprim to the stream source handler.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 7e314011fb2cc426cbebe8b349f371a89efaa71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e314011fb2cc426cbebe8b34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:13:21 2007 +0100 wined3d: Move debugging fixmes from drawprim to the stream source handler. --- dlls/wined3d/drawprim.c | 17 ----------------- dlls/wined3d/state.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e8fdb12..f2aec53 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1108,23 +1108,6 @@ inline static void drawPrimitiveDrawStri IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; -/* Generate some fixme's if unsupported functionality is being used */ -#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData - /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ - if (!useVertexShaderFunction && (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) { - FIXME("Blending data is only valid with vertex shaders %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData); - } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { - FIXME("Tweening is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(tangent) || BUFFER_OR_DATA(binormal))) { - FIXME("Tangent and binormal bump mapping is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) { - FIXME("Extended attributes are only valid with vertex shaders\n"); - } -#undef BUFFER_OR_DATA - /* Make any shaders active */ This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a8bdce3..34aa4bc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2543,6 +2543,23 @@ static inline void handleStreams(IWineD3 TRACE("Not loading vertex data\n"); device->useDrawStridedSlow = TRUE; } + +/* Generate some fixme's if unsupported functionality is being used */ +#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData + /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ + if (!useVertexShaderFunction && (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) { + FIXME("Blending data is only valid with vertex shaders %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData); + } + if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { + FIXME("Tweening is only valid with vertex shaders\n"); + } + if (!useVertexShaderFunction && (BUFFER_OR_DATA(tangent) || BUFFER_OR_DATA(binormal))) { + FIXME("Tangent and binormal bump mapping is only valid with vertex shaders\n"); + } + if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) { + FIXME("Extended attributes are only valid with vertex shaders\n"); + } +#undef BUFFER_OR_DATA } static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) {

1 0

Stefan Dösinger : wined3d: Apply shaders in their state handlers.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 799770b992967f562b309fbacce31bf661980a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=799770b992967f562b309fbac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:14:12 2007 +0100 wined3d: Apply shaders in their state handlers. --- dlls/wined3d/arb_program_shader.c | 6 +++++ dlls/wined3d/drawprim.c | 14 +++++++----- dlls/wined3d/state.c | 39 +++++++++++++++++++++--------------- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a8e4c9a..073a3ad 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -946,6 +946,9 @@ static void shader_arb_select(IWineD3DDe checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.prgId); + } else if(GL_SUPPORT(GL_VERTEX_PROGRAM_ARB)) { + glDisable(GL_VERTEX_PROGRAM_ARB); + checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } if (usePS) { @@ -961,6 +964,9 @@ static void shader_arb_select(IWineD3DDe checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.prgId); + } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + glDisable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f2aec53..33c7480 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1108,9 +1108,6 @@ inline static void drawPrimitiveDrawStri IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* Make any shaders active */ - This->shader_backend->shader_select(iface, usePixelShaderFunction, useVertexShaderFunction); - /* Load any global constants/uniforms that may have been set by the application */ This->shader_backend->shader_load_constants(iface, usePixelShaderFunction, useVertexShaderFunction); @@ -1119,9 +1116,6 @@ inline static void drawPrimitiveDrawStri drawStridedSlow(iface, dataLocations, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx, baseVIndex); else drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx, baseVIndex); - - /* Cleanup any shaders */ - This->shader_backend->shader_cleanup(usePixelShaderFunction, useVertexShaderFunction); } static void check_fbo_status(IWineD3DDevice *iface) { @@ -1164,6 +1158,14 @@ static void depth_blt(IWineD3DDevice *if glBindTexture(GL_TEXTURE_2D, old_binding); glPopAttrib(); + + /* Reselect the old shaders. There doesn't seem to be any glPushAttrib bit for arb shaders, + * and this seems easier and more efficient than providing the shader backend with a private + * storage to read and restore the old shader settings + */ + This->shader_backend->shader_select(iface, + This->stateBlock->pixelShader && ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.function, + This->stateBlock->vertexShader && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.function); } static void depth_copy(IWineD3DDevice *iface) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34aa4bc..70a374f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1833,16 +1833,12 @@ static void pixelshader(DWORD state, IWi /* Compile and bind the shader */ IWineD3DPixelShader_CompileShader(stateblock->pixelShader); -#if 0 - /* Can't do that here right now, because glsl shaders depend on having both pixel and vertex shader - * setup at the same time. The shader_select call will be done by drawprim until vertex shaders are - * moved to the state table too - */ - stateblock->wineD3DDevice->shader_backend->shader_select( - (IWineD3DDevice *) stateblock->wineD3DDevice, - TRUE, - !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); -#endif + if(!isStateDirty(stateblock->wineD3DDevice, StateTable[STATE_VSHADER].representative)) { + stateblock->wineD3DDevice->shader_backend->shader_select( + (IWineD3DDevice *) stateblock->wineD3DDevice, + TRUE, + !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); + } stateblock->wineD3DDevice->last_was_pshader = TRUE; } else { /* Disabled the pixel shader - color ops weren't applied @@ -1855,12 +1851,12 @@ static void pixelshader(DWORD state, IWi } stateblock->wineD3DDevice->last_was_pshader = FALSE; -#if 0 - stateblock->wineD3DDevice->shader_backend->shader_select( - (IWineD3DDevice *) stateblock->wineD3DDevice, - FALSE, - !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); -#endif + if(!isStateDirty(stateblock->wineD3DDevice, StateTable[STATE_VSHADER].representative)) { + stateblock->wineD3DDevice->shader_backend->shader_select( + (IWineD3DDevice *) stateblock->wineD3DDevice, + FALSE, + !stateblock->vertexShader ? FALSE : ((IWineD3DVertexShaderImpl *) stateblock->vertexShader)->baseShader.function != NULL); + } } } @@ -2653,6 +2649,17 @@ static void vertexdeclaration(DWORD stat * in order to determine if we need to do any swizzling for D3DCOLOR * registers. If the shader is already compiled this call will do nothing. */ IWineD3DVertexShader_CompileShader(stateblock->vertexShader); + + /* Vertex and pixel shaders are applied together for now, so let the last dirty state do the + * application + */ + if(!isStateDirty(device, STATE_PIXELSHADER)) { + BOOL usePixelShaderFunction = device->ps_selected_mode != SHADER_NONE && + stateblock->pixelShader && + ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.function; + + device->shader_backend->shader_select((IWineD3DDevice *) device, usePixelShaderFunction, useVertexShaderFunction); + } } if(updateFog) {

1 0

Stefan Dösinger : wined3d: Move applying the gl stream sources to the state table.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: d5f18e6a631159a655698765361e7d8e50c953a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f18e6a631159a6556987653… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:11:21 2007 +0100 wined3d: Move applying the gl stream sources to the state table. --- dlls/wined3d/drawprim.c | 484 +--------------------------------------- dlls/wined3d/state.c | 489 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 485 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5f18e6a631159a655698…

1 0

Dmitry Timoshkov : user32: Restore old WM_SIZE handler in mdi child.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: d3d030eb88b931971888c20ac938f5cd66d38f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d030eb88b931971888c20ac… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 8 18:31:56 2007 +0800 user32: Restore old WM_SIZE handler in mdi child. --- dlls/user32/mdi.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 8f25386..4f6844c 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1513,20 +1513,18 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw break; case WM_SIZE: + /* do not change */ TRACE("current active %p, maximized %p\n", ci->hwndActiveChild, ci->hwndChildMaximized); - if( ci->hwndChildMaximized == hwnd && wParam != SIZE_MAXIMIZED ) + if( ci->hwndActiveChild == hwnd && wParam != SIZE_MAXIMIZED ) { HWND frame; + ci->hwndChildMaximized = 0; + frame = GetParent(client); MDI_RestoreFrameMenu( frame, hwnd ); MDI_UpdateFrameText( frame, client, FALSE, NULL ); - - ci->hwndChildMaximized = 0; - - MDI_RefreshMenu(ci); - MDI_PostUpdate(client, ci, SB_BOTH+1); } if( wParam == SIZE_MAXIMIZED ) @@ -1534,11 +1532,14 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw HWND frame, hMaxChild = ci->hwndChildMaximized; if( hMaxChild == hwnd ) break; + if( hMaxChild) { SendMessageW( hMaxChild, WM_SETREDRAW, FALSE, 0 ); + MDI_RestoreFrameMenu( GetParent(client), hMaxChild ); ShowWindow( hMaxChild, SW_SHOWNOACTIVATE ); + SendMessageW( hMaxChild, WM_SETREDRAW, TRUE, 0 ); } @@ -1550,10 +1551,17 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw frame = GetParent(client); MDI_AugmentFrameMenu( frame, hwnd ); MDI_UpdateFrameText( frame, client, TRUE, NULL ); - - MDI_RefreshMenu(ci); - MDI_PostUpdate(client, ci, SB_BOTH+1); } + + if( wParam == SIZE_MINIMIZED ) + { + HWND switchTo = MDI_GetWindow( ci, hwnd, TRUE, WS_MINIMIZE ); + + if( switchTo ) + SendMessageW( switchTo, WM_CHILDACTIVATE, 0, 0 ); + } + + MDI_PostUpdate(client, ci, SB_BOTH+1); break; case WM_NEXTMENU:

1 0

Dmitry Timoshkov : server: Map ESPIPE to STATUS_ILLEGAL_FUNCTION for consistency with ntdll.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: ced2e56ddc59f5d63039fb4aec7b1b90827543e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced2e56ddc59f5d63039fb4ae… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 8 11:16:59 2007 +0800 server: Map ESPIPE to STATUS_ILLEGAL_FUNCTION for consistency with ntdll. --- server/file.c | 2 +- server/trace.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/file.c b/server/file.c index d84e4f3..6647138 100644 --- a/server/file.c +++ b/server/file.c @@ -295,7 +295,7 @@ void file_set_error(void) case EMFILE: set_error( STATUS_TOO_MANY_OPENED_FILES ); break; case EEXIST: set_error( STATUS_OBJECT_NAME_COLLISION ); break; case EINVAL: set_error( STATUS_INVALID_PARAMETER ); break; - case ESPIPE: set_win32_error( ERROR_SEEK ); break; + case ESPIPE: set_error( STATUS_ILLEGAL_FUNCTION ); break; case ENOTEMPTY: set_error( STATUS_DIRECTORY_NOT_EMPTY ); break; case EIO: set_error( STATUS_ACCESS_VIOLATION ); break; case ENOTDIR: set_error( STATUS_NOT_A_DIRECTORY ); break; diff --git a/server/trace.c b/server/trace.c index 70284ce..1770a6d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3962,7 +3962,6 @@ static const struct { "ERROR_CLIPBOARD_NOT_OPEN", 0xc0010000 | ERROR_CLIPBOARD_NOT_OPEN }, { "ERROR_INVALID_INDEX", 0xc0010000 | ERROR_INVALID_INDEX }, { "ERROR_INVALID_WINDOW_HANDLE", 0xc0010000 | ERROR_INVALID_WINDOW_HANDLE }, - { "ERROR_SEEK", 0xc0010000 | ERROR_SEEK }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, { "HANDLES_CLOSED", STATUS_HANDLES_CLOSED },

1 0

Dmitry Timoshkov : kernel32: Skip the VirtualAllocEx test under Win9x.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: cda39686936d69ecbeb852aae09e33c7ce49e70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda39686936d69ecbeb852aae… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 8 11:17:19 2007 +0800 kernel32: Skip the VirtualAllocEx test under Win9x. --- dlls/kernel32/tests/virtual.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4f2469f..30b037a 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -63,8 +63,14 @@ static void test_VirtualAllocEx(void) for (i = 0; i < alloc_size; i++) src[i] = 0xcafedead + i; + SetLastError(0xdeadbeef); addr1 = VirtualAllocEx(hProcess, NULL, alloc_size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + if (!addr1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { /* Win9x */ + trace("VirtualAllocEx is not implemented, skipping the test\n"); + return; + } todo_wine ok(addr1 != NULL, "VirtualAllocEx error %u\n", GetLastError()); b = WriteProcessMemory(hProcess, addr1, src, alloc_size, &bytes_written); ok(b && (bytes_written == alloc_size), "%lu bytes written\n",

1 0

Dmitry Timoshkov : kernel32: Fix the file sharing test to pass cleanly under XP and Win9x.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 1e7ba7c2ce4bbe57f9d771722c296f65c6ecf8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7ba7c2ce4bbe57f9d771722… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 8 11:17:49 2007 +0800 kernel32: Fix the file sharing test to pass cleanly under XP and Win9x. --- dlls/kernel32/tests/file.c | 64 +++++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7eecec6..b2dc1bd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -36,9 +36,10 @@ static int dll_capable(const char *dll, return (GetProcAddress(module, function) != NULL); } - -LPCSTR filename = "testfile.xxx"; -LPCSTR sillytext = +/* keep filename and filenameW the same */ +static const char filename[] = "testfile.xxx"; +static const WCHAR filenameW[] = { 't','e','s','t','f','i','l','e','.','x','x','x',0 }; +static const char sillytext[] = "en larvig liten text dx \033 gx hej 84 hej 4484 ! \001\033 bla bl\na.. bla bla." "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3" "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3" @@ -1075,9 +1076,22 @@ static void test_LockFile(void) DeleteFileA( filename ); } -static inline int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2 ) +static inline int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2, BOOL is_win9x ) { - if (!access1 || !access2) return 1; + if (!is_win9x) + { + if (!access1) sharing1 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; + if (!access2) sharing2 = FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE; + } + else + { + access1 &= ~DELETE; + if (!access1) access1 = GENERIC_READ; + + access2 &= ~DELETE; + if (!access2) access2 = GENERIC_READ; + } + if ((access1 & GENERIC_READ) && !(sharing2 & FILE_SHARE_READ)) return 0; if ((access1 & GENERIC_WRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; if ((access1 & DELETE) && !(sharing2 & FILE_SHARE_DELETE)) return 0; @@ -1100,6 +1114,7 @@ static void test_file_sharing(void) int a1, s1, a2, s2; int ret; HANDLE h, h2; + BOOL is_win9x = FALSE; /* make sure the file exists */ h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); @@ -1108,12 +1123,18 @@ static void test_file_sharing(void) ok(0, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError()); return; } + is_win9x = GetFileAttributesW(filenameW) == INVALID_FILE_ATTRIBUTES; CloseHandle( h ); for (a1 = 0; a1 < sizeof(access_modes)/sizeof(access_modes[0]); a1++) { for (s1 = 0; s1 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s1++) { + /* Win9x doesn't support FILE_SHARE_DELETE */ + if (is_win9x && (sharing_modes[s1] & FILE_SHARE_DELETE)) + continue; + + SetLastError(0xdeadbeef); h = CreateFileA( filename, access_modes[a1], sharing_modes[s1], NULL, OPEN_EXISTING, 0, 0 ); if (h == INVALID_HANDLE_VALUE) @@ -1125,35 +1146,40 @@ static void test_file_sharing(void) { for (s2 = 0; s2 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s2++) { + /* Win9x doesn't support FILE_SHARE_DELETE */ + if (is_win9x && (sharing_modes[s2] & FILE_SHARE_DELETE)) + continue; + SetLastError(0xdeadbeef); h2 = CreateFileA( filename, access_modes[a2], sharing_modes[s2], NULL, OPEN_EXISTING, 0, 0 ); + if (is_sharing_compatible( access_modes[a1], sharing_modes[s1], - access_modes[a2], sharing_modes[s2] )) + access_modes[a2], sharing_modes[s2], is_win9x )) { ret = GetLastError(); - ok( ERROR_SHARING_VIOLATION == ret || 0 == ret, - "Windows 95 sets GetLastError() = ERROR_SHARING_VIOLATION and\n" - " Windows XP GetLastError() = 0, but now it is %d.\n" - " indexes = %d, %d, %d, %d\n" - " modes =\n %x/%x/%x/%x\n", - ret, - a1, s1, a2, s2, + + ok( h2 != INVALID_HANDLE_VALUE, + "open failed for modes %x/%x/%x/%x\n", access_modes[a1], sharing_modes[s1], - access_modes[a2], sharing_modes[s2] - ); + access_modes[a2], sharing_modes[s2] ); + ok( ret == 0xdeadbeef /* Win9x */ || + ret == 0, /* XP */ + "wrong error code %d\n", ret ); + + CloseHandle( h2 ); } else { + ret = GetLastError(); + ok( h2 == INVALID_HANDLE_VALUE, "open succeeded for modes %x/%x/%x/%x\n", access_modes[a1], sharing_modes[s1], access_modes[a2], sharing_modes[s2] ); - if (h2 == INVALID_HANDLE_VALUE) - ok( GetLastError() == ERROR_SHARING_VIOLATION, - "wrong error code %d\n", GetLastError() ); + ok( ret == ERROR_SHARING_VIOLATION, + "wrong error code %d\n", ret ); } - if (h2 != INVALID_HANDLE_VALUE) CloseHandle( h2 ); } } CloseHandle( h );

1 0

Dmitry Timoshkov : kernel32: Print more information about the reason of a test failure.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 67568764e5469f826e3a36a568744c91c7744bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67568764e5469f826e3a36a56… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 8 11:18:18 2007 +0800 kernel32: Print more information about the reason of a test failure. --- dlls/kernel32/tests/file.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b2dc1bd..96fe96e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1745,47 +1745,50 @@ static void test_overlapped(void) result = 1; r = GetOverlappedResult(0, &ov, &result, 0); ok( r == TRUE, "should return false\n"); - ok( result == 0, "result wrong\n"); + ok( result == 0, "wrong result %u\n", result ); result = 0; ov.Internal = 0; ov.InternalHigh = 0xabcd; r = GetOverlappedResult(0, &ov, &result, 0); ok( r == TRUE, "should return false\n"); - ok( result == 0xabcd, "result wrong\n"); + ok( result == 0xabcd, "wrong result %u\n", result ); SetLastError( 0xb00 ); result = 0; ov.Internal = STATUS_INVALID_HANDLE; ov.InternalHigh = 0xabcd; r = GetOverlappedResult(0, &ov, &result, 0); - ok (GetLastError() == ERROR_INVALID_HANDLE, "error wrong\n"); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); ok( r == FALSE, "should return false\n"); - ok( result == 0xabcd, "result wrong\n"); + ok( result == 0xabcd, "wrong result %u\n", result ); + SetLastError( 0xb00 ); result = 0; ov.Internal = STATUS_PENDING; ov.InternalHigh = 0xabcd; r = GetOverlappedResult(0, &ov, &result, 0); todo_wine { - ok (GetLastError() == ERROR_IO_INCOMPLETE, "error wrong\n"); + ok( GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError() ); } ok( r == FALSE, "should return false\n"); - ok( result == 0, "result wrong\n"); + ok( result == 0, "wrong result %u\n", result ); + SetLastError( 0xb00 ); ov.hEvent = CreateEvent( NULL, 1, 1, NULL ); ov.Internal = STATUS_PENDING; ov.InternalHigh = 0xabcd; r = GetOverlappedResult(0, &ov, &result, 0); - ok (GetLastError() == ERROR_IO_INCOMPLETE, "error wrong\n"); + ok( GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError() ); ok( r == FALSE, "should return false\n"); ResetEvent( ov.hEvent ); + SetLastError( 0xb00 ); ov.Internal = STATUS_PENDING; ov.InternalHigh = 0; r = GetOverlappedResult(0, &ov, &result, 0); - ok (GetLastError() == ERROR_IO_INCOMPLETE, "error wrong\n"); + ok( GetLastError() == ERROR_IO_INCOMPLETE, "wrong error %u\n", GetLastError() ); ok( r == FALSE, "should return false\n"); r = CloseHandle( ov.hEvent );

1 0

Rob Shearman : wininet: Use Keep-Alive for HTTP requests if specified by the flags passed into HttpOpenRequest .
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 47a8b86b5332a988d5f32b99ea6a84b17061a27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a8b86b5332a988d5f32b99e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:53:29 2007 +0000 wininet: Use Keep-Alive for HTTP requests if specified by the flags passed into HttpOpenRequest. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cb8b844..cdf2bff 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2302,7 +2302,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } - HTTP_ProcessHeader(lpwhr, szConnection, szClose, + HTTP_ProcessHeader(lpwhr, szConnection, + lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); /* if there's a proxy username and password, add it to the headers */

1 0

Dmitry Timoshkov : user32: Make message tests pass cleanly under XP SP2.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: b8c72fdf7c5efbdbc9c71d949bc21a9758a33510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c72fdf7c5efbdbc9c71d949… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 7 19:40:46 2007 +0800 user32: Make message tests pass cleanly under XP SP2. --- dlls/user32/tests/msg.c | 630 ++++++++++++++++++++++++++--------------------- 1 files changed, 351 insertions(+), 279 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8c72fdf7c5efbdbc9c71…

1 0