August 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : makefiles: Get rid of the checklink rules, they no longer work.
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 80a9a065dda7131a9dc0038077df8f0b4503d88b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80a9a065dda7131a9dc0038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 26 20:21:33 2006 +0200 makefiles: Get rid of the checklink rules, they no longer work. --- Make.rules.in | 7 ------- Makefile.in | 2 -- dlls/Makedll.rules.in | 16 ---------------- dlls/Makefile.in | 2 -- dlls/checklink.c | 4 ---- 5 files changed, 0 insertions(+), 31 deletions(-) delete mode 100644 dlls/checklink.c diff --git a/Make.rules.in b/Make.rules.in index f77ae49..9d7e502 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -263,13 +263,6 @@ uninstall:: $(INSTALLSUBDIRS:%=%/__unins $(SUBDIRS:%=%/__install__) $(SUBDIRS:%=%/__uninstall__) \ $(SUBDIRS:%=%/__install-lib__) $(SUBDIRS:%=%/__install-dev__) -# Rules for checking that no imports are missing - -$(SUBDIRS:%=%/__checklink__): dummy - @cd `dirname $@` && $(MAKE) checklink - -.PHONY: checklink $(SUBDIRS:%=%/__checklink__) - # Rules for testing $(SUBDIRS:%=%/__test__): dummy diff --git a/Makefile.in b/Makefile.in index 52cb7c8..e013cfc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,8 +107,6 @@ tools/__install-lib__ tools/__install-de # Test rules -checklink:: $(TESTSUBDIRS:%=%/__checklink__) - check test:: $(TESTSUBDIRS:%=%/__test__) $(TESTSUBDIRS:%=%/__test__): wine diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 5b4f62c..b48e710 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -62,28 +62,12 @@ lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB $(SUBDIRS): implib -# Rules for checking that no imports are missing - -.PHONY: checklink16 $(WIN16_FILES:%=__checklink16__%) - -$(WIN16_FILES:%=__checklink16__%): checklink16 - -checklink16:: $(MAINSPEC).o $(OBJS) dummy - $(CC) -o checklink -Wl,-rpath,$(TOPOBJDIR)/libs $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) -L$(DLLDIR) $(ALL_LIBS) -lwinecrt0 -lm && $(RM) checklink $(MAINSPEC).o - -checklink:: $(WIN16_FILES:%=__checklink16__%) - # Rules for testing check test:: $(SUBDIRS:%=%/__test__) crosstest:: $(SUBDIRS:%=%/__crosstest__) -# Rule to explicitly generate the .spec.s for debugging - -$(MAINSPEC).s $(MAINSPEC).o: $(MAINSPEC) $(ALL_OBJS) - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --export $(SRCDIR)/$(MAINSPEC) $(SUBSYSTEM:%=--subsystem %) $(ALL_OBJS) $(DLL_LDPATH) $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-d%) $(DLLDIR)/libwinecrt0.a - # Rules for auto documentation man: $(C_SRCS) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index ce542d6..5927f33 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -981,6 +981,4 @@ check test:: $(BUILDSUBDIRS:%=%/__test__ crosstest:: $(BUILDSUBDIRS:%=%/__crosstest__) -checklink:: $(BUILDSUBDIRS:%=%/__checklink__) - ### Dependencies: diff --git a/dlls/checklink.c b/dlls/checklink.c deleted file mode 100644 index 58fe692..0000000 --- a/dlls/checklink.c +++ /dev/null @@ -1,4 +0,0 @@ -int main(void) -{ - return 0; -}

1 0

Robert Shearman : ole32: Call IRpcChannelBuffer_GetBuffer for the RemRelease case of
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 588c782ac8a6affaa6550bf0e573e2a63e943533 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=588c782ac8a6affaa6550bf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Aug 26 12:07:18 2006 +0100 ole32: Call IRpcChannelBuffer_GetBuffer for the RemRelease case of Invoke, even though we are requesting a buffer size of 0 as we put extra data into the buffer in IRpcChannelBuffer_GetBuffer. --- dlls/ole32/oleproxy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 95327d8..7f0b45d 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -601,6 +601,7 @@ static HRESULT WINAPI RemUnkStub_Invoke( /* out */ pMsg->cbBuffer = 0; + IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown); break; } }

1 0

Robert Shearman : ole32: Use IRpcChannelBuffer_GetBuffer in the hand-made proxy/stubs
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 428c63f58682c0c9592f22cc37296e55c9dbcb45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=428c63f58682c0c9592f22c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Aug 26 12:05:13 2006 +0100 ole32: Use IRpcChannelBuffer_GetBuffer in the hand-made proxy/stubs instead of calling I_RpcGetBuffer as IRpcChannelBuffer_GetBuffer does some extra magic. --- dlls/ole32/oleproxy.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index fddbf54..95327d8 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -196,7 +196,7 @@ CFStub_Invoke( msg->cbBuffer = ststg.cbSize.u.LowPart; - I_RpcGetBuffer((RPC_MESSAGE *)msg); + IRpcChannelBuffer_GetBuffer(chanbuf, msg, &IID_IClassFactory); if (hres) return hres; seekto.u.LowPart = 0;seekto.u.HighPart = 0; @@ -546,7 +546,7 @@ static HRESULT WINAPI RemUnkStub_Invoke( /* out */ pMsg->cbBuffer = cIids * sizeof(REMQIRESULT) + sizeof(HRESULT); - I_RpcGetBuffer((RPC_MESSAGE *)pMsg); + IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown); buf = pMsg->Buffer; *(HRESULT *)buf = hr; @@ -576,7 +576,7 @@ static HRESULT WINAPI RemUnkStub_Invoke( /* out */ pMsg->cbBuffer = cIids * sizeof(HRESULT); - I_RpcGetBuffer((RPC_MESSAGE *)pMsg); + IRpcChannelBuffer_GetBuffer(pChannel, pMsg, &IID_IRemUnknown); if (!hr) { buf = pMsg->Buffer;

1 0

Robert Shearman : ole32: Add support for main-threaded apartments.
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 986027af9fe3cb8eb7f36acb31a06c84e021a5f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=986027af9fe3cb8eb7f36ac… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Aug 26 12:02:31 2006 +0100 ole32: Add support for main-threaded apartments. A main-threaded apartment is the first single-threaded apartment in the process. It was designed to be used for legacy applications that don't want to think about threading at all, even if they are always called from the same context, as is the case for regular STAs. --- dlls/ole32/compobj.c | 66 +++++++++++++++++++++++++++++++++++------- dlls/ole32/compobj_private.h | 7 +++- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4a61aca..0208bc5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -85,6 +85,7 @@ static void COM_RevokeAllClasses(void); static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); static APARTMENT *MTA; /* protected by csApartment */ +static APARTMENT *MainApartment; /* the first STA apartment */ static struct list apts = LIST_INIT( apts ); /* protected by csApartment */ static CRITICAL_SECTION csApartment; @@ -217,7 +218,7 @@ static void COM_TlsDestroy(void) */ /* allocates memory and fills in the necessary fields for a new apartment - * object */ + * object. must be called inside apartment cs */ static APARTMENT *apartment_construct(DWORD model) { APARTMENT *apt; @@ -252,11 +253,7 @@ static APARTMENT *apartment_construct(DW TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid)); - /* the locking here is not currently needed for the MTA case, but it - * doesn't hurt and makes the code simpler */ - EnterCriticalSection(&csApartment); list_add_head(&apts, &apt->entry); - LeaveCriticalSection(&csApartment); return apt; } @@ -272,8 +269,17 @@ static APARTMENT *apartment_get_or_creat { if (model & COINIT_APARTMENTTHREADED) { + EnterCriticalSection(&csApartment); + apt = apartment_construct(model); - COM_CurrentInfo()->apt = apt; + if (!MainApartment) + { + MainApartment = apt; + apt->main = TRUE; + TRACE("Created main-threaded apartment with OXID %s\n", wine_dbgstr_longlong(apt->oxid)); + } + + LeaveCriticalSection(&csApartment); } else { @@ -291,10 +297,10 @@ static APARTMENT *apartment_get_or_creat MTA = apartment_construct(model); apt = MTA; - COM_CurrentInfo()->apt = apt; LeaveCriticalSection(&csApartment); } + COM_CurrentInfo()->apt = apt; } return apt; @@ -324,6 +330,7 @@ DWORD apartment_release(struct apartment if (ret == 0) { if (apt == MTA) MTA = NULL; + else if (apt == MainApartment) MainApartment = NULL; list_remove(&apt->entry); } @@ -431,12 +438,21 @@ APARTMENT *apartment_findfromtid(DWORD t /* gets an apartment which has a given type. The caller must * release the reference from the apartment as soon as the apartment pointer * is no longer required. */ -static APARTMENT *apartment_findfromtype(BOOL multi_threaded) +static APARTMENT *apartment_findfromtype(BOOL multi_threaded, BOOL main_apartment) { APARTMENT *result = NULL; struct apartment *apt; EnterCriticalSection(&csApartment); + + if (!multi_threaded && main_apartment) + { + result = MainApartment; + if (result) apartment_addref(result); + LeaveCriticalSection(&csApartment); + return result; + } + LIST_FOR_EACH_ENTRY( apt, &apts, struct apartment, entry ) { if (apt->multi_threaded == multi_threaded) @@ -1750,7 +1766,7 @@ static HRESULT get_inproc_class_object(H if (apt->multi_threaded) { /* try to find an STA */ - APARTMENT *host_apt = apartment_findfromtype(FALSE); + APARTMENT *host_apt = apartment_findfromtype(FALSE, FALSE); if (!host_apt) FIXME("create a host apartment for apartment-threaded object %s\n", debugstr_guid(rclsid)); if (host_apt) @@ -1785,9 +1801,37 @@ static HRESULT get_inproc_class_object(H /* everything except "Apartment", "Free" and "Both" */ else if (strcmpiW(threading_model, wszBoth)) { + APARTMENT *apt = COM_CurrentApt(); + /* everything else is main-threaded */ - FIXME("unrecognised threading model %s for object %s, should be main-threaded?\n", - debugstr_w(threading_model), debugstr_guid(rclsid)); + if (threading_model[0]) + FIXME("unrecognised threading model %s for object %s, should be main-threaded?\n", + debugstr_w(threading_model), debugstr_guid(rclsid)); + + if (apt->multi_threaded || !apt->main) + { + /* try to find an STA */ + APARTMENT *host_apt = apartment_findfromtype(FALSE, TRUE); + if (!host_apt) + FIXME("create a host apartment for main-threaded object %s\n", debugstr_guid(rclsid)); + if (host_apt) + { + struct host_object_params params; + HWND hwnd = apartment_getwindow(host_apt); + + params.hkeydll = hkeydll; + params.clsid = *rclsid; + params.iid = *riid; + hr = CreateStreamOnHGlobal(NULL, TRUE, &params.stream); + if (FAILED(hr)) + return hr; + hr = SendMessageW(hwnd, DM_HOSTOBJECT, 0, (LPARAM)&params); + if (SUCCEEDED(hr)) + hr = CoUnmarshalInterface(params.stream, riid, ppv); + IStream_Release(params.stream); + return hr; + } + } } if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index cb4dd64..9052c38 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -145,9 +145,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 (LOCK) */ CRITICAL_SECTION cs; /* thread safety */ - LPMESSAGEFILTER filter; /* message filter (CS cs) */ struct list proxies; /* imported objects (CS cs) */ struct list stubmgrs; /* stub managers for exported objects (CS cs) */ BOOL remunk_exported; /* has the IRemUnknown interface for this apartment been created yet? (CS cs) */ @@ -156,6 +154,11 @@ struct apartment /* FIXME: OID's should be given out by RPCSS */ OID oidc; /* object ID counter, starts at 1, zero is invalid OID (CS cs) */ + + /* STA-only fields */ + HWND win; /* message window (LOCK) */ + LPMESSAGEFILTER filter; /* message filter (CS cs) */ + BOOL main; /* is this a main-threaded-apartment? (RO) */ }; /* this is what is stored in TEB->ReservedForOle */

1 0

Robert Shearman : ole32: Move the opening of the AppId key for a clsid to a helper function.
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 83d24a640875c2e834e37e3bd7e03e1c6e497ee5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83d24a640875c2e834e37e3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Aug 26 11:55:16 2006 +0100 ole32: Move the opening of the AppId key for a clsid to a helper function. --- dlls/ole32/compobj.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj_private.h | 1 + dlls/ole32/rpc.c | 17 ++--------------- 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 51e942b..4a61aca 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1108,6 +1108,43 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID cls return S_OK; } +/* open HKCR\\AppId\\{string form of appid clsid} key */ +HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey) +{ + static const WCHAR szAppId[] = { 'A','p','p','I','d',0 }; + static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; + DWORD res; + WCHAR buf[CHARS_IN_GUID]; + WCHAR keyname[ARRAYSIZE(szAppIdKey) + CHARS_IN_GUID]; + DWORD size; + HKEY hkey; + DWORD type; + HRESULT hr; + + /* read the AppID value under the class's key */ + hr = COM_OpenKeyForCLSID(clsid, szAppId, KEY_READ, &hkey); + if (FAILED(hr)) + return hr; + + size = sizeof(buf); + res = RegQueryValueExW(hkey, NULL, NULL, &type, (LPBYTE)buf, &size); + RegCloseKey(hkey); + if (res == ERROR_FILE_NOT_FOUND) + return REGDB_E_KEYMISSING; + else if (res != ERROR_SUCCESS || type!=REG_SZ) + return REGDB_E_READREGDB; + + strcpyW(keyname, szAppIdKey); + strcatW(keyname, buf); + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, access, subkey); + if (res == ERROR_FILE_NOT_FOUND) + return REGDB_E_KEYMISSING; + else if (res != ERROR_SUCCESS) + return REGDB_E_READREGDB; + + return S_OK; +} + /****************************************************************************** * ProgIDFromCLSID [OLE32.@] * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index ac9243c..cb4dd64 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -178,6 +178,7 @@ extern void* StdGlobalInterfaceTableInst extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr); HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key); +HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey); HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 8decc2c..cf55b4c 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -796,9 +796,7 @@ static DWORD start_local_service(LPCWSTR static HRESULT create_local_service(REFCLSID rclsid) { HRESULT hres; - WCHAR buf[CHARS_IN_GUID], keyname[50]; - static const WCHAR szAppId[] = { 'A','p','p','I','d',0 }; - static const WCHAR szAppIdKey[] = { 'A','p','p','I','d','\\',0 }; + WCHAR buf[CHARS_IN_GUID]; static const WCHAR szLocalService[] = { 'L','o','c','a','l','S','e','r','v','i','c','e',0 }; static const WCHAR szServiceParams[] = {'S','e','r','v','i','c','e','P','a','r','a','m','s',0}; HKEY hkey; @@ -807,22 +805,11 @@ static HRESULT create_local_service(REFC TRACE("Attempting to start Local service for %s\n", debugstr_guid(rclsid)); - /* read the AppID value under the class's key */ - hres = COM_OpenKeyForCLSID(rclsid, szAppId, KEY_READ, &hkey); + hres = COM_OpenKeyForAppIdFromCLSID(rclsid, KEY_READ, &hkey); if (FAILED(hres)) return hres; - sz = sizeof buf; - r = RegQueryValueExW(hkey, NULL, NULL, &type, (LPBYTE)buf, &sz); - RegCloseKey(hkey); - if (r!=ERROR_SUCCESS || type!=REG_SZ) - return hres; /* read the LocalService and ServiceParameters values from the AppID key */ - strcpyW(keyname, szAppIdKey); - strcatW(keyname, buf); - r = RegOpenKeyExW(HKEY_CLASSES_ROOT, keyname, 0, KEY_READ, &hkey); - if (r!=ERROR_SUCCESS) - return hres; sz = sizeof buf; r = RegQueryValueExW(hkey, szLocalService, NULL, &type, (LPBYTE)buf, &sz); if (r==ERROR_SUCCESS && type==REG_SZ)

1 0

Robert Shearman : ole32: Get the threading model value for inproc classes and output a
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: c1eb2c70032307fb775c86293b799c6c306e4f5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1eb2c70032307fb775c862… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Aug 26 11:41:42 2006 +0100 ole32: Get the threading model value for inproc classes and output a fixme if we should create it in an apartment of another type. --- dlls/ole32/compobj.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index e049563..1f13fd0 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1627,14 +1627,59 @@ static DWORD COM_RegReadPath(HKEY hkeyro return ret; } +static void get_threading_model(HKEY key, LPWSTR value, DWORD len) +{ + static const WCHAR wszThreadingModel[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; + DWORD keytype; + DWORD ret; + DWORD dwLength = len * sizeof(WCHAR); + + ret = RegQueryValueExW(key, wszThreadingModel, NULL, &keytype, (LPBYTE)value, &dwLength); + if ((ret != ERROR_SUCCESS) || (keytype != REG_SZ)) + value[0] = '\0'; +} + static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) { + static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; + static const WCHAR wszFree[] = {'F','r','e','e',0}; + static const WCHAR wszBoth[] = {'B','o','t','h',0}; HINSTANCE hLibrary; typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); DllGetClassObjectFunc DllGetClassObject; WCHAR dllpath[MAX_PATH+1]; + WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; HRESULT hr; + get_threading_model(hkeydll, threading_model, ARRAYSIZE(threading_model)); + /* "Apartment" */ + if (!strcmpiW(threading_model, wszApartment)) + { + APARTMENT *apt = COM_CurrentApt(); + if (apt->multi_threaded) + { + FIXME("should create object %s in single-threaded apartment\n", + debugstr_guid(rclsid)); + } + } + /* "Free" */ + else if (!strcmpiW(threading_model, wszFree)) + { + APARTMENT *apt = COM_CurrentApt(); + if (!apt->multi_threaded) + { + FIXME("should create object %s in multi-threaded apartment\n", + debugstr_guid(rclsid)); + } + } + /* everything except "Apartment", "Free" and "Both" */ + else if (strcmpiW(threading_model, wszBoth)) + { + /* everything else is main-threaded */ + FIXME("unrecognised threading model %s for object %s, should be main-threaded?\n", + debugstr_w(threading_model), debugstr_guid(rclsid)); + } + if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */

1 0

Robert Shearman : ole32: CoGetClassObject should host a single-threaded object in a
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 619ba90dbecaca7b4bc360b38bd7ba45f5b82546 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=619ba90dbecaca7b4bc360b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Aug 26 11:42:40 2006 +0100 ole32: CoGetClassObject should host a single-threaded object in a single-threaded apartment if executing in a multi-threaded apartment, if one exists. --- dlls/ole32/compobj.c | 77 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/compobj_private.h | 1 + 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1f13fd0..51e942b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -82,6 +82,7 @@ #define ARRAYSIZE(array) (sizeof(array)/ static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); static void COM_RevokeAllClasses(void); +static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); static APARTMENT *MTA; /* protected by csApartment */ static struct list apts = LIST_INIT( apts ); /* protected by csApartment */ @@ -427,6 +428,57 @@ APARTMENT *apartment_findfromtid(DWORD t return result; } +/* gets an apartment which has a given type. The caller must + * release the reference from the apartment as soon as the apartment pointer + * is no longer required. */ +static APARTMENT *apartment_findfromtype(BOOL multi_threaded) +{ + APARTMENT *result = NULL; + struct apartment *apt; + + EnterCriticalSection(&csApartment); + LIST_FOR_EACH_ENTRY( apt, &apts, struct apartment, entry ) + { + if (apt->multi_threaded == multi_threaded) + { + result = apt; + apartment_addref(result); + break; + } + } + LeaveCriticalSection(&csApartment); + + return result; +} + +struct host_object_params +{ + HKEY hkeydll; + CLSID clsid; /* clsid of object to marshal */ + IID iid; /* interface to marshal */ + IStream *stream; /* stream that the object will be marshaled into */ +}; + +static HRESULT apartment_hostobject(const struct host_object_params *params) +{ + IUnknown *object; + HRESULT hr; + static const LARGE_INTEGER llZero; + + TRACE("\n"); + + hr = get_inproc_class_object(params->hkeydll, &params->clsid, &params->iid, (void **)&object); + if (FAILED(hr)) + return hr; + + hr = CoMarshalInterface(params->stream, &params->iid, object, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + if (FAILED(hr)) + IUnknown_Release(object); + IStream_Seek(params->stream, llZero, STREAM_SEEK_SET, NULL); + + return hr; +} + static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) @@ -434,6 +486,8 @@ static LRESULT CALLBACK apartment_wndpro case DM_EXECUTERPC: RPC_ExecuteCall((struct dispatch_params *)lParam); return 0; + case DM_HOSTOBJECT: + return apartment_hostobject((const struct host_object_params *)lParam); default: return DefWindowProcW(hWnd, msg, wParam, lParam); } @@ -1658,8 +1712,27 @@ static HRESULT get_inproc_class_object(H APARTMENT *apt = COM_CurrentApt(); if (apt->multi_threaded) { - FIXME("should create object %s in single-threaded apartment\n", - debugstr_guid(rclsid)); + /* try to find an STA */ + APARTMENT *host_apt = apartment_findfromtype(FALSE); + if (!host_apt) + FIXME("create a host apartment for apartment-threaded object %s\n", debugstr_guid(rclsid)); + if (host_apt) + { + struct host_object_params params; + HWND hwnd = apartment_getwindow(host_apt); + + params.hkeydll = hkeydll; + params.clsid = *rclsid; + params.iid = *riid; + hr = CreateStreamOnHGlobal(NULL, TRUE, &params.stream); + if (FAILED(hr)) + return hr; + hr = SendMessageW(hwnd, DM_HOSTOBJECT, 0, (LPARAM)&params); + if (SUCCEEDED(hr)) + hr = CoUnmarshalInterface(params.stream, riid, ppv); + IStream_Release(params.stream); + return hr; + } } } /* "Free" */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 4d27bab..ac9243c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -246,6 +246,7 @@ void apartment_joinmta(void); /* DCOM messages used by the apartment window (not compatible with native) */ #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */ +#define DM_HOSTOBJECT (WM_USER + 1) /* WPARAM = 0, LPARAM = (struct host_object_params *) */ /* * Per-thread values are stored in the TEB on offset 0xF80,

1 0

Andrew Talbot : advapi32: Cast-qual warnings fix.
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 9959d7e37f75ffe1be661c6e49aeff2abd1bbfb7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9959d7e37f75ffe1be661c6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 25 22:14:38 2006 +0100 advapi32: Cast-qual warnings fix. --- dlls/advapi32/crypt.c | 3 ++- dlls/advapi32/crypt_lmhash.c | 2 +- dlls/advapi32/eventlog.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 01be73b..7fd50e0 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1819,7 +1819,8 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR } CRYPT_Free(keyname); - if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (LPBYTE)pszProvName, (strlenW(pszProvName) + 1)*sizeof(WCHAR))) + if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName, + (strlenW(pszProvName) + 1)*sizeof(WCHAR))) { RegCloseKey(hTypeKey); RegCloseKey(hProvKey); diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 5617d3f..a7e8e55 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -50,7 +50,7 @@ static void CRYPT_LMhash( unsigned char NTSTATUS WINAPI SystemFunction006( LPCSTR password, LPSTR hash ) { - CRYPT_LMhash( (unsigned char*)hash, (unsigned char*)password, strlen(password) ); + CRYPT_LMhash( (unsigned char*)hash, (const unsigned char*)password, strlen(password) ); return STATUS_SUCCESS; } diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index ad477d4..2c40173 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -373,7 +373,7 @@ HANDLE WINAPI RegisterEventSourceW( LPCW BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData) { - LPCWSTR *wideStrArray; + LPWSTR *wideStrArray; UNICODE_STRING str; int i; BOOL ret; @@ -384,17 +384,17 @@ BOOL WINAPI ReportEventA ( HANDLE hEvent if (wNumStrings == 0) return TRUE; if (!lpStrings) return TRUE; - wideStrArray = HeapAlloc(GetProcessHeap(), 0, sizeof(LPCWSTR) * wNumStrings); + wideStrArray = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWSTR) * wNumStrings); for (i = 0; i < wNumStrings; i++) { RtlCreateUnicodeStringFromAsciiz(&str, lpStrings[i]); wideStrArray[i] = str.Buffer; } ret = ReportEventW(hEventLog, wType, wCategory, dwEventID, lpUserSid, - wNumStrings, dwDataSize, wideStrArray, lpRawData); + wNumStrings, dwDataSize, (LPCWSTR *)wideStrArray, lpRawData); for (i = 0; i < wNumStrings; i++) { - HeapFree( GetProcessHeap(), 0, (LPSTR)wideStrArray[i] ); + HeapFree( GetProcessHeap(), 0, wideStrArray[i] ); } HeapFree(GetProcessHeap(), 0, wideStrArray); return ret;

1 0

Jacek Caban : mshtml: Better stub for QueryStatus(CGID_MSHTML).
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: 4c4c583f53a2d32df218e6f1f946fee121a099cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c4c583f53a2d32df218e6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 26 17:41:55 2006 +0200 mshtml: Better stub for QueryStatus(CGID_MSHTML). --- dlls/mshtml/olecmd.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 09905c2..9b17502 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -517,6 +517,97 @@ static HRESULT WINAPI OleCommandTarget_Q if(pCmdText) FIXME("Set pCmdText\n"); + }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + ULONG i; + + for(i=0; i<cCmds; i++) { + switch(prgCmds[i].cmdID) { + case IDM_COPY: + FIXME("CGID_MSHTML: IDM_COPY\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_CUT: + FIXME("CGID_MSHTML: IDM_CUT\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_FONTNAME: + FIXME("CGID_MSHTML: IDM_FONTNAME\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_FONTSIZE: + FIXME("CGID_MSHTML: IDM_FONTSIZE\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_PASTE: + FIXME("CGID_MSHTML: IDM_PASTE\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_BOLD: + FIXME("CGID_MSHTML: IDM_BOLD\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_FORECOLOR: + FIXME("CGID_MSHTML: IDM_FORECOLOR\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_ITALIC: + FIXME("CGID_MSHTML: IDM_ITALIC\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_JUSTIFYCENTER: + FIXME("CGID_MSHTML: IDM_JUSTIFYCENTER\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_JUSTIFYLEFT: + FIXME("CGID_MSHTML: IDM_JUSTIFYLEFT\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_JUSTIFYRIGHT: + FIXME("CGID_MSHTML: IDM_JUSTIFYRIGHT\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_UNDERLINE: + FIXME("CGID_MSHTML: IDM_UNDERLINE\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_HORIZONTALLINE: + FIXME("CGID_MSHTML: IDM_HORIZONTALLINE\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_ORDERLIST: + FIXME("CGID_MSHTML: IDM_ORDERLIST\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_UNORDERLIST: + FIXME("CGID_MSHTML: IDM_UNORDERLIST\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_INDENT: + FIXME("CGID_MSHTML: IDM_INDENT\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_OUTDENT: + FIXME("CGID_MSHTML: IDM_OUTDENT\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_BLOCKDIRLTR: + FIXME("CGID_MSHTML: IDM_BLOCKDIRLTR\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + case IDM_BLOCKDIRRTL: + FIXME("CGID_MSHTML: IDM_BLOCKDIRRTL\n"); + prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + break; + default: + FIXME("CGID_MSHTML: unsupported cmdID %ld\n", prgCmds[i].cmdID); + prgCmds[i].cmdf = 0; + } + } + + hres = prgCmds[i-1].cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED; + + if(pCmdText) + FIXME("Set pCmdText\n"); }else { FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); hres = OLECMDERR_E_UNKNOWNGROUP;

1 0

Jacek Caban : mshtml: Added nsICommandParams argument to do_ns_command.
by Alexandre Julliard Aug. 26, 2006

Aug. 26, 2006

Module: wine Branch: master Commit: beaa66f17e1039a4c91f2e58f9b34f0731b2a732 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=beaa66f17e1039a4c91f2e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 26 16:41:20 2006 +0200 mshtml: Added nsICommandParams argument to do_ns_command. --- dlls/mshtml/nsiface.idl | 31 ++++++++++++++++++++++++++++--- dlls/mshtml/olecmd.c | 6 +++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8bd59c4..601e54e 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -40,6 +40,7 @@ typedef LPCWSTR nscwstring; typedef ULONG PRUint32; typedef LONG PRInt32; typedef WORD PRUint16; +typedef INT16 PRInt16; typedef BYTE PRUint8; typedef BOOL PRBool; typedef LARGE_INTEGER PRInt64; @@ -109,7 +110,6 @@ typedef nsISupports nsIDOMHTMLOptionsCol typedef nsISupports nsIDOMHTMLCollection; typedef nsISupports nsIDOMRange; typedef nsISupports nsIEditor; -typedef nsISupports nsICommandParams; [ object, @@ -540,8 +540,8 @@ interface nsIDOMHTMLDocument : nsIDOMDoc nsresult GetAnchors(nsIDOMHTMLCollection **aAnchors); nsresult GetCookie(nsAString *aCookie); nsresult SetCookie(const nsAString *aCookie); - nsresult Open(void); - nsresult Close(void); + nsresult Open(); + nsresult Close(); nsresult Write(const nsAString *text); nsresult Writeln(const nsAString *text); nsresult GetElementsByName(const nsAString *elementName, nsIDOMNodeList **_retval); @@ -1177,6 +1177,31 @@ interface nsIEditingSession : nsISupport [ object, + uuid(83f892cf-7ed3-490e-967a-62640f3158e1) +] +interface nsICommandParams : nsISupports +{ + nsresult GetValueType(const char *name, PRInt16 *_retval); + nsresult GetBooleanValue(const char *name, PRBool *_retval); + nsresult GetLongValue(const char *name, PRInt32 *_retval); + nsresult GetDoubleValue(const char *name, double *_retval); + nsresult GetStringValue(const char *name, nsAString *_retval); + nsresult GetCStringValue(const char *name, char **_retval); + nsresult GetISupportsValue(const char *name, nsISupports **_retval); + nsresult SetBooleanValue(const char *name, PRBool value); + nsresult SetLongValue(const char *name, PRInt32 value); + nsresult SetDoubleValue(const char *name, double value); + nsresult SetStringValue(const char *name, const nsAString *value); + nsresult SetCStringValue(const char *name, const char *value); + nsresult SetISupportsValue(const char *name, nsISupports *value); + nsresult RemoveValue(const char *name); + nsresult HasMoreElements(PRBool *_retval); + nsresult First(); + nsresult GetNext(char **_retval); +} + +[ + object, uuid(080d2001-f91e-11d4-a73c-f9242928207c) ] interface nsICommandManager : nsISupports diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 72d6d98..09905c2 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -238,7 +238,7 @@ static HRESULT exec_get_print_template(H return E_NOTIMPL; } -static void do_ns_command(NSContainer *This, const char *cmd) +static void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam) { nsICommandManager *cmdmgr; nsIInterfaceRequestor *iface_req; @@ -261,7 +261,7 @@ static void do_ns_command(NSContainer *T return; } - nsres = nsICommandManager_DoCommand(cmdmgr, cmd, NULL, NULL); + nsres = nsICommandManager_DoCommand(cmdmgr, cmd, nsparam, NULL); if(NS_FAILED(nsres)) ERR("DoCommand(%s) failed: %08lx\n", debugstr_a(cmd), nsres); @@ -273,7 +273,7 @@ static HRESULT exec_bold(HTMLDocument *T TRACE("(%p)\n", This); if(This->nscontainer) - do_ns_command(This->nscontainer, "cmd_bold"); + do_ns_command(This->nscontainer, "cmd_bold", NULL); return S_OK; }

1 0