November 2008 - Wine-Commits

Michael Stefaniuc : netapi32/tests: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: df4cb76100bfcceb6805976464c1ca99cd234e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4cb76100bfcceb680597646… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:59 2008 +0100 netapi32/tests: Do not cast NULL. --- dlls/netapi32/tests/apibuf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 5589c18..fa29fc4 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -74,13 +74,13 @@ static void run_apibuf_tests(void) /* NULL-Pointer */ /* NT: ERROR_INVALID_PARAMETER, lasterror is untouched) */ SetLastError(0xdeadbeef); - res = pNetApiBufferAllocate(0, (LPVOID *)NULL); + res = pNetApiBufferAllocate(0, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); - res = pNetApiBufferAllocate(1024, (LPVOID *)NULL); + res = pNetApiBufferAllocate(1024, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError());

1 0

Michael Stefaniuc : dnsapi: Transform two for loops into while loops.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 42c733cd3b74631ae6966ef539fb3ca00f44f1a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c733cd3b74631ae6966ef53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:20 2008 +0100 dnsapi: Transform two for loops into while loops. --- dlls/dnsapi/ns_name.c | 2 +- dlls/dnsapi/ns_parse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index 4bb3e4a..9822578 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -103,7 +103,7 @@ dns_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { if (dn + n >= eom) { return (-1); } - for ((void)NULL; n > 0; n--) { + while (n-- > 0) { c = *cp++; if (special(c)) { if (dn + 1 >= eom) { diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index b5884bf..cb9aa62 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -74,7 +74,7 @@ static int dns_ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) { const u_char *optr = ptr; - for ((void)NULL; count > 0; count--) { + while (count-- > 0) { int b, rdlength; b = dn_skipname(ptr, eom);

1 0

Michael Stefaniuc : d3dx8: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: c6a9182a8340a538e5cfee5f018051471723ba35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a9182a8340a538e5cfee5f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:38 2008 +0100 d3dx8: Do not cast NULL. --- dlls/d3dx8/d3dx8_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c index ee897a8..aa186a0 100644 --- a/dlls/d3dx8/d3dx8_main.c +++ b/dlls/d3dx8/d3dx8_main.c @@ -39,7 +39,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); if (NULL == object) { - *ppBuffer = (LPD3DXBUFFER)NULL; + *ppBuffer = NULL; return E_OUTOFMEMORY; } object->lpVtbl = &D3DXBuffer_Vtbl; @@ -48,7 +48,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); if (NULL == object->buffer) { HeapFree(GetProcessHeap(), 0, object); - *ppBuffer = (LPD3DXBUFFER)NULL; + *ppBuffer = NULL; return E_OUTOFMEMORY; } *ppBuffer = (LPD3DXBUFFER)object;

1 0

Michael Stefaniuc : dmusic: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 892f735930631a757aea84e9d7f5582d627a9b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892f735930631a757aea84e9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:24:00 2008 +0100 dmusic: Do not cast NULL. --- dlls/dmusic/dmusic.c | 4 ++-- dlls/dmusic/port.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 34edce9..f37f8f6 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -127,7 +127,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLS if (IsEqualCLSID (rclsidPort, &PortCaps.guidPort)) { hr = DMUSIC_CreateDirectMusicPortImpl(&IID_IDirectMusicPort, (LPVOID*) &pNewPort, (LPUNKNOWN) This, pPortParams, &PortCaps); if (FAILED(hr)) { - *ppPort = (LPDIRECTMUSICPORT) NULL; + *ppPort = NULL; return hr; } This->nrofports++; @@ -255,7 +255,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPU dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); if (NULL == dmusic) { - *ppobj = (LPDIRECTMUSIC8) NULL; + *ppobj = NULL; return E_OUTOFMEMORY; } dmusic->lpVtbl = &DirectMusic8_Vtbl; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 83fda74..c8cb20e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -243,8 +243,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPortImpl)); - if (NULL == obj) { - *ppobj = (LPDIRECTMUSICPORT) NULL; + if (NULL == obj) { + *ppobj = NULL; return E_OUTOFMEMORY; } obj->lpVtbl = &DirectMusicPort_Vtbl;

1 0

Michael Stefaniuc : winedbg: Use FIELD_OFFSET instead of reimplementing it.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 880d944ea0f02fb7c3f1c60ff6371555f29825ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=880d944ea0f02fb7c3f1c60ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:23:02 2008 +0100 winedbg: Use FIELD_OFFSET instead of reimplementing it. --- programs/winedbg/display.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/display.c b/programs/winedbg/display.c index 0901961..287d4ae 100644 --- a/programs/winedbg/display.c +++ b/programs/winedbg/display.c @@ -40,8 +40,6 @@ struct display static struct display *displaypoints = NULL; static unsigned int maxdisplays = 0, ndisplays = 0; -#define OFFSET_OF(_f,_s) ((unsigned)(&(((_s*)NULL)->_f))) - static inline BOOL cmp_symbol(const SYMBOL_INFO* si1, const SYMBOL_INFO* si2) { /* FIXME: !memcmp(si1, si2, sizeof(SYMBOL_INFO) + si1->NameLen) @@ -50,7 +48,7 @@ static inline BOOL cmp_symbol(const SYMBOL_INFO* si1, const SYMBOL_INFO* si2) * stack_get_frame, so that un-touched fields by stack_get_frame * get the same value!! */ - return !memcmp(si1, si2, OFFSET_OF(Name, SYMBOL_INFO)) && + return !memcmp(si1, si2, FIELD_OFFSET(SYMBOL_INFO, Name)) && !memcmp(si1->Name, si2->Name, si1->NameLen); }

1 0

Michael Stefaniuc : riched20: Use MAKELPARAM instead of "(LPARAM) MAKELONG" .
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 2ae8511980596b7034ec7a817860aca24e7b5402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae8511980596b7034ec7a817… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:22:27 2008 +0100 riched20: Use MAKELPARAM instead of "(LPARAM) MAKELONG". --- dlls/riched20/tests/editor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a55f845..bc93899 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3821,7 +3821,7 @@ static void test_WM_SETFONT(void) returnedCF2A.cbSize = sizeof(returnedCF2A); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "x"); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont1, MAKELPARAM(TRUE, 0)); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); GetObjectA(testFont1, sizeof(LOGFONTA), &sentLogFont); @@ -3829,14 +3829,14 @@ static void test_WM_SETFONT(void) "EM_GETCHARFORMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n", sentLogFont.lfFaceName,returnedCF2A.szFaceName); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2, MAKELPARAM(TRUE, 0)); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); GetObjectA(testFont2, sizeof(LOGFONTA), &sentLogFont); ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), "EM_GETCHARFORMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n", sentLogFont.lfFaceName,returnedCF2A.szFaceName); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3, MAKELPARAM(TRUE, 0)); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A); GetObjectA(testFont3, sizeof(LOGFONTA), &sentLogFont); ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName), @@ -3923,7 +3923,7 @@ static void test_EM_GETMODIFY(void) /* setting font doesn't change modify flag */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); - SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont,(LPARAM) MAKELONG((WORD) TRUE, 0)); + SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont, MAKELPARAM(TRUE, 0)); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result == 0, "EM_GETMODIFY returned non-zero, instead of zero on setting font\n");

1 0

Michael Stefaniuc : user32: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 706df65c5a02d6d889bfa7f4656b4738e3a97dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706df65c5a02d6d889bfa7f46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:23:27 2008 +0100 user32: Do not cast NULL. --- dlls/user32/comm16.c | 4 ++-- dlls/user32/tests/dde.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index c7f3ab2..46f72c6 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -752,14 +752,14 @@ SEGPTR WINAPI SetCommEventMask16(INT16 cid,UINT16 fuEvtMask) TRACE("cid %d,mask %d\n",cid,fuEvtMask); if ((ptr = GetDeviceStruct(cid)) == NULL) { FIXME("no handle for cid = %0x!\n",cid); - return (SEGPTR)NULL; + return 0; } ptr->eventmask = fuEvtMask; if (cid&FLAG_LPT) { WARN(" cid %d not comm port\n",cid); - return (SEGPTR)NULL; + return 0; } /* it's a COM port ? -> modify flags */ stol = (unsigned char *)COM[cid].unknown + COMM_MSR_OFFSET; diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 968cd26..14a52b5 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1726,7 +1726,7 @@ static void test_FreeDDElParam(void) HGLOBAL val, hglobal; BOOL ret; - ret = FreeDDElParam(WM_DDE_INITIATE, (LPARAM)NULL); + ret = FreeDDElParam(WM_DDE_INITIATE, 0); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); @@ -1975,7 +1975,7 @@ static void test_UnpackDDElParam(void) /* NULL lParam */ lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_INITIATE, (LPARAM)NULL, &lo, &hi); + ret = UnpackDDElParam(WM_DDE_INITIATE, 0, &lo, &hi); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(lo == 0, "Expected 0, got %08lx\n", lo); ok(hi == 0, "Expected 0, got %08lx\n", hi); @@ -2012,7 +2012,7 @@ static void test_UnpackDDElParam(void) lo = 0xdead; hi = 0xbeef; - ret = UnpackDDElParam(WM_DDE_ADVISE, (LPARAM)NULL, &lo, &hi); + ret = UnpackDDElParam(WM_DDE_ADVISE, 0, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(lo == 0 || broken(lo == 0xdead), /* win2k */

1 0

Michael Stefaniuc : riched20: Do not cast NULL.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 9f92f6bc1021bc52d178712008f6b8b2e4ea5d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f92f6bc1021bc52d17871200… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:22:07 2008 +0100 riched20: Do not cast NULL. --- dlls/riched20/reader.c | 4 +- dlls/riched20/tests/editor.c | 56 ++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f92f6bc1021bc52d1787…

1 0

Stefan Dösinger : d3d: Do not restore the display mode in ddraw.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 93af8d363118b076600547622f5be57c08a300ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=93af8d363118b076600547622… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 1 22:35:23 2008 +0100 d3d: Do not restore the display mode in ddraw. --- dlls/d3d8/device.c | 2 ++ dlls/d3d8/directx.c | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 1 + dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/swapchain_gdi.c | 2 +- include/wine/wined3d_types.h | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 04f56b8..e8df4f0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -305,6 +305,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DD localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_CreateSwapChain(This->WineD3DDevice, &localParameters, &object->wineD3DSwapChain, (IUnknown*)object, D3D8CB_CreateRenderTarget, D3D8CB_CreateDepthStencilSurface, SURFACE_OPENGL); @@ -358,6 +359,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRE localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index afcb0fe..3efbab0 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -444,6 +444,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; if(BehaviourFlags & D3DCREATE_MULTITHREADED) { IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8aab230..426c8ab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -376,6 +376,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3 localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b605f44..b44c632 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -515,6 +515,7 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adap localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; if(BehaviourFlags & D3DCREATE_MULTITHREADED) { IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 74e1cf6..6f4393a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -72,7 +72,7 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE) { + if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index f0ec4f2..f634e50 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -59,7 +59,7 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE) { + if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 4ccbcab..28e5525 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -886,6 +886,7 @@ typedef struct _WINED3DPRESENT_PARAMETERS { DWORD Flags; UINT FullScreen_RefreshRateInHz; UINT PresentationInterval; + BOOL AutoRestoreDisplayMode; } WINED3DPRESENT_PARAMETERS; #define WINED3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001

1 0

Stefan Dösinger : wined3d: Restore the fragment replacement prog after depth_blt.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 8b38533f691154b889f92ab8722332c3cce47ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b38533f691154b889f92ab87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 1 20:11:41 2008 +0100 wined3d: Restore the fragment replacement prog after depth_blt. The current code properly enabled/disabled GL_ARB_fragment_program after a depth blit, but it did not restore the bound fragment program properly. This leads to problems if a depth blit was done between two draws without any change of the fragment processing settings. --- dlls/wined3d/arb_program_shader.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 77654d9..3edeabf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1887,21 +1887,20 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixelShader->prgId);"); - /* Enable OpenGL fragment programs */ - glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + if(!priv->use_arbfp_fixed_func) { + /* Enable OpenGL fragment programs */ + glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + } TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else { + } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { + /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, + * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function + * replacement shader + */ + glDisable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); priv->current_fprogram_id = 0; - - if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { - /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, - * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function - * replacement shader - */ - glDisable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - } } } @@ -1946,7 +1945,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else if(!priv->use_arbfp_fixed_func) { + } else { glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } @@ -3087,6 +3086,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, */ GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); + priv->current_fprogram_id = desc->shader; if(device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) { /* Reload fixed function constants since they collide with the pixel shader constants */

1 0