Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[khornicek] 46098: [SHELL32] - partial Wine sync, fixes crashing shlfileop winetest: Use the current directory when copying to an empty destination. Fix a memory leak in SHFileOperationW. Vincent Povirk <vincent at codeweavers dot com>

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Mar 11 15:57:05 2010 New Revision: 46098 URL: http://svn.reactos.org/svn/reactos?rev=46098&view=rev Log: [SHELL32] - partial Wine sync, fixes crashing shlfileop winetest: Use the current directory when copying to an empty destination. Fix a memory leak in SHFileOperationW. Vincent Povirk <vincent at codeweavers dot com> Modified: trunk/reactos/dll/win32/shell32/shlfileop.c Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Thu Mar 11 15:57:05 2010 @@ -1087,6 +1087,20 @@ if (flFrom->bAnyDontExist) return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + if (flTo->dwNumFiles == 0) + { + /* If the destination is empty, SHFileOperation should use the current directory */ + WCHAR curdir[MAX_PATH+1]; + + GetCurrentDirectoryW(MAX_PATH, curdir); + curdir[lstrlenW(curdir)+1] = 0; + + destroy_file_list(flTo); + ZeroMemory(flTo, sizeof(FILE_LIST)); + parse_file_list(flTo, curdir); + fileDest = &flTo->feFiles[0]; + } + if (op->req->fFlags & FOF_MULTIDESTFILES) { if (flFrom->bAnyFromWildcard) @@ -1096,6 +1110,14 @@ { if (flFrom->dwNumFiles != 1 && !IsAttribDir(fileDest->attributes)) return ERROR_CANCELLED; + + /* Free all but the first entry. */ + for (i = 1; i < flTo->dwNumFiles; i++) + { + HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szDirectory); + HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szFilename); + HeapFree(GetProcessHeap(), 0, flTo->feFiles[i].szFullPath); + } flTo->dwNumFiles = 1; }

14 years, 10 months

[tkreuzer] 46097: [FREELDR] Include ntddk.h instead of winddk.h [RAMDISK] Add missing DO_XIP definition (not in WDK/DDK) [FASTFAT] Remove duplicate VOLUME_IS_DIRTY definition [HAL] Add case stubs for missing HAL_QUERY_INFORMATION_CLASS members [NDK] Fix DbgPrompt prototype [NTDDK] - Move from winddk.h: _KUSER_SHARED_DATA (updated), pHalIoAssignDriveLetters, PHAL_RESET_DISPLAY_PARAMETERS, HAL_DISPATCH, HalDispatchTable, PCREATE_PROCESS_NOTIFY_ROUTINE, PCREATE_THREAD_NOTIFY_ROUTINE, IMAGE_INFO, PL

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 11 15:49:41 2010 New Revision: 46097 URL: http://svn.reactos.org/svn/reactos?rev=46097&view=rev Log: [FREELDR] Include ntddk.h instead of winddk.h [RAMDISK] Add missing DO_XIP definition (not in WDK/DDK) [FASTFAT] Remove duplicate VOLUME_IS_DIRTY definition [HAL] Add case stubs for missing HAL_QUERY_INFORMATION_CLASS members [NDK] Fix DbgPrompt prototype [NTDDK] - Move from winddk.h: _KUSER_SHARED_DATA (updated), pHalIoAssignDriveLetters, PHAL_RESET_DISPLAY_PARAMETERS, HAL_DISPATCH, HalDispatchTable, PCREATE_PROCESS_NOTIFY_ROUTINE, PCREATE_THREAD_NOTIFY_ROUTINE, IMAGE_INFO, PLOAD_IMAGE_NOTIFY_ROUTINE, BUS_DATA_TYPE (updated), PROCESSINFOCLASS (updated), THREADINFOCLASS (updated), DISK_SIGNATURE, PTIMER_APC_ROUTINE, Exfi386InterlockedIncrementLong, Exfi386InterlockedDecrementLong, Exfi386InterlockedExchangeUlong - Add pHalGetAcpiTable, PCI_ERROR_HANDLER_CALLBACK, pHalSetPciErrorHandlerCallback [WDM] Add _DECL_HAL_KE_IMPORT, Reorder sections (types before functions) Modified: branches/header-work/boot/freeldr/freeldr/include/ntoskrnl.h branches/header-work/drivers/filesystems/fastfat/fsctl.c branches/header-work/drivers/storage/class/ramdisk/ramdisk.c branches/header-work/hal/halx86/generic/sysinfo.c branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/wdm.h branches/header-work/include/ddk/winddk.h branches/header-work/include/ndk/rtlfuncs.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/boot/freeldr/freeldr/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/boot/freeldr/freeld… Modified: branches/header-work/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/filesystems… Modified: branches/header-work/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/cla… Modified: branches/header-work/hal/halx86/generic/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/hal/halx86/generic/… Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… Modified: branches/header-work/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.… Modified: branches/header-work/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ndk/rtlfunc…

14 years, 10 months

[khornicek] 46096: fix build?

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Mar 11 12:47:13 2010 New Revision: 46096 URL: http://svn.reactos.org/svn/reactos?rev=46096&view=rev Log: fix build? Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild [iso-8859-1] Thu Mar 11 12:47:13 2010 @@ -9,7 +9,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> - <define name="PROXY_CLSID_IS">{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}</define> + <define name="PROXY_CLSID_IS">"{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}"</define> <define name="COM_NO_WINDOWS_H"/> <define name="_OLEAUT32_"/> <define name="PROXY_DELEGATION"/> @@ -54,7 +54,7 @@ </module> <module name="oleaut32_proxy" type="rpcproxy" allowwarnings="true"> <define name="COM_NO_WINDOWS_H"/> - <define name="PROXY_CLSID_IS">{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}</define> + <define name="PROXY_CLSID_IS">"{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}"</define> <define name="_OLEAUT32_"/> <define name="PROXY_DELEGATION"/> <define name="REGISTER_PROXY_DLL"/>

14 years, 10 months

[khornicek] 46095: [KERNEL32] GetConsoleProcessList is implemented, this prevents the console winetest from crashing

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Mar 11 12:34:29 2010 New Revision: 46095 URL: http://svn.reactos.org/svn/reactos?rev=46095&view=rev Log: [KERNEL32] GetConsoleProcessList is implemented, this prevents the console winetest from crashing Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Mar 11 12:34:29 2010 @@ -324,7 +324,7 @@ @ stdcall GetConsoleMode(long ptr) @ stdcall GetConsoleNlsMode(long ptr) @ stdcall GetConsoleOutputCP() -@ stub GetConsoleProcessList ; missing in XP SP3 +@ stdcall GetConsoleProcessList(ptr long) ; missing in XP SP3 @ stdcall GetConsoleScreenBufferInfo(long ptr) @ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long)

14 years, 10 months

[tkreuzer] 46094: [KTMTYPES] Fix the UOW hack, use special case for C++ Thanks to Dmitry Gorbachev for the solution.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 11 12:32:54 2010 New Revision: 46094 URL: http://svn.reactos.org/svn/reactos?rev=46094&view=rev Log: [KTMTYPES] Fix the UOW hack, use special case for C++ Thanks to Dmitry Gorbachev for the solution. Modified: branches/header-work/include/psdk/ktmtypes.h Modified: branches/header-work/include/psdk/ktmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ktmtyp… ============================================================================== --- branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] Thu Mar 11 12:32:54 2010 @@ -72,11 +72,7 @@ #define MAX_TRANSACTION_DESCRIPTION_LENGTH 64 #define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64 -/* HACK: GCC does not like class members of the same name */ -#ifdef _MSC_VER typedef GUID UOW, *PUOW; -#endif - typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID; typedef ULONG NOTIFICATION_MASK; typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID; @@ -90,7 +86,11 @@ typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT { GUID EnlistmentId; - GUID UOW; +#if defined(__cplusplus) + ::UOW UOW; +#else + UOW UOW; +#endif } TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT, *PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT; typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT { @@ -123,7 +123,11 @@ } KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER; typedef struct _KCRM_TRANSACTION_BLOB { - GUID UOW; +#if defined(__cplusplus) + ::UOW UOW; +#else + UOW UOW; +#endif GUID TmIdentity; ULONG IsolationLevel; ULONG IsolationFlags;

14 years, 10 months

[fireball] 46093: [OLEAUT32] - Sync to Wine-1.1.40.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 11 11:28:34 2010 New Revision: 46093 URL: http://svn.reactos.org/svn/reactos?rev=46093&view=rev Log: [OLEAUT32] - Sync to Wine-1.1.40. Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Lt.rc (with props) Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Bg.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Cz.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Da.rc trunk/reactos/dll/win32/oleaut32/oleaut32_De.rc trunk/reactos/dll/win32/oleaut32/oleaut32_El.rc trunk/reactos/dll/win32/oleaut32/oleaut32_En.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Eo.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Es.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Fr.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Hu.rc trunk/reactos/dll/win32/oleaut32/oleaut32_It.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Ko.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Nl.rc trunk/reactos/dll/win32/oleaut32/oleaut32_No.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Pl.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Pt.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Ro.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Ru.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Si.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Sv.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Th.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Tr.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Zh.rc trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/regsvr.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/dispatc… Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Removed: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… Modified: trunk/reactos/dll/win32/oleaut32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/regsvr.… Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

14 years, 10 months

[jimtabor] 46092: - Fix test build!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Mar 11 04:29:01 2010 New Revision: 46092 URL: http://svn.reactos.org/svn/reactos?rev=46092&view=rev Log: - Fix test build! Modified: trunk/rostests/winetests/ole32/compobj.c Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Thu Mar 11 04:29:01 2010 @@ -34,6 +34,8 @@ #include "ctxtcall.h" #include "wine/test.h" + +extern const IID GUID_NULL; /* functions that are not present on all versions of Windows */ HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit);

14 years, 10 months

[jimtabor] 46091: - Fix build!

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Mar 11 04:28:32 2010 New Revision: 46091 URL: http://svn.reactos.org/svn/reactos?rev=46091&view=rev Log: - Fix build! Modified: trunk/reactos/include/psdk/guiddef.h Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Thu Mar 11 04:28:32 2010 @@ -140,6 +140,4 @@ #endif #endif -extern const IID GUID_NULL; - #endif /* _GUIDDEF_H_ */

14 years, 10 months

[jimtabor] 46090: - Add new menu structures.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Mar 11 03:43:51 2010 New Revision: 46090 URL: http://svn.reactos.org/svn/reactos?rev=46090&view=rev Log: - Add new menu structures. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Mar 11 03:43:51 2010 @@ -220,6 +220,57 @@ C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo)); #define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) + +typedef struct tagITEM +{ + UINT fType; + UINT fState; + UINT wID; + struct tagMENU* spSubMenu; /* Pop-up menu. */ + HANDLE hbmpChecked; + HANDLE hbmpUnchecked; + USHORT* lpstr; /* Item text pointer. */ + ULONG cch; + DWORD_PTR dwItemData; + ULONG xItem; /* Item position. left */ + ULONG yItem; /* " top */ + ULONG cxItem; /* Item Size Width */ + ULONG cyItem; /* " Height */ + ULONG dxTab; /* X position of text after Tab */ + ULONG ulX; /* underline.. start position */ + ULONG ulWidth; /* underline.. width */ + HBITMAP hbmp; /* bitmap */ + INT cxBmp; /* Width Maximum size of the bitmap items in MIIM_BITMAP state */ + INT cyBmp; /* Height " */ +} ITEM, *PITEM; + +typedef struct tagMENULIST +{ + struct tagMENULIST* pNext; + struct tagMENU* pMenu; +} MENULIST, *PMENULIST; + +typedef struct tagMENU +{ + PROCDESKHEAD head; + ULONG fFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ + INT iItem; /* nPos of selected item, if -1 not selected. */ + UINT cAlloced; /* Number of allocated items. */ + UINT cItems; /* Number of items in the menu */ + ULONG cxMenu; /* Width of the whole menu */ + ULONG cyMenu; /* Height of the whole menu */ + ULONG cxTextAlign; /* Offset of text when items have both bitmaps and text */ + struct _WND *spwndNotify; /* window receiving the messages for ownerdraw */ + PITEM rgItems; /* Array of menu items */ + struct tagMENULIST* pParentMenus; /* If this is SubMenu, list of parents. */ + DWORD dwContextHelpId; + ULONG cyMax; /* max height of the whole menu, 0 is screen height */ + DWORD_PTR dwMenuData; /* application defined value */ + HBRUSH hbrBack; /* brush for menu background */ + INT iTop; /* Current scroll position Top */ + INT iMaxTop; /* Current scroll position Max Top */ + DWORD dwArrowsOn:2; /* Arrows: 0 off, 1 on, 2 to the top, 3 to the bottom. */ +} MENU, *PMENU; typedef struct _REGISTER_SYSCLASS {

14 years, 10 months

[tkreuzer] 46089: [KMTYPES] Add a compilation hack for gcc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 11 01:47:36 2010 New Revision: 46089 URL: http://svn.reactos.org/svn/reactos?rev=46089&view=rev Log: [KMTYPES] Add a compilation hack for gcc Modified: branches/header-work/include/psdk/ktmtypes.h Modified: branches/header-work/include/psdk/ktmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ktmtyp… ============================================================================== --- branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ktmtypes.h [iso-8859-1] Thu Mar 11 01:47:36 2010 @@ -72,7 +72,11 @@ #define MAX_TRANSACTION_DESCRIPTION_LENGTH 64 #define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64 +/* HACK: GCC does not like class members of the same name */ +#ifdef _MSC_VER typedef GUID UOW, *PUOW; +#endif + typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID; typedef ULONG NOTIFICATION_MASK; typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID; @@ -86,7 +90,7 @@ typedef struct _TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT { GUID EnlistmentId; - UOW UOW; + GUID UOW; } TRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT, *PTRANSACTION_NOTIFICATION_RECOVERY_ARGUMENT; typedef struct _TRANSACTION_NOTIFICATION_TM_ONLINE_ARGUMENT { @@ -119,7 +123,7 @@ } KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER; typedef struct _KCRM_TRANSACTION_BLOB { - UOW UOW; + GUID UOW; GUID TmIdentity; ULONG IsolationLevel; ULONG IsolationFlags;

14 years, 10 months

← Newer
1
...
51
52
53
54
55
56
57
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010