wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Michael Stefaniuc : dplayx: Introduce impl_from_IDPLobbySP().
by Alexandre Julliard 04 Sep '13

04 Sep '13

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

Michael Stefaniuc : dplayx: Use consistent naming for the IDPLobbySP members.
by Alexandre Julliard 04 Sep '13

04 Sep '13

Module: wine Branch: master Commit: a4589d5673f823a2cd02b0f5a544f206cd9b6396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4589d5673f823a2cd02b0f5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 3 23:17:09 2013 +0200 dplayx: Use consistent naming for the IDPLobbySP members. --- dlls/dplayx/lobbysp.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 0235718..e771424 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -159,12 +159,8 @@ static BOOL DPLSP_DestroyDPLobbySP( LPVOID lpSP ) return TRUE; } -static -HRESULT WINAPI DPLSP_QueryInterface -( LPDPLOBBYSP iface, - REFIID riid, - LPVOID* ppvObj -) +static HRESULT WINAPI IDPLobbySPImpl_QueryInterface( IDPLobbySP *iface, REFIID riid, + void **ppvObj ) { IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); @@ -199,9 +195,7 @@ HRESULT WINAPI DPLSP_QueryInterface return S_OK; } -static -ULONG WINAPI DPLSP_AddRef -( LPDPLOBBYSP iface ) +static ULONG WINAPI IDPLobbySPImpl_AddRef( IDPLobbySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; @@ -215,9 +209,7 @@ ULONG WINAPI DPLSP_AddRef return ulObjRefCount; } -static -ULONG WINAPI DPLSP_Release -( LPDPLOBBYSP iface ) +static ULONG WINAPI IDPLobbySPImpl_Release( IDPLobbySP *iface ) { ULONG ulInterfaceRefCount, ulObjRefCount; IDPLobbySPImpl *This = (IDPLobbySPImpl *)iface; @@ -422,11 +414,9 @@ HRESULT WINAPI IDPLobbySPImpl_StartSession static const IDPLobbySPVtbl dpLobbySPVT = { - - DPLSP_QueryInterface, - DPLSP_AddRef, - DPLSP_Release, - + IDPLobbySPImpl_QueryInterface, + IDPLobbySPImpl_AddRef, + IDPLobbySPImpl_Release, IDPLobbySPImpl_AddGroupToGroup, IDPLobbySPImpl_AddPlayerToGroup, IDPLobbySPImpl_CreateGroup, @@ -443,5 +433,4 @@ static const IDPLobbySPVtbl dpLobbySPVT = IDPLobbySPImpl_SetSessionDesc, IDPLobbySPImpl_SetSPDataPointer, IDPLobbySPImpl_StartSession - };

1 0

Frédéric Delanoy : wineusr: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard 04 Sep '13

04 Sep '13

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 : winedev: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard 04 Sep '13

04 Sep '13

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 : winelib: Use appropriate values for 'filename' tag attributes.
by Alexandre Julliard 04 Sep '13

04 Sep '13

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

Detlef Riekenberg : scrrun/tests: Ignore case in path names.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 25bca2ede4372ab7987423e15aade048f2f63c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bca2ede4372ab7987423e15… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 3 19:03:25 2013 +0200 scrrun/tests: Ignore case in path names. --- dlls/scrrun/tests/filesystem.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index e231f9a..6016049 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -411,7 +411,7 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(cur_dir, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); find = FindFirstFileW(dir_match2, &fdata); @@ -425,26 +425,26 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir_match1, MAX_PATH, buf2, NULL); - ok(!lstrcmpW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); + ok(!lstrcmpiW(buf2, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf2)); SysFreeString(result); ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir1, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + ok(!lstrcmpiW(buf, result) || broken(!lstrcmpiW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - if(!lstrcmpW(buf, result) || !lstrcmpW(buf2, result)) { - ok(!lstrcmpW(buf, result) || broken(!lstrcmpW(buf2, result)), "result = %s, expected %s\n", + if(!lstrcmpiW(buf, result) || !lstrcmpiW(buf2, result)) { + ok(!lstrcmpiW(buf, result) || broken(!lstrcmpiW(buf2, result)), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); }else { GetFullPathNameW(dir2, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); } SysFreeString(result); @@ -454,7 +454,7 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); GetFullPathNameW(dir_match2, MAX_PATH, buf, NULL); - ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); SysFreeString(path);

1 0

Nikolay Sivov : shell32: Consistently return interface pointer instead of implementation pointer.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: 0de2514f3971206bbe0bcdfcf998bacf6d138ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de2514f3971206bbe0bcdfcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 3 17:09:07 2013 +0400 shell32: Consistently return interface pointer instead of implementation pointer. --- dlls/shell32/assoc.c | 4 +- dlls/shell32/autocomplete.c | 8 +++--- dlls/shell32/cpanelfolder.c | 5 ++- dlls/shell32/dataobject.c | 46 +++++++++++++++++----------------------- dlls/shell32/dragdrophelper.c | 4 +- dlls/shell32/ebrowser.c | 2 +- dlls/shell32/enumidlist.c | 9 +++---- dlls/shell32/recyclebin.c | 14 ++++++------ dlls/shell32/shelldispatch.c | 12 +++++----- dlls/shell32/shellitem.c | 29 ++++++++----------------- 10 files changed, 58 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0de2514f3971206bbe0bc…

1 0

Hans Leidekker : wininet: Fix calculation of content length from chunk size .
by Alexandre Julliard 03 Sep '13

03 Sep '13

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 03 Sep '13

03 Sep '13

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

Jacek Caban : atl110: Added new DLL.
by Alexandre Julliard 03 Sep '13

03 Sep '13

Module: wine Branch: master Commit: b308a5c7adadd8481f2f006026c6d0910e0a02ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b308a5c7adadd8481f2f00602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 3 11:37:21 2013 +0200 atl110: Added new DLL. --- configure | 1 + configure.ac | 1 + dlls/atl110/Makefile.in | 7 +++ dlls/atl110/atl110.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/atl110/atl110.spec | 52 ++++++++++++++++++++++++++ include/atlbase.h | 1 + tools/make_specfiles | 1 + 7 files changed, 157 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0ca39bc..3514c1d 100755 --- a/configure +++ b/configure @@ -15913,6 +15913,7 @@ wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test wine_fn_config_dll atl100 enable_atl100 implib wine_fn_config_test dlls/atl100/tests atl100_test +wine_fn_config_dll atl110 enable_atl110 wine_fn_config_dll atl80 enable_atl80 implib wine_fn_config_test dlls/atl80/tests atl80_test wine_fn_config_dll authz enable_authz diff --git a/configure.ac b/configure.ac index 9b21643..8306fe2 100644 --- a/configure.ac +++ b/configure.ac @@ -2595,6 +2595,7 @@ WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) WINE_CONFIG_DLL(atl100,,[implib]) WINE_CONFIG_TEST(dlls/atl100/tests) +WINE_CONFIG_DLL(atl110) WINE_CONFIG_DLL(atl80,,[implib]) WINE_CONFIG_TEST(dlls/atl80/tests) WINE_CONFIG_DLL(authz) diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in new file mode 100644 index 0000000..f9d98d3 --- /dev/null +++ b/dlls/atl110/Makefile.in @@ -0,0 +1,7 @@ +MODULE = atl110.dll +IMPORTS = atl100 ole32 user32 +EXTRADEFS = -D_ATL_VER=_ATL_VER_110 + +C_SRCS = atl110.c + +@MAKE_DLL_RULES@ diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c new file mode 100644 index 0000000..f704bd9 --- /dev/null +++ b/dlls/atl110/atl110.c @@ -0,0 +1,94 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "atlbase.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl110.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin110[] = {'A','t','l','A','x','W','i','n','1','1','0',0}; + const WCHAR AtlAxWinLic110[] = {'A','t','l','A','x','W','i','n','L','i','c','1','1','0',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin110; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + wcex.lpszClassName = AtlAxWinLic110; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec new file mode 100644 index 0000000..aed22bd --- /dev/null +++ b/dlls/atl110/atl110.spec @@ -0,0 +1,52 @@ +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib +58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration diff --git a/include/atlbase.h b/include/atlbase.h index 1f91f55..660fbf5 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -29,6 +29,7 @@ #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 #define _ATL_VER_100 0x0a00 +#define _ATL_VER_110 0x0b00 #ifndef _ATL_VER #define _ATL_VER _ATL_VER_100 diff --git a/tools/make_specfiles b/tools/make_specfiles index 1a57692..c0de805 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -115,6 +115,7 @@ my @dll_groups = ], [ "atl100", + "atl110", "atl", "atl80", ],

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013