Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by navaraf＠svn.reactos.com

Use W32API. Modified: trunk/reactos/drivers/net/npf/Makefile Modified: trunk/reactos/drivers/net/npf/dump.c Modified: trunk/reactos/drivers/net/npf/jitter.c Modified: trunk/reactos/drivers/net/npf/openclos.c Modified: trunk/reactos/drivers/net/npf/packet.c Modified: trunk/reactos/drivers/net/npf/packet.h Modified: trunk/reactos/drivers/net/npf/read.c Modified: trunk/reactos/drivers/net/npf/win_bpf.h Modified: trunk/reactos/drivers/net/npf/write.c _____ Modified: trunk/reactos/drivers/net/npf/Makefile --- trunk/reactos/drivers/net/npf/Makefile 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/Makefile 2005-05-28 11:09:53 UTC (rev 15570) @@ -7,9 +7,9 @@ TARGET_NAME = npf -#TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include +#TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER -DKQPC_TS -I$(PATH_TO_TOP)/ntoskrnl/include -TARGET_CFLAGS = -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -D_TIMEVAL_DEFINED -DDBG -DWIN_NT_DRIVER -DKQPC_TS -DUSE_KLOCKS -I$(PATH_TO_TOP)/ntoskrnl/include -Wall -Werror TARGET_DDKLIBS = ndis.a _____ Modified: trunk/reactos/drivers/net/npf/dump.c --- trunk/reactos/drivers/net/npf/dump.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/dump.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> //#define PsGetCurrentProcess() IoGetCurrentProcess() #ifndef PsGetCurrentThread #define PsGetCurrentThread() ((PETHREAD) (KeGetCurrentThread())) _____ Modified: trunk/reactos/drivers/net/npf/jitter.c --- trunk/reactos/drivers/net/npf/jitter.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/jitter.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #endif #include "packet.h" _____ Modified: trunk/reactos/drivers/net/npf/openclos.c --- trunk/reactos/drivers/net/npf/openclos.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/openclos.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -25,7 +25,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #endif #include "debug.h" #include "packet.h" _____ Modified: trunk/reactos/drivers/net/npf/packet.c --- trunk/reactos/drivers/net/npf/packet.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/packet.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #endif #include "ntddpack.h" @@ -114,27 +114,14 @@ ProtocolChar.MajorNdisVersion = 3; #endif ProtocolChar.MinorNdisVersion = 0; -#ifndef __GNUC__ ProtocolChar.Reserved = 0; -#else - ProtocolChar.u1.Reserved = 0; -#endif ProtocolChar.OpenAdapterCompleteHandler = NPF_OpenAdapterComplete; ProtocolChar.CloseAdapterCompleteHandler = NPF_CloseAdapterComplete; -#ifndef __GNUC__ ProtocolChar.SendCompleteHandler = NPF_SendComplete; ProtocolChar.TransferDataCompleteHandler = NPF_TransferDataComplete; -#else - ProtocolChar.u2.SendCompleteHandler = NPF_SendComplete; - ProtocolChar.u3.TransferDataCompleteHandler = NPF_TransferDataComplete; -#endif ProtocolChar.ResetCompleteHandler = NPF_ResetComplete; ProtocolChar.RequestCompleteHandler = NPF_RequestComplete; -#ifndef __GNUC__ ProtocolChar.ReceiveHandler = NPF_tap; -#else - ProtocolChar.u4.ReceiveHandler = NPF_tap; -#endif ProtocolChar.ReceiveCompleteHandler = NPF_ReceiveComplete; ProtocolChar.StatusHandler = NPF_Status; ProtocolChar.StatusCompleteHandler = NPF_StatusComplete; _____ Modified: trunk/reactos/drivers/net/npf/packet.h --- trunk/reactos/drivers/net/npf/packet.h 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/packet.h 2005-05-28 11:09:53 UTC (rev 15570) @@ -32,13 +32,9 @@ #define NTKERNEL ///< Forces the compilation of the jitter with kernel calls -#ifdef __GNUC__ +struct bpf_insn; #undef EXIT_SUCCESS #undef EXIT_FAILURE -#define UNICODE_NULL ((WCHAR)0) // winnt -#include "win_bpf.h" -#include <internal/ps.h> -#endif #include "jitter.h" #include "tme.h" _____ Modified: trunk/reactos/drivers/net/npf/read.c --- trunk/reactos/drivers/net/npf/read.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/read.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,10 +26,8 @@ #include <ndis.h> #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> -#define NdisMoveMappedMemory(Destination,Source,Length) RtlCopyMemory(Destination,Source,Length) -#define NdisZeroMappedMemory(Destination,Length) RtlZeroMemory(Destination,Length) #define NdisReinitializePacket(Packet) \ { \ (Packet)->Private.Head = (PNDIS_BUFFER)NULL; \ _____ Modified: trunk/reactos/drivers/net/npf/win_bpf.h --- trunk/reactos/drivers/net/npf/win_bpf.h 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/win_bpf.h 2005-05-28 11:09:53 UTC (rev 15570) @@ -47,7 +47,7 @@ typedef UCHAR u_char; typedef USHORT u_short; -typedef ULONG u_int; +typedef UINT u_int; typedef LONG bpf_int32; typedef ULONG bpf_u_int32; typedef ULONG u_int32; _____ Modified: trunk/reactos/drivers/net/npf/write.c --- trunk/reactos/drivers/net/npf/write.c 2005-05-28 11:09:34 UTC (rev 15569) +++ trunk/reactos/drivers/net/npf/write.c 2005-05-28 11:09:53 UTC (rev 15570) @@ -26,7 +26,7 @@ #include "ndis.h" #else #include <ddk/ntddk.h> -#include <net/ndis.h> +#include <ddk/ndis.h> #define NdisReinitializePacket(Packet) \ { \ (Packet)->Private.Head = (PNDIS_BUFFER)NULL; \

19 years, 7 months

[navaraf] 15569: Use W32API.

by navaraf＠svn.reactos.com

Use W32API. Modified: trunk/reactos/drivers/net/dd/ne2000/Makefile Modified: trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h Modified: trunk/reactos/drivers/net/dd/ne2000/ne2000/main.c _____ Modified: trunk/reactos/drivers/net/dd/ne2000/Makefile --- trunk/reactos/drivers/net/dd/ne2000/Makefile 2005-05-28 10:41:13 UTC (rev 15568) +++ trunk/reactos/drivers/net/dd/ne2000/Makefile 2005-05-28 11:09:34 UTC (rev 15569) @@ -6,7 +6,7 @@ TARGET_NAME = ne2000 -TARGET_CFLAGS = -I./include -Werror -Wall +TARGET_CFLAGS = -I./include -D__USE_W32API -Werror -Wall TARGET_OBJECTS = \ ne2000/8390.o \ _____ Modified: trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h --- trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h 2005-05-28 10:41:13 UTC (rev 15568) +++ trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h 2005-05-28 11:09:34 UTC (rev 15569) @@ -7,16 +7,7 @@ #ifndef __NE2000_H #define __NE2000_H -#ifdef _MSC_VER - -#ifndef ULONG_PTR -#define ULONG ULONG_PTR -#endif - -#include <ndis.h> -#else -#include <net/ndis.h> -#endif +#include <ddk/ndis.h> #include <8390.h> #include <debug.h> _____ Modified: trunk/reactos/drivers/net/dd/ne2000/ne2000/main.c --- trunk/reactos/drivers/net/dd/ne2000/ne2000/main.c 2005-05-28 10:41:13 UTC (rev 15568) +++ trunk/reactos/drivers/net/dd/ne2000/ne2000/main.c 2005-05-28 11:09:34 UTC (rev 15569) @@ -844,9 +844,9 @@ Miniport.QueryInformationHandler = MiniportQueryInformation; Miniport.ReconfigureHandler = MiniportReconfigure; Miniport.ResetHandler = MiniportReset; - Miniport.u1.SendHandler = MiniportSend; + Miniport.SendHandler = MiniportSend; Miniport.SetInformationHandler = MiniportSetInformation; - Miniport.u2.TransferDataHandler = MiniportTransferData; + Miniport.TransferDataHandler = MiniportTransferData; NdisMInitializeWrapper(&NdisWrapperHandle, DriverObject,

19 years, 7 months

[chorns] 15568: Add missing separators to RBUILD_XXX_OUT variables.

by chorns＠svn.reactos.com

Add missing separators to RBUILD_XXX_OUT variables. Patch by Mike Lerwill [mlist(a)ml-solutions.co.uk] Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-28 10:23:48 UTC (rev 15567) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-05-28 10:41:13 UTC (rev 15568) @@ -20,7 +20,7 @@ RBUILD_BACKEND_BASE_ = $(RBUILD_BACKEND_BASE)$(SEP) RBUILD_BACKEND_INT = $(INTERMEDIATE_)$(RBUILD_BACKEND_BASE) RBUILD_BACKEND_INT_ = $(RBUILD_BACKEND_INT)$(SEP) -RBUILD_BACKEND_OUT = $(OUTPUT)$(RBUILD_BACKEND_BASE) +RBUILD_BACKEND_OUT = $(OUTPUT_)$(RBUILD_BACKEND_BASE) RBUILD_BACKEND_OUT_ = $(RBUILD_BACKEND_OUT)$(SEP) $(RBUILD_BACKEND_INT): | $(RBUILD_INT) @@ -38,7 +38,7 @@ RBUILD_MINGW_BASE_ = $(RBUILD_MINGW_BASE)$(SEP) RBUILD_MINGW_INT = $(INTERMEDIATE_)$(RBUILD_MINGW_BASE) RBUILD_MINGW_INT_ = $(RBUILD_MINGW_INT)$(SEP) -RBUILD_MINGW_OUT = $(OUTPUT)$(RBUILD_MINGW_BASE) +RBUILD_MINGW_OUT = $(OUTPUT_)$(RBUILD_MINGW_BASE) RBUILD_MINGW_OUT_ = $(RBUILD_MINGW_OUT)$(SEP) $(RBUILD_MINGW_INT): | $(RBUILD_BACKEND_INT) @@ -56,7 +56,7 @@ RBUILD_TESTS_BASE_ = $(RBUILD_TESTS_BASE)$(SEP) RBUILD_TESTS_INT = $(INTERMEDIATE_)$(RBUILD_TESTS_BASE) RBUILD_TESTS_INT_ = $(RBUILD_TESTS_INT)$(SEP) -RBUILD_TESTS_OUT = $(OUTPUT)$(RBUILD_TESTS_BASE) +RBUILD_TESTS_OUT = $(OUTPUT_)$(RBUILD_TESTS_BASE) $(RBUILD_TESTS_INT): | $(RBUILD_INT) $(ECHO_MKDIR) @@ -73,7 +73,7 @@ RBUILD_DEVCPP_BASE_ = $(RBUILD_DEVCPP_BASE)$(SEP) RBUILD_DEVCPP_INT = $(INTERMEDIATE_)$(RBUILD_DEVCPP_BASE) RBUILD_DEVCPP_INT_ = $(RBUILD_DEVCPP_INT)$(SEP) -RBUILD_DEVCPP_OUT = $(OUTPUT)$(RBUILD_DEVCPP_BASE) +RBUILD_DEVCPP_OUT = $(OUTPUT_)$(RBUILD_DEVCPP_BASE) RBUILD_DEVCPP_OUT_ = $(RBUILD_DEVCPP_OUT)$(SEP) $(RBUILD_DEVCPP_INT): | $(RBUILD_BACKEND_INT)

19 years, 7 months

[mbosma] 15567: !say

by mbosma＠svn.reactos.com

!say Modified: trunk/irc/ArchBlackmann/readme.txt _____ Modified: trunk/irc/ArchBlackmann/readme.txt --- trunk/irc/ArchBlackmann/readme.txt 2005-05-28 09:38:59 UTC (rev 15566) +++ trunk/irc/ArchBlackmann/readme.txt 2005-05-28 10:23:48 UTC (rev 15567) @@ -10,6 +10,7 @@ * !kiss <person> * !hug <person> * !give <someone> <something> +* !say <something> - You can tell him to say something on the channel via PrivateMessage * !add <list> <item> * !remove <list> <item>

19 years, 7 months

[gvg] 15566: Sync to Wine-20050524:

by gvg＠svn.reactos.com

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Robert Shearman <rob(a)codeweavers.com> - Rename MODULENAME_Dll* functions to Dll* for better consistency and type checking. Modified: trunk/reactos/lib/olepro32/Makefile.in Modified: trunk/reactos/lib/olepro32/olepro32.spec Modified: trunk/reactos/lib/olepro32/olepro32stubs.c _____ Modified: trunk/reactos/lib/olepro32/Makefile.in --- trunk/reactos/lib/olepro32/Makefile.in 2005-05-28 09:38:28 UTC (rev 15565) +++ trunk/reactos/lib/olepro32/Makefile.in 2005-05-28 09:38:59 UTC (rev 15566) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olepro32.dll +IMPORTLIB = libolepro32.$(IMPLIBEXT) IMPORTS = oleaut32 C_SRCS = olepro32stubs.c _____ Modified: trunk/reactos/lib/olepro32/olepro32.spec --- trunk/reactos/lib/olepro32/olepro32.spec 2005-05-28 09:38:28 UTC (rev 15565) +++ trunk/reactos/lib/olepro32/olepro32.spec 2005-05-28 09:38:59 UTC (rev 15566) @@ -5,7 +5,7 @@ 252 stdcall OleCreatePictureIndirect(ptr ptr long ptr) oleaut32.OleCreatePictureIndirect 253 stdcall OleCreateFontIndirect(ptr ptr ptr) oleaut32.OleCreateFontIndirect 254 stdcall OleTranslateColor(long long long) oleaut32.OleTranslateColor -@ stdcall -private DllCanUnloadNow() OLEPRO32_DllCanUnloadNow -@ stdcall -private DllGetClassObject( ptr ptr ptr ) OLEPRO32_DllGetClassObject -@ stdcall -private DllRegisterServer() OLEPRO32_DllRegisterServer -@ stdcall -private DllUnregisterServer() OLEPRO32_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject( ptr ptr ptr ) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() _____ Modified: trunk/reactos/lib/olepro32/olepro32stubs.c --- trunk/reactos/lib/olepro32/olepro32stubs.c 2005-05-28 09:38:28 UTC (rev 15565) +++ trunk/reactos/lib/olepro32/olepro32stubs.c 2005-05-28 09:38:59 UTC (rev 15566) @@ -34,7 +34,7 @@ /*********************************************************************** * DllUnregisterServer (OLEPRO32.258) */ -HRESULT WINAPI OLEPRO32_DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer() { FIXME("not implemented (olepro32.dll) \n"); return S_OK; @@ -43,7 +43,7 @@ /*********************************************************************** * DllRegisterServer (OLEPRO32.257) */ -HRESULT WINAPI OLEPRO32_DllRegisterServer() +HRESULT WINAPI DllRegisterServer() { FIXME("not implemented (olepro32.dll) \n"); return S_OK; @@ -52,7 +52,7 @@ /*********************************************************************** * DllCanUnloadNow (OLEPRO32.255) */ -HRESULT WINAPI OLEPRO32_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("not implemented (olepro32.dll) \n"); return S_OK; @@ -61,7 +61,7 @@ /*********************************************************************** * DllGetClassObject (OLEPRO32.256) */ -HRESULT WINAPI OLEPRO32_DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { FIXME("not implemented (olepro32.dll) \n"); return S_OK;

19 years, 7 months

[mbosma] 15565: ArchBackmann readme. Allmost the same as http://reactos.com/wiki/index.php/ArchBlackmann

by mbosma＠svn.reactos.com

ArchBackmann readme. Allmost the same as http://reactos.com/wiki/index.php/ArchBlackmann Added: trunk/irc/ArchBlackmann/readme.txt _____ Added: trunk/irc/ArchBlackmann/readme.txt --- trunk/irc/ArchBlackmann/readme.txt 2005-05-28 09:37:01 UTC (rev 15564) +++ trunk/irc/ArchBlackmann/readme.txt 2005-05-28 09:38:28 UTC (rev 15565) @@ -0,0 +1,19 @@ +This doc can be also found on the wiki. + +ArchBlackman is a IRC-Chat bot. He has been coded by Royce3 and currently DrFred (mbosma) runs him. + +If some one use a swear word he'll tell him not to do so. You can also ask him something technical about reactos. :) + +He also knows some commands. You can give him one like this "ArchBlackmann: !grovel". (don't forget to address him) + +* !grovel - This is the only command that non ops can do (No Parameter) +* !kiss <person> +* !hug <person> +* !give <someone> <something> + +* !add <list> <item> +* !remove <list> <item> + +The lists are the same as the text files. Most of the lists are not used directly, but by the other lists. Like this: + + /me thinks %s is smarter than %dev% \ No newline at end of file

19 years, 7 months

[gvg] 15564: Sync to Wine-20050524:

by gvg＠svn.reactos.com

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Use SUBLANG_NEUTRAL for French resources. Modified: trunk/reactos/lib/oledlg/Makefile.in Modified: trunk/reactos/lib/oledlg/oledlg_Fr.rc _____ Modified: trunk/reactos/lib/oledlg/Makefile.in --- trunk/reactos/lib/oledlg/Makefile.in 2005-05-28 09:35:29 UTC (rev 15563) +++ trunk/reactos/lib/oledlg/Makefile.in 2005-05-28 09:37:01 UTC (rev 15564) @@ -3,6 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oledlg.dll +IMPORTLIB = liboledlg.$(IMPLIBEXT) IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll C_SRCS = \ _____ Modified: trunk/reactos/lib/oledlg/oledlg_Fr.rc --- trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-05-28 09:35:29 UTC (rev 15563) +++ trunk/reactos/lib/oledlg/oledlg_Fr.rc 2005-05-28 09:37:01 UTC (rev 15564) @@ -20,7 +20,7 @@ */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

19 years, 7 months

[gvg] 15563: Sync to Wine-20050524:

by gvg＠svn.reactos.com

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. Michael Stefaniuc <mstefani(a)redhat.de> - Reimplement VarMul(). It can multiply now all variants that the native (WinXP) function supports too. - Fix VariantChangeType: calls to VarDecFromCy and VarDecFromDisp had source and destination swapped. Richard Cohen <richard(a)daijobu.co.uk> - Remove unused macro. - Check for VT_I8 before testing it. - VarMod returns DISP_E_OVERFLOW not E_INVALIDARG. Robert Shearman <rob(a)codeweavers.com> - Use I_RpcGetBuffer instead of HeapReAlloc for getting the Buffer memory. Vincent Beron <vberon(a)mecano.gme.usherb.ca> - Use SUBLANG_NEUTRAL for French resources. Alex Villacis Lasso <a_villacis(a)palosanto.com> - Fix leftover negative sign in height parameter for transparent bitmap. - Properly announce whether bitmap is transparent in get_Attributes. - GIF transparency is now palette-index based, instead of RGB based. - Keep original bitmap and XOR mask separate, so that get_Handle returns original bitmap. Modified: trunk/reactos/lib/oleaut32/Makefile.in Modified: trunk/reactos/lib/oleaut32/oleaut32_Fr.rc Modified: trunk/reactos/lib/oleaut32/olepicture.c Modified: trunk/reactos/lib/oleaut32/tmarshal.c Modified: trunk/reactos/lib/oleaut32/variant.c _____ Modified: trunk/reactos/lib/oleaut32/Makefile.in --- trunk/reactos/lib/oleaut32/Makefile.in 2005-05-28 09:30:04 UTC (rev 15562) +++ trunk/reactos/lib/oleaut32/Makefile.in 2005-05-28 09:35:29 UTC (rev 15563) @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oleaut32.dll +IMPORTLIB = liboleaut32.$(IMPLIBEXT) IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = comctl32 urlmon EXTRALIBS = $(LIBUNICODE) -luuid _____ Modified: trunk/reactos/lib/oleaut32/oleaut32_Fr.rc --- trunk/reactos/lib/oleaut32/oleaut32_Fr.rc 2005-05-28 09:30:04 UTC (rev 15562) +++ trunk/reactos/lib/oleaut32/oleaut32_Fr.rc 2005-05-28 09:35:29 UTC (rev 15563) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { _____ Modified: trunk/reactos/lib/oleaut32/olepicture.c --- trunk/reactos/lib/oleaut32/olepicture.c 2005-05-28 09:30:04 UTC (rev 15562) +++ trunk/reactos/lib/oleaut32/olepicture.c 2005-05-28 09:35:29 UTC (rev 15563) @@ -132,6 +132,7 @@ /* Bitmap transparency mask */ HBITMAP hbmMask; + HBITMAP hbmXor; COLORREF rgbTrans; /* data */ @@ -262,6 +263,7 @@ newObject->keepOrigFormat = TRUE; newObject->hbmMask = NULL; + newObject->hbmXor = NULL; newObject->loadtime_magic = 0xdeadbeef; newObject->loadtime_format = 0; newObject->bIsDirty = FALSE; @@ -320,6 +322,8 @@ switch(Obj->desc.picType) { case PICTYPE_BITMAP: DeleteObject(Obj->desc.u.bmp.hbitmap); + if (Obj->hbmMask != NULL) DeleteObject(Obj->hbmMask); + if (Obj->hbmXor != NULL) DeleteObject(Obj->hbmXor); break; case PICTYPE_METAFILE: DeleteMetaFile(Obj->desc.u.wmf.hmeta); @@ -588,12 +592,12 @@ SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - if (This->hbmMask) { HDC hdcMask = CreateCompatibleDC(0); HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); + hbmpOld = SelectObject(hdcBmp, This->hbmXor); + SetMapMode(hdcMask, MM_ANISOTROPIC); SetWindowOrgEx(hdcMask, 0, 0, NULL); SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); @@ -607,8 +611,10 @@ SelectObject(hdcMask, hOldbm); DeleteDC(hdcMask); - } else + } else { + hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } SelectObject(hdcBmp, hbmpOld); DeleteDC(hdcBmp); @@ -739,7 +745,7 @@ TRACE("(%p)->(%p).\n", This, pdwAttr); *pdwAttr = 0; switch (This->desc.picType) { - case PICTYPE_BITMAP: break; /* not 'truly' scalable, see MSDN. */ + case PICTYPE_BITMAP: if (This->hbmMask) *pdwAttr = PICTURE_TRANSPARENT; break; /* not 'truly' scalable, see MSDN. */ case PICTYPE_ICON: *pdwAttr = PICTURE_TRANSPARENT;break; case PICTYPE_METAFILE: *pdwAttr = PICTURE_TRANSPARENT|PICTURE_SCALABLE;break; default:FIXME("Unknown pictype %d\n",This->desc.picType);break; @@ -1175,15 +1181,60 @@ HBITMAP hOldbitmap; HBITMAP hOldbitmapmask; - This->hbmMask = CreateBitmap(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, 1, 1, NULL); + unsigned int monopadding = (((unsigned)(gif->SWidth + 31)) >> 5) << 2; + HBITMAP hTempMask; - hOldbitmap = SelectObject(hdc,This->desc.u.bmp.hbitmap); + This->hbmXor = CreateDIBitmap( + hdcref, + &bmi->bmiHeader, + CBM_INIT, + bytes, + bmi, + DIB_RGB_COLORS + ); + + bmi->bmiColors[0].rgbRed = 0; + bmi->bmiColors[0].rgbGreen = 0; + bmi->bmiColors[0].rgbBlue = 0; + bmi->bmiColors[1].rgbRed = 255; + bmi->bmiColors[1].rgbGreen = 255; + bmi->bmiColors[1].rgbBlue = 255; + + bmi->bmiHeader.biBitCount = 1; + bmi->bmiHeader.biSizeImage = monopadding*gif->SHeight; + bmi->bmiHeader.biClrUsed = 2; + + for (i = 0; i < gif->SHeight; i++) { + unsigned char * colorPointer = bytes + padding * i; + unsigned char * monoPointer = bytes + monopadding * i; + for (j = 0; j < gif->SWidth; j++) { + unsigned char pixel = colorPointer[j]; + if ((j & 7) == 0) monoPointer[j >> 3] = 0; + if (pixel == (transparent & 0x000000FFU)) monoPointer[j >> 3] |= 1 << (7 - (j & 7)); + } + } + hdcref = GetDC(0); + hTempMask = CreateDIBitmap( + hdcref, + &bmi->bmiHeader, + CBM_INIT, + bytes, + bmi, + DIB_RGB_COLORS + ); + DeleteDC(hdcref); + + bmi->bmiHeader.biHeight = -bmi->bmiHeader.biHeight; + This->hbmMask = CreateBitmap(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, 1, 1, NULL); + hOldbitmap = SelectObject(hdc, hTempMask); hOldbitmapmask = SelectObject(hdcMask, This->hbmMask); - SetBkColor(hdc, This->rgbTrans); + + SetBkColor(hdc, RGB(255, 255, 255)); BitBlt(hdcMask, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, hdc, 0, 0, SRCCOPY); /* We no longer need the original bitmap, so we apply the first transformation with the mask to speed up the rendering */ + SelectObject(hdc, This->hbmXor); SetBkColor(hdc, RGB(0,0,0)); SetTextColor(hdc, RGB(255,255,255)); BitBlt(hdc, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, @@ -1193,6 +1244,7 @@ SelectObject(hdcMask, hOldbitmapmask); DeleteDC(hdcMask); DeleteDC(hdc); + DeleteObject(hTempMask); } DeleteDC(hdcref); _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-05-28 09:30:04 UTC (rev 15562) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-05-28 09:35:29 UTC (rev 15563) @@ -1979,7 +1979,8 @@ memset(&buf,0,sizeof(buf)); buf.size = xmsg->cbBuffer; - buf.base = xmsg->Buffer; + buf.base = HeapAlloc(GetProcessHeap(), 0, xmsg->cbBuffer); + memcpy(buf.base, xmsg->Buffer, xmsg->cbBuffer); buf.curoff = 0; buf.iid = IID_IUnknown; @@ -2173,9 +2174,9 @@ if (hres != S_OK) return hres; - /* might need to use IRpcChannelBuffer_GetBuffer ? */ xmsg->cbBuffer = buf.curoff; - xmsg->Buffer = buf.base; + I_RpcGetBuffer((RPC_MESSAGE *)xmsg); + memcpy(xmsg->Buffer, buf.base, buf.curoff); HeapFree(GetProcessHeap(),0,args); return S_OK; } _____ Modified: trunk/reactos/lib/oleaut32/variant.c --- trunk/reactos/lib/oleaut32/variant.c 2005-05-28 09:30:04 UTC (rev 15562) +++ trunk/reactos/lib/oleaut32/variant.c 2005-05-28 09:35:29 UTC (rev 15563) @@ -493,8 +493,8 @@ case VT_R4: return VarDecFromR4(V_R4(ps), &V_DECIMAL(pd)); case VT_R8: return VarDecFromR8(V_R8(ps), &V_DECIMAL(pd)); case VT_DATE: return VarDecFromDate(V_DATE(ps), &V_DECIMAL(pd)); - case VT_CY: return VarDecFromCy(V_CY(pd), &V_DECIMAL(ps)); - case VT_DISPATCH: return VarDecFromDisp(V_DISPATCH(ps), lcid, &V_DECIMAL(ps)); + case VT_CY: return VarDecFromCy(V_CY(ps), &V_DECIMAL(pd)); + case VT_DISPATCH: return VarDecFromDisp(V_DISPATCH(ps), lcid, &V_DECIMAL(pd)); case VT_BSTR: return VarDecFromStr(V_BSTR(ps), lcid, dwFlags, &V_DECIMAL(pd)); } break; @@ -2914,58 +2914,168 @@ /********************************************************************** * VarMul [OLEAUT32.156] * + * Multiply two variants. + * + * PARAMS + * left [I] First variant + * right [I] Second variant + * result [O] Result variant + * + * RETURNS + * Success: S_OK. + * Failure: An HRESULT error code indicating the error. + * + * NOTES + * Native VarMul up to and including WinXP dosn't like as input variants + * I1, UI2, UI4, UI8, INT and UINT. But it can multiply apples with oranges. + * + * Native VarMul dosn't check for NULL in/out pointers and crashes. We do the + * same here. + * + * FIXME + * Overflow checking for R8 (double) overflow. Return DISP_E_OVERFLOW in that + * case. */ HRESULT WINAPI VarMul(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - HRESULT rc = E_FAIL; - VARTYPE lvt,rvt,resvt; - VARIANT lv,rv; - BOOL found; + HRESULT hres; + VARTYPE lvt, rvt, resvt, tvt; + VARIANT lv, rv, tv; + double r8res; + /* Variant priority for coercion. Sorted from lowest to highest. + VT_ERROR shows an invalid input variant type. */ + enum coerceprio { vt_UI1 = 0, vt_I2, vt_I4, vt_I8, vt_CY, vt_R4, vt_R8, + vt_DECIMAL, vt_NULL, vt_ERROR }; + /* Mapping from priority to variant type. Keep in sync with coerceprio! */ + VARTYPE prio2vt[] = { VT_UI1, VT_I2, VT_I4, VT_I8, VT_CY, VT_R4, VT_R8, + VT_DECIMAL, VT_NULL, VT_ERROR }; + + /* Mapping for coercion from input variant to priority of result variant. */ + static VARTYPE coerce[] = { + /* VT_EMPTY, VT_NULL, VT_I2, VT_I4, VT_R4 */ + vt_UI1, vt_NULL, vt_I2, vt_I4, vt_R4, + /* VT_R8, VT_CY, VT_DATE, VT_BSTR, VT_DISPATCH */ + vt_R8, vt_CY, vt_R8, vt_R8, vt_ERROR, + /* VT_ERROR, VT_BOOL, VT_VARIANT, VT_UNKNOWN, VT_DECIMAL */ + vt_ERROR, vt_I2, vt_ERROR, vt_ERROR, vt_DECIMAL, + /* 15, VT_I1, VT_UI1, VT_UI2, VT_UI4 VT_I8 */ + vt_ERROR, vt_ERROR, vt_UI1, vt_ERROR, vt_ERROR, vt_I8 + }; + TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), + result); - VariantInit(&lv);VariantInit(&rv); + VariantInit(&lv); + VariantInit(&rv); + VariantInit(&tv); lvt = V_VT(left)&VT_TYPEMASK; rvt = V_VT(right)&VT_TYPEMASK; - found = FALSE;resvt=VT_VOID; - if (((1<<lvt) | (1<<rvt)) & (VTBIT_R4|VTBIT_R8)) { - found = TRUE; - resvt = VT_R8; + + /* If we have any flag set (VT_ARRAY, VT_VECTOR, etc.) bail out. + Same for any input variant type > VT_I8 */ + if (V_VT(left) & ~VT_TYPEMASK || V_VT(right) & ~VT_TYPEMASK || + lvt > VT_I8 || rvt > VT_I8) { + hres = DISP_E_BADVARTYPE; + goto end; } - if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1 <<VT_UINT)))) { - found = TRUE; - resvt = VT_I4; + + /* Determine the variant type to coerce to. */ + if (coerce[lvt] > coerce[rvt]) { + resvt = prio2vt[coerce[lvt]]; + tvt = prio2vt[coerce[rvt]]; + } else { + resvt = prio2vt[coerce[rvt]]; + tvt = prio2vt[coerce[lvt]]; } - if (!found) { - FIXME("can't expand vt %d vs %d to a target type.\n",lvt,rvt); - return E_FAIL; + + /* Special cases where the result variant type is defined by both + input variants and not only that with the highest priority */ + if (resvt == VT_R4 && (tvt == VT_CY || tvt == VT_I8 || tvt == VT_I4)) + resvt = VT_R8; + if (lvt == VT_EMPTY && rvt == VT_EMPTY) + resvt = VT_I2; + + /* For overflow detection use the biggest compatible type for the + multiplication */ + switch (resvt) { + case VT_ERROR: + hres = DISP_E_BADVARTYPE; + goto end; + case VT_NULL: + hres = S_OK; + V_VT(result) = VT_NULL; + goto end; + case VT_UI1: + case VT_I2: + case VT_I4: + case VT_I8: + tvt = VT_I8; + break; + case VT_R4: + tvt = VT_R8; + break; + default: + tvt = resvt; } - rc = VariantChangeType(&lv, left, 0, resvt); - if (FAILED(rc)) { - FIXME("Could not convert 0x%x to %d?\n",V_VT(left),resvt); - return rc; + + /* Now coerce the variants */ + hres = VariantChangeType(&lv, left, 0, tvt); + if (FAILED(hres)) + goto end; + hres = VariantChangeType(&rv, right, 0, tvt); + if (FAILED(hres)) + goto end; + + /* Do the math */ + hres = S_OK; + V_VT(&tv) = tvt; + V_VT(result) = resvt; + switch (tvt) { + case VT_DECIMAL: + hres = VarDecMul(&V_DECIMAL(&lv), &V_DECIMAL(&rv), + &V_DECIMAL(result)); + goto end; + case VT_CY: + hres = VarCyMul(V_CY(&lv), V_CY(&rv), &V_CY(result)); + goto end; + case VT_I8: + /* Overflow detection */ + r8res = (double)V_I8(&lv) * (double)V_I8(&rv); + if (r8res > (double)I8_MAX || r8res < (double)I8_MIN) { + V_VT(result) = VT_R8; + V_R8(result) = r8res; + goto end; + } else + V_I8(&tv) = V_I8(&lv) * V_I8(&rv); + break; + case VT_R8: + /* FIXME: overflow detection */ + V_R8(&tv) = V_R8(&lv) * V_R8(&rv); + break; + default: + ERR("We shouldn't get here! tvt = %d!\n", tvt); + break; } - rc = VariantChangeType(&rv, right, 0, resvt); - if (FAILED(rc)) { - FIXME("Could not convert 0x%x to %d?\n",V_VT(right),resvt); - return rc; + if (rvt != tvt) { + while ((hres = VariantChangeType(result, &tv, 0, resvt)) != S_OK) { + /* Overflow! Change to the vartype with the next higher priority */ + resvt = prio2vt[coerce[resvt] + 1]; + } + } else + hres = VariantCopy(result, &tv); + +end: + if (hres != S_OK) { + V_VT(result) = VT_EMPTY; + V_I4(result) = 0; /* No V_EMPTY */ } - switch (resvt) { - case VT_R8: - V_VT(result) = resvt; - V_R8(result) = V_R8(&lv) * V_R8(&rv); - rc = S_OK; - break; - case VT_I4: - V_VT(result) = resvt; - V_I4(result) = V_I4(&lv) * V_I4(&rv); - rc = S_OK; - break; - } - TRACE("returning 0x%8lx (%s%s),%g\n", rc, debugstr_VT(result), - debugstr_VF(result), V_VT(result) == VT_R8 ? V_R8(result) : (double)V_I4(result)); - return rc; + VariantClear(&lv); + VariantClear(&rv); + VariantClear(&tv); + TRACE("returning 0x%8lx (variant type %s)\n", hres, debugstr_VT(result)); + return hres; } /********************************************************************** @@ -4267,7 +4377,7 @@ return DISP_E_TYPEMISMATCH; case VT_DECIMAL: V_VT(result) = VT_EMPTY; - return E_INVALIDARG; + return DISP_E_OVERFLOW; case VT_ERROR: return DISP_E_TYPEMISMATCH; case VT_RECORD: @@ -4352,7 +4462,7 @@ } else { V_VT(result) = VT_EMPTY; - return E_INVALIDARG; + return DISP_E_OVERFLOW; } case VT_ERROR: return DISP_E_TYPEMISMATCH;

19 years, 7 months

[gvg] 15562: Sync to Wine-20050524:

by gvg＠svn.reactos.com

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Added rules for building import libraries in the individual dll makefiles, and added support for building a .def.a static import library too. - Removed unnecessary code in the 16-bit DllEntryPoint function of some dlls, and also fixed its ordinal in a few places. - Comment out stub WEP entry points so that we can call WEP for builtin dlls too. Juan Lang <juan_lang(a)yahoo.com> - Obvious fixes to PropVariantClear and PropVariantCopy for vector types. - Add a comment, and a no-op cleanup. - Differentiate between version 0 and version 1 property storages. - Store property names in the code page of the property set. - maintain proper byte order - maintain PROPSETFLAG_ANSI flag based on codepage - update comments - Correct/improve error checking in IPropertyStorage. - convert strings between property storage's code page and system code page - add tests for setting code page - fix tests and behavior to match WinXP - Define and use endian conversion macros for big-endian machines. Marcus Meissner <marcus(a)jet.franken.de> - Move the Dll init function to compobj.c to avoid having global variables. Remove need of ole32_main.h. - Make HGLOBALStream_* functions static. - Make _xmalloc16() static. - Staticify FTMarshalImpl definition. Francois Gouget <fgouget(a)free.fr> - Specify the proper call convention in the PropSysFreeString() implementation. - Tweak the API documentation to silence winapi_check warnings. Robert Shearman <rob(a)codeweavers.com> - Add error messages on failure in file moniker load function. - Fix incorrect pointer check in both monikers. - Fix max size calculation of item moniker to match native. - Add a generic moniker marshaler that works by saving & loading monikers to & from the stream. - Use the generic moniker marshal in the file & item monikers and add a class factory for each. - Implement IROTData::GetComparisonData for file & item monikers. - Add a useful trace message. - Fix more places where custom header size was calculated exclusive of the data size member. - Optimize custom marshaling by getting size before calling the custom marshaler so we can write the header before and not use a second stream. - Change remaining blocks of code with 2-space indentation to 4-space indentation. - Make vtables const. - Remove an unnecessary memcpy and let the compiler do the work. - Write custom header up to and including size, not excluding. - Add a stub implementation of CoIsHandlerConnected. - Marshal objects & monikers into the ROT. - Test for this behaviour. Mike McCormack <mike(a)codeweavers.com> - Remove unnecessary declarations and make functions static. - Remove forward declarations. - Make sure a stream can't be created in read only storage. - Fix a memory leak in the ole storage implementation. - Remove function prototypes. Kevin Koltzau <kevin(a)plop.org> - Implement Hash function on composite moniker. Jeff Latimer <jeffl(a)defcen.gov.au> - Implement the IEnumMoniker interface for the ROT and provide tests to exercise the interface. Pierre d'Herbemont <stegefin(a)free.fr> - Big Endian specific code fixes in order to conform with NONAMELESSSTRUCT. Matthew Mastracci <matt(a)aclaro.com> - Replace stub entry for StgOpenStorageEx with call to StgOpenStorage. - Replace StgCreateStorageEx stub with call to StgCreateDocfile and add required STGFMT_* enumerations. Modified: trunk/reactos/lib/ole32/Makefile.in Modified: trunk/reactos/lib/ole32/compobj.c Modified: trunk/reactos/lib/ole32/compobj_private.h Modified: trunk/reactos/lib/ole32/compositemoniker.c Modified: trunk/reactos/lib/ole32/filemoniker.c Modified: trunk/reactos/lib/ole32/ftmarshal.c Modified: trunk/reactos/lib/ole32/git.c Modified: trunk/reactos/lib/ole32/hglobalstream.c Modified: trunk/reactos/lib/ole32/itemmoniker.c Modified: trunk/reactos/lib/ole32/marshal.c Modified: trunk/reactos/lib/ole32/moniker.c Modified: trunk/reactos/lib/ole32/moniker.h Modified: trunk/reactos/lib/ole32/ole16.c Modified: trunk/reactos/lib/ole32/ole2.c Modified: trunk/reactos/lib/ole32/ole2_16.c Modified: trunk/reactos/lib/ole32/ole2thk.spec Modified: trunk/reactos/lib/ole32/ole32.spec Modified: trunk/reactos/lib/ole32/ole32_main.c Deleted: trunk/reactos/lib/ole32/ole32_main.h Modified: trunk/reactos/lib/ole32/oleobj.c Modified: trunk/reactos/lib/ole32/oleproxy.c Modified: trunk/reactos/lib/ole32/stg_prop.c Modified: trunk/reactos/lib/ole32/storage32.c Modified: trunk/reactos/lib/ole32/storage32.h Modified: trunk/reactos/w32api/include/objbase.h _____ Modified: trunk/reactos/lib/ole32/Makefile.in --- trunk/reactos/lib/ole32/Makefile.in 2005-05-28 07:39:54 UTC (rev 15561) +++ trunk/reactos/lib/ole32/Makefile.in 2005-05-28 09:30:04 UTC (rev 15562) @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ole32.dll +IMPORTLIB = libole32.$(IMPLIBEXT) IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll EXTRALIBS = -luuid $(LIBUNICODE) _____ Modified: trunk/reactos/lib/ole32/compobj.c --- trunk/reactos/lib/ole32/compobj.c 2005-05-28 07:39:54 UTC (rev 15561) +++ trunk/reactos/lib/ole32/compobj.c 2005-05-28 09:30:04 UTC (rev 15562) @@ -66,7 +66,6 @@ #include "wownt32.h" #include "wine/unicode.h" #include "objbase.h" -#include "ole32_main.h" #include "compobj_private.h" #include "wine/debug.h" @@ -75,6 +74,8 @@ typedef LPCSTR LPCOLESTR16; +HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ + /*********************************************************************** ***** * This section defines variables internal to the COM module. * @@ -169,7 +170,7 @@ static void COMPOBJ_DLLList_Add(HANDLE hLibrary); static void COMPOBJ_DllList_FreeUnused(int Timeout); -void COMPOBJ_InitProcess( void ) +static void COMPOBJ_InitProcess( void ) { WNDCLASSW wclass; @@ -189,12 +190,12 @@ RegisterClassW(&wclass); } -void COMPOBJ_UninitProcess( void ) +static void COMPOBJ_UninitProcess( void ) { UnregisterClassW(wszAptWinClass, OLE32_hInstance); } -void COM_TlsDestroy() +static void COM_TlsDestroy() { struct oletls *info = NtCurrentTeb()->ReservedForOle; if (info) @@ -624,7 +625,7 @@ /* On COM finalization for a STA thread, the message queue is flushed to ensure no pending RPCs are ignored. Non-COM messages are discarded at this point. */ -void COM_FlushMessageQueue(void) +static void COM_FlushMessageQueue(void) { MSG message; APARTMENT *apt = COM_CurrentApt(); @@ -1531,7 +1532,8 @@ * * Reads a registry value and expands it when necessary */ -HRESULT compobj_RegReadPath(char * keyname, char * valuename, char * dst, DWORD dstlen) +static HRESULT +compobj_RegReadPath(char * keyname, char * valuename, char * dst, DWORD dstlen) { HRESULT hres; HKEY key; @@ -2426,6 +2428,25 @@ } /*********************************************************************** + * CoIsHandlerConnected [OLE32.@] + * + * Determines whether a proxy is connected to a remote stub. + * + * PARAMS + * pUnk [I] Pointer to object that may or may not be connected. + * + * RETURNS + * TRUE if pUnk is not a proxy or if pUnk is connected to a remote stub, or + * FALSE otherwise. + */ +BOOL WINAPI CoIsHandlerConnected(IUnknown *pUnk) +{ + FIXME("%p\n", pUnk); + + return TRUE; +} + +/********************************************************************** * * CoQueryProxyBlanket [OLE32.@] * * Retrieves the security settings being used by a proxy. @@ -2635,3 +2656,32 @@ TRACE("-- 0x%08lx\n", hr); return hr; } + +/********************************************************************** * + * DllMain (OLE32.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); + + switch(fdwReason) { + case DLL_PROCESS_ATTACH: + OLE32_hInstance = hinstDLL; + COMPOBJ_InitProcess(); + if (TRACE_ON(ole)) CoRegisterMallocSpy((LPVOID)-1); + break; + + case DLL_PROCESS_DETACH: + if (TRACE_ON(ole)) CoRevokeMallocSpy(); + COMPOBJ_UninitProcess(); + OLE32_hInstance = 0; + break; + + case DLL_THREAD_DETACH: + COM_TlsDestroy(); + break; + } + return TRUE; +} + +/* NOTE: DllRegisterServer and DllUnregisterServer are in regsvr.c */ _____ Modified: trunk/reactos/lib/ole32/compobj_private.h --- trunk/reactos/lib/ole32/compobj_private.h 2005-05-28 07:39:54 UTC (rev 15561) +++ trunk/reactos/lib/ole32/compobj_private.h 2005-05-28 09:30:04 UTC (rev 15562) @@ -203,7 +203,7 @@ HRESULT WINAPI RunningObjectTableImpl_UnInitialize(void); /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ -int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); +int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); /* Apartment Functions */ @@ -254,4 +254,6 @@ # define DEBUG_CLEAR_CRITSEC_NAME(cs) #endif +extern HINSTANCE OLE32_hInstance; /* FIXME: make static */ + #endif /* __WINE_OLE_COMPOBJ_H */ _____ Modified: trunk/reactos/lib/ole32/compositemoniker.c --- trunk/reactos/lib/ole32/compositemoniker.c 2005-05-28 07:39:54 UTC (rev 15561) +++ trunk/reactos/lib/ole32/compositemoniker.c 2005-05-28 09:30:04 UTC (rev 15562) @@ -616,9 +616,36 @@ static HRESULT WINAPI CompositeMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { - FIXME("(),stub!\n"); + IEnumMoniker *enumMoniker; + IMoniker *tempMk; + HRESULT res; + DWORD tempHash; - return E_NOTIMPL; + TRACE("(%p,%p)\n",iface,pdwHash); + + if (pdwHash==NULL) + return E_POINTER; + + res = IMoniker_Enum(iface,TRUE,&enumMoniker); + if(FAILED(res)) + return res; + + while(1){ + res=IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL); + if(FAILED(res)) + break; + + res = IMoniker_Hash(tempMk, &tempHash); + if(FAILED(res)) + break; + *pdwHash = (*pdwHash * 37) + tempHash; + + IMoniker_Release(tempMk); + } + + IEnumMoniker_Release(enumMoniker); + + return res; } /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/ole32/filemoniker.c --- trunk/reactos/lib/ole32/filemoniker.c 2005-05-28 07:39:54 UTC (rev 15561) +++ trunk/reactos/lib/ole32/filemoniker.c 2005-05-28 09:30:04 UTC (rev 15562) @@ -1,7 +1,7 @@ -/********************************************************************** ***************** - * FileMonikers implementation +/* + * FileMonikers implementation * - * Copyright 1999 Noomen Hamza + * 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 @@ -16,7 +16,7 @@ * 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> @@ -57,114 +57,29 @@ LPOLESTR filePathName; /* path string identified by this filemoniker */ + IUnknown *pMarshal; /* custom marshaler */ } FileMonikerImpl; -/********************************************************************** **********/ -/* FileMoniker prototype functions : */ - -/* IUnknown prototype functions */ -static HRESULT WINAPI FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject); -static ULONG WINAPI FileMonikerImpl_AddRef(IMoniker* iface); -static ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface); - -/* IPersist prototype functions */ -static HRESULT WINAPI FileMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID); - -/* IPersistStream prototype functions */ -static HRESULT WINAPI FileMonikerImpl_IsDirty(IMoniker* iface); -static HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface, IStream* pStm); -static HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty); -static HRESULT WINAPI FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize); - -/* IMoniker prototype functions */ -static HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult); -static HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult); -static HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker* iface,IBindCtx* pbc, DWORD dwReduceHowFar,IMoniker** ppmkToLeft, IMoniker** ppmkReduced); -static HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface,IMoniker* pmkRight,BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite); -static HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker); -static HRESULT WINAPI FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker); -static HRESULT WINAPI FileMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash); -static HRESULT WINAPI FileMonikerImpl_IsRunning(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning); -static HRESULT WINAPI FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, FILETIME* pFileTime); -static HRESULT WINAPI FileMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk); -static HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther, IMoniker** ppmkPrefix); -static HRESULT WINAPI FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath); -static HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName); -static HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface,IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut); -static HRESULT WINAPI FileMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys); - -/********************************************************************** **********/ -/* IROTData prototype functions */ - -/* IUnknown prototype functions */ -static HRESULT WINAPI FileMonikerROTDataImpl_QueryInterface(IROTData* iface,REFIID riid,VOID** ppvObject); -static ULONG WINAPI FileMonikerROTDataImpl_AddRef(IROTData* iface); -static ULONG WINAPI FileMonikerROTDataImpl_Release(IROTData* iface); - -/* IROTData prototype function */ -static HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface,BYTE* pbData,ULONG cbMax,ULONG* pcbData); - /* Local function used by filemoniker implementation */ -HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName); -HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface); -int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** tabStr); +static HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* iface, LPCOLESTR lpszPathName); +static HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* iface); - -/********************************************************************** **********/ -/* Virtual function table for the FileMonikerImpl class which include IPersist,*/ -/* IPersistStream and IMoniker functions. */ -static IMonikerVtbl VT_FileMonikerImpl = -{ - FileMonikerImpl_QueryInterface, - FileMonikerImpl_AddRef, - FileMonikerImpl_Release, - FileMonikerImpl_GetClassID, - FileMonikerImpl_IsDirty, - FileMonikerImpl_Load, - FileMonikerImpl_Save, - FileMonikerImpl_GetSizeMax, - FileMonikerImpl_BindToObject, - FileMonikerImpl_BindToStorage, - FileMonikerImpl_Reduce, - FileMonikerImpl_ComposeWith, - FileMonikerImpl_Enum, - FileMonikerImpl_IsEqual, - FileMonikerImpl_Hash, - FileMonikerImpl_IsRunning, - FileMonikerImpl_GetTimeOfLastChange, - FileMonikerImpl_Inverse, - FileMonikerImpl_CommonPrefixWith, - FileMonikerImpl_RelativePathTo, - FileMonikerImpl_GetDisplayName, - FileMonikerImpl_ParseDisplayName, - FileMonikerImpl_IsSystemMoniker -}; - -/********************************************************************** **********/ -/* Virtual function table for the IROTData class. */ -static IROTDataVtbl VT_ROTDataImpl = -{ - FileMonikerROTDataImpl_QueryInterface, - FileMonikerROTDataImpl_AddRef, - FileMonikerROTDataImpl_Release, - FileMonikerROTDataImpl_GetComparaisonData -}; - /*********************************************************************** ******** * FileMoniker_QueryInterface - ************************************************************************ *******/ -HRESULT WINAPI FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) + */ +static HRESULT WINAPI +FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { FileMonikerImpl *This = (FileMonikerImpl *)iface; - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( (This==0) || (ppvObject==0) ) return E_INVALIDARG; /* Initialize the return parameter */ - *ppvObject = 0; + *ppvObject = 0; /* Compare the riid with the interface IDs implemented by this object.*/ if (IsEqualIID(&IID_IUnknown, riid) || @@ -176,21 +91,31 @@ else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = (IROTData*)&(This->lpvtbl2); + else if (IsEqualIID(&IID_IMarshal, riid)) + { + HRESULT hr = S_OK; + if (!This->pMarshal) + hr = MonikerMarshal_Create(iface, &This->pMarshal); + if (hr != S_OK) + return hr; + return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); + } /* Check that we obtained an interface.*/ if ((*ppvObject)==0) return E_NOINTERFACE; /* Query Interface always increases the reference count by one when it is successful */ - FileMonikerImpl_AddRef(iface); + IMoniker_AddRef(iface); return S_OK; } /*********************************************************************** ******* * FileMoniker_AddRef - ************************************************************************ ******/ -ULONG WINAPI FileMonikerImpl_AddRef(IMoniker* iface) + */ +static ULONG WINAPI +FileMonikerImpl_AddRef(IMoniker* iface) { FileMonikerImpl *This = (FileMonikerImpl *)iface; @@ -201,8 +126,9 @@ /*********************************************************************** ******* * FileMoniker_Release - ************************************************************************ ******/ -ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface) + */ +static ULONG WINAPI +FileMonikerImpl_Release(IMoniker* iface) { FileMonikerImpl *This = (FileMonikerImpl *)iface; ULONG ref; @@ -219,9 +145,9 @@ /*********************************************************************** ******* * FileMoniker_GetClassID - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_GetClassID(IMoniker* iface, - CLSID *pClassID)/* Pointer to CLSID of object */ + */ +static HRESULT WINAPI +FileMonikerImpl_GetClassID(IMoniker* iface, CLSID *pClassID) { TRACE("(%p,%p)\n",iface,pClassID); @@ -235,12 +161,14 @@ /*********************************************************************** ******* * FileMoniker_IsDirty - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_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. + */ +static HRESULT WINAPI +FileMonikerImpl_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); @@ -249,8 +177,12 @@ /*********************************************************************** ******* * FileMoniker_Load - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface,IStream* pStm) + * + * this function locates and reads from the stream the filePath string + * written by FileMonikerImpl_Save + */ +static HRESULT WINAPI +FileMonikerImpl_Load(IMoniker* iface,IStream* pStm) { HRESULT res; CHAR* filePathA; @@ -263,36 +195,49 @@ TRACE("(%p,%p)\n",iface,pStm); - /* this function locates and reads from the stream the filePath string written by FileMonikerImpl_Save */ - /* first WORD is non significative */ res=IStream_Read(pStm,&wbuffer,sizeof(WORD),&bread); if (bread!=sizeof(WORD) || wbuffer!=0) + { + ERR("Couldn't read 0 word\n"); return E_FAIL; + } /* read filePath string length (plus one) */ res=IStream_Read(pStm,&length,sizeof(DWORD),&bread); if (bread != sizeof(DWORD)) + { + ERR("Couldn't read file string length\n"); return E_FAIL; + } /* read filePath string */ filePathA=HeapAlloc(GetProcessHeap(),0,length); res=IStream_Read(pStm,filePathA,length,&bread); HeapFree(GetProcessHeap(),0,filePathA); if (bread != length) + { + ERR("Couldn't read file path string\n"); return E_FAIL; + } /* read the first constant */ IStream_Read(pStm,&dwbuffer,sizeof(DWORD),&bread); if (bread != sizeof(DWORD) || dwbuffer != 0xDEADFFFF) + { + ERR("Couldn't read 0xDEADFFFF constant\n"); return E_FAIL; + } length--; for(i=0;i<10;i++){ res=IStream_Read(pStm,&wbuffer,sizeof(WORD),&bread); if (bread!=sizeof(WORD) || wbuffer!=0) + { + ERR("Couldn't read 0 padding\n"); return E_FAIL; + } } if (length>8) @@ -334,30 +279,28 @@ /*********************************************************************** ******* * FileMoniker_Save - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, - IStream* pStm,/* pointer to the stream where the object is to be saved */ - BOOL fClearDirty)/* Specifies whether to clear the dirty flag */ + * + * This function saves data of this object. In the beginning I thougth + * that I have just to write the filePath string on Stream. But, when I + * tested this function whith windows programs samples, I noticed that it + * was not the case. So I analysed data written by this function on + * Windows and what this did function exactly ! But I have no idea about + * its logic ! + * I guessed data which must be written on stream is: + * 1) WORD constant:zero + * 2) length of the path string ("\0" included) + * 3) path string type A + * 4) DWORD constant : 0xDEADFFFF + * 5) ten WORD constant: zero + * 6) DWORD: double-length of the the path string type W ("\0" not + * included) + * 7) WORD constant: 0x3 + * 8) filePath unicode string. + * if the length(filePath) > 8 or length(filePath) == 8 stop at step 5) + */ +static HRESULT WINAPI +FileMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) { - /* this function saves data of this object. In the beginning I thougth - * that I have just to write the filePath string on Stream. But, when I - * tested this function whith windows programs samples, I noticed that it - * was not the case. So I analysed data written by this function on - * Windows and what this did function exactly ! But I have no idea about - * its logic ! - * I guessed data which must be written on stream is: - * 1) WORD constant:zero - * 2) length of the path string ("\0" included) - * 3) path string type A - * 4) DWORD constant : 0xDEADFFFF - * 5) ten WORD constant: zero - * 6) DWORD: double-length of the the path string type W ("\0" not - * included) - * 7) WORD constant: 0x3 - * 8) filePath unicode string. - * if the length(filePath) > 8 or length(filePath) == 8 stop at step 5) - */ - FileMonikerImpl *This = (FileMonikerImpl *)iface; HRESULT res; @@ -426,9 +369,9 @@ /*********************************************************************** ******* * FileMoniker_GetSizeMax - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_GetSizeMax(IMoniker* iface, - ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ + */ +static HRESULT WINAPI +FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) { FileMonikerImpl *This = (FileMonikerImpl *)iface; DWORD len=lstrlenW(This->filePathName); @@ -436,7 +379,7 @@ TRACE("(%p,%p)\n",iface,pcbSize); - if (pcbSize!=NULL) + if (!pcbSize) return E_POINTER; /* for more details see FileMonikerImpl_Save coments */ @@ -462,83 +405,13 @@ } /*********************************************************************** ******* - * FileMoniker_Construct (local function) - ************************************************************************ *******/ -HRESULT WINAPI FileMonikerImpl_Construct(FileMonikerImpl* This, LPCOLESTR lpszPathName) -{ - int nb=0,i; - int sizeStr=lstrlenW(lpszPathName); - LPOLESTR *tabStr=0; - static const WCHAR twoPoint[]={'.','.',0}; - static const WCHAR bkSlash[]={'\\',0}; - BYTE addBkSlash; - - TRACE("(%p,%s)\n",This,debugstr_w(lpszPathName)); - - /* Initialize the virtual fgunction table. */ - This->lpvtbl1 = &VT_FileMonikerImpl; - This->lpvtbl2 = &VT_ROTDataImpl; - This->ref = 0; - - This->filePathName=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(sizeStr+1 )); - - if (This->filePathName==NULL) - return E_OUTOFMEMORY; - - strcpyW(This->filePathName,lpszPathName); - - nb=FileMonikerImpl_DecomposePath(This->filePathName,&tabStr); - - if (nb > 0 ){ - - addBkSlash=1; - if (lstrcmpW(tabStr[0],twoPoint)!=0) - addBkSlash=0; - else - for(i=0;i<nb;i++){ - - if ( (lstrcmpW(tabStr[i],twoPoint)!=0) && (lstrcmpW(tabStr[i],bkSlash)!=0) ){ - addBkSlash=0; - break; - } - else - - if (lstrcmpW(tabStr[i],bkSlash)==0 && i<nb-1 && lstrcmpW(tabStr[i+1],bkSlash)==0){ - *tabStr[i]=0; - sizeStr--; - addBkSlash=0; - break; - } - } - - if (lstrcmpW(tabStr[nb-1],bkSlash)==0) - addBkSlash=0; - - This->filePathName=HeapReAlloc(GetProcessHeap(),0,This->filePathName,(si zeStr+1)*sizeof(WCHAR)); - - *This->filePathName=0; - - for(i=0;tabStr[i]!=NULL;i++) - strcatW(This->filePathName,tabStr[i]); - - if (addBkSlash) - strcatW(This->filePathName,bkSlash); - } - - for(i=0; tabStr[i]!=NULL;i++) - CoTaskMemFree(tabStr[i]); - CoTaskMemFree(tabStr); - - return S_OK; -} - -/********************************************************************** ******** * FileMoniker_Destroy (local function) ************************************************************************ *******/ HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* This) { TRACE("(%p)\n",This); + if (This->pMarshal) IUnknown_Release(This->pMarshal); HeapFree(GetProcessHeap(),0,This->filePathName); HeapFree(GetProcessHeap(),0,This); @@ -547,12 +420,10 @@ /*********************************************************************** ******* * FileMoniker_BindToObject - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvResult) + */ +static HRESULT WINAPI +FileMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) { HRESULT res=E_FAIL; CLSID clsID; @@ -662,12 +533,10 @@ /*********************************************************************** ******* * FileMoniker_BindToStorage - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_BindToStorage(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - VOID** ppvObject) + */ +static HRESULT WINAPI +FileMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvObject) { LPOLESTR filePath=0; IStorage *pstg=0; @@ -680,7 +549,7 @@ if (IsEqualIID(&IID_IStorage, riid)){ /* get the file name */ - FileMonikerImpl_GetDisplayName(iface,pbc,pmkToLeft,&filePath); + IMoniker_GetDisplayName(iface,pbc,pmkToLeft,&filePath); /* verifie if the file contains a storage object */ res=StgIsStorageFile(filePath); @@ -718,30 +587,28 @@ /*********************************************************************** ******* * FileMoniker_Reduce ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_Reduce(IMoniker* iface, - IBindCtx* pbc, - DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, - IMoniker** ppmkReduced) +static HRESULT WINAPI +FileMonikerImpl_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; - FileMonikerImpl_AddRef(iface); + IMoniker_AddRef(iface); *ppmkReduced=iface; return MK_S_REDUCED_TO_SELF; } + /*********************************************************************** ******* * FileMoniker_ComposeWith - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_ComposeWith(IMoniker* iface, - IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, - IMoniker** ppmkComposite) + */ +static HRESULT WINAPI +FileMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, + BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) { HRESULT res; LPOLESTR str1=0,str2=0,*strDec1=0,*strDec2=0,newStr=0; @@ -768,7 +635,7 @@ CreateBindCtx(0,&bind); - FileMonikerImpl_GetDisplayName(iface,bind,NULL,&str1); + IMoniker_GetDisplayName(iface,bind,NULL,&str1); IMoniker_GetDisplayName(pmkRight,bind,NULL,&str2); /* decompose pathnames of the two monikers : (to prepare the path merge operation ) */ @@ -838,8 +705,9 @@ /*********************************************************************** ******* * FileMoniker_Enum - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) + */ +static HRESULT WINAPI +FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) { TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); @@ -853,8 +721,9 @@ /*********************************************************************** ******* * FileMoniker_IsEqual - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) + */ +static HRESULT WINAPI +FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) { FileMonikerImpl *This = (FileMonikerImpl *)iface; CLSID clsid; @@ -886,8 +755,9 @@ /*********************************************************************** ******* * FileMoniker_Hash - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) + */ +static HRESULT WINAPI +FileMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { FileMonikerImpl *This = (FileMonikerImpl *)iface; @@ -920,11 +790,10 @@ /*********************************************************************** ******* * FileMoniker_IsRunning - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_IsRunning(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) + */ +static HRESULT WINAPI +FileMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + IMoniker* pmkNewlyRunning) { IRunningObjectTable* rot; HRESULT res; @@ -952,10 +821,9 @@ /*********************************************************************** ******* * FileMoniker_GetTimeOfLastChange ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - FILETIME* pFileTime) +static HRESULT WINAPI +FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, FILETIME* pFileTime) { FileMonikerImpl *This = (FileMonikerImpl *)iface; IRunningObjectTable* rot; @@ -990,10 +858,10 @@ /*********************************************************************** ******* * FileMoniker_Inverse - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) + */ +static HRESULT WINAPI +FileMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) { - TRACE("(%p,%p)\n",iface,ppmk); return CreateAntiMoniker(ppmk); @@ -1001,8 +869,9 @@ /*********************************************************************** ******* * FileMoniker_CommonPrefixWith - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) + */ +static HRESULT WINAPI +FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) { LPOLESTR pathThis,pathOther,*stringTable1,*stringTable2,commonPath; @@ -1089,8 +958,8 @@ /*********************************************************************** ******* * DecomposePath (local function) - ************************************************************************ ******/ -int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) + */ +int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) { static const WCHAR bSlash[] = {'\\',0}; WCHAR word[MAX_PATH]; @@ -1144,8 +1013,9 @@ /*********************************************************************** ******* * FileMoniker_RelativePathTo - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) + */ +static HRESULT WINAPI +FileMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) { IBindCtx *bind; HRESULT res; @@ -1219,11 +1089,10 @@ /*********************************************************************** ******* * FileMoniker_GetDisplayName - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR *ppszDisplayName) + */ +static HRESULT WINAPI +FileMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) { FileMonikerImpl *This = (FileMonikerImpl *)iface; @@ -1250,13 +1119,10 @@ /*********************************************************************** ******* * FileMoniker_ParseDisplayName - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_ParseDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR pszDisplayName, - ULONG* pchEaten, - IMoniker** ppmkOut) + */ +static HRESULT WINAPI +FileMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut) { FIXME("(%p,%p,%p,%p,%p,%p),stub!\n",iface,pbc,pmkToLeft,pszDisplayName,p chEaten,ppmkOut); return E_NOTIMPL; @@ -1264,8 +1130,9 @@ /*********************************************************************** ******* * FileMoniker_IsSystemMoniker - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) + */ +static HRESULT WINAPI +FileMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) { TRACE("(%p,%p)\n",iface,pwdMksys); @@ -1279,8 +1146,9 @@ /*********************************************************************** ******** * FileMonikerIROTData_QueryInterface - ************************************************************************ *******/ -HRESULT WINAPI FileMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) + */ +static HRESULT WINAPI +FileMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { ICOM_THIS_From_IROTData(IMoniker, iface); @@ -1293,19 +1161,21 @@ /*********************************************************************** * FileMonikerIROTData_AddRef */ -ULONG WINAPI FileMonikerROTDataImpl_AddRef(IROTData *iface) +static ULONG WINAPI +FileMonikerROTDataImpl_AddRef(IROTData *iface) { ICOM_THIS_From_IROTData(IMoniker, iface); TRACE("(%p)\n",This); - return FileMonikerImpl_AddRef(This); + return IMoniker_AddRef(This); } /*********************************************************************** * FileMonikerIROTData_Release */ -ULONG WINAPI FileMonikerROTDataImpl_Release(IROTData* iface) +static ULONG WINAPI +FileMonikerROTDataImpl_Release(IROTData* iface) { ICOM_THIS_From_IROTData(IMoniker, iface); @@ -1316,17 +1186,145 @@ /*********************************************************************** ******* * FileMonikerIROTData_GetComparaisonData - ************************************************************************ ******/ -HRESULT WINAPI FileMonikerROTDataImpl_GetComparaisonData(IROTData* iface, - BYTE* pbData, - ULONG cbMax, - ULONG* pcbData) + */ +static HRESULT WINAPI +FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, + ULONG cbMax, ULONG* pcbData) { - FIXME("(),stub!\n"); - return E_NOTIMPL; + ICOM_THIS_From_IROTData(IMoniker, iface); + FileMonikerImpl *This1 = (FileMonikerImpl *)This; + int len = (strlenW(This1->filePathName)+1); + int i; + LPWSTR pszFileName; + + TRACE("(%p, %lu, %p)\n", pbData, cbMax, pcbData); + + *pcbData = sizeof(CLSID) + len * sizeof(WCHAR); + if (cbMax < *pcbData) + return E_OUTOFMEMORY; + + memcpy(pbData, &CLSID_FileMoniker, sizeof(CLSID)); + pszFileName = (LPWSTR)(pbData+sizeof(CLSID)); + for (i = 0; i < len; i++) + pszFileName[i] = toupperW(This1->filePathName[i]); + + return S_OK; } +/* + * Virtual function table for the FileMonikerImpl class which include IPersist, + * IPersistStream and IMoniker functions. + */ +static IMonikerVtbl VT_FileMonikerImpl = +{ + FileMonikerImpl_QueryInterface, + FileMonikerImpl_AddRef, + FileMonikerImpl_Release, + FileMonikerImpl_GetClassID, + FileMonikerImpl_IsDirty, + FileMonikerImpl_Load, + FileMonikerImpl_Save, + FileMonikerImpl_GetSizeMax, + FileMonikerImpl_BindToObject, + FileMonikerImpl_BindToStorage, + FileMonikerImpl_Reduce, + FileMonikerImpl_ComposeWith, + FileMonikerImpl_Enum, + FileMonikerImpl_IsEqual, + FileMonikerImpl_Hash, + FileMonikerImpl_IsRunning, + FileMonikerImpl_GetTimeOfLastChange, [truncated at 1000 lines; 5091 more skipped]

19 years, 7 months

[hbirr] 15561: Check for the complete initialisation of user mode modules.

by hbirr＠svn.reactos.com

Check for the complete initialisation of user mode modules. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-05-28 07:37:19 UTC (rev 15560) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-05-28 07:39:54 UTC (rev 15561) @@ -64,7 +64,7 @@ Peb = CurrentProcess->Peb; } - if (Peb == NULL) + if (Peb == NULL || Peb->Ldr == NULL) { return FALSE; }

19 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
82
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 May 2005