December 2009 - Wine-commits

Rob Shearman : shell32: Fix a potentially large memory leak in IQueryAssociations_fnGetString.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 3547ea011a98fb902c530bec867d28b32f488412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3547ea011a98fb902c530bec8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:02:54 2009 +0000 shell32: Fix a potentially large memory leak in IQueryAssociations_fnGetString. --- dlls/shell32/assoc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 85efa07..066e8ba 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -505,7 +505,9 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( /* Does strlenW(bufW) == 0 mean we use the filename? */ len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - return ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + hr = ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + HeapFree(GetProcessHeap(), 0, verinfoW); + return hr; } } } @@ -513,7 +515,9 @@ get_friendly_name_fail: PathRemoveExtensionW(path); PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); - return ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + hr = ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + HeapFree(GetProcessHeap(), 0, verinfoW); + return hr; } case ASSOCSTR_CONTENTTYPE:

1 0

Rob Shearman : winex11.drv: Empty clipboard cache on process unload to avoid false positives being reported for memory leaks .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: e4888b0e3c3ef1c7a9a36b6a7c315fee41aedd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4888b0e3c3ef1c7a9a36b6a7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:03:40 2009 +0000 winex11.drv: Empty clipboard cache on process unload to avoid false positives being reported for memory leaks. --- dlls/winex11.drv/clipboard.c | 10 ++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 706d378..f4e49e2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3282,3 +3282,13 @@ void X11DRV_SelectionClear( HWND hWnd, XEvent *xev ) X11DRV_CLIPBOARD_ReleaseSelection( event->display, event->selection, event->window, hWnd, event->time ); } + +/*********************************************************************** + * X11DRV_Clipboard_Cleanup + */ +void X11DRV_Clipboard_Cleanup(void) +{ + selectionAcquired = S_NOSELECTION; + + X11DRV_EmptyClipboard(FALSE); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3dd5edf..62e275d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -765,6 +765,7 @@ extern XContext winContext; extern void X11DRV_InitClipboard(void); extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); +extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3bd934b..a7f7ae0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -583,6 +583,7 @@ static void thread_detach(void) */ static void process_detach(void) { + X11DRV_Clipboard_Cleanup(); #ifdef SONAME_LIBXXF86VM /* cleanup XVidMode */ X11DRV_XF86VM_Cleanup();

1 0

Rob Shearman : secur32: Fix memory leaks in tests.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 5f01280edf8c14cab746066029f81ecbfd9d43cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f01280edf8c14cab74606602… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:04:29 2009 +0000 secur32: Fix memory leaks in tests. --- dlls/secur32/tests/ntlm.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d9f9538..130666a 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -321,6 +321,7 @@ static SECURITY_STATUS setupClient(SspiData *sspi_data, SEC_CHAR *provider) ok(ret == SEC_E_OK, "QuerySecurityPackageInfo returned %s\n", getSecError(ret)); setupBuffers(sspi_data, sec_pkg_info); + pFreeContextBuffer(sec_pkg_info); if((ret = pAcquireCredentialsHandleA(NULL, provider, SECPKG_CRED_OUTBOUND, NULL, sspi_data->id, NULL, NULL, sspi_data->cred, &ttl)) @@ -352,6 +353,7 @@ static SECURITY_STATUS setupServer(SspiData *sspi_data, SEC_CHAR *provider) ok(ret == SEC_E_OK, "QuerySecurityPackageInfo returned %s\n", getSecError(ret)); setupBuffers(sspi_data, sec_pkg_info); + pFreeContextBuffer(sec_pkg_info); if((ret = pAcquireCredentialsHandleA(NULL, provider, SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, sspi_data->cred, &ttl)) != SEC_E_OK) @@ -382,6 +384,7 @@ static SECURITY_STATUS setupFakeServer(SspiData *sspi_data, SEC_CHAR *provider) ok(ret == SEC_E_OK, "QuerySecurityPackageInfo returned %s\n", getSecError(ret)); ret = setupBuffers(sspi_data, sec_pkg_info); + pFreeContextBuffer(sec_pkg_info); return ret; } @@ -627,6 +630,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "With req_attr == 0, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_CONNECTION, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_CONNECTION; @@ -643,6 +647,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_CONNECTION, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_EXTENDED_ERROR, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_EXTENDED_ERROR; @@ -659,6 +664,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_EXTENDED_ERROR, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_MUTUAL_AUTH, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_MUTUAL_AUTH; @@ -675,6 +681,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_MUTUAL_AUTH, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_USE_DCE_STYLE, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_USE_DCE_STYLE; @@ -691,6 +698,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_USE_DCE_STYLE, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_DELEGATE, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_DELEGATE; @@ -707,6 +715,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_DELEGATE, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_INTEGRITY, the lowest byte should have bit 0x10 set */ req_attr = ISC_REQ_INTEGRITY; @@ -723,6 +732,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x10) != 0, "For ISC_REQ_INTEGRITY, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_REPLAY_DETECT, the lowest byte should have bit 0x10 set */ req_attr = ISC_REQ_REPLAY_DETECT; @@ -739,6 +749,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x10) != 0, "For ISC_REQ_REPLAY_DETECT, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_SEQUENCE_DETECT, the lowest byte should have bit 0x10 set */ req_attr = ISC_REQ_SEQUENCE_DETECT; @@ -755,6 +766,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x10) != 0, "For ISC_REQ_SEQUENCE_DETECT, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_CONFIDENTIALITY, the lowest byte should have bit 0x20 set */ req_attr = ISC_REQ_CONFIDENTIALITY; @@ -771,6 +783,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x20) != 0, "For ISC_REQ_CONFIDENTIALITY, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); tISCFend: cleanupBuffers(&client); @@ -1370,6 +1383,12 @@ static void test_null_auth_data(void) NULL, 0, &ctx, &buffer_desc, &attr, &ttl); ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); + ret = pDeleteSecurityContext(&ctx); + ok(ret == SEC_E_OK, "DeleteSecurityContext failed with error 0x%x\n", ret); + ret = pFreeCredentialsHandle(&cred); + ok(ret == SEC_E_OK, "FreeCredentialsHandle failed with error 0x%x\n", ret); + + pFreeContextBuffer(info); HeapFree(GetProcessHeap(), 0, buffers[0].pvBuffer); }

1 0

Rob Shearman : secur32: Simplify memory management by not allocating memory for the CredHandle and CtxtHandle pointers .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 693433a3f22ce470ae35b5f99dc7c07c71a032cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=693433a3f22ce470ae35b5f99… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:05:54 2009 +0000 secur32: Simplify memory management by not allocating memory for the CredHandle and CtxtHandle pointers. Instead store the handles directly in the SspiData structure and pass the addresses of these into SSPI functions. --- dlls/secur32/tests/ntlm.c | 161 ++++++++++++++++++++------------------------- 1 files changed, 71 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=693433a3f22ce470ae35b…

1 0

Kai Blin : secur32: Pretend the NTLM provider also does Negotiate.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 9a81b032c41c694e6e902afcb51d0f7c8a8b1096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a81b032c41c694e6e902afcb… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Dec 29 16:36:18 2009 +0100 secur32: Pretend the NTLM provider also does Negotiate. We had to enable the Negotiate provider a while back so programs that expected that provider to be present would be happy. This broke programs that expect a Negotiate provider to actually do something if it is present. This fix works around that new issue by thunking all calls to Negotiate to NTLM. --- dlls/secur32/negotiate.c | 15 ++++++++++++- dlls/secur32/ntlm.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index 8c36bc1..2b3ce0c 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -28,8 +28,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); +/* Disable for now, see longer comment for SECUR32_initNegotiateSP below */ +#if 0 static char nego_name_A[] = "Negotiate"; static WCHAR nego_name_W[] = {'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'e', 0}; +#endif static SECURITY_STATUS nego_QueryCredentialsAttributes(PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) @@ -429,16 +432,23 @@ static const SecurityFunctionTableW negoTableW = { NULL, /* SetContextAttributesW */ }; +/* Disable for now, see comment below.*/ +#if 0 static WCHAR negotiate_comment_W[] = { 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', ' ', 'P', 'a', 'c', 'k', 'a', 'g', 'e', ' ', 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0}; static CHAR negotiate_comment_A[] = "Microsoft Package Negotiator"; - +#endif void SECUR32_initNegotiateSP(void) { +/* Disable until we really implement a Negotiate provider. + * For now, the NTLM provider will pretend to be the Negotiate provider as well. + * Windows seems to be able to deal with it, and it makes several programs + * happy. */ +#if 0 SecureProvider *provider = SECUR32_addProvider(&negoTableA, &negoTableW, NULL); /* According to Windows, Negotiate has the following capabilities. @@ -462,5 +472,6 @@ void SECUR32_initNegotiateSP(void) const SecPkgInfoA infoA = { caps, version, rpcid, max_token, nego_name_A, negotiate_comment_A}; - SECUR32_addPackages(provider, 1L, &infoA, &infoW); + SECUR32_addPackages(provider, 1L, &infoA, &infoW); +#endif } diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 74fb2db..3313fe4 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1967,6 +1967,51 @@ static const SecPkgInfoA infoA = { ntlm_comment_A }; +#define NEGO_COMMENT { 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', ' ', \ + 'P', 'a', 'c', 'k', 'a', 'g', 'e', ' ', \ + 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0}; + +static CHAR nego_comment_A[] = NEGO_COMMENT; +static WCHAR nego_comment_W[] = NEGO_COMMENT; + +#define NEGO_NAME {'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'e', 0} + +static CHAR nego_name_A[] = NEGO_NAME; +static WCHAR nego_name_W[] = NEGO_NAME; + +#define NEGO_CAPS (\ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_READONLY_WITH_CHECKSUM ) + +/* Not used for now, just kept here for completeness sake. We need to use the + * NTLM_MAX_BUF value. If the hack works, we might want to refactor the code a + * bit. */ +#define NEGO_MAX_TOKEN 12000 + +static const SecPkgInfoW nego_infoW = { + NEGO_CAPS, + 1, + RPC_C_AUTHN_GSS_NEGOTIATE, + NTLM_MAX_BUF, + nego_name_W, + nego_comment_W +}; + +static const SecPkgInfoA nego_infoA = { + NEGO_CAPS, + 1, + RPC_C_AUTHN_GSS_NEGOTIATE, + NTLM_MAX_BUF, + nego_name_A, + nego_comment_A +}; + void SECUR32_initNTLMSP(void) { PNegoHelper helper; @@ -1995,7 +2040,11 @@ void SECUR32_initNTLMSP(void) helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) ) { SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); + SecureProvider *nego_provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); + SECUR32_addPackages(provider, 1L, &infoA, &infoW); + /* HACK: Also pretend this is the Negotiate provider */ + SECUR32_addPackages(nego_provider, 1L, &nego_infoA, &nego_infoW); } else {

1 0

Henri Verbeet : wined3d: The FVF parameter to IWineD3DDeviceImpl_CreateVertexBuffer() is unused now .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 67cba4878255629680cde25ca5d24a83a757b923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cba4878255629680cde25ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 29 17:10:19 2009 +0100 wined3d: The FVF parameter to IWineD3DDeviceImpl_CreateVertexBuffer() is unused now. --- dlls/d3d8/vertexbuffer.c | 3 +-- dlls/d3d9/vertexbuffer.c | 3 +-- dlls/ddraw/direct3d.c | 3 +-- dlls/wined3d/device.c | 8 +++++--- include/wine/wined3d.idl | 1 - 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 18cc7b3..476fcc4 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -272,8 +272,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - usage & WINED3DUSAGE_MASK, 0, - (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, + usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d8_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 4eeb5c1..1841bec 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -273,8 +273,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im wined3d_mutex_lock(); hr = IWineD3DDevice_CreateVertexBuffer(device->WineD3DDevice, size, - usage & WINED3DUSAGE_MASK, 0, - (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, + usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool, &buffer->wineD3DVertexBuffer, (IUnknown *)buffer, &d3d9_vertexbuffer_wined3d_parent_ops); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index a89d998..80052ad 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1016,8 +1016,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, EnterCriticalSection(&ddraw_cs); hr = IWineD3DDevice_CreateVertexBuffer(This->wineD3DDevice, get_flexible_vertex_size(Desc->dwFVF) * Desc->dwNumVertices, - usage, Desc->dwFVF, - Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, + usage, Desc->dwCaps & D3DVBCAPS_SYSTEMMEMORY ? WINED3DPOOL_SYSTEMMEM : WINED3DPOOL_DEFAULT, &object->wineD3DVertexBuffer, (IUnknown *)object, &ddraw_null_wined3d_parent_ops); if(hr != D3D_OK) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8240f55..e025ccd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -479,14 +479,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, str return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface, UINT Size, - DWORD Usage, DWORD FVF, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, +static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *iface, + UINT Size, DWORD Usage, WINED3DPOOL Pool, IWineD3DBuffer **ppVertexBuffer, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; HRESULT hr; + TRACE("iface %p, size %u, usage %#x, pool %#x, buffer %p, parent %p, parent_ops %p.\n", + iface, Size, Usage, Pool, ppVertexBuffer, parent, parent_ops); + if (Pool == WINED3DPOOL_SCRATCH) { /* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense @@ -515,7 +518,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac } TRACE("Created buffer %p.\n", object); - TRACE("FVF %#x, Pool %#x.\n", FVF, Pool); *ppVertexBuffer = (IWineD3DBuffer *)object; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ec69655..7c44b5e 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2867,7 +2867,6 @@ interface IWineD3DDevice : IWineD3DBase HRESULT CreateVertexBuffer( [in] UINT length, [in] DWORD usage, - [in] DWORD fvf, [in] WINED3DPOOL pool, [out] IWineD3DBuffer **vertex_buffer, [in] IUnknown *parent,

1 0

Henri Verbeet : wined3d: Remove some redundant returns.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: ea2f7a2739d76fbe2a7c034e7bd79ecc218531d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2f7a2739d76fbe2a7c034e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 29 17:10:20 2009 +0100 wined3d: Remove some redundant returns. --- dlls/wined3d/buffer.c | 3 --- dlls/wined3d/device.c | 15 +++------------ dlls/wined3d/state.c | 4 ---- dlls/wined3d/surface.c | 4 ---- dlls/wined3d/surface_base.c | 1 - 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 36e9acc..51e594d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -134,8 +134,6 @@ fail: if (This->buffer_object) GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); This->buffer_object = 0; LEAVE_GL(); - - return; } static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, @@ -936,7 +934,6 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) end: context_release(context); - return; } static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e025ccd..5b1ca8c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1297,14 +1297,9 @@ static void IWineD3DDeviceImpl_LoadLogo(IWineD3DDeviceImpl *This, const char *fi IWineD3DDevice_ColorFill((IWineD3DDevice *) This, This->logo_surface, NULL, 0xffffffff); } - out: - if(dcb) { - DeleteDC(dcb); - } - if(hbm) { - DeleteObject(hbm); - } - return; +out: + if (dcb) DeleteDC(dcb); + if (hbm) DeleteObject(hbm); } /* Context activation is done by the caller. */ @@ -1809,8 +1804,6 @@ static void WINAPI IWineD3DDeviceImpl_SetMultithreaded(IWineD3DDevice *iface) { /*For now just store the flag(needed in case of ddraw) */ This->createParms.BehaviorFlags |= WINED3DCREATE_MULTITHREADED; - - return; } static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, @@ -6631,7 +6624,6 @@ static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, pRamp); IWineD3DSwapChain_Release(swapchain); } - return; } static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT iSwapChain, WINED3DGAMMARAMP* pRamp) { @@ -6643,7 +6635,6 @@ static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT i IWineD3DSwapChain_GetGammaRamp(swapchain, pRamp); IWineD3DSwapChain_Release(swapchain); } - return; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d9ece33..1c29dbf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4473,8 +4473,6 @@ static inline void drawPrimitiveTraceDataLocations(const struct wined3d_stream_i TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD5); TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD6); TRACE_STRIDED((dataLocations), WINED3D_FFP_TEXCOORD7); - - return; } static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) @@ -4878,8 +4876,6 @@ static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3 glEnable(GL_LIGHT0 + Index); checkGLcall("glEnable(GL_LIGHT0 + Index)"); } - - return; } static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f956927..8dcc691 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -809,7 +809,6 @@ void surface_internal_preload(IWineD3DSurface *iface, enum WINED3DSRGB srgb) if (context) context_release(context); } - return; } static void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { @@ -928,8 +927,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { } context_release(context); - - return; } /* ****************************************************** @@ -2757,7 +2754,6 @@ static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL if (context) context_release(context); } - return; } #include <errno.h> diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 538add4..33e3d3e 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1866,7 +1866,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) { ERR("Should not be called on base texture\n"); - return; } /* TODO: think about moving this down to resource? */

1 0

Henri Verbeet : ddraw: Remove a redundant return.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 9ae92661cce39595f8c24e2e50e000df847ae237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae92661cce39595f8c24e2e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 29 17:10:21 2009 +0100 ddraw: Remove a redundant return. --- dlls/ddraw/utils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index e9c27f4..f9fd00f 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1221,8 +1221,6 @@ void multiply_matrix_D3D_way(D3DMATRIX* result, const D3DMATRIX *m1, const D3DMA temp._44 = m1->_41 * m2->_14 + m1->_42 * m2->_24 + m1->_43 * m2->_34 + m1->_44 * m2->_44; *result = temp; - - return; } HRESULT

1 0

Henri Verbeet : wined3d: Use the element size to create "isStateDirty" bitmap indices.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 2650885cc8727714a0bb9ccc3c8f25e3a188351d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2650885cc8727714a0bb9ccc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 29 17:10:22 2009 +0100 wined3d: Use the element size to create "isStateDirty" bitmap indices. --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c3c90ea..2aec7d6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -898,8 +898,8 @@ static void Context_MarkStateDirty(struct wined3d_context *context, DWORD state, if (isStateDirty(context, rep)) return; context->dirtyArray[context->numDirtyEntries++] = rep; - idx = rep >> 5; - shift = rep & 0x1f; + idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); + shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); context->isStateDirty[idx] |= (1 << shift); } @@ -2194,8 +2194,8 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI for (i = 0; i < context->numDirtyEntries; ++i) { DWORD rep = context->dirtyArray[i]; - DWORD idx = rep >> 5; - BYTE shift = rep & 0x1f; + DWORD idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); + BYTE shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); context->isStateDirty[idx] &= ~(1 << shift); state_table[rep].apply(rep, device->stateBlock, context); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5b1ca8c..d0660b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7015,8 +7015,8 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { if(isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; - idx = rep >> 5; - shift = rep & 0x1f; + idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); + shift = rep & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); context->isStateDirty[idx] |= (1 << shift); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0c2804..b22a7b2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1028,7 +1028,7 @@ struct wined3d_context */ DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ DWORD numDirtyEntries; - DWORD isStateDirty[STATE_HIGHEST/32 + 1]; /* Bitmap to find out quickly if a state is dirty */ + DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ IWineD3DSurface *surface; IWineD3DSurface *current_rt; @@ -1614,8 +1614,8 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) DE static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state) { - DWORD idx = state >> 5; - BYTE shift = state & 0x1f; + DWORD idx = state / (sizeof(*context->isStateDirty) * CHAR_BIT); + BYTE shift = state & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1); return context->isStateDirty[idx] & (1 << shift); }

1 0

Henri Verbeet : dxgi: Add a separate function for factory initialization.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 9e886423e7822577e8e5200c575fc17e4efebd32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e886423e7822577e8e5200c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 29 17:10:23 2009 +0100 dxgi: Add a separate function for factory initialization. --- dlls/dxgi/dxgi_main.c | 72 ++++----------------------------------------- dlls/dxgi/dxgi_private.h | 3 +- dlls/dxgi/factory.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 80 insertions(+), 68 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 312b3b7..ec1b2f0 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -80,7 +80,6 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) { struct dxgi_factory *object; HRESULT hr; - UINT i; TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); @@ -92,59 +91,13 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) return E_OUTOFMEMORY; } - object->vtbl = &dxgi_factory_vtbl; - object->refcount = 1; - - EnterCriticalSection(&dxgi_cs); - object->wined3d = WineDirect3DCreate(10, (IUnknown *)object); - if(!object->wined3d) - { - hr = DXGI_ERROR_UNSUPPORTED; - LeaveCriticalSection(&dxgi_cs); - goto fail; - } - - object->adapter_count = IWineD3D_GetAdapterCount(object->wined3d); - LeaveCriticalSection(&dxgi_cs); - object->adapters = HeapAlloc(GetProcessHeap(), 0, object->adapter_count * sizeof(*object->adapters)); - if (!object->adapters) - { - ERR("Failed to allocate DXGI adapter array memory\n"); - hr = E_OUTOFMEMORY; - goto fail; - } - - for (i = 0; i < object->adapter_count; ++i) + hr = dxgi_factory_init(object); + if (FAILED(hr)) { - struct dxgi_adapter *adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(*adapter)); - if (!adapter) - { - UINT j; - ERR("Failed to allocate DXGI adapter memory\n"); - for (j = 0; j < i; ++j) - { - HeapFree(GetProcessHeap(), 0, object->adapters[j]); - } - hr = E_OUTOFMEMORY; - goto fail; - } - - hr = dxgi_adapter_init(adapter, (IWineDXGIFactory *)object, i); - if (FAILED(hr)) - { - UINT j; - - ERR("Failed to initialize adapter, hr %#x.\n", hr); - - HeapFree(GetProcessHeap(), 0, adapter); - for (j = 0; j < i; ++j) - { - IDXGIAdapter_Release(object->adapters[j]); - } - goto fail; - } - - object->adapters[i] = (IDXGIAdapter *)adapter; + WARN("Failed to initialize swapchain, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + *factory = NULL; + return hr; } TRACE("Created IDXGIFactory %p\n", object); @@ -153,19 +106,6 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) IDXGIFactory_Release((IDXGIFactory *)object); return hr; - -fail: - HeapFree(GetProcessHeap(), 0, object->adapters); - if (object->wined3d) - { - EnterCriticalSection(&dxgi_cs); - IWineD3D_Release(object->wined3d); - LeaveCriticalSection(&dxgi_cs); - } - HeapFree(GetProcessHeap(), 0, object); - *factory = NULL; - return hr; - } static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 693bc39..2a46e40 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -75,7 +75,6 @@ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; WINED3DFORMAT wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; /* IDXGIFactory */ -extern const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl DECLSPEC_HIDDEN; struct dxgi_factory { const struct IWineDXGIFactoryVtbl *vtbl; @@ -85,6 +84,8 @@ struct dxgi_factory IDXGIAdapter **adapters; }; +HRESULT dxgi_factory_init(struct dxgi_factory *factory) DECLSPEC_HIDDEN; + /* IDXGIDevice */ struct dxgi_device { diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 150e40c..9af9b40 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -274,7 +274,7 @@ static IWineD3D * STDMETHODCALLTYPE dxgi_factory_get_wined3d(IWineDXGIFactory *i return This->wined3d; } -const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = +static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = { /* IUnknown methods */ dxgi_factory_QueryInterface, @@ -294,3 +294,74 @@ const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = /* IWineDXGIFactory methods */ dxgi_factory_get_wined3d, }; + +HRESULT dxgi_factory_init(struct dxgi_factory *factory) +{ + HRESULT hr; + UINT i; + + factory->vtbl = &dxgi_factory_vtbl; + factory->refcount = 1; + + EnterCriticalSection(&dxgi_cs); + factory->wined3d = WineDirect3DCreate(10, (IUnknown *)factory); + if (!factory->wined3d) + { + LeaveCriticalSection(&dxgi_cs); + return DXGI_ERROR_UNSUPPORTED; + } + + factory->adapter_count = IWineD3D_GetAdapterCount(factory->wined3d); + LeaveCriticalSection(&dxgi_cs); + factory->adapters = HeapAlloc(GetProcessHeap(), 0, factory->adapter_count * sizeof(*factory->adapters)); + if (!factory->adapters) + { + ERR("Failed to allocate DXGI adapter array memory.\n"); + hr = E_OUTOFMEMORY; + goto fail; + } + + for (i = 0; i < factory->adapter_count; ++i) + { + struct dxgi_adapter *adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(*adapter)); + if (!adapter) + { + UINT j; + + ERR("Failed to allocate DXGI adapter memory.\n"); + + for (j = 0; j < i; ++j) + { + IDXGIAdapter_Release(factory->adapters[j]); + } + hr = E_OUTOFMEMORY; + goto fail; + } + + hr = dxgi_adapter_init(adapter, (IWineDXGIFactory *)factory, i); + if (FAILED(hr)) + { + UINT j; + + ERR("Failed to initialize adapter, hr %#x.\n", hr); + + HeapFree(GetProcessHeap(), 0, adapter); + for (j = 0; j < i; ++j) + { + IDXGIAdapter_Release(factory->adapters[j]); + } + goto fail; + } + + factory->adapters[i] = (IDXGIAdapter *)adapter; + } + + return S_OK; + +fail: + HeapFree(GetProcessHeap(), 0, factory->adapters); + EnterCriticalSection(&dxgi_cs); + IWineD3D_Release(factory->wined3d); + LeaveCriticalSection(&dxgi_cs); + return hr; +}

1 0