Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 36914: Hello, almost final changelog. Small fix for uninstall routine.
by dreimer＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: dreimer Date: Thu Oct 23 12:58:26 2008 New Revision: 36914 URL: http://svn.reactos.org/svn/reactos?rev=36914&view=rev Log: Hello, almost final changelog. Small fix for uninstall routine. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Oct 23 12:58:26 2008 @@ -1,4 +1,4 @@ -*** July 17th, 2008 - RosBE 1.3 Released +*** October 26th, 2008 - RosBE 1.3 Released - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) - Updated: NASM to 2.04 (Daniel Reimer) @@ -7,16 +7,35 @@ - Updated: GDB to 6.8-3 (Daniel Reimer) - Updated: Binutils 2.18.50 Build 20080109. (Daniel Reimer) - Updated: MingW32 Make 3.81-3 (Daniel Reimer) -- Updated: ccache 2.4 is now a native Version Without Cygwin (Colin Finck) X +- Updated: MingW32 Runtime DLL 3.15.1 (Daniel Reimer) - Other small Fixes here and there (Daniel Reimer) - Added: Basic PowerShell Version of RosBE (Daniel Reimer) - Added: YASM 0.72, which supports 64 bit asm too. (Daniel Reimer) - Added: Update command (Daniel Reimer) -- Added: Mingw-64 GCC 4.4.0 for the 64 bit Branch. (Daniel Reimer) +- Added: A way to include rosapps and rostests into the build and ssvn script by modifying + one var. Add this var to options.exe (Maciej Bialas and slight changes by me) +- Added: nostrip function (Christoph von Wittich) +- Added: RosBE Debugging Feature which disables the @echo off. just set + _ROSBE_DEBUG=1 (Daniel Reimer) +- Added: Mingw-64 GCC 4.4.0 for the 64 bit Branch. It will be installed with a + Optional installer (Daniel Reimer) - Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel Reimer) - Fixed: Clean only cleans the arch which is active right now. (Daniel Reimer) -- Fixed: "if defined xxx" with a nested "if %xxx% == foobar" does not work in batch. (Daniel Reimer) -- Fixed: Stripped apps and removed Debug Symbols at once may not be possible. (Daniel Reimer) +- Fixed: "if defined xxx" with a nested "if %xxx% == foobar" does not work in batch. + (Daniel Reimer) +- Fixed: Bug 3043: Polish translation update (olaf_siejka(a)o2.pl) +- Fixed: Bug 3044: Ukrainian translation update (temarez(a)yandex.ru) +- Fixed: Bug 3035: Patch for RosBE that solves improper handling of a path with + spaces by roelmessiant(a)gmail.com +- Fixed: Stripped apps and removed Debug Symbols at once may not be possible. + (Daniel Reimer) +- Fixed: Warnings, Resource Leaks, Problems with non-allocated Memory, RC MSVC + Comptibility (Christoph von Wittich) +- Fixed: First look into %_ROSBE_BASEDIR% for the specified directory and use it if it + exists. his makes it possible to just call "chdefgcc 3.4.5" instead of + "chdefgcc full\path\to\the\3.4.5\directory" if there is a "3.4.5" directory + in the RosBE installation directory. (Colin Finck) + *** January 23rd, 2008 - RosBE 1.2 Released Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Thu Oct 23 12:58:26 2008 @@ -339,7 +339,6 @@ RMDir /r /REBOOTOK "$APPDATA\RosBE" Delete /REBOOTOK "$INSTDIR\Build.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" - Delete /REBOOTOK "$INSTDIR\charch.cmd" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" Delete /REBOOTOK "$INSTDIR\Clean.cmd"

1 0

[tkreuzer] 36913: Quickfix for bug 3808 Don't set SystemMetrics to -1, when there's no CurInfo. Apparently we initialize the metrics before we have a WindowStation. This code needs to be improved... See issue #3808 for more details.
by tkreuzer＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: tkreuzer Date: Thu Oct 23 12:26:50 2008 New Revision: 36913 URL: http://svn.reactos.org/svn/reactos?rev=36913&view=rev Log: Quickfix for bug 3808 Don't set SystemMetrics to -1, when there's no CurInfo. Apparently we initialize the metrics before we have a WindowStation. This code needs to be improved... See issue #3808 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Thu Oct 23 12:26:50 2008 @@ -85,7 +85,7 @@ gpsi->SystemMetrics[SM_CYVSCROLL] = 16; gpsi->SystemMetrics[SM_CXHSCROLL] = 16; gpsi->SystemMetrics[SM_DEBUG] = 0; - gpsi->SystemMetrics[SM_SWAPBUTTON] = CurInfo ? CurInfo->SwapButtons : 0xFFFFFFFF; + gpsi->SystemMetrics[SM_SWAPBUTTON] = CurInfo ? CurInfo->SwapButtons : 0; gpsi->SystemMetrics[SM_RESERVED1] = 0; gpsi->SystemMetrics[SM_RESERVED2] = 0; gpsi->SystemMetrics[SM_RESERVED3] = 0; @@ -98,8 +98,8 @@ gpsi->SystemMetrics[SM_CYFRAME] = 4; gpsi->SystemMetrics[SM_CXMINTRACK] = 112; gpsi->SystemMetrics[SM_CYMINTRACK] = 27; - gpsi->SystemMetrics[SM_CXDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 0xFFFFFFFF; - gpsi->SystemMetrics[SM_CYDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 0xFFFFFFFF; + gpsi->SystemMetrics[SM_CXDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 4; + gpsi->SystemMetrics[SM_CYDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 4; gpsi->SystemMetrics[SM_CXICONSPACING] = 64; gpsi->SystemMetrics[SM_CYICONSPACING] = 64; gpsi->SystemMetrics[SM_MENUDROPALIGNMENT] = 0;

1 0

[sginsberg] 36912: - More 64-bit fixes
by sginsberg＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sginsberg Date: Thu Oct 23 12:05:40 2008 New Revision: 36912 URL: http://svn.reactos.org/svn/reactos?rev=36912&view=rev Log: - More 64-bit fixes Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Thu Oct 23 12:05:40 2008 @@ -48,7 +48,7 @@ } EVENTTABLE, *PEVENTTABLE; LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); -LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, LONG, LONG); +LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, UINT_PTR, LONG_PTR); VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); PHOOK FASTCALL IntGetHookObject(HHOOK); PHOOK FASTCALL IntGetNextHook(PHOOK Hook); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Thu Oct 23 12:05:40 2008 @@ -141,8 +141,8 @@ FASTCALL co_EVENT_CallEvents( DWORD event, HWND hwnd, - LONG idObject, - LONG idChild) + UINT_PTR idObject, + LONG_PTR idChild) { PEVENTHOOK pEH; LRESULT Result; @@ -185,14 +185,14 @@ if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) { // if all process || all thread || other thread same process if (!(pEH->idProcess) || !(pEH->idThread) || - ((DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess)) + (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) { Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && ( ((pEH->idProcess && - (DWORD)(NtCurrentTeb()->ClientId).UniqueProcess == pEH->idProcess) && + NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess) && !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { @@ -201,7 +201,7 @@ Window->hSelf, idObject, idChild, - (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, + PtrToUint(NtCurrentTeb()->ClientId.UniqueThread), (DWORD)EngGetTickCount(), pEH->Proc); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Oct 23 12:05:40 2008 @@ -942,8 +942,8 @@ { Result = co_EVENT_CallEvents( Message->Msg.message, Message->Msg.hwnd, - (LONG) Message->Msg.wParam, - (LONG) Message->Msg.lParam); + Message->Msg.wParam, + Message->Msg.lParam); } else {

1 0

[sginsberg] 36911: - 64-bit fixes (ULONG -> SIZE_T)
by sginsberg＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sginsberg Date: Thu Oct 23 10:56:27 2008 New Revision: 36911 URL: http://svn.reactos.org/svn/reactos?rev=36911&view=rev Log: - 64-bit fixes (ULONG -> SIZE_T) Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] Thu Oct 23 10:56:27 2008 @@ -76,7 +76,7 @@ { PVOID NewMem = NULL; NTSTATUS Status; - ULONG MemSize = sizeof(USERMEMHEADER) + cj; + SIZE_T MemSize = sizeof(USERMEMHEADER) + cj; PUSERMEMHEADER Header; Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &NewMem, 0, &MemSize, MEM_COMMIT, PAGE_READWRITE); @@ -100,7 +100,7 @@ EngFreeUserMem(PVOID pv) { PUSERMEMHEADER Header = ((PUSERMEMHEADER) pv) - 1; - ULONG MemSize = sizeof(USERMEMHEADER) + Header->MemSize; + SIZE_T MemSize = sizeof(USERMEMHEADER) + Header->MemSize; ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &Header, &MemSize, MEM_RELEASE); }

1 0

[sserapion] 36910: Reorganize a bit, remove unneeded .
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Thu Oct 23 10:18:23 2008 New Revision: 36910 URL: http://svn.reactos.org/svn/reactos?rev=36910&view=rev Log: Reorganize a bit, remove unneeded . Modified: branches/ros-amd64-bringup/reactos/tools/rsym.h Modified: branches/ros-amd64-bringup/reactos/tools/rsym.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym.h [iso-8859-1] Thu Oct 23 10:18:23 2008 @@ -6,6 +6,17 @@ #define IMAGE_DOS_MAGIC 0x5a4d #define IMAGE_PE_MAGIC 0x00004550 #define IMAGE_SIZEOF_SHORT_NAME 8 + +#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 +#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 +#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 + +#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 + +#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 +#define IMAGE_SCN_LNK_REMOVE 0x00000800 +#define IMAGE_SCN_MEM_READ 0x40000000 +#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 @@ -34,6 +45,7 @@ #endif #pragma pack(push,2) + typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -56,10 +68,6 @@ LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; #pragma pack(pop) - -#define IMAGE_FILE_LINE_NUMS_STRIPPED 4 -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 -#define IMAGE_FILE_DEBUG_STRIPPED 512 #pragma pack(push,4) typedef struct _IMAGE_FILE_HEADER { @@ -145,40 +153,14 @@ IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; } IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; -#pragma pack(push,4) -typedef struct _IMAGE_NT_HEADERS32 { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; -} IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32; -#pragma pack(pop) - -#pragma pack(push,4) -typedef struct _IMAGE_NT_HEADERS64 { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER64 OptionalHeader; -} IMAGE_NT_HEADERS64,*PIMAGE_NT_HEADERS64; -#pragma pack(pop) #ifdef _TARGET_PE64 typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; -typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; -typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; #else typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; -typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; -typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; #endif - -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 - -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 -#define IMAGE_SCN_LNK_REMOVE 0x00000800 -#define IMAGE_SCN_MEM_READ 0x40000000 -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 typedef struct _IMAGE_SECTION_HEADER { BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; @@ -200,6 +182,7 @@ typedef struct _IMAGE_BASE_RELOCATION { DWORD VirtualAddress; DWORD SizeOfBlock; + WORD TypeOffset[1]; } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; #pragma pack(pop)

1 0

[sserapion] 36909: Ntdll build fixes.
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Thu Oct 23 10:09:55 2008 New Revision: 36909 URL: http://svn.reactos.org/svn/reactos?rev=36909&view=rev Log: Ntdll build fixes. Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Oct 23 10:09:55 2008 @@ -1226,7 +1226,8 @@ { PIMAGE_DATA_DIRECTORY RelocationDDir; PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd; - ULONG Count, ProtectSize, OldProtect, OldProtect2; + ULONG Count, OldProtect, OldProtect2; + SIZE_T ProtectSize; PVOID Page, ProtectPage, ProtectPage2; PUSHORT TypeOffset; ULONG_PTR Delta; @@ -1413,7 +1414,7 @@ PVOID IATBase; ULONG OldProtect; ULONG Ordinal; - ULONG IATSize; + SIZE_T IATSize; if (ImportModuleDirectory == NULL || ImportModuleDirectory->Name == 0) { @@ -1559,7 +1560,7 @@ PVOID IATBase; ULONG OldProtect; ULONG Offset; - ULONG IATSize; + SIZE_T IATSize; PIMAGE_NT_HEADERS NTHeaders; PCHAR Name; ULONG Size; @@ -2559,7 +2560,7 @@ { TRACE_LDR("Unload %wZ - Calling entry point at %x\n", &Module->BaseDllName, Module->EntryPoint); - LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(Module->LoadCount == 0xFFFF ? 1 : 0)); + LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(INT_PTR)(Module->LoadCount == 0xFFFF ? 1 : 0)); } else { @@ -2644,7 +2645,7 @@ Module->Flags |= LDRP_LOAD_IN_PROGRESS; TRACE_LDR("%wZ loaded - Calling init routine at %x for process attaching\n", &Module->BaseDllName, Module->EntryPoint); - Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(Module->LoadCount == 0xFFFF ? 1 : 0)); + Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(INT_PTR)(Module->LoadCount == 0xFFFF ? 1 : 0)); if (!Result) { Status = STATUS_DLL_INIT_FAILED;

1 0

[sserapion] 36908: Fix 64bit build.
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Thu Oct 23 09:52:38 2008 New Revision: 36908 URL: http://svn.reactos.org/svn/reactos?rev=36908&view=rev Log: Fix 64bit build. Modified: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.c Modified: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.c [iso-8859-1] Thu Oct 23 09:52:38 2008 @@ -25,7 +25,7 @@ wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}"); - return (int) ShellExecuteW(NULL, L"open", L"explorer.exe", szParameters, NULL, SW_SHOWDEFAULT) > 32; + return (INT_PTR) ShellExecuteW(NULL, L"open", L"explorer.exe", szParameters, NULL, SW_SHOWDEFAULT) > 32; } /* Control Panel Callback */

1 0

[sserapion] 36907: Fix taskmgr build after GetProcessAffinityMask definition change.
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Thu Oct 23 09:43:08 2008 New Revision: 36907 URL: http://svn.reactos.org/svn/reactos?rev=36907&view=rev Log: Fix taskmgr build after GetProcessAffinityMask definition change. Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/affinity.c Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/affinity.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/taskmgr/affinity.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/taskmgr/affinity.c [iso-8859-1] Thu Oct 23 09:43:08 2008 @@ -75,8 +75,8 @@ INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - DWORD dwProcessAffinityMask = 0; - DWORD dwSystemAffinityMask = 0; + DWORD_PTR dwProcessAffinityMask = 0; + DWORD_PTR dwSystemAffinityMask = 0; WCHAR strErrorText[260]; WCHAR szTitle[256]; BYTE nCpu;

1 0

[sserapion] 36906: - Fix definitions of CDHOOKPROC, PROC, FARPROC, NEARPROC - Fix definitions of SYSTEM_INFO, COMPAREITEMSTRUCT, COPYDATASTRUCT, DELETEITEMSTRUCT, DRAWITEMSTRUCT, MENUITEMINFOA/W, HELPINFO, MSGBOXPARAMSA/W, MOUSEHOOKSTRUCT, DROPSTRUCT, KBDLLHOOKSTRUCT - Fix definitions of GetProcessAffinityMask, SetProcessAffinityMask, DragObject, InsertMenuA/W, ModifyMenuA/W, WinHelpA/W, RT_GROUP_CURSOR, RT_GROUP_ICON - Fix Treeview in 64bit regedit. - Patch by Daniel Verkamp.
by sserapion＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: sserapion Date: Thu Oct 23 09:27:06 2008 New Revision: 36906 URL: http://svn.reactos.org/svn/reactos?rev=36906&view=rev Log: - Fix definitions of CDHOOKPROC, PROC, FARPROC, NEARPROC - Fix definitions of SYSTEM_INFO, COMPAREITEMSTRUCT, COPYDATASTRUCT, DELETEITEMSTRUCT, DRAWITEMSTRUCT, MENUITEMINFOA/W, HELPINFO, MSGBOXPARAMSA/W, MOUSEHOOKSTRUCT, DROPSTRUCT, KBDLLHOOKSTRUCT - Fix definitions of GetProcessAffinityMask, SetProcessAffinityMask, DragObject, InsertMenuA/W, ModifyMenuA/W, WinHelpA/W, RT_GROUP_CURSOR, RT_GROUP_ICON - Fix Treeview in 64bit regedit. - Patch by Daniel Verkamp. Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h branches/ros-amd64-bringup/reactos/include/psdk/winbase.h branches/ros-amd64-bringup/reactos/include/psdk/windef.h branches/ros-amd64-bringup/reactos/include/psdk/winuser.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h [iso-8859-1] Thu Oct 23 09:27:06 2008 @@ -2412,10 +2412,10 @@ #define TVIF_INTEGRAL 0x0080 #define TVIF_DI_SETITEM 0x1000 -#define TVI_ROOT ((HTREEITEM)0xffff0000) /* -65536 */ -#define TVI_FIRST ((HTREEITEM)0xffff0001) /* -65535 */ -#define TVI_LAST ((HTREEITEM)0xffff0002) /* -65534 */ -#define TVI_SORT ((HTREEITEM)0xffff0003) /* -65533 */ +#define TVI_ROOT ((HTREEITEM)(ULONG_PTR)-0x10000) /* -65536 */ +#define TVI_FIRST ((HTREEITEM)(ULONG_PTR)-0x0FFFF) /* -65535 */ +#define TVI_LAST ((HTREEITEM)(ULONG_PTR)-0x0FFFE) /* -65534 */ +#define TVI_SORT ((HTREEITEM)(ULONG_PTR)-0x0FFFD) /* -65533 */ #define TVIS_FOCUSED 0x0001 #define TVIS_SELECTED 0x0002 Modified: branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] Thu Oct 23 09:27:06 2008 @@ -216,7 +216,7 @@ #define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0)) #define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e))) -typedef UINT (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); +typedef UINT_PTR (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); typedef __CDHOOKPROC LPCCHOOKPROC; typedef __CDHOOKPROC LPCFHOOKPROC; typedef __CDHOOKPROC LPFRHOOKPROC; Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winbase.h [iso-8859-1] Thu Oct 23 09:27:06 2008 @@ -910,7 +910,7 @@ DWORD dwPageSize; PVOID lpMinimumApplicationAddress; PVOID lpMaximumApplicationAddress; - DWORD dwActiveProcessorMask; + DWORD_PTR dwActiveProcessorMask; DWORD dwNumberOfProcessors; DWORD dwProcessorType; DWORD dwAllocationGranularity; @@ -1530,7 +1530,7 @@ BOOL WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR); BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR); FARPROC WINAPI GetProcAddress(HINSTANCE,LPCSTR); -BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD,PDWORD); +BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD_PTR,PDWORD_PTR); #if (_WIN32_WINNT >= 0x0502) BOOL WINAPI GetProcessHandleCount(HANDLE,PDWORD); #endif @@ -2071,7 +2071,7 @@ BOOL WINAPI SetNamedPipeHandleState(HANDLE,PDWORD,PDWORD,PDWORD); BOOL WINAPI SetPriorityClass(HANDLE,DWORD); BOOL WINAPI SetPrivateObjectSecurity(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR *,PGENERIC_MAPPING,HANDLE); -BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD); +BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); Modified: branches/ros-amd64-bringup/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/windef.h [iso-8859-1] Thu Oct 23 09:27:06 2008 @@ -348,9 +348,9 @@ typedef int HFILE; typedef HICON HCURSOR; typedef DWORD COLORREF; -typedef int (WINAPI *FARPROC)(); -typedef int (WINAPI *NEARPROC)(); -typedef int (WINAPI *PROC)(); +typedef INT_PTR (WINAPI *FARPROC)(); +typedef INT_PTR (WINAPI *NEARPROC)(); +typedef INT_PTR (WINAPI *PROC)(); typedef struct tagRECT { LONG left; LONG top; Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] Thu Oct 23 09:27:06 2008 @@ -615,8 +615,8 @@ #define RT_RCDATA MAKEINTRESOURCE(10) #define RT_MESSAGETABLE MAKEINTRESOURCE(11) #define DIFFERENCE 11 -#define RT_GROUP_CURSOR MAKEINTRESOURCE((DWORD)RT_CURSOR+DIFFERENCE) -#define RT_GROUP_ICON MAKEINTRESOURCE((DWORD)RT_ICON+DIFFERENCE) +#define RT_GROUP_CURSOR MAKEINTRESOURCE((ULONG_PTR)RT_CURSOR+DIFFERENCE) +#define RT_GROUP_ICON MAKEINTRESOURCE((ULONG_PTR)RT_ICON+DIFFERENCE) #define RT_VERSION MAKEINTRESOURCE(16) #define RT_DLGINCLUDE MAKEINTRESOURCE(17) #define RT_PLUGPLAY MAKEINTRESOURCE(19) @@ -2804,13 +2804,13 @@ UINT CtlID; HWND hwndItem; UINT itemID1; - DWORD itemData1; + ULONG_PTR itemData1; UINT itemID2; - DWORD itemData2; + ULONG_PTR itemData2; DWORD dwLocaleId; } COMPAREITEMSTRUCT,*LPCOMPAREITEMSTRUCT; typedef struct tagCOPYDATASTRUCT { - DWORD dwData; + ULONG_PTR dwData; DWORD cbData; PVOID lpData; } COPYDATASTRUCT,*PCOPYDATASTRUCT; @@ -2848,7 +2848,7 @@ UINT CtlID; UINT itemID; HWND hwndItem; - UINT itemData; + ULONG_PTR itemData; } DELETEITEMSTRUCT,*PDELETEITEMSTRUCT,*LPDELETEITEMSTRUCT; #pragma pack(push,2) typedef struct { @@ -2887,7 +2887,7 @@ HWND hwndItem; HDC hDC; RECT rcItem; - DWORD itemData; + ULONG_PTR itemData; } DRAWITEMSTRUCT,*LPDRAWITEMSTRUCT,*PDRAWITEMSTRUCT; typedef struct { UINT cbSize; @@ -2985,7 +2985,7 @@ HMENU hSubMenu; HBITMAP hbmpChecked; HBITMAP hbmpUnchecked; - DWORD dwItemData; + ULONG_PTR dwItemData; LPSTR dwTypeData; UINT cch; #if (_WIN32_WINNT >= 0x0500) @@ -3002,7 +3002,7 @@ HMENU hSubMenu; HBITMAP hbmpChecked; HBITMAP hbmpUnchecked; - DWORD dwItemData; + ULONG_PTR dwItemData; LPWSTR dwTypeData; UINT cch; #if (_WIN32_WINNT >= 0x0500) @@ -3043,7 +3043,7 @@ int iContextType; int iCtrlId; HANDLE hItemHandle; - DWORD dwContextId; + DWORD_PTR dwContextId; POINT MousePos; } HELPINFO,*LPHELPINFO; typedef void(CALLBACK *MSGBOXCALLBACK)(LPHELPINFO); @@ -3055,7 +3055,7 @@ LPCSTR lpszCaption; DWORD dwStyle; LPCSTR lpszIcon; - DWORD dwContextHelpId; + DWORD_PTR dwContextHelpId; MSGBOXCALLBACK lpfnMsgBoxCallback; DWORD dwLanguageId; } MSGBOXPARAMSA,*PMSGBOXPARAMSA,*LPMSGBOXPARAMSA; @@ -3067,7 +3067,7 @@ LPCWSTR lpszCaption; DWORD dwStyle; LPCWSTR lpszIcon; - DWORD dwContextHelpId; + DWORD_PTR dwContextHelpId; MSGBOXCALLBACK lpfnMsgBoxCallback; DWORD dwLanguageId; } MSGBOXPARAMSW,*PMSGBOXPARAMSW,*LPMSGBOXPARAMSW; @@ -3220,7 +3220,7 @@ POINT pt; HWND hwnd; UINT wHitTestCode; - DWORD dwExtraInfo; + ULONG_PTR dwExtraInfo; } MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT; #if ( _WIN32_WINNT >= 0x0500 ) #ifdef __cplusplus @@ -3306,13 +3306,13 @@ UINT itemID; UINT itemWidth; UINT itemHeight; - DWORD itemData; + ULONG_PTR itemData; } MEASUREITEMSTRUCT,*PMEASUREITEMSTRUCT,*LPMEASUREITEMSTRUCT; typedef struct tagDROPSTRUCT { HWND hwndSource; HWND hwndSink; DWORD wFmt; - DWORD dwData; + ULONG_PTR dwData; POINT ptDrop; DWORD dwControlData; } DROPSTRUCT,*PDROPSTRUCT,*LPDROPSTRUCT; @@ -3451,7 +3451,7 @@ DWORD scanCode; DWORD flags; DWORD time; - DWORD dwExtraInfo; + ULONG_PTR dwExtraInfo; } KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT; typedef struct tagMSLLHOOKSTRUCT { @@ -3750,7 +3750,7 @@ BOOL WINAPI DlgDirSelectExA(HWND,LPSTR,int,int); BOOL WINAPI DlgDirSelectExW(HWND,LPWSTR,int,int); BOOL WINAPI DragDetect(HWND,POINT); -DWORD WINAPI DragObject(HWND,HWND,UINT,DWORD,HCURSOR); +DWORD WINAPI DragObject(HWND,HWND,UINT,ULONG_PTR,HCURSOR); BOOL WINAPI DrawAnimatedRects(HWND,int,LPCRECT,LPCRECT); BOOL WINAPI DrawCaption(HWND,HDC,LPCRECT,UINT); BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT); @@ -3988,8 +3988,8 @@ #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) DWORD WINAPI InSendMessageEx(LPVOID); #endif -BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR); -BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR); +BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); +BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,LPCMENUITEMINFOA); BOOL WINAPI InsertMenuItemW(HMENU,UINT,BOOL,LPCMENUITEMINFOW); INT WINAPI InternalGetWindowText(HWND,LPWSTR,INT); @@ -4069,8 +4069,8 @@ int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD); int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*); int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*); -BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR); -BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR); +BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); +BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD); HMONITOR WINAPI MonitorFromWindow(HWND,DWORD); @@ -4284,8 +4284,8 @@ HWND WINAPI WindowFromDC(HDC hDC); HWND WINAPI WindowFromPoint(POINT); UINT WINAPI WinExec(LPCSTR,UINT); -BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,DWORD); -BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,DWORD); +BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR); +BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,ULONG_PTR); int WINAPIV wsprintfA(LPSTR,LPCSTR,...); int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...); int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);

1 0

[dreimer] 36905: Next RosBE RC in Preperation. This time splitted in default and 64 bit in a optional installer.
by dreimer＠svn.reactos.org 23 Oct '08

23 Oct '08

Author: dreimer Date: Thu Oct 23 07:48:35 2008 New Revision: 36905 URL: http://svn.reactos.org/svn/reactos?rev=36905&view=rev Log: Next RosBE RC in Preperation. This time splitted in default and 64 bit in a optional installer. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Oct 23 07:48:35 2008 @@ -1,16 +1,16 @@ *** July 17th, 2008 - RosBE 1.3 Released - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) -- Updated: NASM to 2.03.01 (Daniel Reimer) -- Updated: NSIS to 2.39 (Daniel Reimer) -- Updated: Subversion to 1.5.2 (Daniel Reimer) +- Updated: NASM to 2.04 (Daniel Reimer) +- Updated: NSIS to 2.40 (Daniel Reimer) +- Updated: Subversion to 1.5.3 (Daniel Reimer) - Updated: GDB to 6.8-3 (Daniel Reimer) - Updated: Binutils 2.18.50 Build 20080109. (Daniel Reimer) - Updated: MingW32 Make 3.81-3 (Daniel Reimer) - Updated: ccache 2.4 is now a native Version Without Cygwin (Colin Finck) X - Other small Fixes here and there (Daniel Reimer) - Added: Basic PowerShell Version of RosBE (Daniel Reimer) -- Added: YASM 0.71, which supports 64 bit asm too. (Daniel Reimer) +- Added: YASM 0.72, which supports 64 bit asm too. (Daniel Reimer) - Added: Update command (Daniel Reimer) - Added: Mingw-64 GCC 4.4.0 for the 64 bit Branch. (Daniel Reimer) - Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Thu Oct 23 07:48:35 2008 @@ -90,8 +90,6 @@ !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.pdf" -!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !insertmacro MUI_PAGE_FINISH ;; @@ -109,9 +107,6 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try - File /r Icons\mingw.ico - File /r Icons\rosbe.ico - File /r Root\LICENSE.txt File /r Root\charch.cmd SectionEnd

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs