Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 05:35:36 2008 New Revision: 36464 URL: http://svn.reactos.org/svn/reactos?rev=36464&view=rev Log: Minor 64bit fix. Modified: branches/ros-amd64-bringup/reactos/dll/cpl/access/display.c Modified: branches/ros-amd64-bringup/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/access/display.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/access/display.c [iso-8859-1] Wed Sep 24 05:35:36 2008 @@ -255,7 +255,7 @@ SetCaretBlinkTime(pGlobalData->uCaretBlinkTime); SystemParametersInfo(SPI_SETCARETWIDTH, 0, - (PVOID)pGlobalData->uCaretWidth, + IntToPtr(pGlobalData->uCaretWidth), SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/); SystemParametersInfo(SPI_SETHIGHCONTRAST, sizeof(HIGHCONTRAST),

16 years, 3 months

[sserapion] 36463: Convert to spec.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 05:33:46 2008 New Revision: 36463 URL: http://svn.reactos.org/svn/reactos?rev=36463&view=rev Log: Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def (removed) @@ -1,6 +1,0 @@ -LIBRARY joy.cpl - -EXPORTS -CPlApplet@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.rbuild [iso-8859-1] Wed Sep 24 05:33:46 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="joy" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_JOY}" installbase="system32" installname="joy.cpl" unicode="yes"> - <importlibrary definition="joy.def" /> + <importlibrary definition="joy.spec.def" /> <include base="joy">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> @@ -15,4 +15,5 @@ <library>shell32</library> <file>joy.c</file> <file>joy.rc</file> + <file>joy.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.spec [iso-8859-1] Wed Sep 24 05:33:46 2008 @@ -1,6 +1,1 @@ -LIBRARY joy.cpl - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/joy/joy.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[sserapion] 36462: Convert to spec.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 05:28:59 2008 New Revision: 36462 URL: http://svn.reactos.org/svn/reactos?rev=36462&view=rev Log: Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def (removed) @@ -1,6 +1,0 @@ -LIBRARY odbccp32.cpl - -EXPORTS -CPlApplet@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.rbuild [iso-8859-1] Wed Sep 24 05:28:59 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> - <importlibrary definition="odbccp32.def" /> + <importlibrary definition="odbccp32.spec.def" /> <include base="odbccp32">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -10,4 +10,5 @@ <library>comctl32</library> <file>odbccp32.c</file> <file>odbccp32.rc</file> + <file>odbccp32.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.spec [iso-8859-1] Wed Sep 24 05:28:59 2008 @@ -1,6 +1,1 @@ -LIBRARY odbccp32.cpl - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/odbccp32/odbccp32.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[sserapion] 36461: Convert to spec.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 05:26:21 2008 New Revision: 36461 URL: http://svn.reactos.org/svn/reactos?rev=36461&view=rev Log: Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def (removed) @@ -1,6 +1,0 @@ -LIBRARY ncpa.cpl - -EXPORTS -CPlApplet@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.rbuild [iso-8859-1] Wed Sep 24 05:26:21 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes"> - <importlibrary definition="ncpa.def" /> + <importlibrary definition="ncpa.spec.def" /> <include base="ncpa">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define> @@ -16,4 +16,5 @@ <file>ncpa.c</file> <file>tcpip_properties.c</file> <file>ncpa.rc</file> + <file>ncpa.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.spec [iso-8859-1] Wed Sep 24 05:26:21 2008 @@ -1,6 +1,1 @@ -LIBRARY ncpa.cpl - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/ncpa/ncpa.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[sserapion] 36460: Minor 64bit fixes.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 05:18:20 2008 New Revision: 36460 URL: http://svn.reactos.org/svn/reactos?rev=36460&view=rev Log: Minor 64bit fixes. Modified: branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c Modified: branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Wed Sep 24 05:18:20 2008 @@ -107,7 +107,7 @@ if (DevNum == (UINT) CB_ERR) return 0; - if (mixerGetID((HMIXEROBJ) DevNum, &DevNum, Id) != MMSYSERR_NOERROR) + if (mixerGetID((HMIXEROBJ)IntToPtr(DevNum), &DevNum, Id) != MMSYSERR_NOERROR) return 0; return DevNum; Modified: branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Wed Sep 24 05:18:20 2008 @@ -237,14 +237,14 @@ return; } - if (mixerOpen(&pGlobalData->hMixer, 0, (DWORD)hwndDlg, 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) + if (mixerOpen(&pGlobalData->hMixer, 0, PtrToUlong(hwndDlg), 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) { MessageBox(hwndDlg, _T("Cannot open mixer"), NULL, MB_OK); return; } ZeroMemory(&mxc, sizeof(MIXERCAPS)); - if (mixerGetDevCaps((UINT)pGlobalData->hMixer, &mxc, sizeof(MIXERCAPS)) != MMSYSERR_NOERROR) + if (mixerGetDevCaps(PtrToUint(pGlobalData->hMixer), &mxc, sizeof(MIXERCAPS)) != MMSYSERR_NOERROR) { MessageBox(hwndDlg, _T("mixerGetDevCaps failed"), NULL, MB_OK); return; @@ -278,7 +278,7 @@ VOID LaunchSoundControl(HWND hwndDlg) { - if ((INT)ShellExecuteW(NULL, L"open", L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL) > 32) + if ((INT_PTR)ShellExecuteW(NULL, L"open", L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL) > 32) return; MessageBox(hwndDlg, _T("Cannot run sndvol32.exe"), NULL, MB_OK); }

16 years, 3 months

[fireball] 36459: - Create a VdmpInitialize function for NtVdmControl's initialize command. - Remove NtEarlyVdmInitialize hack and csrss IVT/BDA copying hack, instead, copy the first page of physical memory to the beginning of process's virtual address space like NT does.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Sep 24 05:06:08 2008 New Revision: 36459 URL: http://svn.reactos.org/svn/reactos?rev=36459&view=rev Log: - Create a VdmpInitialize function for NtVdmControl's initialize command. - Remove NtEarlyVdmInitialize hack and csrss IVT/BDA copying hack, instead, copy the first page of physical memory to the beginning of process's virtual address space like NT does. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/vdm/vdmmain.c trunk/reactos/subsystems/win32/csrss/video.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Wed Sep 24 05:06:08 2008 @@ -68,8 +68,6 @@ ULONG KeAllocateGdtSelector(ULONG Desc[2]); VOID KeFreeGdtSelector(ULONG Entry); VOID -NtEarlyInitVdm(VOID); -VOID KeApplicationProcessorInitDispatcher(VOID); VOID KeCreateApplicationProcessorIdleThread(ULONG Id); Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Wed Sep 24 05:06:08 2008 @@ -54,8 +54,6 @@ KiPPCSetProcessorFeatures(VOID); ULONG KeAllocateGdtSelector(ULONG Desc[2]); VOID KeFreeGdtSelector(ULONG Entry); -VOID -NtEarlyInitVdm(VOID); #ifdef CONFIG_SMP #define LOCK "isync ; " Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Wed Sep 24 05:06:08 2008 @@ -1332,11 +1332,6 @@ LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; } -#if defined(_M_IX86) - /* Set up the VDM Data */ - NtEarlyInitVdm(); -#endif - /* Convert the loader block */ KiRosFrldrLpbToNtLpb(KeRosLoaderBlock, &NtLoaderBlock); Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Wed Sep 24 05:06:08 2008 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/vdm/vdmmain.c * PURPOSE: VDM Support Services * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -14,20 +15,8 @@ /* GLOBALS *******************************************************************/ -static UCHAR OrigIVT[1024]; -static UCHAR OrigBDA[256]; /* PRIVATE FUNCTIONS *********************************************************/ - -VOID -INIT_FUNCTION -NtEarlyInitVdm(VOID) -{ - PCHAR start = MmCreateHyperspaceMapping(0); - memcpy(OrigIVT, start, 1024); - memcpy(OrigBDA, start+0x400, 256); - MmDeleteHyperspaceMapping(start); -} VOID NTAPI @@ -82,6 +71,90 @@ ZwClose(RegHandle); } +NTSTATUS +NTAPI +VdmpInitialize(PVOID ControlData) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + NTSTATUS Status; + HANDLE PhysMemHandle; + PVOID BaseAddress; + PVOID NullAddress = NULL; + LARGE_INTEGER Offset; + ULONG ViewSize; + + /* Open the physical memory section */ + InitializeObjectAttributes(&ObjectAttributes, + &PhysMemName, + 0, + NULL, + NULL); + Status = ZwOpenSection(&PhysMemHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); + return Status; + } + + /* Map the BIOS and device registers into the address space */ + Offset.QuadPart = 0; + ViewSize = PAGE_SIZE; + BaseAddress = 0; + Status = ZwMapViewOfSection(PhysMemHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &Offset, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't map physical memory (%x)\n", Status); + ZwClose(PhysMemHandle); + return Status; + } + + /* Now, copy the first physical pagee into the first virtual page */ + _SEH_TRY + { + RtlMoveMemory(NullAddress, BaseAddress, ViewSize); + } + _SEH_HANDLE + { + /* Get the status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't copy first page (%x)\n", Status); + ZwClose(PhysMemHandle); + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + return Status; + } + + /* Close physical memory section handle */ + ZwClose(PhysMemHandle); + + /* Unmap the section */ + Status = ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't unmap the section (%x)\n", Status); + return Status; + } + + return STATUS_SUCCESS; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -107,10 +180,8 @@ case VdmInitialize: - /* Pretty much a hack, since a lot more needs to happen */ - memcpy(ControlData, OrigIVT, 1024); - memcpy((PVOID)((ULONG_PTR)ControlData + 1024), OrigBDA, 256); - Status = STATUS_SUCCESS; + /* Call the init sub-function */ + Status = VdmpInitialize(ControlData); break; default: Modified: trunk/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/vid… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] Wed Sep 24 05:06:08 2008 @@ -23,7 +23,6 @@ NTSTATUS Status; HANDLE PhysMemHandle; PVOID BaseAddress; - PVOID NullAddress; LARGE_INTEGER Offset; ULONG ViewSize; CHAR IVTAndBda[1024+256]; @@ -105,11 +104,6 @@ return 0; } - /* Copy the IVT and BDA into the right place */ - NullAddress = (PVOID)0x0; /* Workaround for GCC 3.4 */ - memcpy(NullAddress, IVTAndBda, 1024); - memcpy((PVOID)0x400, &IVTAndBda[1024], 256); - /* Return success */ return 1; }

16 years, 3 months

[sserapion] 36458: Convert to spec. Sprinkle IntToPtr all over mouse.c

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 05:05:05 2008 New Revision: 36458 URL: http://svn.reactos.org/svn/reactos?rev=36458&view=rev Log: Convert to spec. Sprinkle IntToPtr all over mouse.c Added: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c Removed: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def (removed) @@ -1,6 +1,0 @@ -LIBRARY main.cpl - -EXPORTS -CPlApplet@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild [iso-8859-1] Wed Sep 24 05:05:05 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes"> - <importlibrary definition="main.def" /> + <importlibrary definition="main.spec.def" /> <include base="main">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -17,4 +17,5 @@ <file>main.c</file> <file>mouse.c</file> <file>main.rc</file> + <file>main.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec [iso-8859-1] Wed Sep 24 05:05:05 2008 @@ -1,6 +1,1 @@ -LIBRARY main.cpl - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Sep 24 05:05:05 2008 @@ -1260,7 +1260,7 @@ //#if (WINVER >= 0x0500) if (pPointerData->bOrigDropShadow != pPointerData->bDropShadow) { - SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bDropShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); pPointerData->bOrigDropShadow = pPointerData->bDropShadow; } //#endif @@ -1269,7 +1269,7 @@ else if (lppsn->hdr.code == PSN_RESET) { //#if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bOrigDropShadow, 0); + SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bOrigDropShadow), 0); //#endif } break; @@ -1368,7 +1368,7 @@ SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } //#if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, 0); + SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bDropShadow), 0); //#endif PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -1552,7 +1552,7 @@ pOptionData->bMouseVanish = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bMouseVanish, 0); + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), 0); break; case IDC_CHECK_SHOW_POINTER: @@ -1566,7 +1566,7 @@ pOptionData->bMouseSonar = TRUE; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bMouseSonar, 0); + SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), 0); break; } @@ -1580,7 +1580,7 @@ /* Set mouse speed */ if (pOptionData->ulOrigMouseSpeed != pOptionData->ulMouseSpeed) { - SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSpeed, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); pOptionData->ulOrigMouseSpeed = pOptionData->ulMouseSpeed; } @@ -1610,14 +1610,14 @@ /* hide pointer while typing */ if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish) { - SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bMouseVanish, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish; } /* show pointer with Ctrl-Key */ if (pOptionData->bOrigMouseSonar != pOptionData->bMouseSonar) { - SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bMouseSonar, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar; } return TRUE; @@ -1625,12 +1625,12 @@ else if (lppsn->hdr.code == PSN_RESET) { /* Set the original mouse speed */ - SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulOrigMouseSpeed, 0); + SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulOrigMouseSpeed), 0); SystemParametersInfo(SPI_SETMOUSE, 0, &pOptionData->OrigMouseAccel, 0); SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bOrigSnapToDefaultButton, 0, 0); SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uOrigMouseTrails, 0, 0); - SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bOrigMouseVanish, 0); - SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bOrigMouseSonar, 0); + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bOrigMouseVanish), 0); + SystemParametersInfo(SPI_SETMOUSESONAR, 0,IntToPtr(pOptionData->bOrigMouseSonar), 0); } break; @@ -1647,7 +1647,7 @@ case TB_BOTTOM: case TB_ENDTRACK: pOptionData->ulMouseSpeed = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SPEED, TBM_GETPOS, 0, 0) + 1; - SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSpeed, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; #if 0

16 years, 3 months

[sserapion] 36457: Convert to spec. Use tabs in rbuild file.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 04:51:33 2008 New Revision: 36457 URL: http://svn.reactos.org/svn/reactos?rev=36457&view=rev Log: Convert to spec. Use tabs in rbuild file. Added: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def (removed) @@ -1,6 +1,0 @@ -LIBRARY intl.cpl - -EXPORTS -CPlApplet@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.rbuild [iso-8859-1] Wed Sep 24 04:51:33 2008 @@ -1,27 +1,28 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes"> - <importlibrary definition="intl.def" /> - <include base="intl">.</include> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x600</define> - <define name="WINVER">0x609</define> - <library>kernel32</library> - <library>user32</library> - <library>comctl32</library> - <library>advapi32</library> - <library>setupapi</library> - <library>shell32</library> - <file>currency.c</file> - <file>date.c</file> - <file>generalp.c</file> - <file>intl.c</file> - <file>inplocale.c</file> - <file>numbers.c</file> - <file>time.c</file> - <file>misc.c</file> - <file>languages.c</file> - <file>advanced.c</file> - <file>sort.c</file> - <file>intl.rc</file> + <importlibrary definition="intl.spec.def" /> + <include base="intl">.</include> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="WINVER">0x609</define> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <library>advapi32</library> + <library>setupapi</library> + <library>shell32</library> + <file>currency.c</file> + <file>date.c</file> + <file>generalp.c</file> + <file>intl.c</file> + <file>inplocale.c</file> + <file>numbers.c</file> + <file>time.c</file> + <file>misc.c</file> + <file>languages.c</file> + <file>advanced.c</file> + <file>sort.c</file> + <file>intl.rc</file> + <file>intl.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.spec [iso-8859-1] Wed Sep 24 04:51:33 2008 @@ -1,6 +1,1 @@ -LIBRARY intl.cpl - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/intl/intl.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[sserapion] 36456: Convert to spec.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 04:49:25 2008 New Revision: 36456 URL: http://svn.reactos.org/svn/reactos?rev=36456&view=rev Log: Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def (removed) @@ -1,6 +1,0 @@ -LIBRARY input.dll - -EXPORTS -CPlApplet@16 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/input.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/input.rbuild [iso-8859-1] Wed Sep 24 04:49:25 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes"> - <importlibrary definition="input.def" /> + <importlibrary definition="input.spec.def" /> <include base="input">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -16,4 +16,5 @@ <file>add.c</file> <file>changekeyseq.c</file> <file>input.rc</file> + <file>input.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/input.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/input.spec [iso-8859-1] Wed Sep 24 04:49:25 2008 @@ -1,6 +1,1 @@ -LIBRARY input.dll - -EXPORTS -CPlApplet@16 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/input/input.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

[sserapion] 36455: Convert to spec.

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Sep 24 04:48:04 2008 New Revision: 36455 URL: http://svn.reactos.org/svn/reactos?rev=36455&view=rev Log: Convert to spec. Added: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.spec (contents, props changed) - copied, changed from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def Removed: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def (removed) @@ -1,8 +1,0 @@ -LIBRARY desk.cpl - -EXPORTS -CPlApplet@16 -DisplayClassInstaller@12 -DisplaySaveSettings@8 - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Wed Sep 24 04:48:04 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes"> - <importlibrary definition="desk.def" /> + <importlibrary definition="desk.spec.def" /> <include base="desk">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -34,4 +34,5 @@ <file>monslctl.c</file> <file>general.c</file> <file>desk.rc</file> + <file>desk.spec</file> </module> Copied: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.spec (from r36423, branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.spec [iso-8859-1] Wed Sep 24 04:48:04 2008 @@ -1,8 +1,3 @@ -LIBRARY desk.cpl - -EXPORTS -CPlApplet@16 -DisplayClassInstaller@12 -DisplaySaveSettings@8 - -; EOF +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall DisplayClassInstaller(ptr ptr ptr) +@ stdcall DisplaySaveSettings(ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/desk/desk.spec ------------------------------------------------------------------------------ svn:mergeinfo =

16 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
75
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 September 2008