March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Don't leak WineD3DAdapter.cfgs.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 40d4f9b7ec00c47d68c2e11765ee4874815e2711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d4f9b7ec00c47d68c2e1176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 10:15:10 2009 +0100 wined3d: Don't leak WineD3DAdapter.cfgs. --- dlls/wined3d/directx.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce0b9e4..155d704 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -370,6 +370,12 @@ static ULONG WINAPI IWineD3DImpl_Release(IWineD3D *iface) { TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + unsigned int i; + + for (i = 0; i < This->adapter_count; ++i) + { + HeapFree(GetProcessHeap(), 0, This->adapters[i].cfgs); + } HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : d3d9: Present parameters are an array when D3DCREATE_ADAPTERGROUP_DEVICE is specified .
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 39ae94d0b3f3e0ce42963c26ddc35d1ba24ccfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ae94d0b3f3e0ce42963c26d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 10:15:10 2009 +0100 d3d9: Present parameters are an array when D3DCREATE_ADAPTERGROUP_DEVICE is specified. --- dlls/d3d9/directx.c | 80 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 32 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 371e6f7..e74a83f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -376,7 +376,8 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adap IDirect3D9Impl *This = (IDirect3D9Impl *)iface; IDirect3DDevice9Impl *object = NULL; - WINED3DPRESENT_PARAMETERS localParameters; + WINED3DPRESENT_PARAMETERS *localParameters; + UINT i, count = 1; HRESULT hr; TRACE("(%p) Relay\n", This); @@ -412,49 +413,64 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adap TRACE("(%p) : Created Device %p\n", This, object); - localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; - localParameters.BackBufferHeight = pPresentationParameters->BackBufferHeight; - localParameters.BackBufferFormat = wined3dformat_from_d3dformat(pPresentationParameters->BackBufferFormat); - localParameters.BackBufferCount = pPresentationParameters->BackBufferCount; - localParameters.MultiSampleType = pPresentationParameters->MultiSampleType; - localParameters.MultiSampleQuality = pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = pPresentationParameters->SwapEffect; - localParameters.hDeviceWindow = pPresentationParameters->hDeviceWindow; - localParameters.Windowed = pPresentationParameters->Windowed; - localParameters.EnableAutoDepthStencil = pPresentationParameters->EnableAutoDepthStencil; - localParameters.AutoDepthStencilFormat = wined3dformat_from_d3dformat(pPresentationParameters->AutoDepthStencilFormat); - localParameters.Flags = pPresentationParameters->Flags; - localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; - localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; - localParameters.AutoRestoreDisplayMode = TRUE; + if (BehaviourFlags & D3DCREATE_ADAPTERGROUP_DEVICE) + { + WINED3DCAPS caps; + + IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, &caps); + count = caps.NumberOfAdaptersInGroup; + } if(BehaviourFlags & D3DCREATE_MULTITHREADED) { IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); } - hr = IWineD3DDevice_Init3D(object->WineD3DDevice, &localParameters); - - pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; - pPresentationParameters->BackBufferHeight = localParameters.BackBufferHeight; - pPresentationParameters->BackBufferFormat = d3dformat_from_wined3dformat(localParameters.BackBufferFormat); - pPresentationParameters->BackBufferCount = localParameters.BackBufferCount; - pPresentationParameters->MultiSampleType = localParameters.MultiSampleType; - pPresentationParameters->MultiSampleQuality = localParameters.MultiSampleQuality; - pPresentationParameters->SwapEffect = localParameters.SwapEffect; - pPresentationParameters->hDeviceWindow = localParameters.hDeviceWindow; - pPresentationParameters->Windowed = localParameters.Windowed; - pPresentationParameters->EnableAutoDepthStencil = localParameters.EnableAutoDepthStencil; - pPresentationParameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat); - pPresentationParameters->Flags = localParameters.Flags; - pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz; - pPresentationParameters->PresentationInterval = localParameters.PresentationInterval; + localParameters = HeapAlloc(GetProcessHeap(), 0, sizeof(*localParameters) * count); + for (i = 0; i < count; ++i) + { + localParameters[i].BackBufferWidth = pPresentationParameters[i].BackBufferWidth; + localParameters[i].BackBufferHeight = pPresentationParameters[i].BackBufferHeight; + localParameters[i].BackBufferFormat = wined3dformat_from_d3dformat(pPresentationParameters[i].BackBufferFormat); + localParameters[i].BackBufferCount = pPresentationParameters[i].BackBufferCount; + localParameters[i].MultiSampleType = pPresentationParameters[i].MultiSampleType; + localParameters[i].MultiSampleQuality = pPresentationParameters[i].MultiSampleQuality; + localParameters[i].SwapEffect = pPresentationParameters[i].SwapEffect; + localParameters[i].hDeviceWindow = pPresentationParameters[i].hDeviceWindow; + localParameters[i].Windowed = pPresentationParameters[i].Windowed; + localParameters[i].EnableAutoDepthStencil = pPresentationParameters[i].EnableAutoDepthStencil; + localParameters[i].AutoDepthStencilFormat = wined3dformat_from_d3dformat(pPresentationParameters[i].AutoDepthStencilFormat); + localParameters[i].Flags = pPresentationParameters[i].Flags; + localParameters[i].FullScreen_RefreshRateInHz = pPresentationParameters[i].FullScreen_RefreshRateInHz; + localParameters[i].PresentationInterval = pPresentationParameters[i].PresentationInterval; + localParameters[i].AutoRestoreDisplayMode = TRUE; + } + hr = IWineD3DDevice_Init3D(object->WineD3DDevice, localParameters); if (hr != D3D_OK) { FIXME("(%p) D3D Initialization failed for WineD3DDevice %p\n", This, object->WineD3DDevice); HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; } + for (i = 0; i < count; ++i) + { + pPresentationParameters[i].BackBufferWidth = localParameters[i].BackBufferWidth; + pPresentationParameters[i].BackBufferHeight = localParameters[i].BackBufferHeight; + pPresentationParameters[i].BackBufferFormat = d3dformat_from_wined3dformat(localParameters[i].BackBufferFormat); + pPresentationParameters[i].BackBufferCount = localParameters[i].BackBufferCount; + pPresentationParameters[i].MultiSampleType = localParameters[i].MultiSampleType; + pPresentationParameters[i].MultiSampleQuality = localParameters[i].MultiSampleQuality; + pPresentationParameters[i].SwapEffect = localParameters[i].SwapEffect; + pPresentationParameters[i].hDeviceWindow = localParameters[i].hDeviceWindow; + pPresentationParameters[i].Windowed = localParameters[i].Windowed; + pPresentationParameters[i].EnableAutoDepthStencil = localParameters[i].EnableAutoDepthStencil; + pPresentationParameters[i].AutoDepthStencilFormat = d3dformat_from_wined3dformat(localParameters[i].AutoDepthStencilFormat); + pPresentationParameters[i].Flags = localParameters[i].Flags; + pPresentationParameters[i].FullScreen_RefreshRateInHz = localParameters[i].FullScreen_RefreshRateInHz; + pPresentationParameters[i].PresentationInterval = localParameters[i].PresentationInterval; + } + HeapFree(GetProcessHeap(), 0, localParameters); + /* Initialize the converted declaration array. This creates a valid pointer and when adding decls HeapReAlloc * can be used without further checking */

1 0

Huw Davies : gdi32/tests: Remove a cut and paste error.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: e41e1f8f84f10d6a580dcf1070324eaea36c7f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41e1f8f84f10d6a580dcf107… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 11 10:01:03 2009 +0000 gdi32/tests: Remove a cut and paste error. --- dlls/gdi32/tests/bitmap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ec466dd..107d274 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1649,7 +1649,6 @@ static void test_GetDIBits(void) ok(bm.bmType == 0 || broken(bm.bmType == 21072), /* win9x */ "wrong bmType %d\n", bm.bmType); - ok(bm.bmType == 0, "wrong bmType %d\n", bm.bmType); ok(bm.bmWidth == 16, "wrong bmWidth %d\n", bm.bmWidth); ok(bm.bmHeight == 16, "wrong bmHeight %d\n", bm.bmHeight); ok(bm.bmWidthBytes == BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), "wrong bmWidthBytes %d\n", bm.bmWidthBytes);

1 0

Henri Verbeet : wined3d: The adapters array should be owned by IWineD3DImpl .
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 2cc43393f04bb1066cc73a6bcc3dfedb4be2f270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc43393f04bb1066cc73a6bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 10:15:09 2009 +0100 wined3d: The adapters array should be owned by IWineD3DImpl. --- dlls/wined3d/directx.c | 382 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_gl.h | 2 + dlls/wined3d/wined3d_main.c | 19 ++- dlls/wined3d/wined3d_private.h | 7 +- 4 files changed, 236 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc43393f04bb1066cc73…

1 0

Henri Verbeet : wined3d: Get rid of the PUSH1 macro.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: ddae14169ba050d0758d45ac94b8b2036e75e7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddae14169ba050d0758d45ac9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 10:15:10 2009 +0100 wined3d: Get rid of the PUSH1 macro. --- dlls/wined3d/directx.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bf9b3f4..ce0b9e4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4221,7 +4221,6 @@ static void fillGLAttribFuncs(const WineD3D_GL_Info *gl_info) } } -#define PUSH1(att) attribs[nAttribs++] = (att); BOOL InitAdapters(IWineD3DImpl *This) { static HMODULE mod_gl; @@ -4346,16 +4345,16 @@ BOOL InitAdapters(IWineD3DImpl *This) adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->nCfgs *sizeof(WineD3D_PixelFormat)); cfgs = adapter->cfgs; - PUSH1(WGL_RED_BITS_ARB) - PUSH1(WGL_GREEN_BITS_ARB) - PUSH1(WGL_BLUE_BITS_ARB) - PUSH1(WGL_ALPHA_BITS_ARB) - PUSH1(WGL_DEPTH_BITS_ARB) - PUSH1(WGL_STENCIL_BITS_ARB) - PUSH1(WGL_DRAW_TO_WINDOW_ARB) - PUSH1(WGL_PIXEL_TYPE_ARB) - PUSH1(WGL_DOUBLE_BUFFER_ARB) - PUSH1(WGL_AUX_BUFFERS_ARB) + attribs[nAttribs++] = WGL_RED_BITS_ARB; + attribs[nAttribs++] = WGL_GREEN_BITS_ARB; + attribs[nAttribs++] = WGL_BLUE_BITS_ARB; + attribs[nAttribs++] = WGL_ALPHA_BITS_ARB; + attribs[nAttribs++] = WGL_DEPTH_BITS_ARB; + attribs[nAttribs++] = WGL_STENCIL_BITS_ARB; + attribs[nAttribs++] = WGL_DRAW_TO_WINDOW_ARB; + attribs[nAttribs++] = WGL_PIXEL_TYPE_ARB; + attribs[nAttribs++] = WGL_DOUBLE_BUFFER_ARB; + attribs[nAttribs++] = WGL_AUX_BUFFERS_ARB; for (iPixelFormat=1; iPixelFormat <= adapter->nCfgs; ++iPixelFormat) { @@ -4457,7 +4456,6 @@ nogl_adapter: This->adapter_count = 1; return FALSE; } -#undef PUSH1 /********************************************************** * IWineD3D VTbl follows

1 0

Henri Verbeet : wined3d: Set the correct texture names on cube surfaces.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: a75590343a2ad6f5c8d2ae45b1c269a1b462f5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75590343a2ad6f5c8d2ae45b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 10:15:09 2009 +0100 wined3d: Set the correct texture names on cube surfaces. --- dlls/wined3d/cubetexture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index c1805c8..fe874a7 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -231,9 +231,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i for (i = 0; i < This->baseTexture.levels; ++i) { for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z; ++j) { if(This->baseTexture.is_srgb) { - surface_set_texture_name(This->surfaces[j][i], This->baseTexture.textureName, TRUE); + surface_set_texture_name(This->surfaces[j][i], This->baseTexture.srgbTextureName, TRUE); } else { - surface_set_texture_name(This->surfaces[j][i], This->baseTexture.srgbTextureName, FALSE); + surface_set_texture_name(This->surfaces[j][i], This->baseTexture.textureName, FALSE); } } }

1 0

Henri Verbeet : wined3d: Free the logo path when we're done with it.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 3644a7f6d734ed6107baec7870b57dbe066f2e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3644a7f6d734ed6107baec787… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 10:15:09 2009 +0100 wined3d: Free the logo path when we're done with it. --- dlls/wined3d/wined3d_main.c | 407 +++++++++++++++++++++++-------------------- 1 files changed, 214 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3644a7f6d734ed6107bae…

1 0

Alexandre Julliard : user32/tests: SetForegroundWindow sometimes fails on Win98.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 943ae1f5a6edd8a0f5451d7436d35bb1339ca788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ae1f5a6edd8a0f5451d743… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 11:42:01 2009 +0100 user32/tests: SetForegroundWindow sometimes fails on Win98. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 33f1403..89eefcd 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2430,9 +2430,9 @@ static void test_SetForegroundWindow(HWND hwnd) /*trace("testing SetForegroundWindow on an invisible window %p\n", hwnd);*/ ret = SetForegroundWindow(hwnd); - ok(ret, "SetForegroundWindow returned FALSE instead of TRUE\n"); + ok(ret || broken(!ret), /* win98 */ "SetForegroundWindow returned FALSE instead of TRUE\n"); check_wnd_state(hwnd, hwnd, hwnd, 0); - + ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0);

1 0

Alexandre Julliard : user32/tests: Skip shift+button test if we don' t receive the event.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 28582dbf6cddf5c215a7a019c086d1bcddfa4fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=28582dbf6cddf5c215a7a019c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 11:42:21 2009 +0100 user32/tests: Skip shift+button test if we don't receive the event. --- dlls/user32/tests/msg.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ed6a820..d1825d3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6850,12 +6850,17 @@ static void test_accelerators(void) GetCursorPos(&pt); if (pt.x == rc.left && pt.y == rc.top) { + int i; keybd_event(VK_SHIFT, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); - ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE); + for (i = 0; i < sequence_cnt; i++) if (sequence[i].message == WM_LBUTTONDOWN) break; + if (i < sequence_cnt) + ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE); + else + skip( "Shift+MouseButton event didn't get to the window\n" ); } done: @@ -8222,12 +8227,9 @@ static const struct message ScrollWindowPaint1[] = { { WM_GETTEXTLENGTH, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, - { WM_GETTEXT, sent|optional }, - { WM_GETTEXT, sent|optional }, - { WM_GETTEXT, sent|optional }, - { WM_GETTEXT, sent|defwinproc|optional }, - { WM_GETTEXT, sent|defwinproc|optional }, - { WM_ERASEBKGND, sent|optional }, + { WM_GETTEXT, sent|beginpaint|optional }, + { WM_GETTEXT, sent|beginpaint|optional }, + { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } };

1 0

Michael Stefaniuc : kernel32: Remove superfluous pointer casts.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 9b2730eb8857b4c8d7f2764fc5fb32dac59b1456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2730eb8857b4c8d7f2764fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 11 09:39:16 2009 +0100 kernel32: Remove superfluous pointer casts. --- dlls/kernel32/console.c | 2 +- dlls/kernel32/dosmem.c | 2 +- dlls/kernel32/except.c | 4 ++-- dlls/kernel32/file.c | 8 ++++---- dlls/kernel32/format_msg.c | 8 ++++---- dlls/kernel32/heap.c | 2 +- dlls/kernel32/local16.c | 16 ++++++++-------- dlls/kernel32/locale.c | 8 ++++---- dlls/kernel32/ne_module.c | 4 ++-- dlls/kernel32/oldconfig.c | 14 +++++++------- dlls/kernel32/profile.c | 18 +++++++++--------- dlls/kernel32/sync.c | 2 +- dlls/kernel32/task.c | 4 ++-- dlls/kernel32/tests/change.c | 13 ++++++------- dlls/kernel32/tests/codepage.c | 2 +- dlls/kernel32/tests/comm.c | 6 +++--- dlls/kernel32/tests/loader.c | 2 +- dlls/kernel32/tests/pipe.c | 4 ++-- dlls/kernel32/tests/sync.c | 4 ++-- dlls/kernel32/tests/thread.c | 13 ++++++------- dlls/kernel32/tests/toolhelp.c | 2 +- dlls/kernel32/thunk.c | 2 +- dlls/kernel32/toolhelp.c | 6 +++--- dlls/kernel32/volume.c | 2 +- 24 files changed, 73 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b2730eb8857b4c8d7f27…

1 0