Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[ion] 19372: - Remove RosSymInfo hack from LDR_DATA_TABLE_ENTRY and use PatchInformation instead. It's still an abuse but at least we're not defining a new structure/

by ion＠svn.reactos.com

- Remove RosSymInfo hack from LDR_DATA_TABLE_ENTRY and use PatchInformation instead. It's still an abuse but at least we're not defining a new structure/ Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-20 15:09:59 UTC (rev 19371) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-20 15:27:07 UTC (rev 19372) @@ -11,7 +11,7 @@ List: Priority 1: - - LDR_DATA_TABLE_ENTRY has a ROSSYM Hack (GvG) [ldrtypes.h] + - FIXED: LDR_DATA_TABLE_ENTRY has a ROSSYM Hack (Alex) [ldrtypes.h] - FIXED: LDR_FLAGS are not correct (Alex) [ldrtypes.h] - FIXED: Remove extra Process Info classes from ddk (Alex) [zwtypes.h] - FIXED: PsEstablishWin32Callouts + Parameters don't match NT (Alex) [obtypes.h] _____ Modified: trunk/reactos/include/ndk/ldrtypes.h --- trunk/reactos/include/ndk/ldrtypes.h 2005-11-20 15:09:59 UTC (rev 19371) +++ trunk/reactos/include/ndk/ldrtypes.h 2005-11-20 15:27:07 UTC (rev 19372) @@ -76,10 +76,6 @@ }; PVOID EntryPointActivationContext; PVOID PatchInformation; -#if defined(DBG) || defined(KDBG) - /* FIXME: THIS _REALLY_ NEEDS TO GO SOMEWHERE ELSE */ - PVOID RosSymInfo; -#endif /* KDBG */ } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY; typedef struct _LDR_RESOURCE_INFO _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-11-20 15:09:59 UTC (rev 19371) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-11-20 15:27:07 UTC (rev 19372) @@ -84,7 +84,7 @@ pInfo->Name[Length] = L'\0'; pInfo->Base = (ULONG_PTR)current->DllBase; pInfo->Size = current->SizeOfImage; - pInfo->RosSymInfo = current->RosSymInfo; + pInfo->RosSymInfo = current->PatchInformation; return TRUE; } current_entry = current_entry->Flink; @@ -127,7 +127,7 @@ pInfo->Name[Length] = L'\0'; pInfo->Base = (ULONG_PTR)current->DllBase; pInfo->Size = current->SizeOfImage; - pInfo->RosSymInfo = current->RosSymInfo; + pInfo->RosSymInfo = current->PatchInformation; return TRUE; } current_entry = current_entry->Flink; @@ -493,7 +493,7 @@ UNICODE_STRING KernelName; DPRINT("LdrModule %p\n", LdrModule); - LdrModule->RosSymInfo = NULL; + LdrModule->PatchInformation = NULL; KernelName.MaximumLength = sizeof(Prefix) + LdrModule->FullDllName.Length; KernelName.Length = KernelName.MaximumLength - sizeof(WCHAR); @@ -507,7 +507,7 @@ LdrModule->FullDllName.Length); KernelName.Buffer[KernelName.Length / sizeof(WCHAR)] = L'\0'; - KdbpSymLoadModuleSymbols(&KernelName, (PROSSYM_INFO*)&LdrModule->RosSymInfo); + KdbpSymLoadModuleSymbols(&KernelName, (PROSSYM_INFO*)&LdrModule->PatchInformation); ExFreePool(KernelName.Buffer); } @@ -539,7 +539,7 @@ { Current = CONTAINING_RECORD(CurrentEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); - KdbpSymUnloadModuleSymbols(Current->RosSymInfo); + KdbpSymUnloadModuleSymbols(Current->PatchInformation); CurrentEntry = CurrentEntry->Flink; } @@ -561,9 +561,9 @@ /* Load symbols for the image if available */ DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename, Module->Base); - Module->RosSymInfo = NULL; + Module->PatchInformation = NULL; - KdbpSymLoadModuleSymbols(Filename, (PROSSYM_INFO*)&Module->RosSymInfo); + KdbpSymLoadModuleSymbols(Filename, (PROSSYM_INFO*)&Module->PatchInformation); } /*! \brief Unloads symbol info for a driver. @@ -574,8 +574,8 @@ KdbSymUnloadDriverSymbols(IN PLDR_DATA_TABLE_ENTRY ModuleObject) { /* Unload symbols for module if available */ - KdbpSymUnloadModuleSymbols(ModuleObject->RosSymInfo); - ModuleObject->RosSymInfo = NULL; + KdbpSymUnloadModuleSymbols(ModuleObject->PatchInformation); + ModuleObject->PatchInformation = NULL; } /*! \brief Called when a symbol file is loaded by the loader? @@ -617,7 +617,7 @@ { if (! LoadSymbols) { - ModuleObject->RosSymInfo = NULL; + ModuleObject->PatchInformation = NULL; return; } @@ -631,16 +631,16 @@ if (i < KeLoaderBlock.ModsCount) { KeLoaderModules[i].Reserved = 1; - if (ModuleObject->RosSymInfo != NULL) + if (ModuleObject->PatchInformation != NULL) { - KdbpSymRemoveCachedFile(ModuleObject->RosSymInfo); + KdbpSymRemoveCachedFile(ModuleObject->PatchInformation); } if (IsRaw) { if (! RosSymCreateFromRaw((PVOID) KeLoaderModules[i].ModStart, KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart, - (PROSSYM_INFO*)&ModuleObject->RosSymInfo)) + (PROSSYM_INFO*)&ModuleObject->PatchInformation)) { return; } @@ -649,7 +649,7 @@ { if (! RosSymCreateFromMem((PVOID) KeLoaderModules[i].ModStart, KeLoaderModules[i].ModEnd - KeLoaderModules[i].ModStart, - (PROSSYM_INFO*)&ModuleObject->RosSymInfo)) + (PROSSYM_INFO*)&ModuleObject->PatchInformation)) { return; } @@ -658,14 +658,14 @@ /* add file to cache */ RtlInitAnsiString(&AnsiString, FileName); RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - KdbpSymAddCachedFile(&UnicodeString, ModuleObject->RosSymInfo); + KdbpSymAddCachedFile(&UnicodeString, ModuleObject->PatchInformation); RtlFreeUnicodeString(&UnicodeString); DPRINT("Installed symbols: %s@%08x-%08x %p\n", FileName, ModuleObject->DllBase, ModuleObject->SizeOfImage + ModuleObject->DllBase, - ModuleObject->RosSymInfo); + ModuleObject->PatchInformation); } } } @@ -683,8 +683,8 @@ int Found; char YesNo; - NtoskrnlModuleObject->RosSymInfo = NULL; - LdrHalModuleObject->RosSymInfo = NULL; + NtoskrnlModuleObject->PatchInformation = NULL; + LdrHalModuleObject->PatchInformation = NULL; InitializeListHead(&SymbolFileListHead); KeInitializeSpinLock(&SymbolFileListLock);

18 years, 10 months

[ion] 19371: - Add msvc compatible version of ProveForRead(U)LargeInteger

by ion＠svn.reactos.com

- Add msvc compatible version of ProveForRead(U)LargeInteger Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-20 15:01:10 UTC (rev 19370) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-11-20 15:09:59 UTC (rev 19371) @@ -136,8 +136,13 @@ #define ProbeForReadPointer(Ptr) ProbeForReadGenericType(Ptr, PVOID, NULL) #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) #define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) +#ifdef _MSC_VER +#define ProbeForReadLargeInteger(Ptr) (*(volatile LARGE_INTEGER*)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) +#define ProbeForReadUlargeInteger(Ptr) (*(volatile ULARGE_INTEGER*)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) +#else #define ProbeForReadLargeInteger(Ptr) ((LARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) #define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) +#endif #define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) /*

18 years, 10 months

[gvg] 19370: Sync from Wine-20050830 to Wine-0_9_1:

by gvg＠svn.reactos.com

Sync from Wine-20050830 to Wine-0_9_1: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. - Fix .spec declarations for functinos with 64bit arguments (reported by winapi_check). Mike Hearn <mh(a)codeweavers.com> - Robert Shearman <rob(a)codeweavers.com> Change stub manager to track the number of normal marshals instead of using the state machine so that multiple marshals of the same object and interface work correctly. Robert Shearman <rob(a)codeweavers.com> - Pass WM_QUIT to outer modal loop. - Fix the return codes during unmarshaling so that it returns failure codes instead of S_FALSE returned from IStream_Read. - Don't fail in CoRegisterClassObject if the class already exists and the REGCLS_MULTIPLEUSE flag is specified. - Fix ref-counting rules to match native DCOM Dlls. - Add exception handling for stubs. - Implement OleRegEnumVerbs. - The [string] attribute is only valid on byte, char and wchar_t types, so replace "unsigned short" by "WCHAR". - Implement OleIsRunning. - Add a stubbed out implementation of IAdviseSink and advise the delegate object to use it. - Initialize out pointer to NULL before access check in IStorage_CreateStorage. - WriteClassStg should return E_INVALIDARG if pstg is NULL instead of asserting. - ReadClassStg should return E_INVALIDARG if pstg is NULL instead of crashing and a NULL pclsid should cause it to return the same value. - Make the interfaces that should be supported by the data cache explicit so their is no confusion in this file as to what it should be implementing and what this object should implement. - Delegate some IOleObject methods to the server IOleObject if it is running. - Implement some IRunningObject functions that actually start the server and initialize it. - Remove redunant braces. - Compact multi-line comments that fit into one line. - Remove comments that state the obvious. - Remove extra brackets that are redundant because the -> operator binds tighter than &. - Change "this" to "This" to make code more like other interface implementations. - Remove redundant comparisons with NULL for pointers. - Re-arrange some functions and vtables so we don't have declarations for all of the functions in the file. - Fix a trace to refer to the object ID rather than the legacy MID. - Fix the error case of CoMarshalInterThreadInterface to release the stream. - Move all 16-bit functions to an appropriate 16-bit file. - Implement OLE object notifications, making sure to cope with the case of the advise holder not being created because no notifications are needed. - Implement a Stop function and use this to properly implement IOleObject_Close, IAdviseSink_OnClose and the destructor. - We shouldn't pass the application name into CreateProcess because the value stored in the registry could include arguments. - Extend COM_OpenKeyForCLSID to open a subkey and return an HRESULT. - Fix up the callers and reorganize CoGetClassObject to split out the inproc code into another function. Alex Villacís Lasso <a_villacis(a)palosanto.com> - Add NULL check for sinkInterface in DataCache_GetAdvise. - Add missing ! to fix a reversed condition check in OleCreateDefaultHandler, in order to match intent in comment. Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Use the proper calling convention for 2 16-bit functions. Alexandre Julliard <julliard(a)winehq.org> - We are no longer generating .spec.c files. - Use a more portable scheme for storing the name of a critical section. - Fixed some traces to use the right printf format and avoid typecasts. - Removed unused debug channels. - We are no longer generating .dbg.c files. Richard Cohen <richard(a)daijobu.co.uk> - Relax the share mode validation for transacted storage, with a test. Eric Pouech <eric.pouech(a)wanadoo.fr> - Fixes for function prototypes without arguments. Michael Jung <mjung(a)iss.tu-darmstadt.de> - Added tracing to CoCreateInstance. Markus Amsler <markus.amsler(a)oribi.org> - Improve c2man Documented-Total count. Modified: trunk/reactos/lib/ole32/antimoniker.c Modified: trunk/reactos/lib/ole32/bindctx.c Modified: trunk/reactos/lib/ole32/clipboard.c Modified: trunk/reactos/lib/ole32/compobj.c Modified: trunk/reactos/lib/ole32/compobj_private.h Modified: trunk/reactos/lib/ole32/datacache.c Modified: trunk/reactos/lib/ole32/dcom.idl Modified: trunk/reactos/lib/ole32/defaulthandler.c Modified: trunk/reactos/lib/ole32/errorinfo.c Modified: trunk/reactos/lib/ole32/git.c Modified: trunk/reactos/lib/ole32/ifs.c Modified: trunk/reactos/lib/ole32/marshal.c Modified: trunk/reactos/lib/ole32/memlockbytes16.c Modified: trunk/reactos/lib/ole32/moniker.c Modified: trunk/reactos/lib/ole32/ole16.c Modified: trunk/reactos/lib/ole32/ole2.c Modified: trunk/reactos/lib/ole32/ole2.spec Modified: trunk/reactos/lib/ole32/ole2_16.c Modified: trunk/reactos/lib/ole32/ole2nls.c Modified: trunk/reactos/lib/ole32/ole2stubs.c Modified: trunk/reactos/lib/ole32/oleproxy.c Modified: trunk/reactos/lib/ole32/rpc.c Modified: trunk/reactos/lib/ole32/storage.c Modified: trunk/reactos/lib/ole32/storage.spec Modified: trunk/reactos/lib/ole32/storage32.c Modified: trunk/reactos/lib/ole32/stubmanager.c _____ Modified: trunk/reactos/lib/ole32/antimoniker.c --- trunk/reactos/lib/ole32/antimoniker.c 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/antimoniker.c 2005-11-20 15:01:10 UTC (rev 19370) @@ -442,7 +442,7 @@ return E_POINTER; if (pmkToLeft!=NULL){ - FIXME("() pmkToLeft!=NULL not implemented \n"); + FIXME("() pmkToLeft!=NULL not implemented\n"); return E_NOTIMPL; } _____ Modified: trunk/reactos/lib/ole32/bindctx.c --- trunk/reactos/lib/ole32/bindctx.c 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/bindctx.c 2005-11-20 15:01:10 UTC (rev 19370) @@ -170,7 +170,7 @@ if (lastIndex == This->bindCtxTableSize){ /* the table is full so it must be resized */ if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){ - FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize); + FIXME("This->bindCtxTableSize: %ld is out of data limite\n", This->bindCtxTableSize); return E_FAIL; } @@ -351,7 +351,7 @@ This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */ if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)) { - FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize); + FIXME("This->bindCtxTableSize: %ld is out of data limite\n", This->bindCtxTableSize); return E_FAIL; } This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable, @@ -526,15 +526,6 @@ } /*********************************************************************** ******* - * CreateBindCtx16 - ************************************************************************ ******/ -HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC * ppbc) -{ - FIXME("(%ld,%p),stub!\n",reserved,ppbc); - return E_NOTIMPL; -} - -/********************************************************************** ******** * CreateBindCtx (OLE32.@) ************************************************************************ ******/ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) _____ Modified: trunk/reactos/lib/ole32/clipboard.c --- trunk/reactos/lib/ole32/clipboard.c 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/clipboard.c 2005-11-20 15:01:10 UTC (rev 19370) @@ -303,7 +303,7 @@ * Places a pointer to the specified data object onto the clipboard, * making the data object accessible to the OleGetClipboard function. * - * RETURNS: + * RETURNS * * S_OK IDataObject pointer placed on the clipboard * CLIPBRD_E_CANT_OPEN OpenClipboard failed @@ -478,16 +478,6 @@ return hr; } -/********************************************************************** * - * OleFlushClipboard [OLE2.76] - */ - -HRESULT WINAPI OleFlushClipboard16(void) -{ - return OleFlushClipboard(); -} - - /*********************************************************************** ******* * OleFlushClipboard [OLE32.@] * Renders the data from the source IDataObject into the windows clipboard _____ Modified: trunk/reactos/lib/ole32/compobj.c --- trunk/reactos/lib/ole32/compobj.c 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/compobj.c 2005-11-20 15:01:10 UTC (rev 19370) @@ -56,24 +56,20 @@ #include "windef.h" #include "winbase.h" +#include "winerror.h" +#include "winreg.h" #include "winuser.h" #include "objbase.h" #include "ole2.h" #include "ole2ver.h" -#include "rpc.h" -#include "winerror.h" -#include "winreg.h" -#include "wownt32.h" -#include "wine/unicode.h" -#include "objbase.h" + #include "compobj_private.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -typedef LPCSTR LPCOLESTR16; - HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) @@ -97,7 +93,7 @@ { 0, 0, &csApartment, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": csApartment") } + 0, 0, { (DWORD_PTR)(__FILE__ ": csApartment") } }; static CRITICAL_SECTION csApartment = { &critsect_debug, -1, 0, 0, 0, 0 }; @@ -134,7 +130,7 @@ { 0, 0, &csRegisteredClassList, { &class_cs_debug.ProcessLocksList, &class_cs_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": csRegisteredClassList") } + 0, 0, { (DWORD_PTR)(__FILE__ ": csRegisteredClassList") } }; static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, 0 }; @@ -161,7 +157,7 @@ { 0, 0, &csOpenDllList, { &dll_cs_debug.ProcessLocksList, &dll_cs_debug.ProcessLocksList }, - 0, 0, { 0, (DWORD)(__FILE__ ": csOpenDllList") } + 0, 0, { (DWORD_PTR)(__FILE__ ": csOpenDllList") } }; static CRITICAL_SECTION csOpenDllList = { &dll_cs_debug, -1, 0, 0, 0, 0 }; @@ -419,7 +415,8 @@ switch (msg) { case DM_EXECUTERPC: - return RPC_ExecuteCall((struct dispatch_params *)lParam); + RPC_ExecuteCall((struct dispatch_params *)lParam); + return 0; default: return DefWindowProcW(hWnd, msg, wParam, lParam); } @@ -981,14 +978,36 @@ return MultiByteToWideChar( CP_ACP, 0, xguid, -1, str, cmax ); } -/* open HKCR\\CLSID\\{string form of clsid} key */ -DWORD COM_OpenKeyForCLSID(REFCLSID clsid, REGSAM access, HKEY *key) +/* open HKCR\\CLSID\\{string form of clsid}\\{keyname} key */ +HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey) { static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) - 1]; + LONG res; + HKEY key; + strcpyW(path, wszCLSIDSlash); StringFromGUID2(clsid, path + strlenW(wszCLSIDSlash), CHARS_IN_GUID); - return RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, access, key); + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, keyname ? KEY_READ : access, &key); + if (res == ERROR_FILE_NOT_FOUND) + return REGDB_E_CLASSNOTREG; + else if (res != ERROR_SUCCESS) + return REGDB_E_READREGDB; + + if (!keyname) + { + *subkey = key; + return S_OK; + } + + res = RegOpenKeyExW(key, keyname, 0, access, subkey); + RegCloseKey(key); + if (res == ERROR_FILE_NOT_FOUND) + return REGDB_E_KEYMISSING; + else if (res != ERROR_SUCCESS) + return REGDB_E_READREGDB; + + return S_OK; } /*********************************************************************** ******* @@ -1007,25 +1026,15 @@ */ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID) { - static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; - HKEY hkey = NULL; - HKEY hkey_clsid; - HRESULT ret = S_OK; - - if (ERROR_SUCCESS != COM_OpenKeyForCLSID(clsid, KEY_READ, &hkey_clsid)) - ret = REGDB_E_CLASSNOTREG; - - if (ret == S_OK) - { - if (RegOpenKeyExW(hkey_clsid, wszProgID, 0, KEY_READ, &hkey)) - ret = REGDB_E_CLASSNOTREG; - RegCloseKey(hkey_clsid); - } - - if (ret == S_OK) - { + static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; + HKEY hkey; + HRESULT ret; LONG progidlen = 0; + ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey); + if (FAILED(ret)) + return ret; + if (RegQueryValueW(hkey, NULL, NULL, &progidlen)) ret = REGDB_E_CLASSNOTREG; @@ -1040,49 +1049,12 @@ else ret = E_OUTOFMEMORY; } - } - RegCloseKey(hkey); - return ret; + RegCloseKey(hkey); + return ret; } /*********************************************************************** ******* - * CLSIDFromProgID [COMPOBJ.61] - * - * Converts a program ID into the respective GUID. - * - * PARAMS - * progid [I] program id as found in registry - * riid [O] associated CLSID - * - * RETURNS - * Success: S_OK - * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. - */ -HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid) -{ - char *buf,buf2[80]; - LONG buf2len; - HRESULT err; - HKEY xhkey; - - buf = HeapAlloc(GetProcessHeap(),0,strlen(progid)+8); - sprintf(buf,"%s\\CLSID",progid); - if ((err=RegOpenKeyA(HKEY_CLASSES_ROOT,buf,&xhkey))) { - HeapFree(GetProcessHeap(),0,buf); - return CO_E_CLASSSTRING; - } - HeapFree(GetProcessHeap(),0,buf); - buf2len = sizeof(buf2); - if ((err=RegQueryValueA(xhkey,NULL,buf2,&buf2len))) { - RegCloseKey(xhkey); - return CO_E_CLASSSTRING; - } - RegCloseKey(xhkey); - return __CLSIDFromStringA(buf2,riid); -} - -/********************************************************************** ******** * CLSIDFromProgID [OLE32.@] * * Converts a program id into the respective GUID. @@ -1122,7 +1094,6 @@ } - /*********************************************************************** ****** * CoGetPSClsid [OLE32.@] * @@ -1388,7 +1359,14 @@ */ hr = COM_GetRegisteredClassObject(rclsid, dwClsContext, &foundObject); if (hr == S_OK) { + if (flags & REGCLS_MULTIPLEUSE) { + if (dwClsContext & CLSCTX_LOCAL_SERVER) + hr = CoLockObjectExternal(foundObject, TRUE, FALSE); + IUnknown_Release(foundObject); + return hr; + } IUnknown_Release(foundObject); + ERR("object already registered for class %s\n", debugstr_guid(rclsid)); return CO_E_OBJISREG; } @@ -1559,6 +1537,40 @@ return hres; } +static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) +{ + HINSTANCE hLibrary; + typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); + DllGetClassObjectFunc DllGetClassObject; + WCHAR dllpath[MAX_PATH+1]; + + if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + { + /* failure: CLSID is not found in registry */ + WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); + return REGDB_E_CLASSNOTREG; + } + + if ((hLibrary = LoadLibraryExW(dllpath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) + { + /* failure: DLL could not be loaded */ + ERR("couldn't load in-process dll %s\n", debugstr_w(dllpath)); + return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ + } + + if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) + { + /* failure: the dll did not export DllGetClassObject */ + ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllpath)); + FreeLibrary( hLibrary ); + return CO_E_DLLNOTFOUND; + } + + /* OK: get the ClassObject */ + COMPOBJ_DLLList_Add( hLibrary ); + return DllGetClassObject(rclsid, riid, ppv); +} + /*********************************************************************** * CoGetClassObject [OLE32.@] * @@ -1600,50 +1612,58 @@ return hres; } - /* first try: in-process */ - if ((CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER) & dwClsContext) + /* First try in-process server */ + if (CLSCTX_INPROC_SERVER & dwClsContext) { static const WCHAR wszInprocServer32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; - HINSTANCE hLibrary; - typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv); - DllGetClassObjectFunc DllGetClassObject; - WCHAR dllpath[MAX_PATH+1]; HKEY hkey; - if (ERROR_SUCCESS != COM_OpenKeyForCLSID(rclsid, KEY_READ, &hkey)) + hres = COM_OpenKeyForCLSID(rclsid, wszInprocServer32, KEY_READ, &hkey); + if (FAILED(hres)) { - ERR("class %s not registered\n", debugstr_guid(rclsid)); - hres = REGDB_E_CLASSNOTREG; + if (hres == REGDB_E_CLASSNOTREG) + ERR("class %s not registered\n", debugstr_guid(rclsid)); + else + WARN("class %s not registered as in-proc server\n", debugstr_guid(rclsid)); } - if (COM_RegReadPath(hkey, wszInprocServer32, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (SUCCEEDED(hres)) { - /* failure: CLSID is not found in registry */ - WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); - hres = REGDB_E_CLASSNOTREG; + hres = get_inproc_class_object(hkey, rclsid, iid, ppv); + RegCloseKey(hkey); } - else + + /* return if we got a class, otherwise fall through to one of the + * other types */ + if (SUCCEEDED(hres)) + return hres; + } + + /* Next try in-process handler */ + if (CLSCTX_INPROC_HANDLER & dwClsContext) + { + static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; + HKEY hkey; + + hres = COM_OpenKeyForCLSID(rclsid, wszInprocHandler32, KEY_READ, &hkey); + if (FAILED(hres)) { - if ((hLibrary = LoadLibraryExW(dllpath, 0, LOAD_WITH_ALTERED_SEARCH_PATH)) == 0) - { - /* failure: DLL could not be loaded */ - ERR("couldn't load InprocServer32 dll %s\n", debugstr_w(dllpath)); - hres = E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ - } - else if (!(DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject"))) - { - /* failure: the dll did not export DllGetClassObject */ - ERR("couldn't find function DllGetClassObject in %s\n", debugstr_w(dllpath)); - FreeLibrary( hLibrary ); - hres = CO_E_DLLNOTFOUND; - } + if (hres == REGDB_E_CLASSNOTREG) + ERR("class %s not registered\n", debugstr_guid(rclsid)); else - { - /* OK: get the ClassObject */ - COMPOBJ_DLLList_Add( hLibrary ); - return DllGetClassObject(rclsid, iid, ppv); - } + WARN("class %s not registered in-proc handler\n", debugstr_guid(rclsid)); } + + if (SUCCEEDED(hres)) + { + hres = get_inproc_class_object(hkey, rclsid, iid, ppv); + RegCloseKey(hkey); + } + + /* return if we got a class, otherwise fall through to one of the + * other types */ + if (SUCCEEDED(hres)) + return hres; } /* Next try out of process */ @@ -1659,26 +1679,13 @@ hres = E_NOINTERFACE; } + if (FAILED(hres)) + ERR("no class object %s could be created for for context 0x%lx\n", + debugstr_guid(rclsid), dwClsContext); return hres; } /*********************************************************************** - * CoGetClassObject [COMPOBJ.7] - * - */ -HRESULT WINAPI CoGetClassObject16( - REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo, - REFIID iid, LPVOID *ppv) -{ - FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); - - if (pServerInfo) { - FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName)); - FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo); - } - return E_NOTIMPL; -} -/********************************************************************** * * CoResumeClassObjects (OLE32.@) * * Resumes all class objects registered with REGCLS_SUSPENDED. @@ -1800,6 +1807,9 @@ HRESULT hres; LPCLASSFACTORY lpclf = 0; + TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08lx, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), + pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); + if (!COM_CurrentApt()) return CO_E_NOTINITIALIZED; /* @@ -1855,23 +1865,6 @@ } /*********************************************************************** - * CoCreateInstance [COMPOBJ.13] - */ -HRESULT WINAPI CoCreateInstance16( - REFCLSID rclsid, - LPUNKNOWN pUnkOuter, - DWORD dwClsContext, - REFIID iid, - LPVOID *ppv) -{ - FIXME("(%s, %p, %lx, %s, %p), stub!\n", - debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), - ppv - ); - return E_NOTIMPL; -} - -/********************************************************************** * * CoCreateInstanceEx [OLE32.@] */ HRESULT WINAPI CoCreateInstanceEx( @@ -2207,16 +2200,12 @@ LONG len; HRESULT res = S_OK; - if (ERROR_SUCCESS != COM_OpenKeyForCLSID(clsidOld, KEY_READ, &hkey)) - { - res = REGDB_E_CLASSNOTREG; + res = COM_OpenKeyForCLSID(clsidOld, wszAutoConvertTo, KEY_READ, &hkey); + if (FAILED(res)) goto done; - } len = sizeof(buf); - /* we can just query for the default value of AutoConvertTo key like that, - without opening the AutoConvertTo key and querying for NULL (default) */ - if (RegQueryValueW(hkey, wszAutoConvertTo, buf, &len)) + if (RegQueryValueW(hkey, NULL, buf, &len)) { res = REGDB_E_KEYMISSING; goto done; @@ -2254,11 +2243,9 @@ LONG auto_treat_as_size = sizeof(auto_treat_as); CLSID id; - if (ERROR_SUCCESS != COM_OpenKeyForCLSID(clsidOld, KEY_READ | KEY_WRITE, &hkey)) - { - res = REGDB_E_CLASSNOTREG; - goto done; - } + res = COM_OpenKeyForCLSID(clsidOld, NULL, KEY_READ | KEY_WRITE, &hkey); + if (FAILED(res)) + goto done; if (!memcmp( clsidOld, clsidNew, sizeof(*clsidOld) )) { if (!RegQueryValueW(hkey, wszAutoTreatAs, auto_treat_as, &auto_treat_as_size) && @@ -2315,13 +2302,11 @@ FIXME("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); memcpy(clsidNew,clsidOld,sizeof(CLSID)); /* copy over old value */ - if (COM_OpenKeyForCLSID(clsidOld, KEY_READ, &hkey)) + res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); + if (FAILED(res)) + goto done; + if (RegQueryValueW(hkey, NULL, szClsidNew, &len)) { - res = REGDB_E_CLASSNOTREG; - goto done; - } - if (RegQueryValueW(hkey, wszTreatAs, szClsidNew, &len)) - { res = S_FALSE; goto done; } @@ -2688,6 +2673,12 @@ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); DispatchMessageW(&msg); + if (msg.message == WM_QUIT) + { + TRACE("resending WM_QUIT to outer message loop\n"); + PostQuitMessage(msg.wParam); + goto done; + } } } else if ((res >= WAIT_OBJECT_0) && (res < WAIT_OBJECT_0 + cHandles)) @@ -2708,6 +2699,7 @@ break; } } +done: TRACE("-- 0x%08lx\n", hr); return hr; } _____ Modified: trunk/reactos/lib/ole32/compobj_private.h --- trunk/reactos/lib/ole32/compobj_private.h 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/compobj_private.h 2005-11-20 15:01:10 UTC (rev 19370) @@ -71,6 +71,7 @@ IID iid; /* RO */ IPID ipid; /* RO */ IUnknown *iface; /* RO */ + MSHLFLAGS flags; /* so we can enforce process-local marshalling rules (RO) */ }; @@ -87,7 +88,14 @@ OID oid; /* apartment-scoped unique identifier (RO) */ IUnknown *object; /* the object we are managing the stub for (RO) */ ULONG next_ipid; /* currently unused (LOCK) */ - STUB_STATE state; /* state machine (CS lock) */ + + /* We need to keep a count of the outstanding marshals, so we can enforce the + * marshalling rules (ie, you can only unmarshal normal marshals once). Note + * that these counts do NOT include unmarshalled interfaces, once a stream is + * unmarshalled and a proxy set up, this count is decremented. + */ + + ULONG norm_refs; /* refcount of normal marshals (CS lock) */ }; /* imported interface proxy */ @@ -163,22 +171,23 @@ extern HRESULT WINE_StringFromCLSID(const CLSID *id,LPSTR idstr); HRESULT WINAPI __CLSIDFromStringA(LPCSTR idstr, CLSID *id); -DWORD COM_OpenKeyForCLSID(REFCLSID clsid, REGSAM access, HKEY *key); +HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *key); HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv); /* Stub Manager */ ULONG stub_manager_int_addref(struct stub_manager *This); ULONG stub_manager_int_release(struct stub_manager *This); -struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object, MSHLFLAGS mshlflags); +struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object); ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs); ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs); -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid); +struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, MSHLFLAGS flags); +struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags); struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid); struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, void *object); -BOOL stub_manager_notify_unmarshal(struct stub_manager *m); -BOOL stub_manager_is_table_marshaled(struct stub_manager *m); -void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs); +BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid); +BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid); +void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid); HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stubmgr_ret); IRpcStubBuffer *ipid_to_apt_and_stubbuffer(const IPID *ipid, APARTMENT **stub_apt); HRESULT start_apartment_remote_unknown(void); @@ -191,7 +200,7 @@ void RPC_StartRemoting(struct apartment *apt); HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **pipebuf); -HRESULT RPC_ExecuteCall(struct dispatch_params *params); +void RPC_ExecuteCall(struct dispatch_params *params); HRESULT RPC_RegisterInterface(REFIID riid); void RPC_UnregisterInterface(REFIID riid); void RPC_StartLocalServer(REFCLSID clsid, IStream *stream); @@ -247,13 +256,8 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* helpers for debugging */ -#ifdef __i386__ -# define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[1] = (DWORD)(__FILE__ ": " name) -# define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[1] = 0 -#else -# define DEBUG_SET_CRITSEC_NAME(cs, name) -# define DEBUG_CLEAR_CRITSEC_NAME(cs) -#endif +# define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": " name) +# define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[0] = 0 extern HINSTANCE OLE32_hInstance; /* FIXME: make static */ _____ Modified: trunk/reactos/lib/ole32/datacache.c --- trunk/reactos/lib/ole32/datacache.c 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/datacache.c 2005-11-20 15:01:10 UTC (rev 19370) @@ -1390,9 +1390,11 @@ if (ppAdvSink!=NULL) { - IAdviseSink_QueryInterface(this->sinkInterface, + if (this->sinkInterface != NULL) + IAdviseSink_QueryInterface(this->sinkInterface, &IID_IAdviseSink, (void**)ppAdvSink); + else *ppAdvSink = NULL; } return S_OK; _____ Modified: trunk/reactos/lib/ole32/dcom.idl --- trunk/reactos/lib/ole32/dcom.idl 2005-11-20 14:56:24 UTC (rev 19369) +++ trunk/reactos/lib/ole32/dcom.idl 2005-11-20 15:01:10 UTC (rev 19370) @@ -1,292 +1,292 @@ -/* - * Copyright 2003 Ove KÕven, TransGaming Technologies - * - * 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 - */ - -/* see http://www.microsoft.com/msj/0398/dcom.htm */ -/* and the official DCOM specification - * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */ - -import "unknwn.idl"; - -[ - uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), - pointer_default(unique) -] -interface ObjectRpcBaseTypes -{ - typedef unsigned hyper ID; - typedef ID MID; - typedef ID OXID; - typedef ID OID; - typedef ID SETID; - typedef GUID IPID; - typedef GUID CID; - typedef REFGUID REFIPID; - - const unsigned short COM_MINOR_VERSION_1 = 1; - const unsigned short COM_MINOR_VERSION_2 = 2; - - const unsigned short COM_MAJOR_VERSION = 5; - const unsigned short COM_MINOR_VERSION = 3; - - typedef struct tagCOMVERSION { - unsigned short MajorVersion; - unsigned short MinorVersion; - } COMVERSION; - - const unsigned long ORPCF_NULL = 0; - const unsigned long ORPCF_LOCAL = 1; - const unsigned long ORPCF_RESERVED1 = 2; - const unsigned long ORPCF_RESERVED2 = 4; - const unsigned long ORPCF_RESERVED3 = 8; - const unsigned long ORPCF_RESERVED4 = 16; - - typedef struct tagORPC_EXTENT { - GUID id; - unsigned long size; - [size_is((size+7)&~7)] byte data[]; - } ORPC_EXTENT; - - typedef struct tagORPC_EXTENT_ARRAY { - unsigned long size; - unsigned long reserved; - [size_is((size+1)&~1,), unique] ORPC_EXTENT **extent; - } ORPC_EXTENT_ARRAY; - - typedef struct tagORPCTHIS { - COMVERSION version; - unsigned long flags; - unsigned long reserved1; - CID cid; - [unique] ORPC_EXTENT_ARRAY *extensions; - } ORPCTHIS; - - typedef struct tagORPCTHAT { - unsigned long flags; - [unique] ORPC_EXTENT_ARRAY *extensions; - } ORPCTHAT; - - const unsigned short NCADG_IP_UDP = 0x08; - const unsigned short NCACN_IP_TCP = 0x07; - const unsigned short NCADG_IPX = 0x0E; - const unsigned short NCACN_SPX = 0x0C; - const unsigned short NCACN_NB_NB = 0x12; - const unsigned short NCACN_NB_IPX = 0x0D; - const unsigned short NCACN_DNET_NSP = 0x04; - const unsigned short NCACN_HTTP = 0x1F; - - typedef struct tagSTRINGBINDING { - unsigned short wTowerId; - [string] unsigned short aNetworkAddr[]; - } STRINGBINDING; - - const unsigned short COM_C_AUTHZ_NONE = 0xffff; - - typedef struct tagSECURITYBINDING { - unsigned short wAuthnSvc; - unsigned short wAuthzSvc; - [string] unsigned short aPrincName[]; - } SECURITYBINDING; - - typedef struct tagDUALSTRINGARRAY { - unsigned short wNumEntries; - unsigned short wSecurityOffset; - [size_is(wNumEntries)] unsigned short aStringArray[]; - } DUALSTRINGARRAY; - - const unsigned long OBJREF_SIGNATURE = 0x574f454d; /* "MEOW" */ - const unsigned long OBJREF_STANDARD = 0x1; - const unsigned long OBJREF_HANDLER = 0x2; - const unsigned long OBJREF_CUSTOM = 0x4; - const unsigned long SORF_OXRES1 = 0x1; - const unsigned long SORF_OXRES2 = 0x20; - const unsigned long SORF_OXRES3 = 0x40; - const unsigned long SORF_OXRES4 = 0x80; - const unsigned long SORF_OXRES5 = 0x100; - const unsigned long SORF_OXRES6 = 0x200; - const unsigned long SORF_OXRES7 = 0x400; - const unsigned long SORF_OXRES8 = 0x800; - const unsigned long SORF_NULL = 0x0; - const unsigned long SORF_NOPING = 0x1000; - - typedef struct tagSTDOBJREF { - unsigned long flags; - unsigned long cPublicRefs; - OXID oxid; - OID oid; - IPID ipid; - } STDOBJREF; - - typedef struct tagOBJREF { - unsigned long signature; - unsigned long flags; - GUID iid; - [switch_is(flags)] union { - [case(OBJREF_STANDARD)] struct OR_STANDARD { - STDOBJREF std; - DUALSTRINGARRAY saResAddr; - } u_standard; - [case(OBJREF_HANDLER)] struct OR_HANDLER { - STDOBJREF std; - CLSID clsid; - DUALSTRINGARRAY saResAddr; - } u_handler; - [case(OBJREF_CUSTOM)] struct OR_CUSTOM { - CLSID clsid; - unsigned long cbExtension; - unsigned long size; - [size_is(size), ref] byte *pData; - } u_custom; - } u_objref; - } OBJREF; - - typedef struct tagMInterfacePointer { - ULONG ulCntData; - [size_is(ulCntData)] BYTE abData[]; - } MInterfacePointer; - - typedef [unique] MInterfacePointer *PMInterfacePointer; - -} /* interface ObjectRpcBaseTypes */ - -[ - object, - uuid(00000131-0000-0000-C000-000000000046) -] -interface IRemUnknown : IUnknown -{ - typedef [unique] IRemUnknown *LPREMUNKNOWN; - - typedef struct tagREMQIRESULT { - HRESULT hResult; - STDOBJREF std; - } REMQIRESULT; - - typedef struct tagREMINTERFACEREF { - IPID ipid; - unsigned long cPublicRefs; - unsigned long cPrivateRefs; - } REMINTERFACEREF; - - HRESULT RemQueryInterface( - [in] REFIPID ripid, - [in] unsigned long cRefs, - [in] unsigned short cIids, - [in, size_is(cIids)] IID *iids, - [out, size_is(,cIids)] REMQIRESULT **ppQIResults); - - HRESULT RemAddRef( - [in] unsigned short cInterfaceRefs, - [in, size_is(cInterfaceRefs)] REMINTERFACEREF* InterfaceRefs, - [out, size_is(cInterfaceRefs)] HRESULT *pResults); - - HRESULT RemRelease( - [in] unsigned short cInterfaceRefs, - [in, size_is(cInterfaceRefs)] REMINTERFACEREF* InterfaceRefs); -} - -[ - object, - uuid(00000142-0000-0000-C000-000000000046) -] -interface IRemUnknown2 : IRemUnknown -{ - typedef [unique] IRemUnknown2 *LPREMUNKNOWN2; - - HRESULT RemQueryInterface2( - [in] REFIPID ripid, - [in] unsigned short cIids, - [in, size_is(cIids)] IID *iids, - [out, size_is(cIids)] HRESULT *phr, - [out, size_is(cIids)] MInterfacePointer **ppMIF); -} - -cpp_quote("#if 0") -[ - uuid(99fcfec4-5260-101b-bbcb-00aa0021347a), - pointer_default(unique) -] -interface IOXIDResolver -{ - [idempotent] error_status_t ResolveOxid( - [in] handle_t hRpc, - [in] OXID *pOxid, - [in] unsigned short cRequestedProtseqs, - [in, ref, size_is(cRequestedProtseqs)] unsigned short arRequestedProtseqs[], - [out, ref] DUALSTRINGARRAY **ppdsaOxidBindings, - [out, ref] IPID *pipidRemUnknown, - [out, ref] DWORD *pAuthnHint); - - [idempotent] error_status_t SimplePing( - [in] handle_t hRpc, - [in] SETID *pSetId); - - [idempotent] error_status_t ComplexPing( - [in] handle_t hRpc, - [in, out] SETID *pSetId, - [in] unsigned short SequenceNum, - [in] unsigned short cAddToSet, - [in] unsigned short cDelFromSet, - [in, unique, size_is(cAddToSet)] OID AddToSet[], - [in, unique, size_is(cDelFromSet)] OID DelFromSet[], - [out] unsigned short *pPingBackoffFactor); - - [idempotent] error_status_t ServerAlive( - [in] handle_t hRpc); - - [idempotent] error_status_t ResolveOxid2( - [in] handle_t hRpc, - [in] OXID *pOxid, - [in] unsigned short cRequestedProtseqs, - [in, ref, size_is(cRequestedProtseqs)] unsigned short arRequestedProtseqs[], - [out, ref] DUALSTRINGARRAY **ppdsaOxidBindings, - [out, ref] IPID *pipidRemUnknown, - [out, ref] DWORD *pAuthnHint, - [out, ref] COMVERSION *pComVersion); -} - -[ - uuid(4d9f4ab8-7d1c-11cf-861e-0020af6e7c57), - pointer_default(unique) -] -interface IRemoteActivation -{ - const unsigned long MODE_GET_CLASS_OBJECT = 0xffffffff; - - HRESULT RemoteActivation( - [in] handle_t hRpc, - [in] ORPCTHIS *ORPCthis, - [out] ORPCTHAT *ORPCthat, - [in] GUID *Clsid, - [in, string, unique] WCHAR *pwszObjectName, - [in, unique] MInterfacePointer *pObjectStorage, - [in] DWORD ClientImpLevel, - [in] DWORD Mode, - [in] DWORD Interfaces, - [in, unique, size_is(Interfaces)] IID *pIIDs, - [in] unsigned short cRequestedProtseqs, - [in, size_is(cRequestedProtseqs)] unsigned short RequestedProtseqs[], - [out] OXID *pOxid, - [out] DUALSTRINGARRAY **ppdsaOxidBindings, - [out] IPID *pipidRemUnknown, - [out] DWORD *pAuthnHint, - [out] COMVERSION *pServerVersion, - [out] HRESULT *phr, - [out,size_is(Interfaces)] MInterfacePointer **ppInterfaceData, - [out,size_is(Interfaces)] HRESULT *pResults); -} -cpp_quote("#endif") +/* + * Copyright 2003 Ove KÕven, TransGaming Technologies + * + * 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 + */ + +/* see http://www.microsoft.com/msj/0398/dcom.htm */ +/* and the official DCOM specification + * (there's a copy at http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm) */ + +import "unknwn.idl"; + +[ + uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), + pointer_default(unique) +] +interface ObjectRpcBaseTypes +{ + typedef unsigned hyper ID; + typedef ID MID; + typedef ID OXID; + typedef ID OID; [truncated at 1000 lines; 3575 more skipped]

18 years, 10 months

[sgasiorek] 19369: little fix for one polish char

by sgasiorek＠svn.reactos.com

little fix for one polish char Modified: trunk/reactos/lib/userenv/Pl.rc _____ Modified: trunk/reactos/lib/userenv/Pl.rc --- trunk/reactos/lib/userenv/Pl.rc 2005-11-20 14:54:49 UTC (rev 19368) +++ trunk/reactos/lib/userenv/Pl.rc 2005-11-20 14:56:24 UTC (rev 19369) @@ -26,7 +26,7 @@ IDS_FAVORITES "Ulubione" IDS_STARTMENU "Menu Start" IDS_PROGRAMS "Menu Start\\Programy" - IDS_ADMINTOOLS "Menu Start\\Programy\\Narz?¬ia administracyjne" + IDS_ADMINTOOLS "Menu Start\\Programy\\NarzÛdzia administracyjne" IDS_STARTUP "Menu Start\\Programy\\Autostart" IDS_MYDOCUMENTS "Moje dokumenty" IDS_MYPICTURES "Moje dokumenty\\Moje obrazy"

18 years, 10 months

[gvg] 19368: Sync to Wine-0_9_1:

by gvg＠svn.reactos.com

Sync to Wine-0_9_1: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing returns section Modified: trunk/reactos/lib/uxtheme/system.c _____ Modified: trunk/reactos/lib/uxtheme/system.c --- trunk/reactos/lib/uxtheme/system.c 2005-11-20 14:51:28 UTC (rev 19367) +++ trunk/reactos/lib/uxtheme/system.c 2005-11-20 14:54:49 UTC (rev 19368) @@ -600,7 +600,13 @@ /*********************************************************************** * GetWindowTheme (UXTHEME.@) * - * Retrieve the last theme opened for a window + * Retrieve the last theme opened for a window. + * + * PARAMS + * hwnd [I] window to retrieve the theme for + * + * RETURNS + * The most recent theme. */ HTHEME WINAPI GetWindowTheme(HWND hwnd) { @@ -788,6 +794,10 @@ * pszColorName Color defined in the theme, eg. NormalColor * pszSizeName Size defined in the theme, eg. NormalSize * hThemeFile Handle to theme file + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, @@ -806,6 +816,10 @@ * * PARAMS * hThemeFile Handle to theme file + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile) { @@ -824,6 +838,10 @@ * unknown See notes * hWnd Window requesting the theme change * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code + * * NOTES * I'm not sure what the second parameter is (the datatype is likely wrong), other then this: * Under XP if I pass @@ -854,6 +872,10 @@ * dwColorNameLen Length, in characters, of color name buffer * pszSizeName Buffer to receive the default size name * dwSizeNameLen Length, in characters, of size name buffer + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwColorNameLen, LPWSTR pszSizeName, @@ -885,6 +907,10 @@ * pszThemePath Path containing themes * callback Called for each theme found in path * lpData Passed through to callback + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback, LPVOID lpData) @@ -1097,6 +1123,10 @@ * * PARAMS * pszIniFileName Path to a theme file + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI CheckThemeSignature(LPCWSTR pszThemeFileName) {

18 years, 10 months

[gvg] 19367: Sync to Wine-0_9_1:

by gvg＠svn.reactos.com

Sync to Wine-0_9_1: Jacek Caban <jack(a)itma.pwr.wroc.pl> - Added IInternetPriority implementation to FileProtocol. - Report BINDSTATUS_SENDINGREQUEST in FileProtocol::Start. - Added implementation of IInternetPriority in HttpProtocol. Added: trunk/reactos/lib/urlmon/binding.c Modified: trunk/reactos/lib/urlmon/file.c Modified: trunk/reactos/lib/urlmon/http.c Modified: trunk/reactos/lib/urlmon/internet.c Modified: trunk/reactos/lib/urlmon/session.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/urlmon.spec Modified: trunk/reactos/lib/urlmon/urlmon.xml Modified: trunk/reactos/lib/urlmon/urlmon_main.h Modified: trunk/reactos/w32api/include/urlmon.h _____ Copied: trunk/reactos/lib/urlmon/binding.c (from rev 19364, vendor/wine/dlls/urlmon/current/binding.c) Property changes on: trunk/reactos/lib/urlmon/binding.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/file.c --- trunk/reactos/lib/urlmon/file.c 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/file.c 2005-11-20 14:51:28 UTC (rev 19367) @@ -33,16 +33,19 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; HANDLE file; + LONG priority; LONG ref; } FileProtocol; +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) + #define PROTOCOL_THIS(iface) DEFINE_THIS(FileProtocol, InternetProtocol, iface) -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) - static HRESULT WINAPI FileProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { FileProtocol *This = PROTOCOL_THIS(iface); @@ -57,6 +60,9 @@ }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -104,6 +110,7 @@ LARGE_INTEGER size; DWORD len; LPWSTR url, mime = NULL; + WCHAR null_char = 0; HRESULT hres; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -132,6 +139,8 @@ IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, mime); if(!This->file) { + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); + This->file = CreateFileW(url+sizeof(wszFile)/sizeof(WCHAR), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -263,6 +272,57 @@ FileProtocol_UnlockRequest }; +#define PRIORITY_THIS(iface) DEFINE_THIS(FileProtocol, InternetPriority, iface) + +static HRESULT WINAPI FilePriority_QueryInterface(IInternetPriority *iface, + REFIID riid, void **ppv) +{ + FileProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI FilePriority_AddRef(IInternetPriority *iface) +{ + FileProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI FilePriority_Release(IInternetPriority *iface) +{ + FileProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI FilePriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + FileProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%ld)\n", This, nPriority); + + This->priority = nPriority; + return S_OK; +} + +static HRESULT WINAPI FilePriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + FileProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pnPriority); + + *pnPriority = This->priority; + return S_OK; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl FilePriorityVtbl = { + FilePriority_QueryInterface, + FilePriority_AddRef, + FilePriority_Release, + FilePriority_SetPriority, + FilePriority_GetPriority +}; + HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FileProtocol *ret; @@ -274,7 +334,9 @@ ret = HeapAlloc(GetProcessHeap(), 0, sizeof(FileProtocol)); ret->lpInternetProtocolVtbl = &FileProtocolVtbl; + ret->lpInternetPriorityVtbl = &FilePriorityVtbl; ret->file = NULL; + ret->priority = 0; ret->ref = 1; *ppobj = PROTOCOL(ret); _____ Modified: trunk/reactos/lib/urlmon/http.c --- trunk/reactos/lib/urlmon/http.c 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/http.c 2005-11-20 14:51:28 UTC (rev 19367) @@ -32,14 +32,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetProtocolVtbl *lpInternetProtocolVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; + + LONG priority; + LONG ref; } HttpProtocol; +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) + #define PROTOCOL_THIS(iface) DEFINE_THIS(HttpProtocol, InternetProtocol, iface) -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) - static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { HttpProtocol *This = PROTOCOL_THIS(iface); @@ -54,6 +59,9 @@ }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); } if(*ppv) { @@ -167,6 +175,56 @@ #undef PROTOCOL_THIS +#define PRIORITY_THIS(iface) DEFINE_THIS(HttpProtocol, InternetPriority, iface) + +static HRESULT WINAPI HttpPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpPriority_AddRef(IInternetPriority *iface) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpPriority_Release(IInternetPriority *iface) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpPriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%ld)\n", This, nPriority); + + This->priority = nPriority; + return S_OK; +} + +static HRESULT WINAPI HttpPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + HttpProtocol *This = PRIORITY_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pnPriority); + + *pnPriority = This->priority; + return S_OK; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl HttpPriorityVtbl = { + HttpPriority_QueryInterface, + HttpPriority_AddRef, + HttpPriority_Release, + HttpPriority_SetPriority, + HttpPriority_GetPriority +}; + static const IInternetProtocolVtbl HttpProtocolVtbl = { HttpProtocol_QueryInterface, HttpProtocol_AddRef, @@ -194,8 +252,12 @@ ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HttpProtocol)); ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; + ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; + ret->ref = 1; + ret->priority = 0; + *ppobj = PROTOCOL(ret); return S_OK; _____ Modified: trunk/reactos/lib/urlmon/internet.c --- trunk/reactos/lib/urlmon/internet.c 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/internet.c 2005-11-20 14:51:28 UTC (rev 19367) @@ -64,47 +64,16 @@ static IInternetProtocolInfo *get_protocol_info(LPCWSTR url) { IInternetProtocolInfo *ret = NULL; - WCHAR schema[64], str_clsid[64]; - HKEY hkey = NULL; - DWORD res, type, size, schema_len; - CLSID clsid; - LPWSTR wszKey; + IUnknown *unk; HRESULT hres; - static const WCHAR wszProtocolsKey[] = - {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\ \'}; - static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; - - hres = parse_schema(url, 0, schema, sizeof(schema)/sizeof(schema[0]), &schema_len); - if(FAILED(hres) || !schema_len) + hres = get_protocol_iface(url, &unk); + if(FAILED(hres)) return NULL; - wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); - memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); - memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); + IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&ret); + IUnknown_Release(unk); - res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); - HeapFree(GetProcessHeap(), 0, wszKey); - if(res != ERROR_SUCCESS) { - TRACE("Could not open key %s\n", debugstr_w(wszKey)); - return NULL; - } - - size = sizeof(str_clsid); - res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { - WARN("Could not get protocol CLSID res=%ld\n", res); - return NULL; - } - - hres = CLSIDFromString(str_clsid, &clsid); - if(FAILED(hres)) { - WARN("CLSIDFromString failed: %08lx\n", hres); - return NULL; - } - - CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IInternetProtocolInfo, (void**)&ret); return ret; } _____ Modified: trunk/reactos/lib/urlmon/session.c --- trunk/reactos/lib/urlmon/session.c 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/session.c 2005-11-20 14:51:28 UTC (rev 19367) @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" #include "ole2.h" #include "urlmon.h" #include "urlmon_main.h" @@ -31,6 +32,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret) +{ + WCHAR schema[64], str_clsid[64]; + HKEY hkey = NULL; + DWORD res, type, size, schema_len; + CLSID clsid; + LPWSTR wszKey; + HRESULT hres; + + static const WCHAR wszProtocolsKey[] = + {'P','R','O','T','O','C','O','L','S','\\','H','a','n','d','l','e','r','\ \'}; + static const WCHAR wszCLSID[] = {'C','L','S','I','D',0}; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), + &schema_len, 0); + if(FAILED(hres) || !schema_len) + return E_FAIL; + + wszKey = HeapAlloc(GetProcessHeap(), 0, sizeof(wszProtocolsKey)+(schema_len+1)*sizeof(WCHAR)); + memcpy(wszKey, wszProtocolsKey, sizeof(wszProtocolsKey)); + memcpy(wszKey + sizeof(wszProtocolsKey)/sizeof(WCHAR), schema, (schema_len+1)*sizeof(WCHAR)); + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, wszKey, &hkey); + HeapFree(GetProcessHeap(), 0, wszKey); + if(res != ERROR_SUCCESS) { + TRACE("Could not open key %s\n", debugstr_w(wszKey)); + return E_FAIL; + } + + size = sizeof(str_clsid); + res = RegQueryValueExW(hkey, wszCLSID, NULL, &type, (LPBYTE)str_clsid, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) { + WARN("Could not get protocol CLSID res=%ld\n", res); + return E_FAIL; + } + + hres = CLSIDFromString(str_clsid, &clsid); + if(FAILED(hres)) { + WARN("CLSIDFromString failed: %08lx\n", hres); + return hres; + } + + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)ret); +} + static HRESULT WINAPI InternetSession_QueryInterface(IInternetSession *iface, REFIID riid, void **ppv) { _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/umon.c 2005-11-20 14:51:28 UTC (rev 19367) @@ -198,7 +198,7 @@ (This->total_read == written) ? BINDSTATUS_BEGINDOWNLOADDATA : BINDSTATUS_DOWNLOADINGDATA, - NULL); + This->URLName); if (!hr) { STGMEDIUM stg; @@ -244,7 +244,8 @@ stg.u.pstm = (IStream *)This->pstrCache; stg.pUnkForRelease = NULL; - IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size, BINDSTATUS_ENDDOWNLOADDATA, NULL); + IBindStatusCallback_OnProgress(This->pbscb, This->total_read, This->expected_size, + BINDSTATUS_ENDDOWNLOADDATA, This->URLName); IBindStatusCallback_OnDataAvailable(This->pbscb, BSCF_LASTDATANOTIFICATION, This->total_read, &fmt, &stg); if (hr) { @@ -547,13 +548,12 @@ /*********************************************************************** ******* * URLMoniker_BindToStorage ************************************************************************ ******/ -static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, +static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvObject) { - URLMonikerImpl *This = (URLMonikerImpl *)iface; HRESULT hres; BINDINFO bi; DWORD bindf; @@ -561,6 +561,9 @@ Binding *bind; int len; + WARN("(%s %p %p %s %p)\n", debugstr_w(URLName), pbc, pmkToLeft, debugstr_guid(riid), + ppvObject); + if(pmkToLeft) { FIXME("pmkToLeft != NULL\n"); return E_NOTIMPL; @@ -575,9 +578,9 @@ bind->ref = 1; URLMON_LockModule(); - len = lstrlenW(This->URLName)+1; + len = lstrlenW(URLName)+1; bind->URLName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - memcpy(bind->URLName, This->URLName, len*sizeof(WCHAR)); + memcpy(bind->URLName, URLName, len*sizeof(WCHAR)); hres = UMCreateStreamOnCacheFile(bind->URLName, 0, szFileName, &bind->hCacheFile, &bind->pstrCache); @@ -855,6 +858,37 @@ return hres; } +static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + REFIID riid, + VOID** ppvObject) +{ + URLMonikerImpl *This = (URLMonikerImpl*)iface; + WCHAR schema[64]; + BOOL bret; + + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW), schema, + sizeof(schema)/sizeof(WCHAR), 0, NULL, 0, 0, NULL, 0, NULL, 0, NULL, 0, NULL, 0}; + + bret = InternetCrackUrlW(This->URLName, 0, ICU_ESCAPE, &url); + if(!bret) { + ERR("InternetCrackUrl failed: %ld\n", GetLastError()); + return E_FAIL; + } + + if(url.nScheme == INTERNET_SCHEME_HTTP + || url.nScheme== INTERNET_SCHEME_HTTPS + || url.nScheme== INTERNET_SCHEME_FTP + || url.nScheme == INTERNET_SCHEME_GOPHER + || url.nScheme == INTERNET_SCHEME_FILE) + return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, pmkToLeft, riid, ppvObject); + + TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); + + return start_binding(This->URLName, pbc, riid, ppvObject); +} + /*********************************************************************** ******* * URLMoniker_Reduce ************************************************************************ ******/ @@ -1609,6 +1643,51 @@ } /*********************************************************************** + * URLDownloadToCacheFileA (URLMON.@) + */ +HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPSTR szFileName, + DWORD dwBufLength, DWORD dwReserved, LPBINDSTATUSCALLBACK pBSC) +{ + LPWSTR url = NULL, file_name = NULL; + int len; + HRESULT hres; + + TRACE("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName, + dwBufLength, dwReserved, pBSC); + + if(szURL) { + len = MultiByteToWideChar(CP_ACP, 0, szURL, -1, NULL, 0); + url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szURL, -1, url, -1); + } + + if(szFileName) + file_name = HeapAlloc(GetProcessHeap(), 0, dwBufLength*sizeof(WCHAR)); + + hres = URLDownloadToCacheFileW(lpUnkCaller, url, file_name, dwBufLength*sizeof(WCHAR), + dwReserved, pBSC); + + if(SUCCEEDED(hres) && file_name) + WideCharToMultiByte(CP_ACP, 0, file_name, -1, szFileName, dwBufLength, NULL, NULL); + + HeapFree(GetProcessHeap(), 0, url); + HeapFree(GetProcessHeap(), 0, file_name); + + return hres; +} + +/********************************************************************** * + * URLDownloadToCacheFileW (URLMON.@) + */ +HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPWSTR szFileName, + DWORD dwBufLength, DWORD dwReserved, LPBINDSTATUSCALLBACK pBSC) +{ + FIXME("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_w(szURL), szFileName, + dwBufLength, dwReserved, pBSC); + return E_NOTIMPL; +} + +/********************************************************************** * * HlinkSimpleNavigateToString (URLMON.@) */ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget, _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/urlmon.spec 2005-11-20 14:51:28 UTC (rev 19367) @@ -64,8 +64,8 @@ @ stdcall RevokeFormatEnumerator(ptr ptr) @ stub SetSoftwareUpdateAdvertisementState @ stub URLDownloadA -@ stub URLDownloadToCacheFileA -@ stub URLDownloadToCacheFileW +@ stdcall URLDownloadToCacheFileA(ptr str str long long ptr) +@ stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) @ stdcall URLDownloadToFileA(ptr str str long ptr) @ stdcall URLDownloadToFileW(ptr wstr wstr long ptr) @ stub URLDownloadW _____ Modified: trunk/reactos/lib/urlmon/urlmon.xml --- trunk/reactos/lib/urlmon/urlmon.xml 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/urlmon.xml 2005-11-20 14:51:28 UTC (rev 19367) @@ -18,6 +18,7 @@ <library>shlwapi</library> <library>cabinet</library> <library>wininet</library> + <file>binding.c</file> <file>file.c</file> <file>format.c</file> <file>ftp.c</file> _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.h --- trunk/reactos/lib/urlmon/urlmon_main.h 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/lib/urlmon/urlmon_main.h 2005-11-20 14:51:28 UTC (rev 19367) @@ -54,4 +54,8 @@ HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); void UMCloseCacheFileStream(IUMCacheStream *pstr); +HRESULT get_protocol_iface(LPCWSTR url, IUnknown **ret); + +HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); + #endif /* __WINE_URLMON_MAIN_H */ _____ Modified: trunk/reactos/w32api/include/urlmon.h --- trunk/reactos/w32api/include/urlmon.h 2005-11-20 14:48:19 UTC (rev 19366) +++ trunk/reactos/w32api/include/urlmon.h 2005-11-20 14:51:28 UTC (rev 19367) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 0.1 from urlmon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 0.9.1 from urlmon.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h> @@ -22,7 +22,6 @@ #endif typedef IBinding *LPBINDING; - /*********************************************************************** ****** * IBinding interface */ @@ -188,14 +187,12 @@ #endif typedef IBindStatusCallback *LPBINDSTATUSCALLBACK; - typedef enum { BINDVERB_GET = 0x0, BINDVERB_POST = 0x1, BINDVERB_PUT = 0x2, BINDVERB_CUSTOM = 0x3 } BINDVERB; - typedef enum { BINDF_ASYNCHRONOUS = 0x1, BINDF_ASYNCSTORAGE = 0x2, @@ -222,7 +219,6 @@ BINDF_PREFERDEFAULTHANDLER = 0x400000, BINDF_ENFORCERESTRICTED = 0x800000 } BINDF; - typedef struct _tagBINDINFO { ULONG cbSize; LPWSTR szExtraInfo; @@ -239,13 +235,11 @@ IUnknown *pUnk; DWORD dwReserved; } BINDINFO; - typedef struct _REMSECURITY_ATTRIBUTES { DWORD nLength; DWORD lpSecurityDescriptor; BOOL bInheritHandle; } REMSECURITY_ATTRIBUTES, *PREMSECURITY_ATTRIBUTES, *LPREMSECURITY_ATTRIBUTES; - typedef struct _tagRemBINDINFO { ULONG cbSize; LPWSTR szExtraInfo; @@ -261,7 +255,6 @@ IUnknown *pUnk; DWORD dwReserved; } RemBINDINFO; - typedef struct tagRemFORMATETC { DWORD cfFormat; DWORD ptd; @@ -269,7 +262,6 @@ LONG lindex; DWORD tymed; } RemFORMATETC, *LPREMFORMATETC; - typedef enum { BSCF_FIRSTDATANOTIFICATION = 0x1, BSCF_INTERMEDIATEDATANOTIFICATION = 0x2, @@ -277,7 +269,6 @@ BSCF_DATAFULLYAVAILABLE = 0x8, BSCF_AVAILABLEDATASIZEUNKNOWN = 0x10 } BSCF; - typedef enum BINDSTATUS { BINDSTATUS_FINDINGRESOURCE = 1, BINDSTATUS_CONNECTING, @@ -328,7 +319,6 @@ BINDSTATUS_SESSION_COOKIES_ALLOWED, BINDSTATUS_CACHECONTROL } BINDSTATUS; - /*********************************************************************** ****** * IBindStatusCallback interface */ @@ -563,7 +553,6 @@ #endif typedef IAuthenticate *LPAUTHENTICATION; - /*********************************************************************** ****** * IAuthenticate interface */ @@ -634,6 +623,204 @@ #endif /* __IAuthenticate_INTERFACE_DEFINED__ */ +#ifndef __IHttpNegotiate_FWD_DEFINED__ +#define __IHttpNegotiate_FWD_DEFINED__ +typedef struct IHttpNegotiate IHttpNegotiate; +#endif + +typedef IHttpNegotiate *LPHTTPNEGOTIATE; +/********************************************************************** ******* + * IHttpNegotiate interface + */ +#ifndef __IHttpNegotiate_INTERFACE_DEFINED__ +#define __IHttpNegotiate_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IHttpNegotiate, 0x79eac9d2, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IHttpNegotiate : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE BeginningTransaction( + LPCWSTR szURL, + LPCWSTR szHeaders, + DWORD dwReserved, + LPWSTR* pszAdditionalHeaders) = 0; + + virtual HRESULT STDMETHODCALLTYPE OnResponse( + DWORD dwResponseCode, + LPCWSTR szResponseHeaders, + LPCWSTR szRequestHeaders, + LPWSTR* pszAdditionalRequestHeaders) = 0; + +}; +#else +typedef struct IHttpNegotiateVtbl IHttpNegotiateVtbl; +struct IHttpNegotiate { + const IHttpNegotiateVtbl* lpVtbl; +}; +struct IHttpNegotiateVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IHttpNegotiate* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IHttpNegotiate* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IHttpNegotiate* This); + + /*** IHttpNegotiate methods ***/ + HRESULT (STDMETHODCALLTYPE *BeginningTransaction)( + IHttpNegotiate* This, + LPCWSTR szURL, + LPCWSTR szHeaders, + DWORD dwReserved, + LPWSTR* pszAdditionalHeaders); + + HRESULT (STDMETHODCALLTYPE *OnResponse)( + IHttpNegotiate* This, + DWORD dwResponseCode, + LPCWSTR szResponseHeaders, + LPCWSTR szRequestHeaders, + LPWSTR* pszAdditionalRequestHeaders); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IHttpNegotiate_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IHttpNegotiate_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IHttpNegotiate_Release(p) (p)->lpVtbl->Release(p) +/*** IHttpNegotiate methods ***/ +#define IHttpNegotiate_BeginningTransaction(p,a,b,c,d) (p)->lpVtbl->BeginningTransaction(p,a,b,c,d) +#define IHttpNegotiate_OnResponse(p,a,b,c,d) (p)->lpVtbl->OnResponse(p,a,b,c,d) +#endif + +#endif + +HRESULT CALLBACK IHttpNegotiate_BeginningTransaction_Proxy( + IHttpNegotiate* This, + LPCWSTR szURL, + LPCWSTR szHeaders, + DWORD dwReserved, + LPWSTR* pszAdditionalHeaders); +void __RPC_STUB IHttpNegotiate_BeginningTransaction_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IHttpNegotiate_OnResponse_Proxy( + IHttpNegotiate* This, + DWORD dwResponseCode, + LPCWSTR szResponseHeaders, + LPCWSTR szRequestHeaders, + LPWSTR* pszAdditionalRequestHeaders); +void __RPC_STUB IHttpNegotiate_OnResponse_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IHttpNegotiate_INTERFACE_DEFINED__ */ + +#ifndef __IHttpNegotiate2_FWD_DEFINED__ +#define __IHttpNegotiate2_FWD_DEFINED__ +typedef struct IHttpNegotiate2 IHttpNegotiate2; +#endif + +typedef IHttpNegotiate2 *LPHTTPNEGOTIATE2; +/********************************************************************** ******* + * IHttpNegotiate2 interface + */ +#ifndef __IHttpNegotiate2_INTERFACE_DEFINED__ +#define __IHttpNegotiate2_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IHttpNegotiate2, 0x4f9f9fcb, 0xe0f4, 0x48eb, 0xb7,0xab, 0xfa,0x2e,0xa9,0x36,0x5c,0xb4); +#if defined(__cplusplus) && !defined(CINTERFACE) +struct IHttpNegotiate2 : public IHttpNegotiate +{ + virtual HRESULT STDMETHODCALLTYPE GetRootSecurityId( + BYTE* pbSecurityId, + DWORD* pcbSecurityId, + DWORD_PTR dwReserved) = 0; + +}; +#else +typedef struct IHttpNegotiate2Vtbl IHttpNegotiate2Vtbl; +struct IHttpNegotiate2 { + const IHttpNegotiate2Vtbl* lpVtbl; +}; +struct IHttpNegotiate2Vtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IHttpNegotiate2* This, + REFIID riid, + void** ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IHttpNegotiate2* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IHttpNegotiate2* This); + + /*** IHttpNegotiate methods ***/ + HRESULT (STDMETHODCALLTYPE *BeginningTransaction)( + IHttpNegotiate2* This, + LPCWSTR szURL, + LPCWSTR szHeaders, + DWORD dwReserved, + LPWSTR* pszAdditionalHeaders); + + HRESULT (STDMETHODCALLTYPE *OnResponse)( + IHttpNegotiate2* This, + DWORD dwResponseCode, + LPCWSTR szResponseHeaders, + LPCWSTR szRequestHeaders, + LPWSTR* pszAdditionalRequestHeaders); + + /*** IHttpNegotiate2 methods ***/ + HRESULT (STDMETHODCALLTYPE *GetRootSecurityId)( + IHttpNegotiate2* This, + BYTE* pbSecurityId, + DWORD* pcbSecurityId, + DWORD_PTR dwReserved); + + END_INTERFACE +}; + +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IHttpNegotiate2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IHttpNegotiate2_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IHttpNegotiate2_Release(p) (p)->lpVtbl->Release(p) +/*** IHttpNegotiate methods ***/ +#define IHttpNegotiate2_BeginningTransaction(p,a,b,c,d) (p)->lpVtbl->BeginningTransaction(p,a,b,c,d) +#define IHttpNegotiate2_OnResponse(p,a,b,c,d) (p)->lpVtbl->OnResponse(p,a,b,c,d) +/*** IHttpNegotiate2 methods ***/ +#define IHttpNegotiate2_GetRootSecurityId(p,a,b,c) (p)->lpVtbl->GetRootSecurityId(p,a,b,c) +#endif + +#endif + +HRESULT CALLBACK IHttpNegotiate2_GetRootSecurityId_Proxy( + IHttpNegotiate2* This, + BYTE* pbSecurityId, + DWORD* pcbSecurityId, + DWORD_PTR dwReserved); +void __RPC_STUB IHttpNegotiate2_GetRootSecurityId_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __IHttpNegotiate2_INTERFACE_DEFINED__ */ + #define SID_IBindHost IID_IBindHost #define SID_SBindHost IID_IBindHost #ifndef __IBindHost_FWD_DEFINED__ @@ -642,7 +829,6 @@ #endif typedef IBindHost *LPBINDHOST; - /*********************************************************************** ****** * IBindHost interface */ @@ -806,7 +992,6 @@ #endif typedef IWinInetInfo *LPWININETINFO; - /*********************************************************************** ****** * IWinInetInfo interface */ @@ -893,7 +1078,6 @@ #endif typedef IWinInetHttpInfo *LPWININETHTTPINFO; - /*********************************************************************** ****** * IWinInetHttpInfo interface */ @@ -999,7 +1183,6 @@ #endif typedef IPersistMoniker *LPPERSISTMONIKER; - /*********************************************************************** ****** * IPersistMoniker interface */ @@ -1166,12 +1349,10 @@ #endif typedef IMonikerProp *LPMONIKERPROP; - typedef enum { MIMETYPEPROP = 0x0, USE_SRC_URL = 0x1 } MONIKERPROPERTY; - /*********************************************************************** ****** * IMonikerProp interface */ @@ -1245,7 +1426,6 @@ #endif typedef IInternetBindInfo *LPIINTERNETBINDINFO; - typedef enum tagBINDSTRING { BINDSTRING_HEADERS = 1, BINDSTRING_ACCEPT_MIMES, @@ -1260,9 +1440,11 @@ BINDSTRING_ACCEPT_ENCODINGS, BINDSTRING_POST_COOKIE, BINDSTRING_POST_DATA_MIME, - BINDSTRING_URL + BINDSTRING_URL, + BINDSTRING_IID, + BINDSTRING_FLAG_BIND_TO_OBJECT, + BINDSTRING_PTR_BIND_CONTEXT } BINDSTRING; - /*********************************************************************** ****** * IInternetBindInfo interface */ @@ -1361,7 +1543,6 @@ #endif typedef IInternetPriority *LPIINTERNETPRIORITY; - /*********************************************************************** ****** * IInternetPriority interface */ @@ -1448,7 +1629,6 @@ #endif typedef IInternetProtocolRoot *LPIINTERNETPROTOCOLROOT; - typedef enum _tagPI_FLAGS { PI_PARSE_URL = 0x1, PI_FILTER_MODE = 0x2, @@ -1462,14 +1642,12 @@ PI_CLASSINSTALL = 0x200, PD_FORCE_SWITCH = 0x10000 } PI_FLAGS; - typedef struct _tagPROTOCOLDATA { DWORD grfFlags; DWORD dwState; LPVOID pData; ULONG cbData; } PROTOCOLDATA; - /*********************************************************************** ****** * IInternetProtocolRoot interface */ @@ -1626,7 +1804,6 @@ #endif /* __IInternetProtocolRoot_INTERFACE_DEFINED__ */ typedef IInternetProtocolSink *LPIINTERNETPROTOCOLSINK; - /*********************************************************************** ****** * IInternetProtocolSink interface */ @@ -1760,7 +1937,6 @@ #endif typedef IInternetProtocol *LPIINTERNETPROTOCOL; - /*********************************************************************** ****** * IInternetProtocol interface */ @@ -1924,7 +2100,6 @@ #endif typedef IInternetProtocolInfo *LPIINTERNETPROTOCOLINFO; - typedef enum _tagPARSEACTION { PARSE_CANONICALIZE = 1, PARSE_FRIENDLY, @@ -1946,12 +2121,10 @@ PARSE_ESCAPE, PARSE_UNESCAPE } PARSEACTION; - typedef enum _tagPSUACTION { PSU_DEFAULT = 1, PSU_SECURITY_URL_ONLY } PSUACTION; - typedef enum _tagQUERYOPTION { QUERY_EXPIRATION_DATE = 1, QUERY_TIME_OF_LAST_CHANGE, @@ -1968,7 +2141,6 @@ QUERY_IS_SECURE, QUERY_IS_SAFE } QUERYOPTION; - /*********************************************************************** ****** * IInternetProtocolInfo interface */ @@ -2147,12 +2319,10 @@ #endif typedef IInternetSession *LPIINTERNETSESSION; - typedef enum _tagOIBDG_FLAGS { OIBDG_APARTMENTTHREADED = 0x100, OIBDG_DATAONLY = 0x1000 } OIBDG_FLAGS; - [truncated at 1000 lines; 230 more skipped]

18 years, 10 months

[sgasiorek] 19366: added Polish resource

by sgasiorek＠svn.reactos.com

added Polish resource Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_Pl.rc _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-11-20 14:31:55 UTC (rev 19365) +++ trunk/reactos/lib/aclui/aclui.rc 2005-11-20 14:48:19 UTC (rev 19366) @@ -15,3 +15,4 @@ #include "aclui_Nl.rc" #include "aclui_Sv.rc" #include "aclui_Es.rc" +#include "aclui_Pl.rc" _____ Added: trunk/reactos/lib/aclui/aclui_Pl.rc --- trunk/reactos/lib/aclui/aclui_Pl.rc 2005-11-20 14:31:55 UTC (rev 19365) +++ trunk/reactos/lib/aclui/aclui_Pl.rc 2005-11-20 14:48:19 UTC (rev 19366) @@ -0,0 +1,28 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Zabezpieczenia" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Nazwy grupy lub u?ytkownika:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "&Dodaj...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "U&su±", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "Zezwalaj", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Odm¾w", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Kliknij przycisk Zaawansowane, aby przej£µ do specjalnych uprawnie± lub ustawie± zaawansowanych.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "Z&aawansowane", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "Uprawnienia dla %1" + IDS_UNKNOWN "Nieznany" + IDS_SPECIAL_PERMISSIONS "Uprawnienia specjalne" + IDS_PERMISSIONS_FOR "Uprawnienia dla %1" + IDS_PERMISSIONS "Uprawnienia" +} +

18 years, 10 months

[mf] 19365: make compatible again to Windows 2000

by mf＠svn.reactos.com

make compatible again to Windows 2000 Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-11-20 14:30:08 UTC (rev 19364) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-11-20 14:31:55 UTC (rev 19365) @@ -453,6 +453,8 @@ dir += 7; } + ///@todo use SHGetFileInfo() with SHGFI_EXETYPE flag to determine EXE type and open console window + HINSTANCE hinst = ShellExecute(_hwnd, NULL, p, NULL, dir, SW_SHOWNORMAL); if ((int)hinst <= 32) _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp --- trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp 2005-11-20 14:30:08 UTC (rev 19364) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp 2005-11-20 14:31:55 UTC (rev 19365) @@ -369,7 +369,7 @@ CHECKERROR(sf->GetUIObjectOf(hWnd, 1, &idl, riid, 0, ppvOut)); } -#if 1 // ILCombine() was missing in previous versions of MinGW. +#if 0 // ILCombine() was missing in previous versions of MinGW and is not exported from shell32.dll on Windows 2000. // convert an item id list from relative to absolute (=relative to the desktop) format ShellPath ShellPath::create_absolute_pidl(LPCITEMIDLIST parent_pidl) const @@ -415,7 +415,10 @@ return p; } -UINT ILGetSize(LPCITEMIDLIST pidl) +#endif + + // local implementation of ILGetSize() to replace missing export on Windows 2000 +UINT ILGetSize_local(LPCITEMIDLIST pidl) { if (!pidl) return 0; @@ -430,9 +433,7 @@ return l; } -#endif - #ifndef _SHFOLDER_H_ #define CSIDL_FLAG_CREATE 0x8000 #endif _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h --- trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-11-20 14:30:08 UTC (rev 19364) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.h 2005-11-20 14:31:55 UTC (rev 19365) @@ -633,15 +633,16 @@ extern HRESULT name_from_pidl(IShellFolder* folder, LPCITEMIDLIST pidl, LPTSTR buffer, int len, SHGDNF flags); -#if 0 // ILGetSize() was missing in previous versions of MinGW. -extern "C" UINT STDCALL ILGetSize(LPCITEMIDLIST pidl); + // ILGetSize() was missing in previous versions of MinGW and is not exported from shell32.dll on Windows 2000. +extern "C" UINT ILGetSize_local(LPCITEMIDLIST pidl); +#define ILGetSize ILGetSize_local -#ifdef UNICODE // CFSTR_FILENAME is defined wrong in MinGW. +#if 0 +#ifdef UNICODE // CFSTR_FILENAME was defined wrong in previous versions of MinGW. #define CFSTR_FILENAMEW TEXT("FileNameW") #undef CFSTR_FILENAME #define CFSTR_FILENAME CFSTR_FILENAMEW #endif - #endif

18 years, 10 months

[gvg] 19364: Sync to Wine-0_9_1:

by gvg＠svn.reactos.com

Sync to Wine-0_9_1: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> - Semi-stub implementation for SHRegGetValue(A|W). Modified: trunk/reactos/lib/shlwapi/reg.c Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Added: trunk/reactos/lib/shlwapi/shlwapi_Ko.rc _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-11-20 14:26:47 UTC (rev 19363) +++ trunk/reactos/lib/shlwapi/reg.c 2005-11-20 14:30:08 UTC (rev 19364) @@ -1140,6 +1140,68 @@ } /*********************************************************************** ** + * SHRegGetValueA [SHLWAPI.@] + * + * Get a value from the registry. + * + * PARAMS + * hKey [I] Handle to registry key + * lpszSubKey [I] Name of sub key containing value to get + * lpszValue [I] Name of value to get + * srrf [I] Flags for restricting returned data + * pwType [O] Pointer to the values type + * pvData [O] Pointer to the values data + * pcbData [O] Pointer to the values size + * + * RETURNS + * Success: ERROR_SUCCESS. Output parameters contain the details read. + * Failure: An error code from RegOpenKeyExA() or SHQueryValueExA(). + */ +DWORD WINAPI SHRegGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWORD srrfFlags, + LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) +{ + DWORD dwRet = 0; + HKEY hSubKey = 0; + + TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_a(lpszSubKey), + debugstr_a(lpszValue), pwType, pvData, pcbData); + FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08lx\n", srrfFlags); + + dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); + if (! dwRet) + { + /* SHQueryValueEx expands Environment strings */ + dwRet = SHQueryValueExA(hSubKey, lpszValue, 0, pwType, pvData, pcbData); + RegCloseKey(hSubKey); + } + return dwRet; +} + +/********************************************************************** *** + * SHReg GetRegValueW [SHLWAPI.@] + * + * See SHGetValueA. + */ +DWORD WINAPI SHRegGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, DWORD srrfFlags, + LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) +{ + DWORD dwRet = 0; + HKEY hSubKey = 0; + + TRACE("(hkey=%p,%s,%s,0x%08lx, %p,%p,%p)\n", hKey, debugstr_w(lpszSubKey), + debugstr_w(lpszValue), srrfFlags,pwType, pvData, pcbData); + FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08lx\n", srrfFlags); + + dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); + if (! dwRet) + { + dwRet = SHQueryValueExW(hSubKey, lpszValue, 0, pwType, pvData, pcbData); + RegCloseKey(hSubKey); + } + return dwRet; +} + +/********************************************************************** *** * SHGetValueW [SHLWAPI.@] * * See SHGetValueA. _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-11-20 14:26:47 UTC (rev 19363) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-11-20 14:30:08 UTC (rev 19364) @@ -28,6 +28,7 @@ #include "shlwapi_De.rc" #include "shlwapi_En.rc" #include "shlwapi_Es.rc" +#include "shlwapi_Ko.rc" #include "shlwapi_Nl.rc" #include "shlwapi_No.rc" #include "shlwapi_It.rc" _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2005-11-20 14:26:47 UTC (rev 19363) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2005-11-20 14:30:08 UTC (rev 19364) @@ -726,6 +726,8 @@ @ stdcall SHRegGetPathW(long wstr wstr ptr long) @ stdcall SHRegGetUSValueA ( str str ptr ptr ptr long ptr long ) @ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long ) +@ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) +@ stdcall SHRegGetValueW ( long wstr wstr long ptr ptr ptr ) @ stdcall SHRegOpenUSKeyA ( str long long long long ) @ stdcall SHRegOpenUSKeyW ( wstr long long long long ) @ stdcall SHRegQueryInfoUSKeyA ( long ptr ptr ptr ptr long ) _____ Copied: trunk/reactos/lib/shlwapi/shlwapi_Ko.rc (from rev 19363, vendor/wine/dlls/shlwapi/current/shlwapi_Ko.rc) Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Ko.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

18 years, 10 months

[gvg] 19363: Sync to Wine-0_9_1:

by gvg＠svn.reactos.com

Sync to Wine-0_9_1: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Support for shell instance objects. Removed a wine_todo for a no longer failing test. Added a test for IPersistFolder3::GetCurFolder. - Added initial tests for shdocvw's FolderShortcut related functionality. - Only return SHDOCVW_ClassFactory if asked for CLSID_WebBrowser. Modified: trunk/reactos/include/wine/objidl.h Added: trunk/reactos/lib/shdocvw/Ko.rc Deleted: trunk/reactos/lib/shdocvw/Makefile.in Added: trunk/reactos/lib/shdocvw/client.c Modified: trunk/reactos/lib/shdocvw/oleobject.c Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw.rc Modified: trunk/reactos/lib/shdocvw/shdocvw.xml Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c Added: trunk/reactos/lib/shdocvw/shlinstobj.c Added: trunk/reactos/lib/shdocvw/view.c Modified: trunk/reactos/lib/shdocvw/webbrowser.c Modified: trunk/reactos/lib/uuid/uuid.c Modified: trunk/reactos/w32api/include/mshtml.h Modified: trunk/reactos/w32api/include/oleidl.h _____ Modified: trunk/reactos/include/wine/objidl.h --- trunk/reactos/include/wine/objidl.h 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/include/wine/objidl.h 2005-11-20 14:26:47 UTC (rev 19363) @@ -643,6 +643,36 @@ }; #undef INTERFACE +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IMoniker_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IMoniker_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IMoniker_Release(p) (p)->lpVtbl->Release(p) +/*** IPersist methods ***/ +#define IMoniker_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a) +/*** IPersistStream methods ***/ +#define IMoniker_IsDirty(p) (p)->lpVtbl->IsDirty(p) +#define IMoniker_Load(p,a) (p)->lpVtbl->Load(p,a) +#define IMoniker_Save(p,a,b) (p)->lpVtbl->Save(p,a,b) +#define IMoniker_GetSizeMax(p,a) (p)->lpVtbl->GetSizeMax(p,a) +/*** IMoniker methods ***/ +#define IMoniker_BindToObject(p,a,b,c,d) (p)->lpVtbl->BindToObject(p,a,b,c,d) +#define IMoniker_BindToStorage(p,a,b,c,d) (p)->lpVtbl->BindToStorage(p,a,b,c,d) +#define IMoniker_Reduce(p,a,b,c,d) (p)->lpVtbl->Reduce(p,a,b,c,d) +#define IMoniker_ComposeWith(p,a,b,c) (p)->lpVtbl->ComposeWith(p,a,b,c) +#define IMoniker_Enum(p,a,b) (p)->lpVtbl->Enum(p,a,b) +#define IMoniker_IsEqual(p,a) (p)->lpVtbl->IsEqual(p,a) +#define IMoniker_Hash(p,a) (p)->lpVtbl->Hash(p,a) +#define IMoniker_IsRunning(p,a,b,c) (p)->lpVtbl->IsRunning(p,a,b,c) +#define IMoniker_GetTimeOfLastChange(p,a,b,c) (p)->lpVtbl->GetTimeOfLastChange(p,a,b,c) +#define IMoniker_Inverse(p,a) (p)->lpVtbl->Inverse(p,a) +#define IMoniker_CommonPrefixWith(p,a,b) (p)->lpVtbl->CommonPrefixWith(p,a,b) +#define IMoniker_RelativePathTo(p,a,b) (p)->lpVtbl->RelativePathTo(p,a,b) +#define IMoniker_GetDisplayName(p,a,b,c) (p)->lpVtbl->GetDisplayName(p,a,b,c) +#define IMoniker_ParseDisplayName(p,a,b,c,d,e) (p)->lpVtbl->ParseDisplayName(p,a,b,c,d,e) +#define IMoniker_IsSystemMoniker(p,a) (p)->lpVtbl->IsSystemMoniker(p,a) +#endif + EXTERN_C const IID IID_IPersistStorage; #define INTERFACE IPersistStorage DECLARE_INTERFACE_(IPersistStorage,IPersist) _____ Copied: trunk/reactos/lib/shdocvw/Ko.rc (from rev 19361, vendor/wine/dlls/shdocvw/current/Ko.rc) Property changes on: trunk/reactos/lib/shdocvw/Ko.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Deleted: trunk/reactos/lib/shdocvw/Makefile.in --- trunk/reactos/lib/shdocvw/Makefile.in 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/Makefile.in 2005-11-20 14:26:47 UTC (rev 19363) @@ -1,26 +0,0 @@ -EXTRADEFS = -D_SHDOCVW_ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = shdocvw.dll -IMPORTLIB = libshdocvw.$(IMPLIBEXT) -IMPORTS = urlmon ole32 user32 advapi32 kernel32 -EXTRALIBS = -luuid - -C_SRCS = \ - classinfo.c \ - events.c \ - factory.c \ - misc.c \ - oleobject.c \ - persist.c \ - regsvr.c \ - shdocvw_main.c \ - webbrowser.c - -RC_SRCS = shdocvw.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Copied: trunk/reactos/lib/shdocvw/client.c (from rev 19361, vendor/wine/dlls/shdocvw/current/client.c) --- vendor/wine/dlls/shdocvw/current/client.c 2005-11-20 13:34:15 UTC (rev 19361) +++ trunk/reactos/lib/shdocvw/client.c 2005-11-20 14:26:47 UTC (rev 19363) @@ -0,0 +1,258 @@ +/* + * Copyright 2005 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define COBJMACROS +#include "wine/debug.h" +#include "shdocvw.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +#define CLIENTSITE_THIS(iface) DEFINE_THIS(WebBrowser, OleClientSite, iface) + +static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **ppv) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = CLIENTSITE(This); + }else if(IsEqualGUID(&IID_IOleClientSite, riid)) { + TRACE("(%p)->(IID_IOleClientSite %p)\n", This, ppv); + *ppv = CLIENTSITE(This); + }else if(IsEqualGUID(&IID_IOleWindow, riid)) { + TRACE("(%p)->(IID_IOleWindow %p)\n", This, ppv); + *ppv = INPLACESITE(This); + }else if(IsEqualGUID(&IID_IOleInPlaceSite, riid)) { + TRACE("(%p)->(IID_IOleInPlaceSite %p)\n", This, ppv); + *ppv = INPLACESITE(This); + } + + if(*ppv) { + IWebBrowser2_AddRef(WEBBROWSER(This)); + return S_OK; + } + + WARN("Unsupported intrface %s\n", debugstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ClientSite_AddRef(IOleClientSite *iface) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI ClientSite_Release(IOleClientSite *iface) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, + DWORD dwWhichMoniker, IMoniker **ppmk) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_ShowObject(IOleClientSite *iface) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_OnShowWindow(IOleClientSite *iface, BOOL fShow) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + FIXME("(%p)->(%x)\n", This, fShow); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClientSite_RequestNewObjectLayout(IOleClientSite *iface) +{ + WebBrowser *This = CLIENTSITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef CLIENTSITE_THIS + +static const IOleClientSiteVtbl OleClientSiteVtbl = { + ClientSite_QueryInterface, + ClientSite_AddRef, + ClientSite_Release, + ClientSite_SaveObject, + ClientSite_GetMoniker, + ClientSite_GetContainer, + ClientSite_ShowObject, + ClientSite_OnShowWindow, + ClientSite_RequestNewObjectLayout +}; + +#define INPLACESITE_THIS(iface) DEFINE_THIS(WebBrowser, OleInPlaceSite, iface) + +static HRESULT WINAPI InPlaceSite_QueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppv) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI InPlaceSite_AddRef(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); +} + +static ULONG WINAPI InPlaceSite_Release(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); +} + +static HRESULT WINAPI InPlaceSite_GetWindow(IOleInPlaceSite *iface, HWND *phwnd) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_ContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnUIActivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, + IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, + LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, + lprcClipRect, lpFrameInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSite *iface, SIZE scrollExtent) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->({%ld %ld})\n", This, scrollExtent.cx, scrollExtent.cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnUIDeactivate(IOleInPlaceSite *iface, BOOL fUndoable) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%x)\n", This, fUndoable); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnInPlaceDeactivate(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_DiscardUndoState(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_DeactivateAndUndo(IOleInPlaceSite *iface) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceSite_OnPosRectChange(IOleInPlaceSite *iface, + LPCRECT lprcPosRect) +{ + WebBrowser *This = INPLACESITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, lprcPosRect); + return E_NOTIMPL; +} + +#undef INPLACESITE_THIS + +static const IOleInPlaceSiteVtbl OleInPlaceSiteVtbl = { + InPlaceSite_QueryInterface, + InPlaceSite_AddRef, + InPlaceSite_Release, + InPlaceSite_GetWindow, + InPlaceSite_ContextSensitiveHelp, + InPlaceSite_CanInPlaceActivate, + InPlaceSite_OnInPlaceActivate, + InPlaceSite_OnUIActivate, + InPlaceSite_GetWindowContext, + InPlaceSite_Scroll, + InPlaceSite_OnUIDeactivate, + InPlaceSite_OnInPlaceDeactivate, + InPlaceSite_DiscardUndoState, + InPlaceSite_DeactivateAndUndo, + InPlaceSite_OnPosRectChange +}; + +void WebBrowser_ClientSite_Init(WebBrowser *This) +{ + This->lpOleClientSiteVtbl = &OleClientSiteVtbl; + This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; +} Property changes on: trunk/reactos/lib/shdocvw/client.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/oleobject.c --- trunk/reactos/lib/shdocvw/oleobject.c 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/oleobject.c 2005-11-20 14:26:47 UTC (rev 19363) @@ -139,16 +139,59 @@ LPOLECLIENTSITE pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { WebBrowser *This = OLEOBJ_THIS(iface); - FIXME("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, + HRESULT hres; + + TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); + switch (iVerb) { - case OLEIVERB_INPLACEACTIVATE: - FIXME ("stub for OLEIVERB_INPLACEACTIVATE\n"); + case OLEIVERB_INPLACEACTIVATE: { + IOleInPlaceSite *inplace; + + TRACE("OLEIVERB_INPLACEACTIVATE\n"); + + if(!pActiveSite) + return E_INVALIDARG; + + hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSite, (void**)&inplace); + if(FAILED(hres)) { + WARN("Could not get IOleInPlaceSite\n"); + return hres; + } + + hres = IOleInPlaceSite_CanInPlaceActivate(inplace); + if(hres != S_OK) { + WARN("CanInPlaceActivate returned: %08lx\n", hres); + IOleInPlaceSite_Release(inplace); + return E_FAIL; + } + + hres = IOleInPlaceSite_GetWindow(inplace, &This->iphwnd); + if(FAILED(hres)) + This->iphwnd = hwndParent; + + IOleInPlaceSite_OnInPlaceActivate(inplace); + + IOleInPlaceSite_GetWindowContext(inplace, &This->frame, &This->uiwindow, + &This->pos_rect, &This->clip_rect, + &This->frameinfo); + + IOleInPlaceSite_Release(inplace); + + if(This->client) { + IOleClientSite_ShowObject(This->client); + IOleClientSite_GetContainer(This->client, &This->container); + } + + if(This->frame) + IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + + return S_OK; + } + default: + FIXME("stub for %ld\n", iVerb); break; - case OLEIVERB_HIDE: - FIXME ("stub for OLEIVERB_HIDE\n"); - break; } return E_NOTIMPL; @@ -451,4 +494,25 @@ This->lpOleControlVtbl = &OleControlVtbl; This->client = NULL; + This->container = NULL; + This->iphwnd = NULL; + This->frame_hwnd = NULL; + This->frame = NULL; + This->uiwindow = NULL; + + memset(&This->pos_rect, 0, sizeof(RECT)); + memset(&This->clip_rect, 0, sizeof(RECT)); + memset(&This->frameinfo, 0, sizeof(OLEINPLACEFRAMEINFO)); } + +void WebBrowser_OleObject_Destroy(WebBrowser *This) +{ + if(This->client) + IOleClientSite_Release(This->client); + if(This->container) + IOleContainer_Release(This->container); + if(This->frame) + IOleInPlaceFrame_Release(This->frame); + if(This->uiwindow) + IOleInPlaceUIWindow_Release(This->uiwindow); +} _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-11-20 14:26:47 UTC (rev 19363) @@ -48,11 +48,18 @@ extern IClassFactoryImpl SHDOCVW_ClassFactory; +/********************************************************************** + * Shell Instance Objects + */ +extern HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, + REFIID riid, LPVOID *ppvClassObj); /********************************************************************** * WebBrowser declaration for SHDOCVW.DLL */ typedef struct { + /* Interfaces available via WebBrowser object */ + const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; const IOleObjectVtbl *lpOleObjectVtbl; const IOleInPlaceObjectVtbl *lpOleInPlaceObjectVtbl; @@ -62,10 +69,29 @@ const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; const IQuickActivateVtbl *lpQuickActivateVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; + const IViewObject2Vtbl *lpViewObjectVtbl; + /* Interfaces available for embeded document */ + + const IOleClientSiteVtbl *lpOleClientSiteVtbl; + const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; + LONG ref; + IUnknown *document; + IOleClientSite *client; + IOleContainer *container; + + /* window context */ + + HWND iphwnd; + HWND frame_hwnd; + IOleInPlaceFrame *frame; + IOleInPlaceUIWindow *uiwindow; + RECT pos_rect; + RECT clip_rect; + OLEINPLACEFRAMEINFO frameinfo; } WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) @@ -78,13 +104,23 @@ #define CLASSINFO(x) ((IProvideClassInfo2*) &(x)->lpProvideClassInfoVtbl) #define QUICKACT(x) ((IQuickActivate*) &(x)->lpQuickActivateVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) +#define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); +#define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); +#define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) +#define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) + void WebBrowser_OleObject_Init(WebBrowser*); +void WebBrowser_ViewObject_Init(WebBrowser*); void WebBrowser_Persist_Init(WebBrowser*); void WebBrowser_ClassInfo_Init(WebBrowser*); void WebBrowser_Misc_Init(WebBrowser*); void WebBrowser_Events_Init(WebBrowser*); +void WebBrowser_ClientSite_Init(WebBrowser*); + +void WebBrowser_OleObject_Destroy(WebBrowser*); + HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); /********************************************************************** _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.rc --- trunk/reactos/lib/shdocvw/shdocvw.rc 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/shdocvw.rc 2005-11-20 14:26:47 UTC (rev 19363) @@ -30,6 +30,7 @@ #include "Fi.rc" #include "Fr.rc" #include "Ja.rc" +#include "Ko.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc" _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.xml --- trunk/reactos/lib/shdocvw/shdocvw.xml 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/shdocvw.xml 2005-11-20 14:26:47 UTC (rev 19363) @@ -15,8 +15,10 @@ <library>advapi32</library> <library>user32</library> <library>ole32</library> + <library>oleaut32</library> <library>urlmon</library> <file>classinfo.c</file> + <file>client.c</file> <file>events.c</file> <file>factory.c</file> <file>misc.c</file> @@ -24,6 +26,8 @@ <file>persist.c</file> <file>regsvr.c</file> <file>shdocvw_main.c</file> + <file>shlinstobj.c</file> + <file>view.c</file> <file>webbrowser.c</file> <file>shdocvw.rc</file> <file>shdocvw.spec</file> _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-11-20 14:26:47 UTC (rev 19363) @@ -480,7 +480,8 @@ return r; } - if (IsEqualGUID(&IID_IClassFactory, riid)) + if (IsEqualCLSID(&CLSID_WebBrowser, rclsid) && + IsEqualIID(&IID_IClassFactory, riid)) { /* Pass back our shdocvw class factory */ *ppv = (LPVOID)&SHDOCVW_ClassFactory; @@ -489,7 +490,8 @@ return S_OK; } - return CLASS_E_CLASSNOTAVAILABLE; + /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ + return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } /*********************************************************************** _____ Copied: trunk/reactos/lib/shdocvw/shlinstobj.c (from rev 19361, vendor/wine/dlls/shdocvw/current/shlinstobj.c) Property changes on: trunk/reactos/lib/shdocvw/shlinstobj.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Copied: trunk/reactos/lib/shdocvw/view.c (from rev 19361, vendor/wine/dlls/shdocvw/current/view.c) Property changes on: trunk/reactos/lib/shdocvw/view.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/webbrowser.c --- trunk/reactos/lib/shdocvw/webbrowser.c 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/shdocvw/webbrowser.c 2005-11-20 14:26:47 UTC (rev 19363) @@ -19,9 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define COBJMACROS #include "wine/debug.h" #include "shdocvw.h" +#include "mshtml.h" + WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /********************************************************************** @@ -41,7 +44,7 @@ if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = WEBBROWSER(This); - }else if(IsEqualGUID (&IID_IDispatch, riid)) { + }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = WEBBROWSER(This); }else if(IsEqualGUID(&IID_IWebBrowser, riid)) { @@ -74,18 +77,24 @@ }else if(IsEqualGUID (&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = PERSTRINIT(This); - }else if(IsEqualGUID (&IID_IProvideClassInfo, riid)) { + }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { TRACE("(%p)->(IID_IProvideClassInfo %p)\n", This, ppv); *ppv = CLASSINFO(This); - }else if(IsEqualGUID (&IID_IProvideClassInfo2, riid)) { + }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { TRACE("(%p)->(IID_IProvideClassInfo2 %p)\n", This, ppv); *ppv = CLASSINFO(This); - }else if(IsEqualGUID (&IID_IQuickActivate, riid)) { + }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv); *ppv = QUICKACT(This); - }else if(IsEqualGUID (&IID_IConnectionPointContainer, riid)) { + }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = CONPTCONT(This); + }else if(IsEqualGUID(&IID_IViewObject, riid)) { + TRACE("(%p)->(IID_IViewObject %p)\n", This, ppv); + *ppv = VIEWOBJ(This); + }else if(IsEqualGUID(&IID_IViewObject2, riid)) { + TRACE("(%p)->(IID_IViewObject2 %p)\n", This, ppv); + *ppv = VIEWOBJ2(This); } if(*ppv) { @@ -113,6 +122,11 @@ TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { + if(This->document) + IUnknown_Release(This->document); + + WebBrowser_OleObject_Destroy(This); + HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); } @@ -480,8 +494,63 @@ VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); - return E_NOTIMPL; + IPersistMoniker *persist; + IOleObject *oleobj; + IMoniker *mon; + HRESULT hres; + + TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); + + if(!This->client) + return E_FAIL; + + if(V_VT(Flags) != VT_EMPTY || V_VT(TargetFrameName) != VT_EMPTY + || V_VT(PostData) != VT_EMPTY || V_VT(Headers) != VT_EMPTY) + FIXME("Unsupported arguments\n"); + + if(V_VT(URL) != VT_BSTR) + FIXME("V_VT(URL) != VT_BSTR\n"); + + /* + * FIXME: + * We should use URLMoniker's BindToObject instead creating HTMLDocument here. + * This should be fixed when mshtml.dll and urlmon.dll will be good enough. + */ + + if(!This->document) { + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&This->document); + if(FAILED(hres)) + return hres; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IPersistMoniker, (void**)&persist); + if(FAILED(hres)) + return hres; + + hres = CreateURLMoniker(NULL, V_BSTR(URL), &mon); + if(FAILED(hres)) { + IPersistMoniker_Release(persist); + return hres; + } + + hres = IPersistMoniker_Load(persist, FALSE, mon, NULL /* FIXME */, 0); + IMoniker_Release(mon); + IPersistMoniker_Release(persist); + if(FAILED(hres)) { + WARN("Load failed: %08lx\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); + if(FAILED(hres)) + return hres; + + hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); + IOleObject_Release(oleobj); + + return hres; } static HRESULT WINAPI WebBrowser_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf) @@ -705,11 +774,15 @@ ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; ret->ref = 0; + ret->document = NULL; + WebBrowser_OleObject_Init(ret); + WebBrowser_ViewObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); WebBrowser_Misc_Init(ret); WebBrowser_Events_Init(ret); + WebBrowser_ClientSite_Init(ret); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv); if(SUCCEEDED(hres)) { _____ Modified: trunk/reactos/lib/uuid/uuid.c --- trunk/reactos/lib/uuid/uuid.c 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/lib/uuid/uuid.c 2005-11-20 14:26:47 UTC (rev 19363) @@ -89,3 +89,5 @@ DEFINE_GUID(CLSID_StdFont,0x0be35203,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0 x00,0x4b,0xb8,0x51); DEFINE_GUID(CLSID_StdPicture,0x0be35204,0x8f91,0x11ce,0x9d,0xe3,0x00,0xa a,0x00,0x4b,0xb8,0x51); + +DEFINE_GUID(CLSID_HTMLDocument, 0x25336920, 0x03f9, 0x11cf, 0x8f,0xd0, 0x00,0xaa,0x00,0x68,0x6f,0x13); _____ Modified: trunk/reactos/w32api/include/mshtml.h --- trunk/reactos/w32api/include/mshtml.h 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/w32api/include/mshtml.h 2005-11-20 14:26:47 UTC (rev 19363) @@ -156,6 +156,7 @@ STDMETHOD(get_Script)(THIS_ IDispatch**) PURE; }; #undef INTERFACE +EXTERN_C const CLSID CLSID_HTMLDocument; EXTERN_C const IID IID_IHTMLDocument2; #define INTERFACE IHTMLDocument2 _____ Modified: trunk/reactos/w32api/include/oleidl.h --- trunk/reactos/w32api/include/oleidl.h 2005-11-20 13:45:15 UTC (rev 19362) +++ trunk/reactos/w32api/include/oleidl.h 2005-11-20 14:26:47 UTC (rev 19363) @@ -125,6 +125,18 @@ }; #undef INTERFACE +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IOleContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IOleContainer_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IOleContainer_Release(p) (p)->lpVtbl->Release(p) +/*** IParseDisplayName methods ***/ +#define IOleContainer_ParseDisplayName(p,a,b,c,d) (p)->lpVtbl->ParseDisplayName(p,a,b,c,d) +/*** IOleContainer methods ***/ +#define IOleContainer_EnumObjects(p,a,b) (p)->lpVtbl->EnumObjects(p,a,b) +#define IOleContainer_LockContainer(p,a) (p)->lpVtbl->LockContainer(p,a) +#endif + EXTERN_C const IID IID_IOleItemContainer; #define INTERFACE IOleItemContainer DECLARE_INTERFACE_(IOleItemContainer,IOleContainer) @@ -275,6 +287,21 @@ }; #undef INTERFACE +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IOleInPlaceUIWindow_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IOleInPlaceUIWindow_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IOleInPlaceUIWindow_Release(p) (p)->lpVtbl->Release(p) +/*** IOleWindow methods ***/ +#define IOleInPlaceUIWindow_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a) +#define IOleInPlaceUIWindow_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a) +/*** IOleInPlaceUIWindow methods ***/ +#define IOleInPlaceUIWindow_GetBorder(p,a) (p)->lpVtbl->GetBorder(p,a) +#define IOleInPlaceUIWindow_RequestBorderSpace(p,a) (p)->lpVtbl->RequestBorderSpace(p,a) +#define IOleInPlaceUIWindow_SetBorderSpace(p,a) (p)->lpVtbl->SetBorderSpace(p,a) +#define IOleInPlaceUIWindow_SetActiveObject(p,a,b) (p)->lpVtbl->SetActiveObject(p,a,b) +#endif + EXTERN_C const IID IID_IOleInPlaceObject; #define INTERFACE IOleInPlaceObject DECLARE_INTERFACE_(IOleInPlaceObject,IOleWindow) @@ -386,6 +413,27 @@ }; #undef INTERFACE +#ifdef COBJMACROS +/*** IUnknown methods ***/ +#define IOleInPlaceSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IOleInPlaceSite_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IOleInPlaceSite_Release(p) (p)->lpVtbl->Release(p) +/*** IOleWindow methods ***/ +#define IOleInPlaceSite_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a) +#define IOleInPlaceSite_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a) +/*** IOleInPlaceSite methods ***/ +#define IOleInPlaceSite_CanInPlaceActivate(p) (p)->lpVtbl->CanInPlaceActivate(p) +#define IOleInPlaceSite_OnInPlaceActivate(p) (p)->lpVtbl->OnInPlaceActivate(p) +#define IOleInPlaceSite_OnUIActivate(p) (p)->lpVtbl->OnUIActivate(p) +#define IOleInPlaceSite_GetWindowContext(p,a,b,c,d,e) (p)->lpVtbl->GetWindowContext(p,a,b,c,d,e) +#define IOleInPlaceSite_Scroll(p,a) (p)->lpVtbl->Scroll(p,a) +#define IOleInPlaceSite_OnUIDeactivate(p,a) (p)->lpVtbl->OnUIDeactivate(p,a) +#define IOleInPlaceSite_OnInPlaceDeactivate(p) (p)->lpVtbl->OnInPlaceDeactivate(p) +#define IOleInPlaceSite_DiscardUndoState(p) (p)->lpVtbl->DiscardUndoState(p) +#define IOleInPlaceSite_DeactivateAndUndo(p) (p)->lpVtbl->DeactivateAndUndo(p) +#define IOleInPlaceSite_OnPosRectChange(p,a) (p)->lpVtbl->OnPosRectChange(p,a) +#endif + EXTERN_C const IID IID_IOleAdviseHolder; #define INTERFACE IOleAdviseHolder DECLARE_INTERFACE_(IOleAdviseHolder,IUnknown)

18 years, 10 months

← Newer
1
...
40
41
42
43
44
45
46
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005