September 2013 - Wine-Commits

Michael Stefaniuc : dplayx: Finish the COM cleanup for IDPLobbySP.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 56e1e6aa7f546ac7010589d31a7ecbc786a0df45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e1e6aa7f546ac7010589d31… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:23:19 2013 +0200 dplayx: Finish the COM cleanup for IDPLobbySP. --- dlls/dplayx/lobbysp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 6e7fdd6..8b0c24c 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -28,14 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct IDPLobbySPImpl { - const IDPLobbySPVtbl *lpVtbl; + IDPLobbySP IDPLobbySP_iface; LONG ref; IDirectPlayImpl *dplay; } IDPLobbySPImpl; static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) { - return CONTAINING_RECORD( iface, IDPLobbySPImpl, lpVtbl ); + return CONTAINING_RECORD(iface, IDPLobbySPImpl, IDPLobbySP_iface); } /* Forward declaration of virtual tables */ @@ -56,7 +56,7 @@ HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) if( IsEqualGUID( &IID_IDPLobbySP, riid ) ) { IDPLobbySPImpl *This = *ppvObj; - This->lpVtbl = &dpLobbySPVT; + This->IDPLobbySP_iface.lpVtbl = &dpLobbySPVT; This->dplay = dp; } else

1 0

Michael Stefaniuc : dplayx: Introduce impl_from_IDPLobbySP().
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 5da060be77d84392f708b4de14a727331c788189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da060be77d84392f708b4de1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:18:26 2013 +0200 dplayx: Introduce impl_from_IDPLobbySP(). --- dlls/dplayx/lobbysp.c | 150 +++++++++++++++++-------------------------------- 1 files changed, 52 insertions(+), 98 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index e771424..33101fd 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -58,6 +58,11 @@ struct IDPLobbySPImpl DPLSP_IMPL_FIELDS }; +static inline IDPLobbySPImpl *impl_from_IDPLobbySP(IDPLobbySP *iface) +{ + return CONTAINING_RECORD( iface, IDPLobbySPImpl, lpVtbl ); +} + /* Forward declaration of virtual tables */ static const IDPLobbySPVtbl dpLobbySPVT; @@ -197,8 +202,8 @@ static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID r static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) { + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); @@ -211,8 +216,8 @@ static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) { + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); ULONG ulInterfaceRefCount, ulObjRefCount; - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); @@ -235,178 +240,127 @@ static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) return ulInterfaceRefCount; } -static -HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup -( LPDPLOBBYSP iface, - LPSPDATA_ADDREMOTEGROUPTOGROUP argtg -) +static HRESULT WINAPI IDPLobbySPImpl_AddGroupToGroup( IDPLobbySP *iface, + SPDATA_ADDREMOTEGROUPTOGROUP *argtg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, argtg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_AddPlayerToGroup -( LPDPLOBBYSP iface, - LPSPDATA_ADDREMOTEPLAYERTOGROUP arptg -) +static HRESULT WINAPI IDPLobbySPImpl_AddPlayerToGroup( IDPLobbySP *iface, + SPDATA_ADDREMOTEPLAYERTOGROUP *arptg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, arptg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_CreateGroup -( LPDPLOBBYSP iface, - LPSPDATA_CREATEREMOTEGROUP crg -) +static HRESULT WINAPI IDPLobbySPImpl_CreateGroup( IDPLobbySP *iface, + SPDATA_CREATEREMOTEGROUP *crg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, crg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_CreateGroupInGroup -( LPDPLOBBYSP iface, - LPSPDATA_CREATEREMOTEGROUPINGROUP crgig -) +static HRESULT WINAPI IDPLobbySPImpl_CreateGroupInGroup( IDPLobbySP *iface, + SPDATA_CREATEREMOTEGROUPINGROUP *crgig ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, crgig ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_DeleteGroupFromGroup -( LPDPLOBBYSP iface, - LPSPDATA_DELETEREMOTEGROUPFROMGROUP drgfg -) +static HRESULT WINAPI IDPLobbySPImpl_DeleteGroupFromGroup( IDPLobbySP *iface, + SPDATA_DELETEREMOTEGROUPFROMGROUP *drgfg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, drgfg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_DeletePlayerFromGroup -( LPDPLOBBYSP iface, - LPSPDATA_DELETEREMOTEPLAYERFROMGROUP drpfg -) +static HRESULT WINAPI IDPLobbySPImpl_DeletePlayerFromGroup( IDPLobbySP *iface, + SPDATA_DELETEREMOTEPLAYERFROMGROUP *drpfg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, drpfg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_DestroyGroup -( LPDPLOBBYSP iface, - LPSPDATA_DESTROYREMOTEGROUP drg -) +static HRESULT WINAPI IDPLobbySPImpl_DestroyGroup( IDPLobbySP *iface, + SPDATA_DESTROYREMOTEGROUP *drg ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, drg ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_EnumSessionsResponse -( LPDPLOBBYSP iface, - LPSPDATA_ENUMSESSIONSRESPONSE er -) +static HRESULT WINAPI IDPLobbySPImpl_EnumSessionsResponse( IDPLobbySP *iface, + SPDATA_ENUMSESSIONSRESPONSE *er ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, er ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_GetSPDataPointer -( LPDPLOBBYSP iface, - LPVOID* lplpData -) +static HRESULT WINAPI IDPLobbySPImpl_GetSPDataPointer( IDPLobbySP *iface, LPVOID* lplpData ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, lplpData ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_HandleMessage -( LPDPLOBBYSP iface, - LPSPDATA_HANDLEMESSAGE hm -) +static HRESULT WINAPI IDPLobbySPImpl_HandleMessage( IDPLobbySP *iface, SPDATA_HANDLEMESSAGE *hm ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, hm ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SendChatMessage -( LPDPLOBBYSP iface, - LPSPDATA_CHATMESSAGE cm -) +static HRESULT WINAPI IDPLobbySPImpl_SendChatMessage( IDPLobbySP *iface, + SPDATA_CHATMESSAGE *cm ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, cm ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetGroupName -( LPDPLOBBYSP iface, - LPSPDATA_SETREMOTEGROUPNAME srgn -) +static HRESULT WINAPI IDPLobbySPImpl_SetGroupName( IDPLobbySP *iface, + SPDATA_SETREMOTEGROUPNAME *srgn ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, srgn ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetPlayerName -( LPDPLOBBYSP iface, - LPSPDATA_SETREMOTEPLAYERNAME srpn -) +static HRESULT WINAPI IDPLobbySPImpl_SetPlayerName( IDPLobbySP *iface, + SPDATA_SETREMOTEPLAYERNAME *srpn ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, srpn ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetSessionDesc -( LPDPLOBBYSP iface, - LPSPDATA_SETSESSIONDESC ssd -) +static HRESULT WINAPI IDPLobbySPImpl_SetSessionDesc( IDPLobbySP *iface, + SPDATA_SETSESSIONDESC *ssd ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, ssd ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_SetSPDataPointer -( LPDPLOBBYSP iface, - LPVOID lpData -) +static HRESULT WINAPI IDPLobbySPImpl_SetSPDataPointer( IDPLobbySP *iface, void *lpData ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, lpData ); return DP_OK; } -static -HRESULT WINAPI IDPLobbySPImpl_StartSession -( LPDPLOBBYSP iface, - LPSPDATA_STARTSESSIONCOMMAND ssc -) +static HRESULT WINAPI IDPLobbySPImpl_StartSession( IDPLobbySP *iface, + SPDATA_STARTSESSIONCOMMAND *ssc ) { - IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; + IDPLobbySPImpl *This = impl_from_IDPLobbySP( iface ); FIXME( "(%p)->(%p):stub\n", This, ssc ); return DP_OK; }

1 0

Frédéric Delanoy : winedev: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: docs Branch: master Commit: cc2040462f980edd190ead333da17aad8fc532f0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=cc2040462f980edd190ead333… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 3 21:28:49 2013 +0200 winedev: Use appropriate values for 'filename' tag attributes. --- en/winedev-architecture.sgml | 61 +++++----- en/winedev-coding.sgml | 29 +++-- en/winedev-debugger.sgml | 24 ++-- en/winedev-debugging.sgml | 2 +- en/winedev-documentation.sgml | 14 +- en/winedev-kernel.sgml | 264 +++++++++++++++++++++-------------------- en/winedev-multimedia.sgml | 110 ++++++++++-------- en/winedev-ole.sgml | 8 +- en/winedev-opengl.sgml | 24 ++-- en/winedev-otherdebug.sgml | 6 +- en/winedev-testing.sgml | 28 ++-- en/winedev-windowing.sgml | 2 +- 12 files changed, 300 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=cc2040462f980edd190ea…

1 0

Frédéric Delanoy : wineusr: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: docs Branch: master Commit: a903ec6838ae5f4d5724568eba2183ee2ee23726 URL: http://source.winehq.org/git/docs.git/?a=commit;h=a903ec6838ae5f4d5724568eb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 3 21:28:47 2013 +0200 wineusr: Use appropriate values for 'filename' tag attributes. --- en/wineusr-bugs.sgml | 4 +- en/wineusr-configuring.sgml | 50 +++++++++++++++++++++++------------------- en/wineusr-getting.sgml | 2 +- en/wineusr-running.sgml | 31 ++++++++++++++------------ 4 files changed, 47 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=a903ec6838ae5f4d57245…

1 0

Frédéric Delanoy : winelib: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: docs Branch: master Commit: da64ad430089a0138a1bedaf1060335eb3b684b0 URL: http://source.winehq.org/git/docs.git/?a=commit;h=da64ad430089a0138a1bedaf1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 3 21:28:48 2013 +0200 winelib: Use appropriate values for 'filename' tag attributes. --- en/winelib-bindlls.sgml | 10 +++++----- en/winelib-intro.sgml | 13 +++++++------ en/winelib-mfc.sgml | 2 +- en/winelib-porting.sgml | 10 +++++----- en/winelib-toolkit.sgml | 34 ++++++++++++++++++---------------- 5 files changed, 36 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=da64ad430089a0138a1be…

1 0

Hans Leidekker : wininet: Fix calculation of content length from chunk size .
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: daa0acdbcf37d5e8ef5f200620a5eefbcbe83e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa0acdbcf37d5e8ef5f20062… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 3 14:18:52 2013 +0200 wininet: Fix calculation of content length from chunk size. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 954c98b..1832b4f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2762,7 +2762,8 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) { TRACE( "reading %u byte chunk\n", chunk_size ); stream->chunk_size = chunk_size; - req->contentLength += chunk_size; + if (req->contentLength == ~0u) req->contentLength = chunk_size; + else req->contentLength += chunk_size; return discard_chunked_eol(stream, req); } remove_chunked_data(stream, 1);

1 0

Jacek Caban : crypt32: Use CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL flag for root store certificate' s chain validation.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 9db146f54414f7ac812e33c0d0ed92bf11cc2296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db146f54414f7ac812e33c0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 3 14:14:27 2013 +0200 crypt32: Use CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL flag for root store certificate's chain validation. --- dlls/crypt32/rootstore.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 4e4e4e4..a6a4f34 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -256,9 +256,10 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to) { CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; - BOOL ret = CertGetCertificateChain(engine, cert, NULL, from, - &chainPara, 0, NULL, &chain); + BOOL ret; + ret = CertGetCertificateChain(engine, cert, NULL, from, + &chainPara, CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL, NULL, &chain); if (!ret) TRACE("rejecting %s: %s\n", get_cert_common_name(cert), "chain creation failed");

1 0

Matteo Bruni : d3dx9: Add / improve traces in some shader-related functions .
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 1f6173a69f6ab0640a6b4734d72c060f5601812f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6173a69f6ab0640a6b4734d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:42 2013 +0200 d3dx9: Add / improve traces in some shader-related functions. --- dlls/d3dx9_36/shader.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index ef1c55f..6edbc33 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -311,6 +311,9 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR HRESULT hr; struct D3DXIncludeImpl includefromfile; + TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + debugstr_w(filename), defines, include, flags, shader, error_messages); + if(FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -334,6 +337,9 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + module, debugstr_a(resource), defines, include, flags, shader, error_messages); + if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) @@ -366,8 +372,10 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO { HRESULT hr; - TRACE("data %p, length %u, defines %p, include %p, function %s, profile %s, flags %#x, shader %p, error_msgs %p, constant_table %p\n", - data, length, defines, include, function, profile, flags, shader, error_msgs, constant_table); + TRACE("data %s, length %u, defines %p, include %p, function %s, profile %s, " + "flags %#x, shader %p, error_msgs %p, constant_table %p.\n", + debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), + flags, shader, error_msgs, constant_table); hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -423,6 +431,11 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO struct D3DXIncludeImpl includefromfile; char *filename_a; + TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + debugstr_w(filename), defines, include, debugstr_a(entrypoint), debugstr_a(profile), + flags, shader, error_messages, constant_table); + if (FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -462,6 +475,11 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + module, debugstr_a(resource), defines, include, debugstr_a(entrypoint), debugstr_a(profile), + flags, shader, error_messages, constant_table); + if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) @@ -494,7 +512,9 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou HRESULT WINAPI D3DXPreprocessShader(const char *data, UINT data_len, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - TRACE("Forward to D3DPreprocess\n"); + TRACE("data %s, data_len %u, defines %p, include %p, shader %p, error_messages %p.\n", + debugstr_a(data), data_len, defines, include, shader, error_messages); + return D3DPreprocess(data, data_len, NULL, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, (ID3DBlob **)shader, (ID3DBlob **)error_messages); @@ -507,6 +527,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC DWORD len; HRESULT ret; + TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", + debugstr_a(filename), defines, include, shader, error_messages); + if (!filename) return D3DXERR_INVALIDDATA; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); @@ -528,6 +551,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA HRESULT hr; struct D3DXIncludeImpl includefromfile; + TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", + debugstr_w(filename), defines, include, shader, error_messages); + if (FAILED(map_view_of_file(filename, &buffer, &len))) return D3DXERR_INVALIDDATA; @@ -553,6 +579,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.\n", + module, debugstr_a(resource), defines, include, shader, error_messages); + if (!(res = FindResourceA(module, resource, (const char *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len))) @@ -568,6 +597,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re HRSRC res; DWORD len; + TRACE("module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.\n", + module, debugstr_w(resource), defines, include, shader, error_messages); + if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) return D3DXERR_INVALIDDATA; if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))

1 0

Dmitry Timoshkov : ntdll: Avoid a needless goto.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: c25776a98149642ce7670a9bbbab5b3e5b95b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25776a98149642ce7670a9bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 3 17:24:52 2013 +0900 ntdll: Avoid a needless goto. --- dlls/ntdll/serial.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index de699ef..b4f9aa9 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1322,7 +1322,7 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, attr.SecurityQualityOfService = NULL; status = NtCreateEvent(&hev, EVENT_ALL_ACCESS, &attr, SynchronizationEvent, FALSE); - if (status) goto done; + if (status) return status; } status = io_control(hDevice, hev, UserApcRoutine, UserApcContext, piosb, dwIoControlCode, lpInBuffer, nInBufferSize, @@ -1340,6 +1340,5 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice, else status = io_control(hDevice, hEvent, UserApcRoutine, UserApcContext, piosb, dwIoControlCode, lpInBuffer, nInBufferSize, lpOutBuffer, nOutBufferSize); -done: return status; }

1 0

Matteo Bruni : d3dcompiler: Skip search of the parent include for the initial file.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: wine Branch: master Commit: 3f221611f02f1f220af451ead1e9c9fa1d1513e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f221611f02f1f220af451ead… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 3 16:29:41 2013 +0200 d3dcompiler: Skip search of the parent include for the initial file. --- dlls/d3dcompiler_43/compiler.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ac8fdc5..371f670 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -149,8 +149,10 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n char *path; int i; + TRACE("Looking for include %s.\n", debugstr_a(filename)); + parent_include = NULL; - if(parent_name[0] != '\0') + if (strcmp(parent_name, initial_filename)) { for(i = 0; i < includes_size; i++) { @@ -162,7 +164,7 @@ static char *wpp_lookup_mem(const char *filename, int type, const char *parent_n } if(parent_include == NULL) { - ERR("Parent include file missing\n"); + ERR("Parent include %s missing.\n", debugstr_a(parent_name)); return NULL; } } @@ -178,6 +180,8 @@ static void *wpp_open_mem(const char *filename, int type) struct mem_file_desc *desc; HRESULT hr; + TRACE("Opening include %s.\n", debugstr_a(filename)); + if(!strcmp(filename, initial_filename)) { current_shader.pos = 0;

1 0