Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 17086: Remove spurious call from I8042BasicDetect.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Remove spurious call from I8042BasicDetect. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 21:25:52 UTC (rev 17085) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 21:31:11 UTC (rev 17086) @@ -517,9 +517,6 @@ DevExt->MouseExists = FALSE; DevExt->KeyboardExists = FALSE; - if (!I8042Write(DevExt, I8042_DATA_PORT, 0x74)) - return STATUS_TIMEOUT; - I8042Flush(); if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST))

1 0

[ion] 17085: - FS Devices don't need a device queue, optimize the call away.
by ion＠svn.reactos.com 05 Aug '05

05 Aug '05

- FS Devices don't need a device queue, optimize the call away. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:16:51 UTC (rev 17084) +++ trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:25:52 UTC (rev 17085) @@ -545,7 +545,20 @@ } /* Create the Device Queue */ - KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); + if (CreatedDeviceObject->DeviceType == FILE_DEVICE_DISK_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_NETWORK_FILE_SYSTEM || + CreatedDeviceObject->DeviceType == FILE_DEVICE_TAPE_FILE_SYSTEM) + { + /* Simple FS Devices, they don't need a real Device Queue */ + InitializeListHead(&CreatedDeviceObject->Queue.ListEntry); + } + else + { + /* An actual Device, initialize its DQ */ + KeInitializeDeviceQueue(&CreatedDeviceObject->DeviceQueue); + } /* Insert the Object */ Status = ObInsertObject(CreatedDeviceObject,

1 0

[ion] 17084: - DeviceExtension should be NULL if the caller didn't specify any size for one.
by ion＠svn.reactos.com 05 Aug '05

05 Aug '05

- DeviceExtension should be NULL if the caller didn't specify any size for one. Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:05:03 UTC (rev 17083) +++ trunk/reactos/ntoskrnl/io/device.c 2005-08-05 21:16:51 UTC (rev 17084) @@ -503,7 +503,9 @@ /* Set Device Object Data */ CreatedDeviceObject->DeviceType = DeviceType; CreatedDeviceObject->Characteristics = DeviceCharacteristics; - CreatedDeviceObject->DeviceExtension = CreatedDeviceObject + 1; + CreatedDeviceObject->DeviceExtension = DeviceExtensionSize ? + CreatedDeviceObject + 1 : + NULL; CreatedDeviceObject->StackSize = 1; CreatedDeviceObject->AlignmentRequirement = 1; /* FIXME */

1 0

[mbosma] 17083: in ddrawgdi.h
by mbosma＠svn.reactos.com 05 Aug '05

05 Aug '05

in ddrawgdi.h - remove #if 0 (Define GdiEntries to thier internal names) - include the right headers instead of defining things on it's own Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/w32api/include/ddrawgdi.h _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-08-05 21:02:28 UTC (rev 17082) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-08-05 21:05:03 UTC (rev 17083) @@ -273,22 +273,22 @@ GdiDrawStream@12 GdiEndDocEMF@4 GdiEndPageEMF@8 -GdiEntry1@8=DdCreateDirectDrawObject@8 -GdiEntry2@44=DdQueryDirectDrawObject@44 -GdiEntry3@4=DdDeleteDirectDrawObject@4 -GdiEntry4@8=DdCreateSurfaceObject@8 -GdiEntry5@4=DdDeleteSurfaceObject@4 -GdiEntry6@8=DdResetVisrgn@8 -GdiEntry7@8=DdGetDC@8 -GdiEntry8@4=DdReleaseDC@4 -GdiEntry9@24=DdCreateDIBSection@24 -GdiEntry10@8=DdReenableDirectDrawObject@8 -GdiEntry11@8=DdAttachSurface@8 -GdiEntry12@8=DdUnattachSurface@8 -GdiEntry13@0=DdQueryDisplaySettingsUniqueness@0 -GdiEntry14@12=DdGetDxHandle@12 -GdiEntry15@12=DdSetGammaRamp@12 -GdiEntry16@12=DdSwapTextureHandles@12 +GdiEntry1@8 +GdiEntry2@44 +GdiEntry3@4 +GdiEntry4@8 +GdiEntry5@4 +GdiEntry6@8 +GdiEntry7@8 +GdiEntry8@4 +GdiEntry9@24 +GdiEntry10@8 +GdiEntry11@8 +GdiEntry12@8 +GdiEntry13@0 +GdiEntry14@12 +GdiEntry15@12 +GdiEntry16@12 GdiFixUpHandle@4 GdiFlush@0 GdiFullscreenControl@20 _____ Modified: trunk/reactos/w32api/include/ddrawgdi.h --- trunk/reactos/w32api/include/ddrawgdi.h 2005-08-05 21:02:28 UTC (rev 17082) +++ trunk/reactos/w32api/include/ddrawgdi.h 2005-08-05 21:05:03 UTC (rev 17083) @@ -16,9 +16,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include <ddk/d3dhal.h> /* Define the real export names */ -#if 0 /* FIXME */ #define DdCreateDirectDrawObject GdiEntry1 #define DdQueryDirectDrawObject GdiEntry2 #define DdDeleteDirectDrawObject GdiEntry3 @@ -35,10 +36,7 @@ #define DdGetDxHandle GdiEntry14 #define DdSetGammaRamp GdiEntry15 #define DdSwapTextureHandles GdiEntry16 -#endif -typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS; -typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA; BOOL STDCALL

1 0

[mbosma] 17082: undo my last change
by mbosma＠svn.reactos.com 05 Aug '05

05 Aug '05

undo my last change Modified: trunk/reactos/lib/ddraw/regsvr.c _____ Modified: trunk/reactos/lib/ddraw/regsvr.c --- trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 20:58:12 UTC (rev 17081) +++ trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 21:02:28 UTC (rev 17082) @@ -495,21 +495,3 @@ hr = unregister_interfaces(interface_list); return hr; } - -BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved) -{ - switch(fwdReason) - { - case DLL_PROCESS_ATTACH: - DDRAW_DllRegisterServer(); - break; - case DLL_THREAD_ATTACH: - break; - case DLL_PROCESS_DETACH: - DDRAW_DllUnregisterServer(); - break; - case DLL_THREAD_DETACH: - break; - } - return(TRUE); -}

1 0

[gvg] 17081: Finish up Wine-20050628 merge
by gvg＠svn.reactos.com 05 Aug '05

05 Aug '05

Finish up Wine-20050628 merge Deleted: vendor/wine/dlls/cabinet/Wine-20050524/ Added: vendor/wine/dlls/cabinet/Wine-20050628/ Deleted: vendor/wine/dlls/comctl32/Wine-20050524/ Added: vendor/wine/dlls/comctl32/Wine-20050628/ Deleted: vendor/wine/dlls/commdlg/Wine-20050524/ Added: vendor/wine/dlls/commdlg/Wine-20050628/ Deleted: vendor/wine/dlls/dinput/Wine-20050524/ Added: vendor/wine/dlls/dinput/Wine-20050628/ Deleted: vendor/wine/dlls/dsound/Wine-20050524/ Added: vendor/wine/dlls/dsound/Wine-20050628/ Deleted: vendor/wine/dlls/icmp/Wine-20050524/ Added: vendor/wine/dlls/icmp/Wine-20050628/ Deleted: vendor/wine/dlls/mpr/Wine-20050524/ Added: vendor/wine/dlls/mpr/Wine-20050628/ Deleted: vendor/wine/dlls/msi/Wine-20050524/ Added: vendor/wine/dlls/msi/Wine-20050628/ Deleted: vendor/wine/dlls/msimg32/Wine-20050524/ Added: vendor/wine/dlls/msimg32/Wine-20050628/ Added: vendor/wine/dlls/ole32/Wine-20050628/ Modified: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in Modified: vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/bindctx.c Modified: vendor/wine/dlls/ole32/Wine-20050628/clipboard.c Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj.c Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/compobj_private.h Modified: vendor/wine/dlls/ole32/Wine-20050628/compositemoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/datacache.c Modified: vendor/wine/dlls/ole32/Wine-20050628/dcom.idl Modified: vendor/wine/dlls/ole32/Wine-20050628/defaulthandler.c Modified: vendor/wine/dlls/ole32/Wine-20050628/errorinfo.c Modified: vendor/wine/dlls/ole32/Wine-20050628/filemoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ftmarshal.c Modified: vendor/wine/dlls/ole32/Wine-20050628/git.c Modified: vendor/wine/dlls/ole32/Wine-20050628/hglobalstream.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ifs.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ifs.h Modified: vendor/wine/dlls/ole32/Wine-20050628/itemmoniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/marshal.c Modified: vendor/wine/dlls/ole32/Wine-20050628/memlockbytes.c Modified: vendor/wine/dlls/ole32/Wine-20050628/memlockbytes16.c Modified: vendor/wine/dlls/ole32/Wine-20050628/moniker.c Modified: vendor/wine/dlls/ole32/Wine-20050628/moniker.h Modified: vendor/wine/dlls/ole32/Wine-20050628/ole16.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2_16.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2conv.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2impl.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2nls.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2nls.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2prox.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2stubs.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole2thk.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32_main.c Modified: vendor/wine/dlls/ole32/Wine-20050628/ole32res.rc Modified: vendor/wine/dlls/ole32/Wine-20050628/oleobj.c Modified: vendor/wine/dlls/ole32/Wine-20050628/oleproxy.c Modified: vendor/wine/dlls/ole32/Wine-20050628/olestd.h Modified: vendor/wine/dlls/ole32/Wine-20050628/regsvr.c Modified: vendor/wine/dlls/ole32/Wine-20050628/rpc.c Modified: vendor/wine/dlls/ole32/Wine-20050628/stg_bigblockfile.c Modified: vendor/wine/dlls/ole32/Wine-20050628/stg_stream.c Modified: vendor/wine/dlls/ole32/Wine-20050628/storage.c Modified: vendor/wine/dlls/ole32/Wine-20050628/storage.spec Modified: vendor/wine/dlls/ole32/Wine-20050628/storage32.c Modified: vendor/wine/dlls/ole32/Wine-20050628/storage32.h Modified: vendor/wine/dlls/ole32/Wine-20050628/stubmanager.c Modified: vendor/wine/dlls/ole32/Wine-20050628/version.rc Modified: vendor/wine/dlls/ole32/current/Makefile.in Modified: vendor/wine/dlls/ole32/current/antimoniker.c Modified: vendor/wine/dlls/ole32/current/bindctx.c Modified: vendor/wine/dlls/ole32/current/clipboard.c Modified: vendor/wine/dlls/ole32/current/compobj.c Modified: vendor/wine/dlls/ole32/current/compobj.spec Modified: vendor/wine/dlls/ole32/current/compobj_private.h Modified: vendor/wine/dlls/ole32/current/compositemoniker.c Modified: vendor/wine/dlls/ole32/current/datacache.c Modified: vendor/wine/dlls/ole32/current/dcom.idl Modified: vendor/wine/dlls/ole32/current/defaulthandler.c Modified: vendor/wine/dlls/ole32/current/errorinfo.c Modified: vendor/wine/dlls/ole32/current/filemoniker.c Modified: vendor/wine/dlls/ole32/current/ftmarshal.c Modified: vendor/wine/dlls/ole32/current/git.c Modified: vendor/wine/dlls/ole32/current/hglobalstream.c Modified: vendor/wine/dlls/ole32/current/ifs.c Modified: vendor/wine/dlls/ole32/current/ifs.h Modified: vendor/wine/dlls/ole32/current/itemmoniker.c Modified: vendor/wine/dlls/ole32/current/marshal.c Modified: vendor/wine/dlls/ole32/current/memlockbytes.c Modified: vendor/wine/dlls/ole32/current/memlockbytes16.c Modified: vendor/wine/dlls/ole32/current/moniker.c Modified: vendor/wine/dlls/ole32/current/moniker.h Modified: vendor/wine/dlls/ole32/current/ole16.c Modified: vendor/wine/dlls/ole32/current/ole2.c Modified: vendor/wine/dlls/ole32/current/ole2.spec Modified: vendor/wine/dlls/ole32/current/ole2_16.c Modified: vendor/wine/dlls/ole32/current/ole2conv.spec Modified: vendor/wine/dlls/ole32/current/ole2impl.c [truncated at 100 lines; 57 more skipped] _____ Copied: vendor/wine/dlls/cabinet/Wine-20050628 (from rev 17041, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-20050628 (from rev 17041, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-20050628 (from rev 17041, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/dinput/Wine-20050628 (from rev 17041, vendor/wine/dlls/dinput/current) _____ Copied: vendor/wine/dlls/dsound/Wine-20050628 (from rev 17041, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-20050628 (from rev 17041, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/mpr/Wine-20050628 (from rev 17041, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-20050628 (from rev 17041, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-20050628 (from rev 17041, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/ole32/Wine-20050628 (from rev 17041, vendor/wine/dlls/ole32/current) _____ Modified: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in --- vendor/wine/dlls/ole32/current/Makefile.in 2005-08-04 06:52:58 UTC (rev 17041) +++ vendor/wine/dlls/ole32/Wine-20050628/Makefile.in 2005-08-05 20:58:12 UTC (rev 17081) @@ -1,78 +1,78 @@ -EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = ole32.dll -IMPORTLIB = libole32.$(IMPLIBEXT) -IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll -EXTRALIBS = -luuid $(LIBUNICODE) - -C_SRCS = \ - antimoniker.c \ - bindctx.c \ - clipboard.c \ - compobj.c \ - compositemoniker.c \ - datacache.c \ - defaulthandler.c \ - dictionary.c \ - errorinfo.c \ - filemoniker.c \ - ftmarshal.c \ - git.c \ - hglobalstream.c \ - ifs.c \ - itemmoniker.c \ - marshal.c \ - memlockbytes.c \ - moniker.c \ - ole2.c \ - ole2stubs.c \ - ole2impl.c \ - ole32_main.c \ - oleobj.c \ - oleproxy.c \ - regsvr.c \ - rpc.c \ - stg_bigblockfile.c \ - stg_prop.c \ - stg_stream.c \ - storage32.c \ - stubmanager.c - -C_SRCS16 = \ - memlockbytes16.c \ - ole16.c \ - ole2_16.c \ - ole2nls.c \ - storage.c - -SPEC_SRCS16 = \ - compobj.spec \ - ole2.spec \ - ole2conv.spec \ - ole2nls.spec \ - ole2prox.spec \ - ole2thk.spec \ - storage.spec - -RC_SRCS = ole32res.rc -RC_BINSRC = ole32res.rc -RC_BINARIES = \ - drag_copy.cur \ - drag_link.cur \ - drag_move.cur \ - nodrop.cur - -IDL_SRCS = \ - dcom.idl - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: - -# note: this will get overwritten by make depend -$(ALL_OBJS): $(IDL_SRCS:.idl=.h) +EXTRADEFS = -D_OLE32_ -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole32.dll +IMPORTLIB = libole32.$(IMPLIBEXT) +IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll +EXTRALIBS = -luuid $(LIBUNICODE) + +C_SRCS = \ + antimoniker.c \ + bindctx.c \ + clipboard.c \ + compobj.c \ + compositemoniker.c \ + datacache.c \ + defaulthandler.c \ + dictionary.c \ + errorinfo.c \ + filemoniker.c \ + ftmarshal.c \ + git.c \ + hglobalstream.c \ + ifs.c \ + itemmoniker.c \ + marshal.c \ + memlockbytes.c \ + moniker.c \ + ole2.c \ + ole2stubs.c \ + ole2impl.c \ + ole32_main.c \ + oleobj.c \ + oleproxy.c \ + regsvr.c \ + rpc.c \ + stg_bigblockfile.c \ + stg_prop.c \ + stg_stream.c \ + storage32.c \ + stubmanager.c + +C_SRCS16 = \ + memlockbytes16.c \ + ole16.c \ + ole2_16.c \ + ole2nls.c \ + storage.c + +SPEC_SRCS16 = \ + compobj.spec \ + ole2.spec \ + ole2conv.spec \ + ole2nls.spec \ + ole2prox.spec \ + ole2thk.spec \ + storage.spec + +RC_SRCS = ole32res.rc +RC_BINSRC = ole32res.rc +RC_BINARIES = \ + drag_copy.cur \ + drag_link.cur \ + drag_move.cur \ + nodrop.cur + +IDL_SRCS = \ + dcom.idl + +SUBDIRS = tests + +@MAKE_DLL_RULES@ + +### Dependencies: + +# note: this will get overwritten by make depend +$(ALL_OBJS): $(IDL_SRCS:.idl=.h) Property changes on: vendor/wine/dlls/ole32/Wine-20050628/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c --- vendor/wine/dlls/ole32/current/antimoniker.c 2005-08-04 06:52:58 UTC (rev 17041) +++ vendor/wine/dlls/ole32/Wine-20050628/antimoniker.c 2005-08-05 20:58:12 UTC (rev 17081) @@ -1,612 +1,612 @@ -/********************************************************************** ***************** - * AntiMonikers implementation - * - * Copyright 1999 Noomen Hamza - * - * 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 - ************************************************************************ ***************/ - -#include <assert.h> -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "objbase.h" -#include "wine/debug.h" -#include "moniker.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -const CLSID CLSID_AntiMoniker = { - 0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - -/* AntiMoniker data structure */ -typedef struct AntiMonikerImpl{ - - const IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ - - /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether - * two monikers are equal. That's whay IROTData interface is implemented by monikers. - */ - const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ - - ULONG ref; /* reference counter for this object */ - -} AntiMonikerImpl; - - -/********************************************************************** ********* - * AntiMoniker_QueryInterface - ************************************************************************ *******/ -static HRESULT WINAPI -AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); - - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; - - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - else if (IsEqualIID(&IID_IROTData, riid)) - *ppvObject = (IROTData*)&(This->lpvtbl2); - - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) - return E_NOINTERFACE; - - /* always increase the reference count by one when it is successful */ - IMoniker_AddRef(iface); - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_AddRef - ************************************************************************ ******/ -static ULONG WINAPI -AntiMonikerImpl_AddRef(IMoniker* iface) -{ - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - - TRACE("(%p)\n",This); - - return InterlockedIncrement(&This->ref); -} - -/********************************************************************** ******** - * AntiMoniker_Release - ************************************************************************ ******/ -static ULONG WINAPI -AntiMonikerImpl_Release(IMoniker* iface) -{ - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; - ULONG ref; - - TRACE("(%p)\n",This); - - ref = InterlockedDecrement(&This->ref); - - /* destroy the object if there's no more reference on it */ - if (ref == 0) HeapFree(GetProcessHeap(),0,This); - - return ref; -} - -/********************************************************************** ******** - * AntiMoniker_GetClassID - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) -{ - TRACE("(%p,%p),stub!\n",iface,pClassID); - - if (pClassID==NULL) - return E_POINTER; - - *pClassID = CLSID_AntiMoniker; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_IsDirty - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsDirty(IMoniker* iface) -{ - /* Note that the OLE-provided implementations of the IPersistStream::IsDirty - method in the OLE-provided moniker interfaces always return S_FALSE because - their internal state never changes. */ - - TRACE("(%p)\n",iface); - - return S_FALSE; -} - -/********************************************************************** ******** - * AntiMoniker_Load - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) -{ - DWORD constant=1,dwbuffer; - HRESULT res; - - /* data read by this function is only a DWORD constant (must be 1) ! */ - res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); - - if (SUCCEEDED(res)&& dwbuffer!=constant) - return E_FAIL; - - return res; -} - -/********************************************************************** ******** - * AntiMoniker_Save - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) -{ - DWORD constant=1; - HRESULT res; - - /* data written by this function is only a DWORD constant set to 1 ! */ - res=IStream_Write(pStm,&constant,sizeof(constant),NULL); - - return res; -} - -/********************************************************************** ******** - * AntiMoniker_GetSizeMax - * - * PARAMS - * pcbSize [out] Pointer to size of stream needed to save object - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) -{ - TRACE("(%p,%p)\n",iface,pcbSize); - - if (pcbSize!=NULL) - return E_POINTER; - - /* for more details see AntiMonikerImpl_Save coments */ - - /* - * Normally the sizemax must be sizeof DWORD, but - * I tested this function it usually return 16 bytes - * more than the number of bytes used by AntiMoniker::Save function - */ - pcbSize->u.LowPart = sizeof(DWORD)+16; - - pcbSize->u.HighPart=0; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_BindToObject - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvResult) -{ - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_BindToStorage - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvResult) -{ - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_Reduce - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, IMoniker** ppmkReduced) -{ - TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkRedu ced); - - if (ppmkReduced==NULL) - return E_POINTER; - - AntiMonikerImpl_AddRef(iface); - - *ppmkReduced=iface; - - return MK_S_REDUCED_TO_SELF; -} -/********************************************************************** ******** - * AntiMoniker_ComposeWith - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) -{ - - TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite); - - if ((ppmkComposite==NULL)||(pmkRight==NULL)) - return E_POINTER; - - *ppmkComposite=0; - - if (fOnlyIfNotGeneric) - return MK_E_NEEDGENERIC; - else - return CreateGenericComposite(iface,pmkRight,ppmkComposite); -} - -/********************************************************************** ******** - * AntiMoniker_Enum - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) -{ - TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); - - if (ppenumMoniker == NULL) - return E_POINTER; - - *ppenumMoniker = NULL; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_IsEqual - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) -{ - DWORD mkSys; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); - - if (pmkOtherMoniker==NULL) - return S_FALSE; - - IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); - - if (mkSys==MKSYS_ANTIMONIKER) - return S_OK; - else - return S_FALSE; -} - -/********************************************************************** ******** - * AntiMoniker_Hash - ************************************************************************ ******/ -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) -{ - if (pdwHash==NULL) - return E_POINTER; - - *pdwHash=0; - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_IsRunning - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) -{ - IRunningObjectTable* rot; - HRESULT res; - - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); - - if (pbc==NULL) - return E_INVALIDARG; - - res=IBindCtx_GetRunningObjectTable(pbc,&rot); - - if (FAILED(res)) - return res; - - res = IRunningObjectTable_IsRunning(rot,iface); - - IRunningObjectTable_Release(rot); - - return res; -} - -/********************************************************************** ******** - * AntiMoniker_GetTimeOfLastChange - ************************************************************************ ******/ -static HRESULT WINAPI AntiMonikerImpl_GetTimeOfLastChange(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - FILETIME* pAntiTime) -{ - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_Inverse - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) -{ - TRACE("(%p,%p)\n",iface,ppmk); - - if (ppmk==NULL) - return E_POINTER; - - *ppmk=0; - - return MK_E_NOINVERSE; -} - -/********************************************************************** ******** - * AntiMoniker_CommonPrefixWith - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) -{ - DWORD mkSys; - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - - if(mkSys==MKSYS_ITEMMONIKER){ - - IMoniker_AddRef(iface); - - *ppmkPrefix=iface; - - IMoniker_AddRef(iface); - - return MK_S_US; - } - else - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); -} - -/********************************************************************** ******** - * AntiMoniker_RelativePathTo - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) -{ - TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); - - if (ppmkRelPath==NULL) - return E_POINTER; - - IMoniker_AddRef(pmOther); - - *ppmkRelPath=pmOther; - - return MK_S_HIM; -} - -/********************************************************************** ******** - * AntiMoniker_GetDisplayName - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) -{ - static const WCHAR back[]={'\\','.','.',0}; - - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); - - if (ppszDisplayName==NULL) - return E_POINTER; - - if (pmkToLeft!=NULL){ - FIXME("() pmkToLeft!=NULL not implemented \n"); - return E_NOTIMPL; - } - - *ppszDisplayName=CoTaskMemAlloc(sizeof(back)); - - if (*ppszDisplayName==NULL) - return E_OUTOFMEMORY; - - lstrcpyW(*ppszDisplayName,back); - - return S_OK; -} - -/********************************************************************** ******** - * AntiMoniker_ParseDisplayName - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR pszDisplayName, - ULONG* pchEaten, IMoniker** ppmkOut) -{ - TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEate n,ppmkOut); - return E_NOTIMPL; -} - -/********************************************************************** ******** - * AntiMoniker_IsSystemMoniker - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) -{ - TRACE("(%p,%p)\n",iface,pwdMksys); - - if (!pwdMksys) - return E_POINTER; - - (*pwdMksys)=MKSYS_ANTIMONIKER; - - return S_OK; -} - -/********************************************************************** ********* - * AntiMonikerIROTData_QueryInterface - ************************************************************************ *******/ -static HRESULT WINAPI -AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) -{ - ICOM_THIS_From_IROTData(IMoniker, iface); - - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); - - return AntiMonikerImpl_QueryInterface(This, riid, ppvObject); -} - -/********************************************************************** * - * AntiMonikerIROTData_AddRef - */ -static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) -{ - ICOM_THIS_From_IROTData(IMoniker, iface); - - TRACE("(%p)\n",iface); - - return AntiMonikerImpl_AddRef(This); -} - -/********************************************************************** * - * AntiMonikerIROTData_Release - */ -static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) -{ - ICOM_THIS_From_IROTData(IMoniker, iface); - - TRACE("(%p)\n",iface); - - return AntiMonikerImpl_Release(This); -} - -/********************************************************************** ******** - * AntiMonikerIROTData_GetComparaisonData - ************************************************************************ ******/ -static HRESULT WINAPI -AntiMonikerROTDataImpl_GetComparaisonData(IROTData* iface, BYTE* pbData, - ULONG cbMax, ULONG* pcbData) -{ - FIXME("(),stub!\n"); - return E_NOTIMPL; -} - -/********************************************************************** **********/ -/* Virtual function table for the AntiMonikerImpl class which include IPersist,*/ -/* IPersistStream and IMoniker functions. */ -static const IMonikerVtbl VT_AntiMonikerImpl = -{ - AntiMonikerImpl_QueryInterface, - AntiMonikerImpl_AddRef, - AntiMonikerImpl_Release, - AntiMonikerImpl_GetClassID, - AntiMonikerImpl_IsDirty, - AntiMonikerImpl_Load, - AntiMonikerImpl_Save, - AntiMonikerImpl_GetSizeMax, - AntiMonikerImpl_BindToObject, - AntiMonikerImpl_BindToStorage, - AntiMonikerImpl_Reduce, - AntiMonikerImpl_ComposeWith, - AntiMonikerImpl_Enum, - AntiMonikerImpl_IsEqual, - AntiMonikerImpl_Hash, - AntiMonikerImpl_IsRunning, - AntiMonikerImpl_GetTimeOfLastChange, - AntiMonikerImpl_Inverse, - AntiMonikerImpl_CommonPrefixWith, - AntiMonikerImpl_RelativePathTo, - AntiMonikerImpl_GetDisplayName, - AntiMonikerImpl_ParseDisplayName, - AntiMonikerImpl_IsSystemMoniker -}; - -/********************************************************************** **********/ -/* Virtual function table for the IROTData class. */ -static const IROTDataVtbl VT_ROTDataImpl = -{ - AntiMonikerROTDataImpl_QueryInterface, - AntiMonikerROTDataImpl_AddRef, - AntiMonikerROTDataImpl_Release, - AntiMonikerROTDataImpl_GetComparaisonData -}; - -/********************************************************************** ******** - * AntiMoniker_Construct (local function) - ************************************************************************ *******/ -static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) -{ - - TRACE("(%p)\n",This); - - /* Initialize the virtual fgunction table. */ - This->lpvtbl1 = &VT_AntiMonikerImpl; - This->lpvtbl2 = &VT_ROTDataImpl; - This->ref = 0; - - return S_OK; -} - -/********************************************************************** ******** - * CreateAntiMoniker [OLE32.@] - ************************************************************************ ******/ -HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) -{ - AntiMonikerImpl* newAntiMoniker = 0; - HRESULT hr = S_OK; - IID riid=IID_IMoniker; - - TRACE("(%p)\n",ppmk); - - newAntiMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(AntiMonikerImpl)); - - if (newAntiMoniker == 0) - return STG_E_INSUFFICIENTMEMORY; - - hr = AntiMonikerImpl_Construct(newAntiMoniker); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(),0,newAntiMoniker); - return hr; - } - - hr = AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&riid,(void**)p pmk); - - return hr; -} +/********************************************************************** ***************** + * AntiMonikers implementation + * + * Copyright 1999 Noomen Hamza + * + * 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 + ************************************************************************ ***************/ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "objbase.h" +#include "wine/debug.h" +#include "moniker.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +const CLSID CLSID_AntiMoniker = { + 0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} +}; + +/* AntiMoniker data structure */ +typedef struct AntiMonikerImpl{ + + const IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + + /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether + * two monikers are equal. That's whay IROTData interface is implemented by monikers. + */ + const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ + + ULONG ref; /* reference counter for this object */ + +} AntiMonikerImpl; + + +/********************************************************************** ********* + * AntiMoniker_QueryInterface + ************************************************************************ *******/ +static HRESULT WINAPI +AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +{ + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + + /* Perform a sanity check on the parameters.*/ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* Initialize the return parameter */ + *ppvObject = 0; + + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; + else if (IsEqualIID(&IID_IROTData, riid)) + *ppvObject = (IROTData*)&(This->lpvtbl2); + + /* Check that we obtained an interface.*/ + if ((*ppvObject)==0) + return E_NOINTERFACE; + + /* always increase the reference count by one when it is successful */ + IMoniker_AddRef(iface); + + return S_OK; +} + +/********************************************************************** ******** + * AntiMoniker_AddRef + ************************************************************************ ******/ +static ULONG WINAPI +AntiMonikerImpl_AddRef(IMoniker* iface) +{ + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + + TRACE("(%p)\n",This); + + return InterlockedIncrement(&This->ref); +} + +/********************************************************************** ******** + * AntiMoniker_Release + ************************************************************************ ******/ +static ULONG WINAPI +AntiMonikerImpl_Release(IMoniker* iface) +{ + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + ULONG ref; + + TRACE("(%p)\n",This); + + ref = InterlockedDecrement(&This->ref); + + /* destroy the object if there's no more reference on it */ + if (ref == 0) HeapFree(GetProcessHeap(),0,This); + + return ref; +} + +/********************************************************************** ******** + * AntiMoniker_GetClassID + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) +{ + TRACE("(%p,%p),stub!\n",iface,pClassID); + + if (pClassID==NULL) + return E_POINTER; + + *pClassID = CLSID_AntiMoniker; + + return S_OK; +} + +/********************************************************************** ******** + * AntiMoniker_IsDirty + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_IsDirty(IMoniker* iface) +{ + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty + method in the OLE-provided moniker interfaces always return S_FALSE because + their internal state never changes. */ + + TRACE("(%p)\n",iface); + + return S_FALSE; +} + +/********************************************************************** ******** + * AntiMoniker_Load + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +{ + DWORD constant=1,dwbuffer; + HRESULT res; + + /* data read by this function is only a DWORD constant (must be 1) ! */ + res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); + + if (SUCCEEDED(res)&& dwbuffer!=constant) + return E_FAIL; + + return res; +} + +/********************************************************************** ******** + * AntiMoniker_Save + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +{ + DWORD constant=1; + HRESULT res; + + /* data written by this function is only a DWORD constant set to 1 ! */ + res=IStream_Write(pStm,&constant,sizeof(constant),NULL); + + return res; +} + +/********************************************************************** ******** + * AntiMoniker_GetSizeMax + * + * PARAMS + * pcbSize [out] Pointer to size of stream needed to save object + ************************************************************************ ******/ +static HRESULT WINAPI +AntiMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) +{ + TRACE("(%p,%p)\n",iface,pcbSize); + + if (pcbSize!=NULL) + return E_POINTER; + + /* for more details see AntiMonikerImpl_Save coments */ + + /* + * Normally the sizemax must be sizeof DWORD, but + * I tested this function it usually return 16 bytes + * more than the number of bytes used by AntiMoniker::Save function [truncated at 1000 lines; 167790 more skipped]

1 0

[gvg] 17080: Update status
by gvg＠svn.reactos.com 05 Aug '05

05 Aug '05

Update status Modified: trunk/reactos/doc/README.WINE _____ Modified: trunk/reactos/doc/README.WINE --- trunk/reactos/doc/README.WINE 2005-08-05 20:48:26 UTC (rev 17079) +++ trunk/reactos/doc/README.WINE 2005-08-05 20:49:13 UTC (rev 17080) @@ -26,57 +26,57 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050419 -reactos/tools/wpp # Synced to Wine-20050419 +reactos/tools/unicode # Synced to Wine-20050628 +reactos/tools/wpp # Synced to Wine-20050628 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050419 +reactos/tools/winebuild # Synced to Wine-20050628 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050419 -reactos/tools/widl # Synced to Wine-20050419 (merge back to winehq in progress) +reactos/tools/wrc # Synced to Wine-20050628 +reactos/tools/widl # Synced to Wine-20050628 (merge back to winehq in progress) The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050419 -reactos/lib/comctl32 # Synced to Wine-20050419 -reactos/lib/comdlg32 # Synced to Wine-20050419 +reactos/lib/cabinet # Synced to Wine-20050628 +reactos/lib/comctl32 # Synced to Wine-20050628 +reactos/lib/comdlg32 # Synced to Wine-20050628 reactos/lib/dinput # Synced to Wine-20050310 -reactos/lib/dinput8 # Synced to Wine-20050419 -reactos/lib/icmp # Synced to Wine-20050419 +reactos/lib/dinput8 # Synced to Wine-20050628 +reactos/lib/icmp # Synced to Wine-20050628 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050419 +reactos/lib/mpr # Synced to Wine-20050628 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050419 -reactos/lib/msi # Synced to Wine-20050419 +reactos/lib/msimg32 # Synced to Wine-20050628 +reactos/lib/msi # Synced to Wine-20050628 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/objsel # Synced to Wine-20050726 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050419 -reactos/lib/oleaut32 # Synced to Wine-20050419 -reactos/lib/oledlg # Synced to Wine-20050419 -reactos/lib/olepro32 # Synced to Wine-20050419 -reactos/lib/riched20 # Synced to Wine-20050419 -reactos/lib/richedit # Synced to Wine-20050419 -reactos/lib/rpcrt4 # Synced to Wine-20050419 -reactos/lib/setupapi # Synced to Wine-20050419 -reactos/lib/shell32 # Synced to Wine-20050419 -reactos/lib/shdocvw # Synced to Wine-20050419 -reactos/lib/shlwapi # Synced to Wine-20050419 +reactos/lib/ole32 # Synced to Wine-20050628 +reactos/lib/oleaut32 # Synced to Wine-20050628 +reactos/lib/oledlg # Synced to Wine-20050628 +reactos/lib/olepro32 # Synced to Wine-20050628 +reactos/lib/riched20 # Synced to Wine-20050628 +reactos/lib/richedit # Synced to Wine-20050628 +reactos/lib/rpcrt4 # Synced to Wine-20050628 +reactos/lib/setupapi # Synced to Wine-20050524 +reactos/lib/shell32 # Synced to Wine-20050628 +reactos/lib/shdocvw # Synced to Wine-20050628 +reactos/lib/shlwapi # Synced to Wine-20050628 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050419 +reactos/lib/urlmon # Synced to Wine-20050628 reactos/lib/uxtheme # Synced to Wine-20050703 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050419 -reactos/lib/winmm/midimap # Synced to Wine-20050419 -reactos/lib/winmm/wavemap # Synced to Wine-20050419 +reactos/lib/winmm # Synced to Wine-20050628 +reactos/lib/winmm/midimap # Synced to Wine-20050628 +reactos/lib/winmm/wavemap # Synced to Wine-20050628 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050419 +reactos/subsys/system/msiexec # Synced to Wine-20050628 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[gvg] 17079: Sync to Wine-20050628:
by gvg＠svn.reactos.com 05 Aug '05

05 Aug '05

Sync to Wine-20050628: Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make remaining OLE interface vtables const. Mike McCormack <mike(a)codeweavers.com> - Stub implementation for GetSoftwareUpdateInfo. - Declare functions and correct prototypes. Maarten Lankhorst <m.b.lankhorst(a)gmail.com> - Improved ObtainUserAgentString stub. Stefan Huehner <stefan(a)huehner.org> - Fix some more -Wstrict-prototypes warnings. Modified: trunk/reactos/include/wine/urlmon.h Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/urlmon.spec Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/lib/urlmon/urlmon_main.h _____ Modified: trunk/reactos/include/wine/urlmon.h --- trunk/reactos/include/wine/urlmon.h 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/include/wine/urlmon.h 2005-08-05 20:48:26 UTC (rev 17079) @@ -2221,6 +2221,22 @@ #endif /* __IInternetZoneManager_INTERFACE_DEFINED__ */ +typedef struct _tagSOFTDISTINFO { + ULONG cbSize; + DWORD dwFlags; + DWORD dwAdState; + LPWSTR szTitle; + LPWSTR szAbstract; + LPWSTR szHREF; + DWORD dwInstalledVersionMS; + DWORD dwInstalledVersionLS; + DWORD dwUpdateVersionMS; + DWORD dwUpdateVersionLS; + DWORD dwAdvertisedVersionMS; + DWORD dwAdvertisedVersionLS; + DWORD dwReserved; +} SOFTDISTINFO, *LPSOFTDISTINFO; + DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4); DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4); DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B); _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-05 20:48:26 UTC (rev 17079) @@ -41,7 +41,7 @@ */ typedef struct SecManagerImpl{ - IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ + const IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ ULONG ref; /* reference counter for this object */ @@ -174,7 +174,7 @@ return E_NOTIMPL; } -static IInternetSecurityManagerVtbl VT_SecManagerImpl = +static const IInternetSecurityManagerVtbl VT_SecManagerImpl = { SecManagerImpl_QueryInterface, SecManagerImpl_AddRef, @@ -209,7 +209,7 @@ * */ typedef struct { - IInternetZoneManagerVtbl* lpVtbl; + const IInternetZoneManagerVtbl* lpVtbl; ULONG ref; } ZoneMgrImpl; @@ -430,7 +430,7 @@ /******************************************************************** * IInternetZoneManager_Construct */ -static IInternetZoneManagerVtbl ZoneMgrImplVtbl = { +static const IInternetZoneManagerVtbl ZoneMgrImplVtbl = { ZoneMgrImpl_QueryInterface, ZoneMgrImpl_AddRef, ZoneMgrImpl_Release, _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/umon.c 2005-08-05 20:48:26 UTC (rev 17079) @@ -49,7 +49,7 @@ /*static BOOL registered_wndclass = FALSE;*/ typedef struct { - IBindingVtbl *lpVtbl; + const IBindingVtbl *lpVtbl; ULONG ref; @@ -273,7 +273,7 @@ This->pbscb = 0; } -static IBindingVtbl BindingVtbl = +static const IBindingVtbl BindingVtbl = { Binding_QueryInterface, Binding_AddRef, @@ -289,7 +289,7 @@ /* filemoniker data structure */ typedef struct { - IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ + const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ ULONG ref; /* reference counter for this object */ @@ -1103,7 +1103,7 @@ /*********************************************************************** *********/ /* Virtual function table for the URLMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ -static IMonikerVtbl VT_URLMonikerImpl = +static const IMonikerVtbl VT_URLMonikerImpl = { URLMonikerImpl_QueryInterface, URLMonikerImpl_AddRef, @@ -1735,3 +1735,12 @@ return HlinkSimpleNavigateToString( szTarget, NULL, NULL, pUnk, NULL, NULL, 0, 0 ); } + +/********************************************************************** * + * GetSoftwareUpdateInfo (URLMON.@) + */ +HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi ) +{ + FIXME("%s %p\n", debugstr_w(szDistUnit), psdi ); + return E_FAIL; +} _____ Modified: trunk/reactos/lib/urlmon/urlmon.spec --- trunk/reactos/lib/urlmon/urlmon.spec 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/urlmon.spec 2005-08-05 20:48:26 UTC (rev 17079) @@ -41,7 +41,7 @@ @ stub GetClassURL @ stub GetComponentIDFromCLSSPEC @ stub GetMarkOfTheWeb -@ stub GetSoftwareUpdateInfo +@ stdcall GetSoftwareUpdateInfo(ptr ptr) @ stub HlinkGoBack @ stub HlinkGoForward @ stub HlinkNavigateMoniker _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.c --- trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-05 20:48:26 UTC (rev 17079) @@ -174,7 +174,7 @@ return S_OK; } -static IClassFactoryVtbl CF_Vtbl = +static const IClassFactoryVtbl CF_Vtbl = { CF_QueryInterface, CF_AddRef, @@ -250,7 +250,7 @@ /*********************************************************************** *** * UrlMkSetSessionOption (URLMON.@) */ -HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBufferLength, +HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD Reserved) { FIXME("(%#lx, %p, %#lx): stub\n", dwOption, pBuffer, dwBufferLength); @@ -261,7 +261,7 @@ /*********************************************************************** *** * UrlMkGetSessionOption (URLMON.@) */ -HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID *pBuffer, DWORD dwBufferLength, +HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD* pdwBufferLength, DWORD dwReserved) { FIXME("(%#lx, %p, %#lx, %p): stub\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); @@ -269,10 +269,12 @@ return S_OK; } +static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"; + /*********************************************************************** *** * ObtainUserAgentString (URLMON.@) */ -HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cbSize) +HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) { FIXME("(%ld, %p, %p): stub\n", dwOption, pcszUAOut, cbSize); @@ -280,6 +282,10 @@ ERR("dwOption: %ld, must be zero\n", dwOption); } + if (sizeof(Agent) < *cbSize) + *cbSize = sizeof(Agent); + lstrcpynA(pcszUAOut, Agent, *cbSize); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.h --- trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-05 20:46:20 UTC (rev 17078) +++ trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-05 20:48:26 UTC (rev 17079) @@ -32,8 +32,8 @@ * Dll lifetime tracking declaration for urlmon.dll */ extern LONG URLMON_refCount; -static inline void URLMON_LockModule() { InterlockedIncrement( &URLMON_refCount ); } -static inline void URLMON_UnlockModule() { InterlockedDecrement( &URLMON_refCount ); } +static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } +static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))

1 0

[mbosma] 17078: Actually call the DDRAW_DllRegisterServer() and DDRAW_DllUnregisterServer() functions from DllMain.
by mbosma＠svn.reactos.com 05 Aug '05

05 Aug '05

Actually call the DDRAW_DllRegisterServer() and DDRAW_DllUnregisterServer() functions from DllMain. Modified: trunk/reactos/lib/ddraw/regsvr.c _____ Modified: trunk/reactos/lib/ddraw/regsvr.c --- trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 20:30:42 UTC (rev 17077) +++ trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 20:46:20 UTC (rev 17078) @@ -495,3 +495,21 @@ hr = unregister_interfaces(interface_list); return hr; } + +BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved) +{ + switch(fwdReason) + { + case DLL_PROCESS_ATTACH: + DDRAW_DllRegisterServer(); + break; + case DLL_THREAD_ATTACH: + break; + case DLL_PROCESS_DETACH: + DDRAW_DllUnregisterServer(); + break; + case DLL_THREAD_DETACH: + break; + } + return(TRUE); +}

1 0

[gvg] 17077: Sync to Wine-20050628:
by gvg＠svn.reactos.com 05 Aug '05

05 Aug '05

Sync to Wine-20050628: Stefan Leichter <Stefan.Leichter(a)camLine.com> - Update version resource of msiexec.exe to current version shipped from Windows Update. Mike McCormack <mike(a)codeweavers.com> - Fix some declaration and write string warnings. Modified: trunk/reactos/subsys/system/msiexec/msiexec.c Modified: trunk/reactos/subsys/system/msiexec/version.rc _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-08-05 20:25:46 UTC (rev 17076) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-08-05 20:30:42 UTC (rev 17077) @@ -386,7 +386,7 @@ return count; } -void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) +static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) { WCHAR **argv, *p = msi_strdup(cmdline); int i, n; @@ -404,7 +404,7 @@ *pargv = argv; } -BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) +static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; HKEY hkey = 0, hkeyArgs = 0; _____ Modified: trunk/reactos/subsys/system/msiexec/version.rc --- trunk/reactos/subsys/system/msiexec/version.rc 2005-08-05 20:25:46 UTC (rev 17076) +++ trunk/reactos/subsys/system/msiexec/version.rc 2005-08-05 20:30:42 UTC (rev 17077) @@ -18,10 +18,11 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" -#define WINE_FILEVERSION 2,0,2600,1183 -#define WINE_FILEVERSION_STR "2.0.2600.1183" -#define WINE_PRODUCTVERSION 2,0,2600,1183 -#define WINE_PRODUCTVERSION_STR "2.0.2600.1183" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 3,1,4000,1823 +#define WINE_FILEVERSION_STR "3.1.4000.1823" +#define WINE_PRODUCTVERSION 3,1,4000,1823 +#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs