Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ea] 13535: Resource script added.
by ea＠svn.reactos.com 13 Feb '05

13 Feb '05

Resource script added. Deleted: trunk/rosapps/sysutils/kill/.cvsignore Added: trunk/rosapps/sysutils/kill/kill.rc Modified: trunk/rosapps/sysutils/kill/makefile _____ Deleted: trunk/rosapps/sysutils/kill/.cvsignore --- trunk/rosapps/sysutils/kill/.cvsignore 2005-02-13 21:06:18 UTC (rev 13534) +++ trunk/rosapps/sysutils/kill/.cvsignore 2005-02-13 21:16:59 UTC (rev 13535) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Added: trunk/rosapps/sysutils/kill/kill.rc --- trunk/rosapps/sysutils/kill/kill.rc 2005-02-13 21:06:18 UTC (rev 13534) +++ trunk/rosapps/sysutils/kill/kill.rc 2005-02-13 21:16:59 UTC (rev 13535) @@ -0,0 +1,6 @@ +/* $Id: $ */ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS W32 Kill Process Utility\0" +#define REACTOS_STR_INTERNAL_NAME "kill\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kill.exe\0" +#include <reactos/version.rc> _____ Modified: trunk/rosapps/sysutils/kill/makefile --- trunk/rosapps/sysutils/kill/makefile 2005-02-13 21:06:18 UTC (rev 13534) +++ trunk/rosapps/sysutils/kill/makefile 2005-02-13 21:16:59 UTC (rev 13535) @@ -1,9 +1,7 @@ -# +# $Id$ PATH_TO_TOP = ../../../reactos -TARGET_NORC = yes - TARGET_TYPE = program TARGET_APPTYPE = console

1 0

[gvg] 13534: Sync to Wine-20050211
by gvg＠svn.reactos.com 13 Feb '05

13 Feb '05

Sync to Wine-20050211 Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - Updated French resources. Added: trunk/reactos/lib/oledlg/oledlg_Fr.rc Modified: trunk/reactos/lib/oledlg/rsrc.rc _____ Copied: trunk/reactos/lib/oledlg/oledlg_Fr.rc (from rev 13533, vendor/wine/dlls/oledlg/current/oledlg_Fr.rc) --- vendor/wine/dlls/oledlg/current/oledlg_Fr.rc 2005-02-13 21:03:37 UTC (rev 13533) +++ trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-02-13 21:06:18 UTC (rev 13534) @@ -0,0 +1,59 @@ +/* + * oledlg dll resources + * French language support + * + * Copyright (C) 2005 Jonathan Ernst + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "InsÚrer Objet" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 + GROUPBOX "RÚsultat",IDC_RESULT,7,103,208,41 + CONTROL "CrÚer Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "CrÚer Contr¶le",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "CrÚer Depuis Fichier",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&Ajoute Contr¶le...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Afficher Comme Ic¶ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "InsÚrer un nouvel object %s dans votre document" + IDS_RESULTFILEOBJDESC "InsÞre le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel vous l'avez crÚÚ." + IDS_BROWSE "Parcourir" + IDS_NOTOLEMOD "Le fichier ne semble pas Ûtre un module OLE valide. Impossible d'enregistrer le contr¶le OLE." + IDS_NOTOLEMODCAPTION "Ajouter Contr¶le" +} Property changes on: trunk/reactos/lib/oledlg/oledlg_Fr.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/oledlg/rsrc.rc --- trunk/reactos/lib/oledlg/rsrc.rc 2005-02-13 21:03:37 UTC (rev 13533) +++ trunk/reactos/lib/oledlg/rsrc.rc 2005-02-13 21:06:18 UTC (rev 13534) @@ -35,6 +35,7 @@ #include "oledlg_De.rc" #include "oledlg_En.rc" #include "oledlg_Es.rc" +#include "oledlg_Fr.rc" #include "oledlg_It.rc" #include "oledlg_Ja.rc" #include "oledlg_Nl.rc"

1 0

[gvg] 13533: Sync to Wine-20050211
by gvg＠svn.reactos.com 13 Feb '05

13 Feb '05

Sync to Wine-20050211 James Hawkins <truiken(a)gmail.com> - Use Interlocked* instead of ++/-- in AddRef/Release. - Use only stored result of Interlocked* in AddRef/Release. - Expand TRACEs to display the ref count. Alex Villacis Lasso <a_villacis(a)palosanto.com> - Initialize temporary variants before calling VariantChangeTypeEx. - When parsing an hex/oct integer value, copy value verbatim in VARIANT, rather than a negated value. Add test case for this behavior. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Remove message telling users to copy native stdole32.tlb over as we now provide it. - Better trace in LoadTypeLib. - Change debug messages type to reflect we provide stdole32.tlb. Robert Shearman <rob(a)codeweavers.com> - Move OLE automation interface registration to oleaut32. - Add IRemUnknown to list of interfaces to register. Mike Hearn <mh(a)codeweavers.com> - Change some FIXMEs to ERRs to reflect the fact that nothing needs fixing. - Fix some memory leaks on error paths in _marshal_interface. - Fix a typo, propagate errors better from inside the typelib marshaller. - Return OLE automation build value as win2k by default. Rein Klazes <wijn(a)wanadoo.nl> - SafeArrayDestroy() returns success when called with a NULL pointer. Added to the test cases. Paul Vriens <Paul.Vriens(a)xs4all.nl> - Add WinXP to OaBuildVersion. Modified: trunk/reactos/lib/oleaut32/connpt.c Modified: trunk/reactos/lib/oleaut32/dispatch.c Modified: trunk/reactos/lib/oleaut32/oleaut.c Deleted: trunk/reactos/lib/oleaut32/oleaut32_Ru.rc Added: trunk/reactos/lib/oleaut32/oleaut32_Ru.rc Modified: trunk/reactos/lib/oleaut32/olefont.c Modified: trunk/reactos/lib/oleaut32/olepicture.c Modified: trunk/reactos/lib/oleaut32/regsvr.c Modified: trunk/reactos/lib/oleaut32/safearray.c Modified: trunk/reactos/lib/oleaut32/tmarshal.c Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/variant.c _____ Modified: trunk/reactos/lib/oleaut32/connpt.c --- trunk/reactos/lib/oleaut32/connpt.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/connpt.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -196,8 +196,11 @@ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) { ConnectionPointImpl *This = (ConnectionPointImpl *)iface; - TRACE("(%p)->(ref=%ld)\n", This, This->ref); - return InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%ld)\n", This, refCount - 1); + + return refCount; } /*********************************************************************** * @@ -209,20 +212,16 @@ IConnectionPoint* iface) { ConnectionPointImpl *This = (ConnectionPointImpl *)iface; - ULONG ref; - TRACE("(%p)->(ref=%ld)\n", This, This->ref); + ULONG refCount = InterlockedDecrement(&This->ref); - /* - * Decrease the reference count on this object. - */ - ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(ref before=%ld)\n", This, refCount + 1); /* * If the reference count goes down to 0, perform suicide. */ - if (ref == 0) ConnectionPointImpl_Destroy(This); + if (!refCount) ConnectionPointImpl_Destroy(This); - return ref; + return refCount; } /*********************************************************************** * @@ -470,11 +469,12 @@ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) { EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; - ULONG ref; - TRACE("(%p)->(ref=%ld)\n", This, This->ref); - ref = InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%ld)\n", This, refCount - 1); + IUnknown_AddRef(This->pUnk); - return ref; + return refCount; } /*********************************************************************** * @@ -485,22 +485,18 @@ static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface) { EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; - ULONG ref; - TRACE("(%p)->(ref=%ld)\n", This, This->ref); + ULONG refCount = InterlockedDecrement(&This->ref); + TRACE("(%p)->(ref before=%ld)\n", This, refCount + 1); + IUnknown_Release(This->pUnk); /* - * Decrease the reference count on this object. - */ - ref = InterlockedDecrement(&This->ref); - - /* * If the reference count goes down to 0, perform suicide. */ - if (ref == 0) EnumConnectionsImpl_Destroy(This); + if (!refCount) EnumConnectionsImpl_Destroy(This); - return ref; + return refCount; } /*********************************************************************** * _____ Modified: trunk/reactos/lib/oleaut32/dispatch.c --- trunk/reactos/lib/oleaut32/dispatch.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/dispatch.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -256,9 +256,11 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) { StdDispatch *This = (StdDispatch *)iface; - TRACE("()\n"); + ULONG refCount = InterlockedIncrement(&This->ref); - return InterlockedIncrement(&This->ref); + TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); + + return refCount; } /*********************************************************************** ******* @@ -269,18 +271,17 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) { StdDispatch *This = (StdDispatch *)iface; - ULONG ref; - TRACE("(%p)->()\n", This); + ULONG refCount = InterlockedDecrement(&This->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); - if (ref == 0) + if (!refCount) { ITypeInfo_Release(This->pTypeInfo); CoTaskMemFree(This); } - return ref; + return refCount; } /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/oleaut32/oleaut.c --- trunk/reactos/lib/oleaut32/oleaut.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/oleaut.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -563,10 +563,11 @@ case 0x80000a04: /* WIN98 */ case 0x00000004: /* NT40 */ case 0x00000005: /* W2K */ + case 0x00000105: /* WinXP */ return MAKELONG(0xffff, 40); default: - ERR("Version value not known yet. Please investigate it !\n"); - return 0x0; + FIXME("Version value not known yet. Please investigate it !\n"); + return MAKELONG(0xffff, 40); /* for now return the same value as for w2k */ } } _____ Deleted: trunk/reactos/lib/oleaut32/oleaut32_Ru.rc --- trunk/reactos/lib/oleaut32/oleaut32_Ru.rc 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/oleaut32_Ru.rc 2005-02-13 21:03:37 UTC (rev 13533) @@ -1,31 +0,0 @@ -/* - * Russian resources for oleaut32 - * - * Copyright 2004 Dmitry Timoshkov - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_TRUE "¤ÓÔõÓ" - IDS_FALSE "?¯µ³" - IDS_YES "?Ó" - IDS_NO "?Õ?" - IDS_ON "?ÛÙ?¸ÕÝ¯" - IDS_OFF "?¹ÛÙ?¸ÕÝ¯" -} _____ Copied: trunk/reactos/lib/oleaut32/oleaut32_Ru.rc (from rev 13532, vendor/wine/dlls/oleaut32/current/oleaut32_Ru.rc) _____ Modified: trunk/reactos/lib/oleaut32/olefont.c --- trunk/reactos/lib/oleaut32/olefont.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/olefont.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -1214,7 +1214,7 @@ return E_FAIL; hres = LoadTypeLib(stdole32tlb, &tl); if (FAILED(hres)) { - FIXME("Could not load the stdole32.tlb?\n"); + ERR("Could not load the stdole32.tlb?\n"); return hres; } hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IDispatch, ppTInfo); _____ Modified: trunk/reactos/lib/oleaut32/olepicture.c --- trunk/reactos/lib/oleaut32/olepicture.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/olepicture.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -409,8 +409,11 @@ IPicture* iface) { OLEPictureImpl *This = (OLEPictureImpl *)iface; - TRACE("(%p)->(ref=%ld)\n", This, This->ref); - return InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%ld)\n", This, refCount - 1); + + return refCount; } /*********************************************************************** * @@ -422,20 +425,16 @@ IPicture* iface) { OLEPictureImpl *This = (OLEPictureImpl *)iface; - ULONG ret; - TRACE("(%p)->(ref=%ld)\n", This, This->ref); + ULONG refCount = InterlockedDecrement(&This->ref); - /* - * Decrease the reference count on this object. - */ - ret = InterlockedDecrement(&This->ref); + TRACE("(%p)->(ref before=%ld)\n", This, refCount + 1); /* * If the reference count goes down to 0, perform suicide. */ - if (ret==0) OLEPictureImpl_Destroy(This); + if (!refCount) OLEPictureImpl_Destroy(This); - return ret; + return refCount; } _____ Modified: trunk/reactos/lib/oleaut32/regsvr.c --- trunk/reactos/lib/oleaut32/regsvr.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/regsvr.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -545,7 +545,358 @@ * interface list */ +/* FIXME: these interfaces should be defined in ocidl.idl */ + +static IID const IID_IFontEventsDisp = { + 0x4EF6100A, 0xAF88, 0x11D0, {0x98,0x46,0x00,0xC0,0x4F,0xC2,0x99,0x93} }; + +static IID const IID_IProvideMultipleClassInfo = { + 0xA7ABA9C1, 0x8983, 0x11CF, {0x8F,0x20,0x00,0x80,0x5F,0x2C,0xD0,0x64} }; + static struct regsvr_interface const interface_list[] = { + { &IID_IDispatch, + "IDispatch", + NULL, + 7, + &CLSID_PSDispatch, + &CLSID_PSDispatch + }, + { &IID_ITypeInfo, + "ITypeInfo", + NULL, + 22, + NULL, + &CLSID_PSTypeInfo + }, + { &IID_ITypeLib, + "ITypeLib", + NULL, + 13, + NULL, + &CLSID_PSTypeLib + }, + { &IID_ITypeComp, + "ITypeComp", + NULL, + 5, + NULL, + &CLSID_PSTypeComp + }, + { &IID_IEnumVARIANT, + "IEnumVARIANT", + NULL, + 15, + NULL, + &CLSID_PSEnumVariant + }, + { &IID_ICreateTypeInfo, + "ICreateTypeInfo", + NULL, + 26, + NULL, + NULL + }, + { &IID_ICreateTypeLib, + "ICreateTypeLib", + NULL, + 13, + NULL, + NULL + }, + { &IID_ITypeInfo2, + "ITypeInfo2", + NULL, + 32, + NULL, + &CLSID_PSDispatch + }, + { &IID_ITypeLib2, + "ITypeLib2", + NULL, + 16, + NULL, + &CLSID_PSDispatch + }, + { &IID_IPropertyPage2, + "IPropertyPage2", + NULL, + 15, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IErrorInfo, + "IErrorInfo", + NULL, + 8, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_ICreateErrorInfo, + "ICreateErrorInfo", + NULL, + 8, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPersistPropertyBag2, + "IPersistPropertyBag2", + NULL, + 8, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPropertyBag2, + "IPropertyBag2", + NULL, + 8, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IErrorLog, + "IErrorLog", + NULL, + 4, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPerPropertyBrowsing, + "IPerPropertyBrowsing", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPersistPropertyBag, + "IPersistPropertyBag", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IAdviseSinkEx, + "IAdviseSinkEx", + NULL, + 9, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IFontEventsDisp, + "IFontEventsDisp", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPropertyBag, + "IPropertyBag", + NULL, + 5, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPointerInactive, + "IPointerInactive", + NULL, + 6, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_ISimpleFrameSite, + "ISimpleFrameSite", + NULL, + 5, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPicture, + "IPicture", + NULL, + 17, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPictureDisp, + "IPictureDisp", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPersistStreamInit, + "IPersistStreamInit", + NULL, + 9, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IOleUndoUnit, + "IOleUndoUnit", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPropertyNotifySink, + "IPropertyNotifySink", + NULL, + 5, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IOleInPlaceSiteEx, + "IOleInPlaceSiteEx", + NULL, + 18, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IOleParentUndoUnit, + "IOleParentUndoUnit", + NULL, + 12, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IProvideClassInfo2, + "IProvideClassInfo2", + NULL, + 5, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IProvideMultipleClassInfo, + "IProvideMultipleClassInfo", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IProvideClassInfo, + "IProvideClassInfo", + NULL, + 4, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IConnectionPointContainer, + "IConnectionPointContainer", + NULL, + 5, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IEnumConnectionPoints, + "IEnumConnectionPoints", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IConnectionPoint, + "IConnectionPoint", + NULL, + 8, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IEnumConnections, + "IEnumConnections", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IOleControl, + "IOleControl", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IOleControlSite, + "IOleControlSite", + NULL, + 10, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_ISpecifyPropertyPages, + "ISpecifyPropertyPages", + NULL, + 4, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPropertyPageSite, + "IPropertyPageSite", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPropertyPage, + "IPropertyPage", + NULL, + 14, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IClassFactory2, + "IClassFactory2", + NULL, + 8, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IEnumOleUndoUnits, + "IEnumOleUndoUnits", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IPersistMemory, + "IPersistMemory", + NULL, + 9, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IFont, + "IFont", + NULL, + 27, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IFontDisp, + "IFontDisp", + NULL, + 7, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IQuickActivate, + "IQuickActivate", + NULL, + 6, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IOleUndoManager, + "IOleUndoManager", + NULL, + 15, + NULL, + &CLSID_PSFactoryBuffer + }, + { &IID_IObjectWithSite, + "IObjectWithSite", + NULL, + 5, + NULL, + &CLSID_PSFactoryBuffer + }, { NULL } /* list terminator */ }; _____ Modified: trunk/reactos/lib/oleaut32/safearray.c --- trunk/reactos/lib/oleaut32/safearray.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/safearray.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -1337,7 +1337,7 @@ TRACE("(%p)\n", psa); if(!psa) - return E_INVALIDARG; + return S_OK; if(psa->cLocks > 0) return DISP_E_ARRAYISLOCKED; _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-02-13 20:52:16 UTC (rev 13532) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-02-13 21:03:37 UTC (rev 13533) @@ -116,34 +116,50 @@ DWORD xsize; TRACE("...%s...\n",debugstr_guid(riid)); + *pUnk = NULL; hres = xbuf_get(buf,(LPBYTE)&xsize,sizeof(xsize)); - if (hres) return hres; + if (hres) { + ERR("xbuf_get failed\n"); + return hres; + } + if (xsize == 0) return S_OK; + hres = CreateStreamOnHGlobal(0,TRUE,&pStm); if (hres) { - FIXME("Stream create failed %lx\n",hres); + ERR("Stream create failed %lx\n",hres); return hres; } + hres = IStream_Write(pStm,buf->base+buf->curoff,xsize,&res); - if (hres) { FIXME("stream write %lx\n",hres); return hres; } + if (hres) { + ERR("stream write %lx\n",hres); + return hres; + } + memset(&seekto,0,sizeof(seekto)); hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); - if (hres) { FIXME("Failed Seek %lx\n",hres); return hres;} + if (hres) { + ERR("Failed Seek %lx\n",hres); + return hres; + } + hres = CoUnmarshalInterface(pStm,riid,(LPVOID*)pUnk); if (hres) { - FIXME("Marshalling interface %s failed with %lx\n",debugstr_guid(riid),hres); + ERR("Unmarshalling interface %s failed with %lx\n",debugstr_guid(riid),hres); return hres; } + IStream_Release(pStm); return xbuf_skip(buf,xsize); } static HRESULT _marshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN pUnk) { - LPUNKNOWN newiface; - LPBYTE tempbuf; - IStream *pStm; + LPUNKNOWN newiface = NULL; + LPBYTE tempbuf = NULL; + IStream *pStm = NULL; STATSTG ststg; ULARGE_INTEGER newpos; LARGE_INTEGER seekto; @@ -151,45 +167,67 @@ DWORD xsize; HRESULT hres; - hres = S_OK; - if (!pUnk) + hres = E_FAIL; + if (!pUnk) { + ERR("pUnk is NULL?\n"); goto fail; + } TRACE("...%s...\n",debugstr_guid(riid)); - hres=IUnknown_QueryInterface(pUnk,riid,(LPVOID*)&newiface); + hres = IUnknown_QueryInterface(pUnk,riid,(LPVOID*)&newiface); if (hres) { - TRACE("%p does not support iface %s\n",pUnk,debugstr_guid(riid)); + WARN("%p does not support iface %s\n",pUnk,debugstr_guid(riid)); goto fail; } + hres = CreateStreamOnHGlobal(0,TRUE,&pStm); if (hres) { - FIXME("Stream create failed %lx\n",hres); + ERR("Stream create failed %lx\n",hres); goto fail; } + hres = CoMarshalInterface(pStm,riid,newiface,0,NULL,0); - IUnknown_Release(newiface); if (hres) { - FIXME("Marshalling interface %s failed with %lx\n", - debugstr_guid(riid),hres - ); + ERR("Marshalling interface %s failed with %lx\n", debugstr_guid(riid), hres); goto fail; } + hres = IStream_Stat(pStm,&ststg,0); + if (hres) { + ERR("Stream stat failed\n"); + goto fail; + } + tempbuf = HeapAlloc(GetProcessHeap(), 0, ststg.cbSize.u.LowPart); memset(&seekto,0,sizeof(seekto)); hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); - if (hres) { FIXME("Failed Seek %lx\n",hres); goto fail;} + if (hres) { + ERR("Failed Seek %lx\n",hres); + goto fail; + } + hres = IStream_Read(pStm,tempbuf,ststg.cbSize.u.LowPart,&res); - if (hres) { FIXME("Failed Read %lx\n",hres); goto fail;} - IStream_Release(pStm); + if (hres) { + ERR("Failed Read %lx\n",hres); + goto fail; + } + xsize = ststg.cbSize.u.LowPart; xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); hres = xbuf_add(buf,tempbuf,ststg.cbSize.u.LowPart); + HeapFree(GetProcessHeap(),0,tempbuf); + IUnknown_Release(newiface); + IStream_Release(pStm); + return hres; + fail: xsize = 0; xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); + if (pStm) IUnknown_Release(pStm); + if (newiface) IUnknown_Release(newiface); + HeapFree(GetProcessHeap(), 0, tempbuf); return hres; } @@ -225,20 +263,20 @@ ); if (RegOpenKeyA(HKEY_CLASSES_ROOT,interfacekey,&ikey)) { - FIXME("No %s key found.\n",interfacekey); + ERR("No %s key found.\n",interfacekey); return E_FAIL; } type = (1<<REG_SZ); tlguidlen = sizeof(tlguid); if (RegQueryValueExA(ikey,NULL,NULL,&type,tlguid,&tlguidlen)) { - FIXME("Getting typelib guid failed.\n"); + ERR("Getting typelib guid failed.\n"); RegCloseKey(ikey); return E_FAIL; } type = (1<<REG_SZ); verlen = sizeof(ver); if (RegQueryValueExA(ikey,"Version",NULL,&type,ver,&verlen)) { - FIXME("Could not get version value?\n"); + ERR("Could not get version value?\n"); RegCloseKey(ikey); return E_FAIL; } @@ -246,7 +284,7 @@ sprintf(typelibkey,"Typelib\\%s\\%s\\0\\win32",tlguid,ver); tlfnlen = sizeof(tlfn); if (RegQueryValueA(HKEY_CLASSES_ROOT,typelibkey,tlfn,&tlfnlen)) { - FIXME("Could not get typelib fn?\n"); + ERR("Could not get typelib fn?\n"); return E_FAIL; } MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, -1); @@ -336,29 +374,29 @@ TMProxyImpl_AddRef(LPRPCPROXYBUFFER iface) { ICOM_THIS_MULTI(TMProxyImpl,lpvtbl2,iface); + ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("()\n"); + TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - return InterlockedIncrement(&This->ref); + return refCount; } static ULONG WINAPI TMProxyImpl_Release(LPRPCPROXYBUFFER iface) { - ULONG refs; ICOM_THIS_MULTI(TMProxyImpl,lpvtbl2,iface); + ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("()\n"); + TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); - refs = InterlockedDecrement(&This->ref); - if (!refs) + if (!refCount) { DeleteCriticalSection(&This->crit); if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf); VirtualFree(This->asmstubs, 0, MEM_RELEASE); CoTaskMemFree(This); } - return refs; + return refCount; } static HRESULT WINAPI @@ -551,7 +589,7 @@ hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); if (hres) { - FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->u.hreftype); + ERR("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->u.hreftype); return hres; } ITypeInfo_GetTypeAttr(tinfo2,&tattr); @@ -571,7 +609,7 @@ hres = ITypeInfo2_GetVarDesc(tinfo2, i, &vdesc); if (hres) { - FIXME("Could not get vardesc of %d\n",i); + ERR("Could not get vardesc of %d\n",i); return hres; } /* Need them for hack below */ @@ -816,7 +854,7 @@ case VT_UI1: if (readit) { hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD)); - if (hres) FIXME("Failed to read integer 4 byte\n"); + if (hres) ERR("Failed to read integer 4 byte\n"); } if (debugout) TRACE_(olerelay)("%lx",*arg); return hres; @@ -827,7 +865,7 @@ if (readit) { hres = xbuf_get(buf,(LPBYTE)&len,sizeof(DWORD)); if (hres) { - FIXME("failed to read bstr klen\n"); + ERR("failed to read bstr klen\n"); return hres; } if (len == -1) { @@ -837,7 +875,7 @@ str = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,len+sizeof(WCHAR)); hres = xbuf_get(buf,(LPBYTE)str,len); if (hres) { - FIXME("Failed to read BSTR.\n"); + ERR("Failed to read BSTR.\n"); return hres; } *arg = (DWORD)SysAllocStringLen(str,len); @@ -858,7 +896,7 @@ if (readit) { hres = xbuf_get(buf,(LPBYTE)&cookie,sizeof(cookie)); if (hres) { - FIXME("Failed to load pointer cookie.\n"); + ERR("Failed to load pointer cookie.\n"); return hres; } if (cookie != 0x42424242) { @@ -903,12 +941,12 @@ hres = ITypeInfo_GetRefTypeInfo(tinfo,tdesc->u.hreftype,&tinfo2); if (hres) { - FIXME("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->u.hreftype); + ERR("Could not get typeinfo of hreftype %lx for VT_USERDEFINED.\n",tdesc->u.hreftype); return hres; } hres = ITypeInfo_GetTypeAttr(tinfo2,&tattr); if (hres) { - FIXME("Could not get typeattr in VT_USERDEFINED.\n"); + ERR("Could not get typeattr in VT_USERDEFINED.\n"); } else { if (alloc) *arg = (DWORD)HeapAlloc(GetProcessHeap(),0,tattr->cbSizeInstance); @@ -927,7 +965,7 @@ hres = ITypeInfo2_GetVarDesc(tinfo2, i, &vdesc); if (hres) { - FIXME("Could not get vardesc of %d\n",i); + ERR("Could not get vardesc of %d\n",i); return hres; } hres = deserialize_param( @@ -953,7 +991,7 @@ } } if (hres) - FIXME("failed to stuballoc in TKIND_RECORD.\n"); + ERR("failed to stuballoc in TKIND_RECORD.\n"); ITypeInfo_Release(tinfo2); return hres; } @@ -1126,26 +1164,26 @@ hres = ITypeInfo_GetTypeAttr(tinfo, &attr); if (hres) { - FIXME("GetTypeAttr failed with %lx\n",hres); + ERR("GetTypeAttr failed with %lx\n",hres); return hres; } /* Not found, so look in inherited ifaces. */ for (j=0;j<attr->cImplTypes;j++) { hres = ITypeInfo_GetRefTypeOfImplType(tinfo, j, &href); if (hres) { - FIXME("Did not find a reftype for interface offset %d?\n",j); + ERR("Did not find a reftype for interface offset %d?\n",j); break; } hres = ITypeInfo_GetRefTypeInfo(tinfo, href, &tinfo2); if (hres) { - FIXME("Did not find a typeinfo for reftype %ld?\n",href); + ERR("Did not find a typeinfo for reftype %ld?\n",href); continue; } hres = _get_funcdesc(tinfo2,iMethod,fdesc,iname,fname); ITypeInfo_Release(tinfo2); if (!hres) return S_OK; } - return E_FAIL; + return hres; } if (((*fdesc)->oVft/4) == iMethod) { if (fname) @@ -1273,7 +1311,7 @@ ); if (hres) { - FIXME("Failed to serialize param, hres %lx\n",hres); + ERR("Failed to serialize param, hres %lx\n",hres); break; } xargs+=_argsize(elem->tdesc.vt); @@ -1285,7 +1323,7 @@ msg.iMethod = method; hres = IRpcChannelBuffer_GetBuffer(tpinfo->chanbuf,&msg,&(tpinfo->iid)); if (hres) { - FIXME("RpcChannelBuffer GetBuffer failed, %lx\n",hres); + ERR("RpcChannelBuffer GetBuffer failed, %lx\n",hres); LeaveCriticalSection(&tpinfo->crit); return hres; } @@ -1293,7 +1331,7 @@ if (relaydeb) TRACE_(olerelay)("\n"); hres = IRpcChannelBuffer_SendReceive(tpinfo->chanbuf,&msg,&status); if (hres) { - FIXME("RpcChannelBuffer SendReceive failed, %lx\n",hres); + ERR("RpcChannelBuffer SendReceive failed, %lx\n",hres); LeaveCriticalSection(&tpinfo->crit); return hres; } @@ -1343,7 +1381,7 @@ &buf ); if (hres) { - FIXME("Failed to deserialize DISPPARAM*, hres %lx\n",hres); + ERR("Failed to deserialize DISPPARAM*, hres %lx\n",hres); break; } isdeserialized = TRUE; @@ -1373,7 +1411,8 @@ &buf ); if (hres) { - FIXME("Failed to unmarshall param, hres %lx\n",hres); + ERR("Failed to unmarshall param, hres %lx\n",hres); + status = hres; break; } xargs += _argsize(elem->tdesc.vt); @@ -1401,7 +1440,7 @@ TRACE("(...%s...)\n",debugstr_guid(riid)); hres = _get_typeinfo_for_iid(riid,&tinfo); if (hres) { - FIXME("No typeinfo for %s?\n",debugstr_guid(riid)); + ERR("No typeinfo for %s?\n",debugstr_guid(riid)); return hres; [truncated at 1000 lines; 236 more skipped]

1 0

[gvg] 13532: Sync to Wine-20050211
by gvg＠svn.reactos.com 13 Feb '05

13 Feb '05

Sync to Wine-20050211 Robert Shearman <rob(a)codeweavers.com> - Add documentation for most Co* functions. - Move several functions into different files to group them with similar functions. - Implement CoDisconnectObject. - Change CoLockObjectExternal so that it does the correct action now and eliminate a fair few lines of now redundant code. - Rename OLE32_Dll{Register,Unregister}Server to Dll{Register,Unregister}Server. - Move OLE automation interface registration to oleaut32. - Add IRemUnknown to list of interfaces to register. - Make proxy manager use IMultiQI instead of IInternalUnknown as tests show that IInternalUnknown isn't exposed. - Implement IMultiQI on top of IRemUnknown calls. - Silence some fixmes that occur during tests and don't give us any useful information. - Fix typo in class factory proxy that caused us to use the wrong offset into the CFProxy structure, causing us to not call the outer_unknown properly. - Use InterlockedIncrement for the ipid counter instead of a critical section (suggested by Mike Hearn). - Remove a line added by a bad merge. - Implement RemUnkStub_Disconnect. - Remove all of the RPC disconnect code. - Implement IRemUnknown. - Use IRemUnknown for life-cycle management instead of the current hacks. - Generate machine-local IPIDs. - Make pipes be uniquely identified only by their IPID. - Implement table marshaling. - The apartment reference should be held while the stub manager reference is held. - Fix same apartment-unmarshal detection. - Proxies/stubs for IRemUnknown methods, based on code written by Ove Ksven. - Initialize ppv pointer in ClientIdentity_QueryInterface to NULL as apps depend on this. - Don't release IRpcProxyBuffer on ifproxy destruction - the caller will do this for us. - Make find_proxy_manager add a reference to the proxy manager and make proxy_manager_construct return an object with a valid ref-count. - Remove stray not operator to fix a memory leak / crash in proxy_manager_destroy. - More debug messages, especially on errors. - Fix ref-count leak in the Class Factory proxy. - Add a test case for IClassFactory_CreateInstance. - Split up apartment creation so that the long code paths that don't need locking no longer have locking. - Add special cases for the threads that join apartments but can't increase the refcount of the apartment. - Free TLS storage on thread destruction (including releasing the apartment the thread is in, if any, and so making another test pass). - More tests. - Change return code of CoGetPSClsid to match test result. - Do a slight hack to make IRemUnknown proxies be added after the proxy that uses them to stop them being used after they are destroyed. - Fix multiple local server connections. - The apartment reference should be held while the stub manager reference is held. - Fix same apartment-unmarshal detection. - Don't use the pipe caching code because it doesn't work correctly at the moment. - Always write disconnect reply packet, even in failure cases. - Move object-to-stub-manager mapping rule to register_ifstub. - Pass the original IID to IMarshal_UnmarshalInterface and query for the requested interface. - Unmarshaling IID_NULL means use the IID the interface was originally marshaled with. - Add code for destroying the thread-local storage data, but don't use it yet. - Don't release apartment on changing modes because we didn't add a reference anywhere. - Quieten the RPC_E_DISCONNECTED error message as it is an expected return code. - Treat IID_NULL the same as IID_IUnknown. - Make tests compile on Win95 again. - Fix copy+paste error where the test failure should be from the CoUnmarshalInterface function. - Give IUnknown its own ifstub to fix ref-counting and ipid storage issues. - Add a new flag SORFP_NOLIFETIMEMGMT to tell the proxy manager not to call any IRemUnknown functions. - Move the low-level unmarshaling code into a new function, unmarshal_object, so that it can be easily reused for unmarshaling IRemUnknown. - Consolidate more stub creation details into register_ifstub. - Replace the current wine_marshal_id structure with STDOBJREF for the on-the-wire format. - Initialize clsid member to the marshaler clsid to fix custom marshaling. - Make proxy shutdown test succeed by releasing the channel on disconnect. - Remove wine_marshal_data: it is unneeded and there is no equivalent in STDOBJREF. - Remove obsolete structs, rearrange things to group the structs together and to group similar functions. - Document thread-safety of members of structs. - Document CoSetState & CoGetState. - Rewrite them to only retrieve TLS info once. - Remove trailing whitespace in COM_CurrentInfo. - Release the client security objects when no longer needed (reported by Mike McCormack). - Implement CoSetProxyBlanket, CoQueryProxyBlanket and CoCopyProxy. - Update todo list. - Destroy stubs on apartment shutdown. - Make MTA dynamically allocated so that proxies and other resources are freed at the proper time. - Changed/removed some incorrect comments regarding apartments. Mike Hearn <mh(a)codeweavers.com> - Various formatting/style changes. - Force context switch on chanbuf disconnect to avoid a race in the test suite. Mike Hearn <mh(a)codeweavers.com> Robert Shearman <rob(a)codeweavers.com> - Rework RPC dispatch layer to be simpler and not get confused by server/client duality. - Make threads shut down at the right time and not access freed memory after apartment destruction. - Rename stub_dispatch_thread to client_dispatch_thread. - Add some more tracing - Check return value of WaitNamedPipe. - Change named pipe timeouts to 0.5s, which should be enough for even the slowest machines. Christian Costa <titan.costa(a)wanadoo.fr> - CoInitialize(Ex) should return S_FALSE when COM is already initialized for the current thread. Modified: trunk/reactos/include/wine/list.h Modified: trunk/reactos/include/wine/objidl.h Modified: trunk/reactos/lib/ole32/compobj.c Modified: trunk/reactos/lib/ole32/compobj_private.h Modified: trunk/reactos/lib/ole32/ifs.c Modified: trunk/reactos/lib/ole32/marshal.c Modified: trunk/reactos/lib/ole32/ole2.c Modified: trunk/reactos/lib/ole32/ole2stubs.c Modified: trunk/reactos/lib/ole32/ole32.spec Modified: trunk/reactos/lib/ole32/ole32_main.c Modified: trunk/reactos/lib/ole32/ole32_main.h Modified: trunk/reactos/lib/ole32/oleproxy.c Modified: trunk/reactos/lib/ole32/regsvr.c Modified: trunk/reactos/lib/ole32/rpc.c Modified: trunk/reactos/lib/ole32/stubmanager.c Modified: trunk/reactos/w32api/include/winerror.h Modified: trunk/reactos/w32api/include/wtypes.h _____ Modified: trunk/reactos/include/wine/list.h --- trunk/reactos/include/wine/list.h 2005-02-13 17:25:52 UTC (rev 13531) +++ trunk/reactos/include/wine/list.h 2005-02-13 20:52:16 UTC (rev 13532) @@ -143,6 +143,18 @@ #define LIST_FOR_EACH(cursor,list) \ for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next) +/* iterate through the list, with safety against removal */ +#define LIST_FOR_EACH_SAFE(cursor, cursor2, list) \ + for ((cursor) = (list)->next, (cursor2) = (cursor)->next; \ + (cursor) != (list); \ + (cursor) = (cursor2), (cursor2) = (cursor)->next) + +/* iterate through the list using a list entry */ +#define LIST_FOR_EACH_ENTRY(elem, list, type, field) \ + for ((elem) = LIST_ENTRY((list)->next, type, field); \ + &(elem)->field != (list); \ + (elem) = LIST_ENTRY((elem)->field.next, type, field)) + /* macros for statically initialized lists */ #define LIST_INIT(list) { &(list), &(list) } _____ Modified: trunk/reactos/include/wine/objidl.h --- trunk/reactos/include/wine/objidl.h 2005-02-13 17:25:52 UTC (rev 13531) +++ trunk/reactos/include/wine/objidl.h 2005-02-13 20:52:16 UTC (rev 13532) @@ -984,6 +984,17 @@ }; #undef INTERFACE +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IClientSecurity_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IClientSecurity_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IClientSecurity_Release(p) (p)->lpVtbl->Release(p) +/*** IClientSecurity methods ***/ +#define IClientSecurity_QueryBlanket(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->QueryBlanket(p,a,b,c,d,e,f,g,h) +#define IClientSecurity_SetBlanket(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->SetBlanket(p,a,b,c,d,e,f,g,h) +#define IClientSecurity_CopyProxy(p,a,b) (p)->lpVtbl->CopyProxy(p,a,b) +#endif + EXTERN_C const IID IID_IServerSecurity; #define INTERFACE IServerSecurity DECLARE_INTERFACE_(IServerSecurity,IUnknown) @@ -2005,5 +2016,78 @@ #endif /* __IInternalUnknown_INTERFACE_DEFINED__ */ +#ifndef __IMultiQI_FWD_DEFINED__ +#define __IMultiQI_FWD_DEFINED__ +typedef struct IMultiQI IMultiQI; +#endif +typedef IMultiQI *LPMULTIQI; + +/********************************************************************** ******* + * IMultiQI interface + */ +#ifndef __IMultiQI_INTERFACE_DEFINED__ +#define __IMultiQI_INTERFACE_DEFINED__ + +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IMultiQI : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE QueryMultipleInterfaces( + ULONG cMQIs, + MULTI_QI* pMQIs) = 0; + +}; +#else +typedef struct IMultiQIVtbl IMultiQIVtbl; +struct IMultiQI { + const IMultiQIVtbl* lpVtbl; +}; +struct IMultiQIVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMultiQI* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMultiQI* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMultiQI* This); + + /*** IMultiQI methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryMultipleInterfaces)( + IMultiQI* This, + ULONG cMQIs, + MULTI_QI* pMQIs); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IMultiQI_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IMultiQI_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IMultiQI_Release(p) (p)->lpVtbl->Release(p) +/*** IMultiQI methods ***/ +#define IMultiQI_QueryMultipleInterfaces(p,a,b) (p)->lpVtbl->QueryMultipleInterfaces(p,a,b) +#endif + +#endif + +HRESULT CALLBACK IMultiQI_QueryMultipleInterfaces_Proxy( + IMultiQI* This, + ULONG cMQIs, + MULTI_QI* pMQIs); +void __RPC_STUB IMultiQI_QueryMultipleInterfaces_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IMultiQI_INTERFACE_DEFINED__ */ + + #endif /* __WINE_OBJIDL_H */ _____ Modified: trunk/reactos/lib/ole32/compobj.c --- trunk/reactos/lib/ole32/compobj.c 2005-02-13 17:25:52 UTC (rev 13531) +++ trunk/reactos/lib/ole32/compobj.c 2005-02-13 20:52:16 UTC (rev 13532) @@ -28,37 +28,19 @@ * * TODO list: (items bunched together depend on each other) * - * - Switch wine_marshal_id to use IPIDs not IIDs - * - Once that's done, replace wine_marshal_id with STDOBJREF - * - * - Rewrite the CoLockObjectExternal code, it does totally the wrong - * thing currently (should be controlling the stub manager) - * - * - Make the MTA dynamically allocated and refcounted - * - Free the ReservedForOle data in DllMain(THREAD_DETACH) - * * - Implement the service control manager (in rpcss) to keep track * of registered class objects: ISCM::ServerRegisterClsid et al * - Implement the OXID resolver so we don't need magic pipe names for * clients and servers to meet up * - Flip our marshalling on top of the RPC runtime transport API, * so we no longer use named pipes to communicate - * - Rework threading so re-entrant calls don't need to be sent on - * the incoming pipe * - Implement RPC thread affinity (should fix InstallShield painting * problems) * - * - Implement IRemUnknown and marshalling for it, then use that for - * reffing/unreffing the stub manager from a proxy instead of our - * current hack of simply reffing the stub manager once when it's - * registered. - * - Implement table marshalling, then use it to let us do the final - * rework of the threading + * - Make all ole interface marshaling use NDR to be wire compatible with + * native DCOM + * - Use & interpret ORPCTHIS & ORPCTHAT. * - * - Make our custom marshalling use NDR to be wire compatible with - * native DCOM - * - * */ #include "config.h" @@ -102,12 +84,11 @@ static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); static void COM_RevokeAllClasses(void); -static void COM_ExternalLockFreeList(void); const CLSID CLSID_StdGlobalInterfaceTable = { 0x00000323, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; -APARTMENT MTA; -static struct list apts = LIST_INIT( apts ); +APARTMENT *MTA; /* protected by csApartment */ +static struct list apts = LIST_INIT( apts ); /* protected by csApartment */ static CRITICAL_SECTION csApartment; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -213,89 +194,108 @@ UnregisterClassA(aptWinClass, OLE32_hInstance); } +void COM_TlsDestroy() +{ + struct oletls *info = NtCurrentTeb()->ReservedForOle; + if (info) + { + if (info->apt) COM_ApartmentRelease(info->apt); + if (info->errorinfo) IErrorInfo_Release(info->errorinfo); + if (info->state) IUnknown_Release(info->state); + HeapFree(GetProcessHeap(), 0, info); + NtCurrentTeb()->ReservedForOle = NULL; + } +} + /*********************************************************************** ******* * Manage apartments. */ - -/* The multi-threaded apartment (MTA) contains zero or more threads interacting - with free threaded (ie thread safe) COM objects. There is only ever one MTA - in a process - you can enter it by calling CoInitializeEx(COINIT_MULTITHREADED) - */ -static void COM_InitMTA(void) +/* allocates memory and fills in the necessary fields for a new apartment + * object */ +static APARTMENT *apartment_construct(DWORD model) { - /* OXIDs are object exporter IDs. Each apartment has an OXID, which is unique - within a network. That is, two different MTAs on different machines will have - different OXIDs. + APARTMENT *apt; - This method of generating an OXID is therefore wrong as it doesn't work across - a network, but for local RPC only it's OK. We can distinguish between MTAs and - STAs because STAs use the thread ID as well, and no thread can have an ID of zero. + TRACE("creating new apartment, model=%ld\n", model); - The algorithm Microsoft use is currently unknown. - */ - MTA.oxid = ((OXID)GetCurrentProcessId() << 32); - InitializeCriticalSection(&MTA.cs); -} + apt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*apt)); + apt->tid = GetCurrentThreadId(); + DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), + GetCurrentProcess(), &apt->thread, + THREAD_ALL_ACCESS, FALSE, 0); -static void COM_UninitMTA(void) -{ - DeleteCriticalSection(&MTA.cs); - MTA.oxid = 0; + list_init(&apt->proxies); + list_init(&apt->stubmgrs); + apt->ipidc = 0; + apt->refs = 1; + apt->remunk_exported = FALSE; + apt->oidc = 1; + InitializeCriticalSection(&apt->cs); + + apt->model = model; + + if (model & COINIT_APARTMENTTHREADED) + { + /* FIXME: should be randomly generated by in an RPC call to rpcss */ + apt->oxid = ((OXID)GetCurrentProcessId() << 32) | GetCurrentThreadId(); + apt->win = CreateWindowA(aptWinClass, NULL, 0, + 0, 0, 0, 0, + 0, 0, OLE32_hInstance, NULL); + } + else + { + /* FIXME: should be randomly generated by in an RPC call to rpcss */ + apt->oxid = ((OXID)GetCurrentProcessId() << 32) | 0xcafe; + } + + apt->shutdown_event = CreateEventW(NULL, TRUE, FALSE, NULL); + + 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; } - -/* creates an apartment structure which stores OLE thread-local - * information. Call with COINIT_UNINITIALIZED to create an apartment - * that will be initialized with a model later. Note: do not call - * with COINIT_UNINITIALIZED if the apartment has already been initialized - * with a different COINIT value */ -APARTMENT* COM_CreateApartment(DWORD model) +/* gets and existing apartment if one exists or otherwise creates an apartment + * structure which stores OLE apartment-local information and stores a pointer + * to it in the thread-local storage */ +static APARTMENT *get_or_create_apartment(DWORD model) { APARTMENT *apt = COM_CurrentApt(); if (!apt) { - if (!(model & COINIT_APARTMENTTHREADED)) /* See note 1 above */ + if (model & COINIT_APARTMENTTHREADED) { - TRACE("thread 0x%lx is entering the multithreaded apartment\n", GetCurrentThreadId()); - COM_CurrentInfo()->apt = &MTA; - return COM_CurrentInfo()->apt; + apt = apartment_construct(model); + COM_CurrentInfo()->apt = apt; } + else + { + EnterCriticalSection(&csApartment); - TRACE("creating new apartment, model=%ld\n", model); + /* The multi-threaded apartment (MTA) contains zero or more threads interacting + * with free threaded (ie thread safe) COM objects. There is only ever one MTA + * in a process */ + if (MTA) + { + TRACE("entering the multithreaded apartment %s\n", wine_dbgstr_longlong(MTA->oxid)); + COM_ApartmentAddRef(MTA); + } + else + MTA = apartment_construct(model); - apt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APARTMENT)); - apt->tid = GetCurrentThreadId(); - DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), - GetCurrentProcess(), &apt->thread, - THREAD_ALL_ACCESS, FALSE, 0); + apt = MTA; + COM_CurrentInfo()->apt = apt; - list_init(&apt->proxies); - list_init(&apt->stubmgrs); - apt->oidc = 1; - apt->refs = 1; - InitializeCriticalSection(&apt->cs); - - apt->model = model; - - /* we don't ref the apartment as CoInitializeEx will do it for us */ - - if (model & COINIT_APARTMENTTHREADED) - { - /* FIXME: how does windoze create OXIDs? */ - apt->oxid = MTA.oxid | GetCurrentThreadId(); - TRACE("Created apartment on OXID %s\n", wine_dbgstr_longlong(apt->oxid)); - apt->win = CreateWindowA(aptWinClass, NULL, 0, - 0, 0, 0, 0, - 0, 0, OLE32_hInstance, NULL); + LeaveCriticalSection(&csApartment); } - - EnterCriticalSection(&csApartment); - list_add_head(&apts, &apt->entry); - LeaveCriticalSection(&csApartment); - - COM_CurrentInfo()->apt = apt; } return apt; @@ -303,39 +303,61 @@ DWORD COM_ApartmentAddRef(struct apartment *apt) { - return InterlockedIncrement(&apt->refs); + DWORD refs = InterlockedIncrement(&apt->refs); + TRACE("%s: before = %ld\n", wine_dbgstr_longlong(apt->oxid), refs - 1); + return refs; } DWORD COM_ApartmentRelease(struct apartment *apt) { DWORD ret; + EnterCriticalSection(&csApartment); + ret = InterlockedDecrement(&apt->refs); + TRACE("%s: after = %ld\n", wine_dbgstr_longlong(apt->oxid), ret); + /* destruction stuff that needs to happen under csApartment CS */ if (ret == 0) { + if (apt == MTA) MTA = NULL; + list_remove(&apt->entry); + } + + LeaveCriticalSection(&csApartment); + + if (ret == 0) + { + struct list *cursor, *cursor2; + TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); - EnterCriticalSection(&csApartment); - list_remove(&apt->entry); - LeaveCriticalSection(&csApartment); - MARSHAL_Disconnect_Proxies(apt); if (apt->win) DestroyWindow(apt->win); - if (!list_empty(&apt->stubmgrs)) + LIST_FOR_EACH_SAFE(cursor, cursor2, &apt->stubmgrs) { - FIXME("Destroy outstanding stubs\n"); + struct stub_manager *stubmgr = LIST_ENTRY(cursor, struct stub_manager, entry); + /* release the implicit reference given by the fact that the + * stub has external references (it must do since it is in the + * stub manager list in the apartment and all non-apartment users + * must have a ref on the apartment and so it cannot be destroyed). + */ + stub_manager_int_release(stubmgr); } + /* if this assert fires, then another thread took a reference to a + * stub manager without taking a reference to the containing + * apartment, which it must do. */ + assert(list_empty(&apt->stubmgrs)); + if (apt->filter) IUnknown_Release(apt->filter); - DeleteCriticalSection(&apt->cs); + SetEvent(apt->shutdown_event); + CloseHandle(apt->shutdown_event); CloseHandle(apt->thread); HeapFree(GetProcessHeap(), 0, apt); - - apt = NULL; } return ret; @@ -369,6 +391,30 @@ return result; } +/* gets the apartment which has a given creator thread ID. The caller must + * release the reference from the apartment as soon as the apartment pointer + * is no longer required. */ +APARTMENT *COM_ApartmentFromTID(DWORD tid) +{ + APARTMENT *result = NULL; + struct list *cursor; + + EnterCriticalSection(&csApartment); + LIST_FOR_EACH( cursor, &apts ) + { + struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); + if (apt->tid == tid) + { + result = apt; + COM_ApartmentAddRef(result); + break; + } + } + LeaveCriticalSection(&csApartment); + + return result; +} + HWND COM_GetApartmentWin(OXID oxid, BOOL ref) { APARTMENT *apt; @@ -461,9 +507,13 @@ } /*********************************************************************** ******* + * CoBuildVersion [OLE32.@] * CoBuildVersion [COMPOBJ.1] - * CoBuildVersion [OLE32.@] * + * Gets the build version of the DLL. + * + * PARAMS + * * RETURNS * Current build version, hiword is majornumber, loword is minornumber */ @@ -479,13 +529,17 @@ * Initializes the COM libraries by calling CoInitializeEx with * COINIT_APARTMENTTHREADED, ie it enters a STA thread. * + * PARAMS + * lpReserved [I] Pointer to IMalloc interface (obsolete, should be NULL). + * + * RETURNS + * Success: S_OK if not already initialized, S_FALSE otherwise. + * Failure: HRESULT code. + * * SEE ALSO * CoInitializeEx */ -HRESULT WINAPI CoInitialize( - LPVOID lpReserved /* [in] pointer to win32 malloc interface - (obsolete, should be NULL) */ -) +HRESULT WINAPI CoInitialize(LPVOID lpReserved) { /* * Just delegate to the newer method. @@ -496,13 +550,11 @@ /*********************************************************************** ******* * CoInitializeEx [OLE32.@] * - * Initializes the COM libraries. The behavior used to set the win32 - * IMalloc used for memory management is obsolete. If - * COINIT_APARTMENTTHREADED is specified this thread enters a new STA - * (single threaded apartment), otherwise COINIT_MULTITHREADED should - * be specified which indicates that the thread will enter the MTA. + * Initializes the COM libraries. * - * Currently STA threading is only partly implemented. + * PARAMS + * lpReserved [I] Pointer to IMalloc interface (obsolete, should be NULL). + * dwCoInit [I] One or more flags from the COINIT enumeration. See notes. * * RETURNS * S_OK if successful, @@ -510,13 +562,22 @@ * RPC_E_CHANGED_MODE if a previous call to CoInitializeEx specified another * threading model. * + * NOTES + * + * The behavior used to set the IMalloc used for memory management is + * obsolete. + * The dwCoInit parameter must specify of of the following apartment + * threading models: + *| COINIT_APARTMENTTHREADED - A single-threaded apartment (STA). + *| COINIT_MULTITHREADED - A multi-threaded apartment (MTA). + * The parameter may also specify zero or more of the following flags: + *| COINIT_DISABLE_OLE1DDE - Don't use DDE for OLE1 support. + *| COINIT_SPEED_OVER_MEMORY - Trade memory for speed. + * * SEE ALSO * CoUninitialize */ -HRESULT WINAPI CoInitializeEx( - LPVOID lpReserved, /* [in] pointer to win32 malloc interface (obsolete, should be NULL) */ - DWORD dwCoInit /* [in] A value from COINIT specifies the threading model */ -) +HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { HRESULT hr = S_OK; APARTMENT *apt; @@ -541,15 +602,13 @@ */ TRACE("() - Initializing the COM libraries\n"); - COM_InitMTA(); - /* we may need to defer this until after apartment initialisation */ RunningObjectTableImpl_Initialize(); } if (!(apt = COM_CurrentInfo()->apt)) { - apt = COM_CreateApartment(dwCoInit); + apt = get_or_create_apartment(dwCoInit); if (!apt) return E_OUTOFMEMORY; } else if (dwCoInit != apt->model) @@ -557,9 +616,10 @@ /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine code then we are probably using the wrong threading model to implement that API. */ ERR("Attempt to change threading model of this apartment from 0x%lx to 0x%lx\n", apt->model, dwCoInit); - COM_ApartmentRelease(apt); return RPC_E_CHANGED_MODE; } + else + hr = S_FALSE; COM_CurrentInfo()->inits++; @@ -594,16 +654,16 @@ /*********************************************************************** * CoUninitialize [OLE32.@] * - * This method will decrement the refcount on the COM libraries, - * potentially unloading them. The current thread leaves the apartment - * it's currently in. If not in an apartment, the routine does - * nothing. + * This method will decrement the refcount on the current apartment, freeing + * the resources associated with it if it is the last thread in the apartment. + * If the last apartment is freed, the function will additionally release + * any COM resources associated with the process. * - * If COM is to be shut down, any outstanding proxies are - * disconnected, all registered class objects are unregistered and the - * message queue for the thread is flushed (if native does - * this or not is unknown). + * PARAMS * + * RETURNS + * Nothing. + * * SEE ALSO * CoInitializeEx */ @@ -648,13 +708,8 @@ /* This will free the loaded COM Dlls */ CoFreeAllLibraries(); - /* This will free list of external references to COM objects */ - COM_ExternalLockFreeList(); - /* This ensures we deal with any pending RPCs */ COM_FlushMessageQueue(); - - COM_UninitMTA(); } else if (lCOMRefCnt<1) { ERR( "CoUninitialize() - not CoInitialized.\n" ); @@ -663,8 +718,8 @@ } /*********************************************************************** ******* + * CoDisconnectObject [OLE32.@] * CoDisconnectObject [COMPOBJ.15] - * CoDisconnectObject [OLE32.@] * * Disconnects all connections to this object from remote processes. Dispatches * pending RPCs while blocking new RPCs from occurring, and then calls @@ -672,25 +727,65 @@ * * Typically called when the object server is forced to shut down, for instance by * the user. + * + * PARAMS + * lpUnk [I] The object whose stub should be disconnected. + * reserved [I] Reserved. Should be set to 0. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * SEE ALSO + * CoMarshalInterface, CoReleaseMarshalData, CoLockObjectExternal */ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) { - FIXME("(%p, %lx): stub - probably harmless\n",lpUnk,reserved); + HRESULT hr; + IMarshal *marshal; + APARTMENT *apt; + + TRACE("(%p, 0x%08lx)\n", lpUnk, reserved); + + hr = IUnknown_QueryInterface(lpUnk, &IID_IMarshal, (void **)&marshal); + if (hr == S_OK) + { + hr = IMarshal_DisconnectObject(marshal, reserved); + IMarshal_Release(marshal); + return hr; + } + + apt = COM_CurrentApt(); + if (!apt) + return CO_E_NOTINITIALIZED; + + apartment_disconnect_object(apt, lpUnk); + + /* Note: native is pretty broken here because it just silently + * fails, without returning an appropriate error code if the object was + * not found, making apps think that the object was disconnected, when + * it actually wasn't */ + return S_OK; } /*********************************************************************** ******* - * CoCreateGuid[OLE32.@] + * CoCreateGuid [OLE32.@] * * Simply forwards to UuidCreate in RPCRT4. * + * PARAMS + * pguid [O] Points to the GUID to initialize. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * * SEE ALSO * UuidCreate - * */ -HRESULT WINAPI CoCreateGuid( - GUID *pguid /* [out] points to the GUID to initialize */ -) { +HRESULT WINAPI CoCreateGuid(GUID *pguid) +{ return UuidCreate(pguid); } @@ -701,17 +796,24 @@ * Converts a unique identifier from its string representation into * the GUID struct. * + * PARAMS + * idstr [I] The string representation of the GUID. + * id [O] GUID converted from the string. + * + * RETURNS + * S_OK on success + * CO_E_CLASSSTRING if idstr is not a valid CLSID + * + * BUGS + * * In Windows, if idstr is not a valid CLSID string then it gets * treated as a ProgID. Wine currently doesn't do this. If idstr is * NULL it's treated as an all-zero GUID. * - * RETURNS - * S_OK on success - * CO_E_CLASSSTRING if idstr is not a valid CLSID + * SEE ALSO + * StringFromCLSID */ -HRESULT WINAPI __CLSIDFromStringA( - LPCSTR idstr, /* [in] string representation of guid */ - CLSID *id) /* [out] GUID converted from string */ +HRESULT WINAPI __CLSIDFromStringA(LPCSTR idstr, CLSID *id) { const BYTE *s = (const BYTE *) idstr; int i; @@ -771,9 +873,7 @@ /*********************************************************************** ******/ -HRESULT WINAPI CLSIDFromString( - LPOLESTR idstr, /* [in] string representation of GUID */ - CLSID *id ) /* [out] GUID represented by above string */ +HRESULT WINAPI CLSIDFromString(LPOLESTR idstr, CLSID *id ) { char xid[40]; HRESULT ret; @@ -831,14 +931,19 @@ * Converts a GUID into the respective string representation. * The target string is allocated using the OLE IMalloc. * + * PARAMS + * id [I] the GUID to be converted. + * idstr [O] A pointer to a to-be-allocated pointer pointing to the resulting string. + * * RETURNS * S_OK * E_FAIL + * + * SEE ALSO + * StringFromGUID2, CLSIDFromString */ -HRESULT WINAPI StringFromCLSID( - REFCLSID id, /* [in] the GUID to be converted */ - LPOLESTR *idstr /* [out] a pointer to a to-be-allocated pointer pointing to the resulting string */ -) { +HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) +{ char buf[80]; HRESULT ret; LPMALLOC mllc; @@ -856,19 +961,22 @@ } /*********************************************************************** ******* + * StringFromGUID2 [OLE32.@] * StringFromGUID2 [COMPOBJ.76] - * StringFromGUID2 [OLE32.@] * * Modified version of StringFromCLSID that allows you to specify max * buffer size. * + * PARAMS + * id [I] GUID to convert to string. + * str [O] Buffer where the result will be stored. + * cmax [I] Size of the buffer in characters. + * * RETURNS - * The length of the resulting string, 0 if there was any problem. + * Success: The length of the resulting string in characters. + * Failure: 0. */ -INT WINAPI StringFromGUID2( - REFGUID id, /* [in] GUID to convert to string */ - LPOLESTR str, /* [out] Unicode buffer to hold result */ - INT cmax) +INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) { char xguid[80]; @@ -880,18 +988,18 @@ /*********************************************************************** ******* * ProgIDFromCLSID [OLE32.@] * - * Converts a class id into the respective Program ID. (By using a - * registry lookup) + * Converts a class id into the respective program ID. * + * PARAMS + * clsid [I] Class ID, as found in registry. + * lplpszProgID [O] Associated ProgID. + * * RETURNS * S_OK * E_OUTOFMEMORY * REGDB_E_CLASSNOTREG if the given clsid has no associated ProgID */ -HRESULT WINAPI ProgIDFromCLSID( - REFCLSID clsid, /* [in] class id as found in registry */ - LPOLESTR *lplpszProgID/* [out] associated Prog ID */ -) +HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID) { char strCLSID[50], *buf, *buf2; DWORD buf2len; @@ -959,18 +1067,20 @@ } /*********************************************************************** ******* + * CLSIDFromProgID [OLE32.@] * CLSIDFromProgID [COMPOBJ.61] * - * Converts a program id into the respective GUID. (By using a - * registry lookup) + * Converts a program id into the respective GUID. * + * PARAMS + * progid [I] Unicode program ID, as found in registry. + * riid [O] Associated CLSID. + * * RETURNS - * S_OK - * CO_E_CLASSSTRING if the given ProgID cannot be found + * Success: S_OK + * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. */ -HRESULT WINAPI CLSIDFromProgID( - LPCOLESTR progid, /* [in] Unicode program id as found in registry */ - LPCLSID riid ) /* [out] associated CLSID */ +HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid) { static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; char buf2[80]; @@ -1001,9 +1111,20 @@ /*********************************************************************** ****** * CoGetPSClsid [OLE32.@] * - * This function returns the CLSID of the proxy/stub factory that - * implements IPSFactoryBuffer for the specified interface. + * Retrieves the CLSID of the proxy/stub factory that implements + * IPSFactoryBuffer for the specified interface. * + * PARAMS + * riid [I] Interface whose proxy/stub CLSID is to be returned. + * pclsid [O] Where to store returned proxy/stub CLSID. + * + * RETURNS + * S_OK + * E_OUTOFMEMORY + * REGDB_E_IIDNOTREG if no PSFactoryBuffer is associated with the IID, or it could not be parsed + * + * NOTES + * * The standard marshaller activates the object with the CLSID * returned and uses the CreateProxy and CreateStub methods on its * IPSFactoryBuffer interface to construct the proxies and stubs for a @@ -1014,17 +1135,15 @@ * in the registry and any interface id registered by * CoRegisterPSClsid within the current process. * - * FIXME: We only search the registry, not ids registered with + * BUGS + * + * We only search the registry, not ids registered with * CoRegisterPSClsid. - * - * RETURNS - * S_OK - * E_OUTOFMEMORY - * E_INVALIDARG if no PSFactoryBuffer is associated with the IID, or it could not be parsed + * Also, native returns S_OK for interfaces with an key in HKCR\Interface, but + * without a ProxyStubClsid32 key and leaves garbage in pclsid. This should be + * considered a bug in native unless an application depends on this (unlikely). */ -HRESULT WINAPI CoGetPSClsid( - REFIID riid, /* [in] Interface whose proxy/stub CLSID is to be returned */ - CLSID *pclsid ) /* [out] Where to store returned proxy/stub CLSID */ +HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) { char *buf, buf2[40]; DWORD buf2len; @@ -1038,9 +1157,7 @@ (length of iid string plus constant length of static text */ buf = HeapAlloc(GetProcessHeap(), 0, strlen(buf2)+27); if (buf == NULL) - { - return (E_OUTOFMEMORY); - } + return E_OUTOFMEMORY; /* Construct the registry key we want */ sprintf(buf,"Interface\\%s\\ProxyStubClsid32", buf2); @@ -1048,9 +1165,9 @@ /* Open the key.. */ if (RegOpenKeyA(HKEY_CLASSES_ROOT, buf, &xhkey)) { - WARN("No PSFactoryBuffer object is registered for this IID\n"); - HeapFree(GetProcessHeap(),0,buf); - return (E_INVALIDARG); + WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); + HeapFree(GetProcessHeap(),0,buf); + return REGDB_E_IIDNOTREG; } HeapFree(GetProcessHeap(),0,buf); @@ -1060,19 +1177,18 @@ buf2len = sizeof(buf2); if ( (RegQueryValueA(xhkey,NULL,buf2,&buf2len)) ) { - RegCloseKey(xhkey); - return E_INVALIDARG; + RegCloseKey(xhkey); + return REGDB_E_IIDNOTREG; } RegCloseKey(xhkey); /* We have the CLSid we want back from the registry as a string, so lets convert it into a CLSID structure */ - if ( (__CLSIDFromStringA(buf2,pclsid)) != NOERROR) { - return E_INVALIDARG; - } + if ( (__CLSIDFromStringA(buf2,pclsid)) != NOERROR) + return REGDB_E_IIDNOTREG; TRACE ("() Returning CLSID=%s\n", debugstr_guid(pclsid)); - return (S_OK); + return S_OK; } @@ -1080,7 +1196,15 @@ /*********************************************************************** * WriteClassStm (OLE32.@) * - * This function write a CLSID on stream + * Writes a CLSID to a stream. + * + * PARAMS + * pStm [I] Stream to write to. + * rclsid [I] CLSID to write. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. */ HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid) { @@ -1095,7 +1219,15 @@ /*********************************************************************** * ReadClassStm (OLE32.@) * - * This function read a CLSID from a stream + * Reads a CLSID from a stream. + * + * PARAMS + * pStm [I] Stream to read from. + * rclsid [O] CLSID to read. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. */ HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid) { @@ -1196,6 +1328,13 @@ * files use this method instead of exporting DllGetClassObject to allow * other code to connect to their objects. * + * PARAMS + * rclsid [I] CLSID of the object to register. + * pUnk [I] IUnknown of the object. + * dwClsContext [I] CLSCTX flags indicating the context in which to run the executable. + * flags [I] REGCLS flags indicating how connections are made. + * lpdwRegister [I] A unique cookie that can be passed to CoRevokeClassObject. + * * RETURNS * S_OK on success, * E_INVALIDARG if lpdwRegister or pUnk are NULL, @@ -1209,11 +1348,11 @@ * can't do that with our current implementation. */ HRESULT WINAPI CoRegisterClassObject( - REFCLSID rclsid, /* [in] CLSID of the object to register */ - LPUNKNOWN pUnk, /* [in] IUnknown of the object */ - DWORD dwClsContext, /* [in] CLSCTX flags indicating the context in which to run the executable */ - DWORD flags, /* [in] REGCLS flags indicating how connections are made */ - LPDWORD lpdwRegister) /* [out] A unique cookie that can be passed to CoRevokeClassObject */ + REFCLSID rclsid, + LPUNKNOWN pUnk, + DWORD dwClsContext, + DWORD flags, + LPDWORD lpdwRegister) { RegisteredClass* newClass; LPUNKNOWN foundObject; [truncated at 1000 lines; 5300 more skipped]

1 0

[hbirr] 13531: - Forgot this file.
by hbirr＠svn.reactos.com 13 Feb '05

13 Feb '05

- Forgot this file. - Prepared cdfs for using CcInitializeCacheMap/CcUninitializeCacheMap instead of CcRosInitializeFileCache/CcRosReleaseFileCache. Modified: trunk/reactos/drivers/fs/cdfs/rw.c _____ Modified: trunk/reactos/drivers/fs/cdfs/rw.c --- trunk/reactos/drivers/fs/cdfs/rw.c 2005-02-13 17:23:41 UTC (rev 13530) +++ trunk/reactos/drivers/fs/cdfs/rw.c 2005-02-13 17:25:52 UTC (rev 13531) @@ -86,7 +86,15 @@ if (FileObject->PrivateCacheMap == NULL) { +#ifdef ROS_USE_CC_AND_FS CcRosInitializeFileCache(FileObject, PAGE_SIZE); +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif } FileOffset.QuadPart = (LONGLONG)ReadOffset;

1 0

[hbirr] 13530: - Prepared ntfs for using CcInitializeCacheMap/CcUninitializeCacheMap instead of CcRosInitializeFileCache/CcRosReleaseFileCache.
by hbirr＠svn.reactos.com 13 Feb '05

13 Feb '05

- Prepared ntfs for using CcInitializeCacheMap/CcUninitializeCacheMap instead of CcRosInitializeFileCache/CcRosReleaseFileCache. Modified: trunk/reactos/drivers/fs/ntfs/fcb.c Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h _____ Modified: trunk/reactos/drivers/fs/ntfs/fcb.c --- trunk/reactos/drivers/fs/ntfs/fcb.c 2005-02-13 17:21:16 UTC (rev 13529) +++ trunk/reactos/drivers/fs/ntfs/fcb.c 2005-02-13 17:23:41 UTC (rev 13530) @@ -155,7 +155,11 @@ if (Fcb->RefCount <= 0 && !NtfsFCBIsDirectory(Fcb)) { RemoveEntryList(&Fcb->FcbListEntry); +#ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache(Fcb->FileObject); +#else + CcUninitializeCacheMap (Fcb->FileObject, NULL, NULL); +#endif NtfsDestroyFCB(Fcb); } KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); @@ -241,7 +245,7 @@ newCCB->PtrFileObject = FileObject; Fcb->FileObject = FileObject; Fcb->DevExt = Vcb; - +#ifdef ROS_USE_CC_AND_FS Status = CcRosInitializeFileCache(FileObject, CACHEPAGESIZE(Vcb)); if (!NT_SUCCESS(Status)) @@ -249,7 +253,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); KEBUGCHECK(0); } - +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif ObDereferenceObject(FileObject); Fcb->Flags |= FCB_CACHE_INITIALIZED; @@ -394,7 +404,6 @@ PFCB Fcb, PFILE_OBJECT FileObject) { - NTSTATUS Status; PCCB newCCB; newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); @@ -412,6 +421,8 @@ if (!(Fcb->Flags & FCB_CACHE_INITIALIZED)) { +#ifdef ROS_USE_CC_AND_FS + NTSTATUS Status; Status = CcRosInitializeFileCache(FileObject, CACHEPAGESIZE(Vcb)); if (!NT_SUCCESS(Status)) @@ -419,6 +430,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); KEBUGCHECK(0); } +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif Fcb->Flags |= FCB_CACHE_INITIALIZED; } _____ Modified: trunk/reactos/drivers/fs/ntfs/fsctl.c --- trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-02-13 17:21:16 UTC (rev 13529) +++ trunk/reactos/drivers/fs/ntfs/fsctl.c 2005-02-13 17:23:41 UTC (rev 13530) @@ -387,7 +387,7 @@ // Fcb->Entry.ExtentLocationL = 0; // Fcb->Entry.DataLengthL = DeviceExt->CdInfo.VolumeSpaceSize * BLOCKSIZE; - +#ifdef ROS_USE_CC_AND_FS Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject, CACHEPAGESIZE(DeviceExt)); if (!NT_SUCCESS (Status)) @@ -395,7 +395,13 @@ DbgPrint("CcRosInitializeFileCache() failed (Status %lx)\n", Status); goto ByeBye; } - +#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif ExInitializeResourceLite(&DeviceExt->DirResource); // ExInitializeResourceLite(&DeviceExt->FatResource); _____ Modified: trunk/reactos/drivers/fs/ntfs/ntfs.h --- trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-02-13 17:21:16 UTC (rev 13529) +++ trunk/reactos/drivers/fs/ntfs/ntfs.h 2005-02-13 17:23:41 UTC (rev 13530) @@ -3,7 +3,9 @@ #include <ddk/ntifs.h> +#define USE_ROS_CC_AND_FS + #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.BytesPerCluster > PAGE_SIZE ? \ (pDeviceExt)->NtfsInfo.BytesPerCluster : PAGE_SIZE)

1 0

[hbirr] 13529: - Prepared cdfs for using CcInitializeCacheMap/CcUninitializeCacheMap instead of CcRosInitializeFileCache/CcRosReleaseFileCache.
by hbirr＠svn.reactos.com 13 Feb '05

13 Feb '05

- Prepared cdfs for using CcInitializeCacheMap/CcUninitializeCacheMap instead of CcRosInitializeFileCache/CcRosReleaseFileCache. Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/cdfs/fcb.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c _____ Modified: trunk/reactos/drivers/fs/cdfs/cdfs.h --- trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-02-13 17:10:59 UTC (rev 13528) +++ trunk/reactos/drivers/fs/cdfs/cdfs.h 2005-02-13 17:21:16 UTC (rev 13529) @@ -3,6 +3,8 @@ #include <ddk/ntifs.h> +#define USE_ROS_CC_AND_FS + #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 #define BLOCKSIZE CDFS_BASIC_SECTOR _____ Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c --- trunk/reactos/drivers/fs/cdfs/cleanup.c 2005-02-13 17:10:59 UTC (rev 13528) +++ trunk/reactos/drivers/fs/cdfs/cleanup.c 2005-02-13 17:21:16 UTC (rev 13529) @@ -54,7 +54,11 @@ /* Uninitialize file cache if initialized for this file object. */ if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer->SharedCacheMap) { +#ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache (FileObject); +#else + CcUninitializeCacheMap (FileObject, NULL, NULL); +#endif } return STATUS_SUCCESS; _____ Modified: trunk/reactos/drivers/fs/cdfs/fcb.c --- trunk/reactos/drivers/fs/cdfs/fcb.c 2005-02-13 17:10:59 UTC (rev 13528) +++ trunk/reactos/drivers/fs/cdfs/fcb.c 2005-02-13 17:21:16 UTC (rev 13529) @@ -241,6 +241,7 @@ Fcb->FileObject = FileObject; Fcb->DevExt = Vcb; +#ifdef USE_ROS_AND_FS Status = CcRosInitializeFileCache(FileObject, PAGE_SIZE); if (!NT_SUCCESS(Status)) @@ -248,6 +249,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); KEBUGCHECK(0); } +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif ObDereferenceObject(FileObject); Fcb->Flags |= FCB_CACHE_INITIALIZED; @@ -411,7 +419,6 @@ PFCB Fcb, PFILE_OBJECT FileObject) { - NTSTATUS Status; PCCB newCCB; newCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(CCB), TAG_CCB); @@ -426,9 +433,11 @@ FileObject->FsContext2 = newCCB; newCCB->PtrFileObject = FileObject; Fcb->DevExt = Vcb; - + if (CdfsFCBIsDirectory(Fcb)) { +#ifdef USE_ROS_CC_AND_FS + NTSTATUS Status; Status = CcRosInitializeFileCache(FileObject, PAGE_SIZE); if (!NT_SUCCESS(Status)) @@ -436,6 +445,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); KEBUGCHECK(0); } +#else + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + NULL, + NULL); +#endif Fcb->Flags |= FCB_CACHE_INITIALIZED; } _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-02-13 17:10:59 UTC (rev 13528) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-02-13 17:21:16 UTC (rev 13529) @@ -402,7 +402,7 @@ Fcb->Entry.ExtentLocationL = 0; Fcb->Entry.DataLengthL = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE; - +#ifdef USE_ROS_CC_AND_FS Status = CcRosInitializeFileCache(DeviceExt->StreamFileObject, PAGE_SIZE); if (!NT_SUCCESS (Status)) @@ -410,7 +410,13 @@ DbgPrint("CcRosInitializeFileCache failed\n"); goto ByeBye; } - +#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + TRUE, + NULL, + NULL); +#endif ExInitializeResourceLite(&DeviceExt->VcbResource); ExInitializeResourceLite(&DeviceExt->DirResource);

1 0

[hbirr] 13528: - Partial implementation of IoSetInformation.
by hbirr＠svn.reactos.com 13 Feb '05

13 Feb '05

- Partial implementation of IoSetInformation. Modified: trunk/reactos/ntoskrnl/io/share.c _____ Modified: trunk/reactos/ntoskrnl/io/share.c --- trunk/reactos/ntoskrnl/io/share.c 2005-02-13 17:09:10 UTC (rev 13527) +++ trunk/reactos/ntoskrnl/io/share.c 2005-02-13 17:10:59 UTC (rev 13528) @@ -327,8 +327,73 @@ IN ULONG Length, OUT PVOID FileInformation) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + ASSERT(FileInformation != NULL); + + if (FileInformationClass == FileCompletionInformation) + { + return STATUS_NOT_IMPLEMENTED; + } + + + + Status = ObReferenceObjectByPointer(FileObject, + FILE_WRITE_ATTRIBUTES, + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DPRINT("FileObject %x\n", FileObject); + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, + TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FileInformation; + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &FileObject->Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + KeResetEvent( &FileObject->Event ); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.SetFile.Length = Length; + + Status = IoCallDriver(FileObject->DeviceObject, Irp); + if (Status==STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock.Status; + } + + return Status; }

1 0

[hbirr] 13527: - Initialize the Lock value of a stream file object.
by hbirr＠svn.reactos.com 13 Feb '05

13 Feb '05

- Initialize the Lock value of a stream file object. Modified: trunk/reactos/ntoskrnl/io/create.c _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-02-13 15:38:56 UTC (rev 13526) +++ trunk/reactos/ntoskrnl/io/create.c 2005-02-13 17:09:10 UTC (rev 13527) @@ -245,6 +245,7 @@ // shouldn't we initialize the lock event, and several other things here too? KeInitializeEvent(&CreatedFileObject->Event, NotificationEvent, FALSE); + KeInitializeEvent(&CreatedFileObject->Lock, SynchronizationEvent, TRUE); return CreatedFileObject; }

1 0

[hbirr] 13526: - Changed the definition of fpos_t to a 64bit value to get binutils 2.15.94 working.
by hbirr＠svn.reactos.com 13 Feb '05

13 Feb '05

- Changed the definition of fpos_t to a 64bit value to get binutils 2.15.94 working. Modified: trunk/reactos/include/msvcrt/stdio.h _____ Modified: trunk/reactos/include/msvcrt/stdio.h --- trunk/reactos/include/msvcrt/stdio.h 2005-02-13 13:49:55 UTC (rev 13525) +++ trunk/reactos/include/msvcrt/stdio.h 2005-02-13 15:38:56 UTC (rev 13526) @@ -325,9 +325,10 @@ * because the programmer using fgetpos and fsetpos will be setting aside * storage for fpos_t structres. Actually I tested using a byte array and * it is fairly evident that the fpos_t type is a long (in CRTDLL.DLL). - * Perhaps an unsigned long? TODO? + * Perhaps an unsigned long? TODO? It's definitely a 64-bit number in + * MSVCRT however, and for now `long long' will do. */ -typedef long fpos_t; +typedef long long fpos_t; int fgetpos(FILE* fileGetPosition, fpos_t* pfpos); int fsetpos(FILE* fileSetPosition, const fpos_t* pfpos);

1 0

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

Ros-diffs