January 2006 - Wine-Commits

Phil Krylov : riched20: Reduced screen flicker by using proper update region invalidation.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: 6818762a6ed50aa9a726085b3439be215916d897 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6818762a6ed50aa9a726085… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Tue Jan 10 20:23:41 2006 +0100 riched20: Reduced screen flicker by using proper update region invalidation. --- dlls/riched20/caret.c | 376 +++++++++++++++++++---------------------------- dlls/riched20/editor.c | 81 +++++++--- dlls/riched20/editor.h | 7 + dlls/riched20/editstr.h | 1 dlls/riched20/paint.c | 65 +++++++- dlls/riched20/wrap.c | 39 +++++ 6 files changed, 314 insertions(+), 255 deletions(-)

1 0

Vitaliy Margolen : kernel: Remove no longer used debug channel.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: 1406010d3ccc9fa49e9e62396e537fd03e724b6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1406010d3ccc9fa49e9e623… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jan 10 20:10:01 2006 +0100 kernel: Remove no longer used debug channel. --- dlls/kernel/virtual.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/virtual.c b/dlls/kernel/virtual.c index 89d2327..c7d129e 100644 --- a/dlls/kernel/virtual.c +++ b/dlls/kernel/virtual.c @@ -45,7 +45,6 @@ #include "kernel_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(seh); static unsigned int page_size;

1 0

Robert Shearman : ole: Defer apartment window creation until the first object is marshalled.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: cd2fafb7753baf3d8e6fd6f8122ed5999f8ac381 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd2fafb7753baf3d8e6fd6f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 20:09:08 2006 +0100 ole: Defer apartment window creation until the first object is marshalled. --- dlls/ole32/compobj.c | 26 +++++++++++++++++++++++--- dlls/ole32/compobj_private.h | 3 ++- dlls/ole32/marshal.c | 4 ++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8283312..a06879e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -236,9 +236,6 @@ static APARTMENT *apartment_construct(DW { /* FIXME: should be randomly generated by in an RPC call to rpcss */ apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId(); - apt->win = CreateWindowW(wszAptWinClass, NULL, 0, - 0, 0, 0, 0, - 0, 0, OLE32_hInstance, NULL); } else { @@ -422,6 +419,29 @@ static LRESULT CALLBACK apartment_wndpro } } +HRESULT apartment_createwindowifneeded(struct apartment *apt) +{ + if (!(apt->model & COINIT_APARTMENTTHREADED)) + return S_OK; + + if (!apt->win) + { + HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, + 0, 0, 0, 0, + 0, 0, OLE32_hInstance, NULL); + if (!hwnd) + { + ERR("CreateWindow failed with error %ld\n", GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + if (InterlockedCompareExchangePointer((PVOID *)&apt->win, hwnd, NULL)) + /* someone beat us to it */ + DestroyWindow(hwnd); + } + + return S_OK; +} + HWND apartment_getwindow(struct apartment *apt) { assert(apt->model & COINIT_APARTMENTTHREADED); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index bb54e3b..2e86a99 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -139,7 +139,7 @@ struct apartment DWORD tid; /* thread id (RO) */ OXID oxid; /* object exporter ID (RO) */ LONG ipidc; /* interface pointer ID counter, starts at 1 (LOCK) */ - HWND win; /* message window (RO) */ + HWND win; /* message window (LOCK) */ CRITICAL_SECTION cs; /* thread safety */ LPMESSAGEFILTER filter; /* message filter (CS cs) */ struct list proxies; /* imported objects (CS cs) */ @@ -230,6 +230,7 @@ static inline HRESULT apartment_getoxid( *oxid = apt->oxid; return S_OK; } +HRESULT apartment_createwindowifneeded(struct apartment *apt); HWND apartment_getwindow(struct apartment *apt); void apartment_joinmta(void); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 6b4679d..313cbd2 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -98,6 +98,10 @@ HRESULT marshal_object(APARTMENT *apt, S if (hr != S_OK) return hr; + hr = apartment_createwindowifneeded(apt); + if (hr != S_OK) + return hr; + hr = IUnknown_QueryInterface(object, riid, (void **)&iobject); if (hr != S_OK) {

1 0

Robert Shearman : ole: Add an accessor function for an apartment's window.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: fcba783fc794e5e822edc107570c77b4c073e956 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fcba783fc794e5e822edc10… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 20:08:41 2006 +0100 ole: Add an accessor function for an apartment's window. --- dlls/ole32/compobj.c | 6 ++++++ dlls/ole32/compobj_private.h | 1 + dlls/ole32/rpc.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6f33091..8283312 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -422,6 +422,12 @@ static LRESULT CALLBACK apartment_wndpro } } +HWND apartment_getwindow(struct apartment *apt) +{ + assert(apt->model & COINIT_APARTMENTTHREADED); + return apt->win; +} + void apartment_joinmta(void) { apartment_addref(MTA); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6dd7d4e..bb54e3b 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -230,6 +230,7 @@ static inline HRESULT apartment_getoxid( *oxid = apt->oxid; return S_OK; } +HWND apartment_getwindow(struct apartment *apt); void apartment_joinmta(void); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 1fa88f6..31ef77c 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -254,7 +254,7 @@ static HRESULT WINAPI RpcChannelBuffer_S TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); - if (!PostMessageW(apt->win, DM_EXECUTERPC, 0, (LPARAM)params)) + if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) { ERR("PostMessage failed with error %ld\n", GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError()); @@ -509,7 +509,7 @@ static void __RPC_STUB dispatch_rpc(RPC_ TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); - if (PostMessageW(apt->win, DM_EXECUTERPC, 0, (LPARAM)params)) + if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) WaitForSingleObject(params->handle, INFINITE); else {

1 0

Robert Shearman : ole: Report and clean up after PostMessage failures.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: d175f154ba855b40e5265b5dae7203490aa2c6f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d175f154ba855b40e5265b5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 20:08:22 2006 +0100 ole: Report and clean up after PostMessage failures. --- dlls/ole32/rpc.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index f2647c1..1fa88f6 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -254,7 +254,11 @@ static HRESULT WINAPI RpcChannelBuffer_S TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); - PostMessageW(apt->win, DM_EXECUTERPC, 0, (LPARAM)params); + if (!PostMessageW(apt->win, DM_EXECUTERPC, 0, (LPARAM)params)) + { + ERR("PostMessage failed with error %ld\n", GetLastError()); + hr = HRESULT_FROM_WIN32(GetLastError()); + } } else { @@ -505,8 +509,14 @@ static void __RPC_STUB dispatch_rpc(RPC_ TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); - PostMessageW(apt->win, DM_EXECUTERPC, 0, (LPARAM)params); - WaitForSingleObject(params->handle, INFINITE); + if (PostMessageW(apt->win, DM_EXECUTERPC, 0, (LPARAM)params)) + WaitForSingleObject(params->handle, INFINITE); + else + { + ERR("PostMessage failed with error %ld\n", GetLastError()); + IRpcChannelBuffer_Release(params->chan); + IRpcStubBuffer_Release(params->stub); + } CloseHandle(params->handle); } else

1 0

Robert Shearman : ole: Pass a channel into IRpcStubBuffer::Invoke.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: a02cb3ebd655745743ca681ea8e82393177ed5aa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a02cb3ebd655745743ca681… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 20:08:02 2006 +0100 ole: Pass a channel into IRpcStubBuffer::Invoke. Create a server channel and store this in the ifstub. Rename ipid_to_apt_and_stubbuffer to ipid_get_dispatch_params and make the function return an HRESULT. Return the channel for the ifstub in ipid_get_dispatch_params. --- dlls/ole32/compobj_private.h | 4 +++- dlls/ole32/rpc.c | 39 ++++++++++++++++++++-------------- dlls/ole32/stubmanager.c | 48 +++++++++++++++++++++++++++++------------- 3 files changed, 59 insertions(+), 32 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c7a1069..6dd7d4e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -72,6 +72,7 @@ struct ifstub IPID ipid; /* RO */ IUnknown *iface; /* RO */ MSHLFLAGS flags; /* so we can enforce process-local marshalling rules (RO) */ + IRpcChannelBuffer*chan; /* channel passed to IRpcStubBuffer::Invoke (RO) */ }; @@ -188,7 +189,7 @@ BOOL stub_manager_notify_unmarshal(struc BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid); HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stubmgr_ret); -IRpcStubBuffer *ipid_to_apt_and_stubbuffer(const IPID *ipid, APARTMENT **stub_apt); +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan); HRESULT start_apartment_remote_unknown(void); HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, MSHLFLAGS mshlflags); @@ -199,6 +200,7 @@ struct dispatch_params; void RPC_StartRemoting(struct apartment *apt); HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **pipebuf); +HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan); void RPC_ExecuteCall(struct dispatch_params *params); HRESULT RPC_RegisterInterface(REFIID riid); void RPC_UnregisterInterface(REFIID riid); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 6e4ff1f..f2647c1 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -227,7 +227,6 @@ static HRESULT WINAPI RpcChannelBuffer_S DWORD index; struct dispatch_params *params; DWORD tid; - IRpcStubBuffer *stub; APARTMENT *apt; IPID ipid; @@ -248,11 +247,9 @@ static HRESULT WINAPI RpcChannelBuffer_S * from DllMain */ RpcBindingInqObject(msg->Handle, &ipid); - stub = ipid_to_apt_and_stubbuffer(&ipid, &apt); - if (apt && (apt->model & COINIT_APARTMENTTHREADED)) + hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); + if ((hr == S_OK) && (apt->model & COINIT_APARTMENTTHREADED)) { - params->stub = stub; - params->chan = NULL; /* FIXME: pass server channel */ params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); TRACE("Calling apartment thread 0x%08lx...\n", apt->tid); @@ -261,7 +258,15 @@ static HRESULT WINAPI RpcChannelBuffer_S } else { - if (stub) IRpcStubBuffer_Release(stub); + if (hr == S_OK) + { + /* otherwise, we go via RPC runtime so the stub and channel aren't + * needed here */ + IRpcStubBuffer_Release(params->stub); + params->stub = NULL; + IRpcChannelBuffer_Release(params->chan); + params->chan = NULL; + } /* we use a separate thread here because we need to be able to * pump the message loop in the application thread: if we do not, @@ -275,6 +280,8 @@ static HRESULT WINAPI RpcChannelBuffer_S ERR("Could not create RpcSendReceive thread, error %lx\n", GetLastError()); hr = E_UNEXPECTED; } + else + hr = S_OK; } if (apt) apartment_release(apt); @@ -459,35 +466,35 @@ void RPC_ExecuteCall(struct dispatch_par } __ENDTRY IRpcStubBuffer_Release(params->stub); + IRpcChannelBuffer_Release(params->chan); if (params->handle) SetEvent(params->handle); } static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { struct dispatch_params *params; - IRpcStubBuffer *stub; - APARTMENT *apt; - IPID ipid; + APARTMENT *apt; + IPID ipid; + HRESULT hr; RpcBindingInqObject(msg->Handle, &ipid); TRACE("ipid = %s, iMethod = %d\n", debugstr_guid(&ipid), msg->ProcNum); - params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params)); + params = HeapAlloc(GetProcessHeap(), 0, sizeof(*params)); if (!params) return RpcRaiseException(E_OUTOFMEMORY); - stub = ipid_to_apt_and_stubbuffer(&ipid, &apt); - if (!apt || !stub) + hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan); + if (hr != S_OK) { - if (apt) apartment_release(apt); ERR("no apartment found for ipid %s\n", debugstr_guid(&ipid)); - return RpcRaiseException(RPC_E_DISCONNECTED); + return RpcRaiseException(hr); } params->msg = (RPCOLEMESSAGE *)msg; - params->stub = stub; - params->chan = NULL; /* FIXME: pass server channel */ params->status = RPC_S_OK; + params->hr = S_OK; + params->handle = NULL; /* Note: this is the important difference between STAs and MTAs - we * always execute RPCs to STAs in the thread that originally created the diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 413f4f3..2f2e297 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -365,29 +365,38 @@ HRESULT ipid_to_stub_manager(const IPID return S_OK; } -/* gets the apartment and IRpcStubBuffer from an object. the caller must - * release the references to both objects */ -IRpcStubBuffer *ipid_to_apt_and_stubbuffer(const IPID *ipid, APARTMENT **stub_apt) +/* gets the apartment, stub and channel of an object. the caller must + * release the references to all objects if the function returned success, + * otherwise no references are returned. */ +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, + IRpcStubBuffer **stub, IRpcChannelBuffer **chan) { - IRpcStubBuffer *ret = NULL; struct stub_manager *stubmgr; struct ifstub *ifstub; + APARTMENT *apt; HRESULT hr; - *stub_apt = NULL; - - hr = ipid_to_stub_manager(ipid, stub_apt, &stubmgr); - if (hr != S_OK) return NULL; + hr = ipid_to_stub_manager(ipid, &apt, &stubmgr); + if (hr != S_OK) return RPC_E_DISCONNECTED; ifstub = stub_manager_ipid_to_ifstub(stubmgr, ipid); if (ifstub) - ret = ifstub->stubbuffer; - - if (ret) IRpcStubBuffer_AddRef(ret); - - stub_manager_int_release(stubmgr); + { + *stub = ifstub->stubbuffer; + IRpcStubBuffer_AddRef(*stub); + *chan = ifstub->chan; + IRpcChannelBuffer_AddRef(*chan); + *stub_apt = apt; - return ret; + stub_manager_int_release(stubmgr); + return S_OK; + } + else + { + stub_manager_int_release(stubmgr); + apartment_release(apt); + return RPC_E_DISCONNECTED; + } } /* generates an ipid in the following format (similar to native version): @@ -417,6 +426,7 @@ static inline HRESULT generate_ipid(stru struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, MSHLFLAGS flags) { struct ifstub *stub; + HRESULT hr; TRACE("oid=%s, stubbuffer=%p, iptr=%p, iid=%s\n", wine_dbgstr_longlong(m->oid), sb, iptr, debugstr_guid(iid)); @@ -424,6 +434,13 @@ struct ifstub *stub_manager_new_ifstub(s stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); if (!stub) return NULL; + hr = RPC_CreateServerChannel(&stub->chan); + if (hr != S_OK) + { + HeapFree(GetProcessHeap(), 0, stub); + return NULL; + } + stub->stubbuffer = sb; if (sb) IRpcStubBuffer_AddRef(sb); @@ -468,9 +485,10 @@ static void stub_manager_delete_ifstub(s list_remove(&ifstub->entry); RPC_UnregisterInterface(&ifstub->iid); - + if (ifstub->stubbuffer) IUnknown_Release(ifstub->stubbuffer); IUnknown_Release(ifstub->iface); + IRpcChannelBuffer_Release(ifstub->chan); HeapFree(GetProcessHeap(), 0, ifstub); }

1 0

Robert Shearman : ole: Reduce the access rights required by start_local_service.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: 8e5b36147dba9e147ad7c1a92530f6563908eee3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e5b36147dba9e147ad7c1a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 20:06:22 2006 +0100 ole: Reduce the access rights required by start_local_service. --- dlls/ole32/rpc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c1b3f78..6e4ff1f 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -677,20 +677,20 @@ static HRESULT create_server(REFCLSID rc /* * start_local_service() - start a service given its name and parameters */ -static DWORD start_local_service(LPCWSTR name, DWORD num, LPWSTR *params) +static DWORD start_local_service(LPCWSTR name, DWORD num, LPCWSTR *params) { SC_HANDLE handle, hsvc; DWORD r = ERROR_FUNCTION_FAILED; TRACE("Starting service %s %ld params\n", debugstr_w(name), num); - handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (!handle) return r; - hsvc = OpenServiceW(handle, name, SC_MANAGER_ALL_ACCESS); + hsvc = OpenServiceW(handle, name, SERVICE_START); if (hsvc) { - if(StartServiceW(hsvc, num, (LPCWSTR*)params)) + if(StartServiceW(hsvc, num, params)) r = ERROR_SUCCESS; else r = GetLastError(); @@ -768,7 +768,7 @@ static HRESULT create_local_service(REFC num_args++; RegQueryValueExW(hkey, szServiceParams, NULL, &type, (LPBYTE)args[0], &sz); } - r = start_local_service(buf, num_args, args); + r = start_local_service(buf, num_args, (LPCWSTR *)args); if (r==ERROR_SUCCESS) hres = S_OK; HeapFree(GetProcessHeap(),0,args[0]);

1 0

Robert Shearman : ole: Return the last error if we couldn't open the requested service.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: c46386ff5c4287f9cf17c1eb3b7e4bd2324844d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c46386ff5c4287f9cf17c1e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 20:06:03 2006 +0100 ole: Return the last error if we couldn't open the requested service. Fix the ok/failed message. --- dlls/ole32/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index ba8ad10..c1b3f78 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -698,9 +698,11 @@ static DWORD start_local_service(LPCWSTR r = ERROR_SUCCESS; CloseServiceHandle(hsvc); } + else + r = GetLastError(); CloseServiceHandle(handle); - TRACE("StartService returned error %ld (%s)\n", r, r?"ok":"failed"); + TRACE("StartService returned error %ld (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); return r; }

1 0

James Hawkins : advpack: Add initial tests for ExtractFiles.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: 4e31bf6863251c54ce8ea04e70ca690f677b35cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e31bf6863251c54ce8ea04… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 10 20:05:41 2006 +0100 advpack: Add initial tests for ExtractFiles. - Use FCI to create a test cabinet file. - Add initial tests for ExtractFiles. --- dlls/advpack/tests/.gitignore | 1 dlls/advpack/tests/Makefile.in | 5 dlls/advpack/tests/files.c | 405 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 409 insertions(+), 2 deletions(-) create mode 100644 dlls/advpack/tests/files.c

1 0

Robert Shearman : rpcrt4: Remove the unused RPCRT4_GetPSFactory function.
by Alexandre Julliard Jan. 10, 2006

Jan. 10, 2006

Module: wine Branch: refs/heads/master Commit: b330bd7ae9c5d1ddca1ea4f737dbbae3865e25f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b330bd7ae9c5d1ddca1ea4f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 10 19:59:48 2006 +0100 rpcrt4: Remove the unused RPCRT4_GetPSFactory function. --- dlls/rpcrt4/ndr_misc.h | 2 -- dlls/rpcrt4/ndr_ole.c | 14 -------------- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h index 1d4319e..0abeaed 100644 --- a/dlls/rpcrt4/ndr_misc.h +++ b/dlls/rpcrt4/ndr_misc.h @@ -30,8 +30,6 @@ struct IPSFactoryBuffer; -HRESULT RPCRT4_GetPSFactory(REFIID riid, struct IPSFactoryBuffer **ppPS); - #define ComputeConformance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->MaxCount) #define ComputeVariance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount) PFORMAT_STRING ComputeConformanceOrVariance( diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 5d7cccf..48f5b72 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -353,17 +353,3 @@ void WINAPI NdrOleFree(void *NodeToFree) if (!LoadCOM()) return; COM_MemFree(NodeToFree); } - -/* internal */ -HRESULT RPCRT4_GetPSFactory(REFIID riid, LPPSFACTORYBUFFER *pPS) -{ - HRESULT hr; - CLSID clsid; - - if (!LoadCOM()) return RPC_E_UNEXPECTED; - hr = COM_GetPSClsid(riid, &clsid); - if (FAILED(hr)) return hr; - hr = COM_GetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, - &IID_IPSFactoryBuffer, (LPVOID *)pPS); - return hr; -}

1 0