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

Vincent Povirk : hhctrl.ocx: Ensure that the topic within MSITStore url' s begins with /.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: c689451cd1e39e93b174043e345d0f64c14273d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c689451cd1e39e93b174043e3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 7 15:27:18 2009 +0200 hhctrl.ocx: Ensure that the topic within MSITStore url's begins with /. --- dlls/hhctrl.ocx/help.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index ff70338..a19e1e6 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -115,7 +115,9 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) LPWSTR ptr; static const WCHAR url_format[] = - {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','%','s',0}; + {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','%','s','%','s',0}; + static const WCHAR slash[] = {'/',0}; + static const WCHAR empty[] = {0}; TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); @@ -127,7 +129,7 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) return FALSE; } - wsprintfW(buf, url_format, full_path, index); + wsprintfW(buf, url_format, full_path, index[0] == '/' ? empty : slash, index); /* FIXME: HACK */ if((ptr = strchrW(buf, '#')))

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 8309788b55ad7d000fc4d2ee88b179295eab83a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8309788b55ad7d000fc4d2ee8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 7 14:18:33 2009 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 3f1e847..123cf57 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -32,6 +32,7 @@ STRINGTABLE DISCARDABLE IDS_SEMICOLON "';' erwartet" IDS_LBRACKET "'(' erwartet" IDS_RBRACKET "')' erwartet" + IDS_UNTERMINATED_STR "konstante Zeichenkette nicht terminiert" IDS_NOT_FUNC "Funktion erwartet" IDS_NOT_DATE "'[Objekt]' ist kein Datums-Objekt" IDS_NOT_NUM "Nummer erwartet"

1 0

Dylan Smith : richedit: Avoid comparing padding in cursor structures on memcmp.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: e306b91392fe6cc2ad270a45aac2a918351a1020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e306b91392fe6cc2ad270a45a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Aug 7 01:56:50 2009 -0400 richedit: Avoid comparing padding in cursor structures on memcmp. --- dlls/riched20/caret.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1cb44bc..33dbdaf 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1493,7 +1493,8 @@ static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) BOOL ME_IsSelection(ME_TextEditor *editor) { - return memcmp(&editor->pCursors[0], &editor->pCursors[1], sizeof(ME_Cursor))!=0; + return editor->pCursors[0].pRun != editor->pCursors[1].pRun || + editor->pCursors[0].nOffset != editor->pCursors[1].nOffset; } static int ME_GetSelCursor(ME_TextEditor *editor, int dir)

1 0

Andrew Nguyen : kernel32: Revise SetThreadIdealProcessor to return success.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 20276d0b38c9cb466a63c9c296ead13c01a1641c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20276d0b38c9cb466a63c9c29… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Aug 7 06:39:47 2009 -0500 kernel32: Revise SetThreadIdealProcessor to return success. --- dlls/kernel32/tests/thread.c | 32 +++++++++++++++++--------------- dlls/kernel32/thread.c | 8 ++++++-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 2c699b4..e80c63e 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -812,22 +812,24 @@ static VOID test_thread_processor(void) "SetThreadAffinityMask passed for an illegal processor\n"); /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) { - todo_wine { - SetLastError(0); - error=pSetThreadIdealProcessor(curthread,0); - if (GetLastError()!=ERROR_CALL_NOT_IMPLEMENTED) { - ok(error!=-1, "SetThreadIdealProcessor failed\n"); - } - } - if (GetLastError()!=ERROR_CALL_NOT_IMPLEMENTED) { - error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS+1); - ok(error==-1, - "SetThreadIdealProcessor succeeded with an illegal processor #\n"); - todo_wine { - error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS); - ok(error==0, "SetThreadIdealProcessor returned an incorrect value\n"); - } + SetLastError(0xdeadbeef); + error=pSetThreadIdealProcessor(curthread,0); + if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetThreadIdealProcessor is not implemented\n"); + return; } + ok(error!=-1, "SetThreadIdealProcessor failed\n"); + + SetLastError(0xdeadbeef); + error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS+1); + ok(error==-1, + "SetThreadIdealProcessor succeeded with an illegal processor #\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS); + ok(error==0, "SetThreadIdealProcessor returned an incorrect value\n"); } } diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0b899c2..b037f44 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -413,8 +413,12 @@ DWORD WINAPI SetThreadIdealProcessor( DWORD dwIdealProcessor) /* [in] Specifies the new preferred processor */ { FIXME("(%p): stub\n",hThread); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return -1L; + if (dwIdealProcessor > MAXIMUM_PROCESSORS) + { + SetLastError(ERROR_INVALID_PARAMETER); + return ~0u; + } + return 0; }

1 0

Mike Kaplinskiy : ws2_32/tests: Test closing (and CancelIo'ing) accepting socket with pending AcceptEx call.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: da1e7a7208dbd96fa38014b8ec811b65bc995d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1e7a7208dbd96fa38014b8e… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Thu Aug 6 22:20:35 2009 -0400 ws2_32/tests: Test closing (and CancelIo'ing) accepting socket with pending AcceptEx call. --- dlls/ws2_32/tests/sock.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5db5bfe..6cbea0e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2971,6 +2971,48 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + closesocket(acceptor); + acceptor = INVALID_SOCKET; + + /* Test closing with pending requests */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + closesocket(acceptor); + acceptor = INVALID_SOCKET; + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + CancelIo((HANDLE) acceptor); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_TIMEOUT, "Waiting for timeout failed with %d + errno %d\n", dwret, GetLastError()); + + closesocket(acceptor); + acceptor = INVALID_SOCKET; + acceptor = socket(AF_INET, SOCK_STREAM, 0); if (acceptor == INVALID_SOCKET) { skip("could not create acceptor socket, error %d\n", WSAGetLastError());

1 0

Stefan Dösinger : wined3d: Dirtify the correct state.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 4f9f8fef0bae4198670901c7a8bd3ca3b32700f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9f8fef0bae4198670901c7a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 7 12:18:10 2009 +0200 wined3d: Dirtify the correct state. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index aa1518e..0737079 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1651,7 +1651,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context } glColorMask(GL_TRUE, GL_TRUE,GL_TRUE,GL_TRUE); checkGLcall("glColorMask"); - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPING), StateTable); + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_COLORWRITEENABLE), StateTable); if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { glDisable(GL_COLOR_SUM_EXT); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable);

1 0

Stefan Dösinger : wined3d: Filter WINED3DSTENCILCAPS_TWOSIDED in d3d8.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 6f5a1d9a150e0371580f818167ddca5e3c9890e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5a1d9a150e0371580f81816… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 7 12:17:41 2009 +0200 wined3d: Filter WINED3DSTENCILCAPS_TWOSIDED in d3d8. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 10 +--------- dlls/d3d8/directx.c | 24 +++++++++++++++--------- dlls/wined3d/directx.c | 4 +--- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 9fa830d..a3aeff1 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -97,6 +97,8 @@ _pD3D8Caps->PixelShaderVersion = _pWineCaps->PixelShaderVersion; \ _pD3D8Caps->MaxPixelShaderValue = _pWineCaps->PixelShader1xMaxValue; +void fixup_caps(WINED3DCAPS *pWineCaps); + /* Direct3D8 Interfaces: */ typedef struct IDirect3DBaseTexture8Impl IDirect3DBaseTexture8Impl; typedef struct IDirect3DVolumeTexture8Impl IDirect3DVolumeTexture8Impl; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ee41ab4..2e854f7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -394,18 +394,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_GetDeviceCaps(This->WineD3DDevice, pWineCaps); LeaveCriticalSection(&d3d8_cs); + fixup_caps(pWineCaps); WINECAPSTOD3D8CAPS(pCaps, pWineCaps) HeapFree(GetProcessHeap(), 0, pWineCaps); - /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ - if(pCaps->PixelShaderVersion > D3DPS_VERSION(1,4)){ - pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); - } - if(pCaps->VertexShaderVersion > D3DVS_VERSION(1,1)){ - pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); - } - pCaps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); - TRACE("Returning %p %p\n", This, pCaps); return hrc; } diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index c50c4b2..eed4b8b 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -250,6 +250,20 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(LPDIRECT3D8 iface, return hr; } +void fixup_caps(WINED3DCAPS *caps) +{ + /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ + if (caps->PixelShaderVersion > D3DPS_VERSION(1,4)) { + caps->PixelShaderVersion = D3DPS_VERSION(1,4); + } + if (caps->VertexShaderVersion > D3DVS_VERSION(1,1)) { + caps->VertexShaderVersion = D3DVS_VERSION(1,1); + } + caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); + + caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; +} + static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS8* pCaps) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hrc = D3D_OK; @@ -267,18 +281,10 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada EnterCriticalSection(&d3d8_cs); hrc = IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, pWineCaps); LeaveCriticalSection(&d3d8_cs); + fixup_caps(pWineCaps); WINECAPSTOD3D8CAPS(pCaps, pWineCaps) HeapFree(GetProcessHeap(), 0, pWineCaps); - /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ - if(pCaps->PixelShaderVersion > D3DPS_VERSION(1,4)){ - pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); - } - if(pCaps->VertexShaderVersion > D3DVS_VERSION(1,1)){ - pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); - } - pCaps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); - TRACE("(%p) returning %p\n", This, pCaps); return hrc; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 554dc5e..1498684 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4050,9 +4050,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, pCaps->StencilCaps |= WINED3DSTENCILCAPS_DECR | WINED3DSTENCILCAPS_INCR; } - if ( This->dxVersion > 8 && - ( GL_SUPPORT(EXT_STENCIL_TWO_SIDE) || - GL_SUPPORT(ATI_SEPARATE_STENCIL) ) ) { + if (GL_SUPPORT(EXT_STENCIL_TWO_SIDE) || GL_SUPPORT(ATI_SEPARATE_STENCIL)) { pCaps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; }

1 0

Stefan Dösinger : wined3d: Watch out about higher constants when clamping ps 1.x consts.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 14eedc5be7f27e55f50bd4a3c01d355b4a986542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eedc5be7f27e55f50bd4a3c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 6 20:30:20 2009 +0200 wined3d: Watch out about higher constants when clamping ps 1.x consts. ps 1.x supports only 8 constants, so the shader load code dirtifies the first 8 on a shader switch. However, the constant load code reloaded all dirty consts with clamping. That potentially left constants > 8 clamped. --- dlls/wined3d/arb_program_shader.c | 61 ++++++++++++++++++++++--------------- 1 files changed, 36 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6300abb..4ed57a0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -284,7 +284,7 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con GLuint target_type, unsigned int max_constants, const float *constants, char *dirty_consts) { local_constant* lconst; - DWORD i, j; + DWORD i = 0, j; unsigned int ret; if (TRACE_ON(d3d_shader)) { @@ -299,7 +299,10 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con if (target_type == GL_FRAGMENT_PROGRAM_ARB && This->baseShader.reg_maps.shader_version.major == 1) { float lcl_const[4]; - for(i = 0; i < max_constants; i++) { + /* ps 1.x supports only 8 constants, clamp only those. When switching between 1.x and higher + * shaders, the first 8 constants are marked dirty for reload + */ + for(; i < min(8, max_constants); i++) { if(!dirty_consts[i]) continue; dirty_consts[i] = 0; @@ -322,31 +325,39 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, lcl_const)); } - } else { - if(GL_SUPPORT(EXT_GPU_PROGRAM_PARAMETERS)) { - /* TODO: Benchmark if we're better of with finding the dirty constants ourselves, - * or just reloading *all* constants at once - * - GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, 0, max_constants, constants)); - */ - for(i = 0; i < max_constants; i++) { - if(!dirty_consts[i]) continue; - /* Find the next block of dirty constants */ - dirty_consts[i] = 0; - j = i; - for(i++; (i < max_constants) && dirty_consts[i]; i++) { - dirty_consts[i] = 0; - } + /* If further constants are dirty, reload them without clamping. + * + * The alternative is not to touch them, but then we cannot reset the dirty constant count + * to zero. That's bad for apps that only use PS 1.x shaders, because in that case the code + * above would always re-check the first 8 constants since max_constant remains at the init + * value + */ + } + + if(GL_SUPPORT(EXT_GPU_PROGRAM_PARAMETERS)) { + /* TODO: Benchmark if we're better of with finding the dirty constants ourselves, + * or just reloading *all* constants at once + * + GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, i, max_constants, constants + (i * 4))); + */ + for(; i < max_constants; i++) { + if(!dirty_consts[i]) continue; - GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, j, i - j, constants + (j * 4))); + /* Find the next block of dirty constants */ + dirty_consts[i] = 0; + j = i; + for(i++; (i < max_constants) && dirty_consts[i]; i++) { + dirty_consts[i] = 0; } - } else { - for(i = 0; i < max_constants; i++) { - if(dirty_consts[i]) { - dirty_consts[i] = 0; - GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); - } + + GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, j, i - j, constants + (j * 4))); + } + } else { + for(; i < max_constants; i++) { + if(dirty_consts[i]) { + dirty_consts[i] = 0; + GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); } } }

1 0

Stefan Dösinger : d3d: Filter R8G8B8 in d3d8 and d3d9.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 296573caae8388830a0972615e763e2a44d66c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=296573caae8388830a0972615… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 5 20:55:51 2009 +0200 d3d: Filter R8G8B8 in d3d8 and d3d9. --- dlls/d3d8/directx.c | 8 ++++++++ dlls/d3d9/directx.c | 12 ++++++++++++ dlls/wined3d/directx.c | 12 ------------ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 33abe84..c50c4b2 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -195,6 +195,14 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 i WINED3DRESOURCETYPE WineD3DRType; TRACE("(%p)->(%d, %d, %d, %08x, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); + if(CheckFormat == D3DFMT_R8G8B8) + { + /* See comment in dlls/d3d9/directx.c, IDirect3D9Impl_CheckDeviceFormat for details */ + WARN("D3DFMT_R8G8B8 is not available on windows, returning D3DERR_NOTAVAILABLE\n"); + return D3DERR_NOTAVAILABLE; + } + + switch(RType) { case D3DRTYPE_VERTEXBUFFER: case D3DRTYPE_INDEXBUFFER: diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index bee2e4f..57039c5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -199,6 +199,18 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9EX iface, WINED3DRESOURCETYPE WineD3DRType; TRACE("%p\n", This); + /* This format is nothing special and it is supported perfectly. + * However, ati and nvidia driver on windows do not mark this format as + * supported (tested with the dxCapsViewer) and pretending to + * support this format uncovers a bug in Battlefield 1942 (fonts are missing) + * So do the same as Windows drivers and pretend not to support it on dx8 and 9 + */ + if(CheckFormat == D3DFMT_R8G8B8) + { + WARN("D3DFMT_R8G8B8 is not available on windows, returning D3DERR_NOTAVAILABLE\n"); + return D3DERR_NOTAVAILABLE; + } + switch(RType) { case D3DRTYPE_VERTEXBUFFER: case D3DRTYPE_INDEXBUFFER: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de37df1..554dc5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3644,18 +3644,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - /* This format is nothing special and it is supported perfectly. - * However, ati and nvidia driver on windows do not mark this format as - * supported (tested with the dxCapsViewer) and pretending to - * support this format uncovers a bug in Battlefield 1942 (fonts are missing) - * So do the same as Windows drivers and pretend not to support it on dx8 and 9 - * Enable it on dx7. It will need additional checking on dx10 when we support it. - */ - if(This->dxVersion > 7 && CheckFormat == WINED3DFMT_R8G8B8) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* When the UsageCaps exactly matches Usage return WINED3D_OK except for the situation in which * WINED3DUSAGE_AUTOGENMIPMAP isn't around, then WINED3DOK_NOAUTOGEN is returned if all the other * usage flags match. */

1 0

Henri Verbeet : winex11.drv: Fallback to X11DRV_SHM_NONE in X11DRV_DIB_DoCopyDIBSection() if dest doesn 't match the pixmap.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 85fe381daf09d42fa4c9275b381677fe2625e06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85fe381daf09d42fa4c9275b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 11:53:17 2009 +0200 winex11.drv: Fallback to X11DRV_SHM_NONE in X11DRV_DIB_DoCopyDIBSection() if dest doesn't match the pixmap. Falling back to X11DRV_SHM_IMAGE doesn't work, the image's data isn't in shared memory if the pixmap was created as Shm pixmap. --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index effe1a4..09df53f 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4300,7 +4300,7 @@ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, #ifdef HAVE_LIBXXSHM if (physBitmap->shm_mode == X11DRV_SHM_PIXMAP && physBitmap->pixmap != dest) { - descr.shm_mode = X11DRV_SHM_IMAGE; + descr.shm_mode = X11DRV_SHM_NONE; } #endif descr.dibpitch = dibSection.dsBm.bmWidthBytes;

1 0