Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 56141: [KMTEST] Add a few more tests. Two should fail on ReactOS
by pschweitzer＠svn.reactos.org 13 Mar '12

13 Mar '12

Author: pschweitzer Date: Tue Mar 13 21:07:55 2012 New Revision: 56141 URL: http://svn.reactos.org/svn/reactos?rev=56141&view=rev Log: [KMTEST] Add a few more tests. Two should fail on ReactOS Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Tue Mar 13 21:07:55 2012 @@ -24,6 +24,12 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); RtlInitUnicodeString(&Expression, L""); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"**"); + RtlInitUnicodeString(&Name, L""); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Name, L"a"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } RtlInitUnicodeString(&Expression, L"ntdll.dll"); @@ -174,6 +180,14 @@ /* Backtracking tests */ RtlInitUnicodeString(&Expression, L"*.*.*.*"); RtlInitUnicodeString(&Name, L"127.0.0.1"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"*?*?*?*"); + RtlInitUnicodeString(&Name, L"1.0.0.1"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"?*?*?*?"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"?.?.?.?"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Expression, L"*a*ab*abc"); @@ -192,6 +206,12 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); RtlInitAnsiString(&Expression, ""); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "**"); + RtlInitAnsiString(&Name, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "a"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); } RtlInitAnsiString(&Expression, "ntdll.dll"); @@ -339,9 +359,17 @@ RtlInitAnsiString(&Name, "winhlp32.exe"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); - /* Backtracking tetss */ + /* Backtracking tests */ RtlInitAnsiString(&Expression, "*.*.*.*"); RtlInitAnsiString(&Name, "127.0.0.1"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "*?*?*?*"); + RtlInitAnsiString(&Name, "1.0.0.1"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "?*?*?*?"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "?.?.?.?"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); RtlInitAnsiString(&Expression, "*a*ab*abc");

1 0

[cgutman] 56140: [HIVESYS] - Add PCI-PCI bridges to the critical device database to fix discovery of critical devices that are not attached directly to the root bus - See bug #6958 for details
by cgutman＠svn.reactos.org 13 Mar '12

13 Mar '12

Author: cgutman Date: Tue Mar 13 18:38:59 2012 New Revision: 56140 URL: http://svn.reactos.org/svn/reactos?rev=56140&view=rev Log: [HIVESYS] - Add PCI-PCI bridges to the critical device database to fix discovery of critical devices that are not attached directly to the root bus - See bug #6958 for details Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Mar 13 18:38:59 2012 @@ -12,6 +12,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","Service",0x00000000,"pci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","Service",0x00000000,"pci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Mar 13 18:38:59 2012 @@ -12,6 +12,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","Service",0x00000000,"pci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","Service",0x00000000,"pci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"

1 0

[tfaber] 56139: [CLT2012] - Fix directory creation in first stage - Avoid relocation of syssetup
by tfaber＠svn.reactos.org 13 Mar '12

13 Mar '12

Author: tfaber Date: Tue Mar 13 09:04:26 2012 New Revision: 56139 URL: http://svn.reactos.org/svn/reactos?rev=56139&view=rev Log: [CLT2012] - Fix directory creation in first stage - Avoid relocation of syssetup Modified: branches/ros-branch-0_3_14-clt2012/baseaddress.rbuild branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in Modified: branches/ros-branch-0_3_14-clt2012/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/basea… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/baseaddress.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/baseaddress.rbuild [iso-8859-1] Tue Mar 13 09:04:26 2012 @@ -171,7 +171,7 @@ <property name="BASEADDRESS_MSCTF" value="0x746e0000" /> <property name="BASEADDRESS_QUARTZ" value="0x747d0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> - <property name="BASEADDRESS_SYSSETUP" value="0x74a10000" /> + <property name="BASEADDRESS_SYSSETUP" value="0x74900000" /> <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> <property name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> <property name="BASEADDRESS_MSXML3" value="0x74ae0000" /> Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Mar 13 09:04:26 2012 @@ -21,7 +21,9 @@ 6 = inf 7 = bin 8 = media -9 = Resources\Themes\Lautus +9 = Resources +10 = Resources\Themes +11 = Resources\Themes\Lautus .InfEnd @@ -696,7 +698,7 @@ media\sounds\ReactOS_LogOn.wav 8 ; Lautus Theme -media\themes\Lautus.msstyles 9 optional +media\themes\Lautus.msstyles 11 optional ; Ini Files boot\bootdata\system.ini 4 Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Tue Mar 13 09:04:26 2012 @@ -22,7 +22,9 @@ 6 = inf 7 = bin 8 = media -9 = Resources\Themes\Lautus +9 = Resources +10 = Resources\Themes +11 = Resources\Themes\Lautus .InfEnd

1 0

[tfaber] 56138: [CLT2012] - Remove the outdated USB driver
by tfaber＠svn.reactos.org 13 Mar '12

13 Mar '12

Author: tfaber Date: Tue Mar 13 00:08:45 2012 New Revision: 56138 URL: http://svn.reactos.org/svn/reactos?rev=56138&view=rev Log: [CLT2012] - Remove the outdated USB driver Removed: branches/ros-branch-0_3_14-clt2012/drivers/usb/nt4compat/ Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Mar 13 00:08:45 2012 @@ -1398,20 +1398,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; USB uhci/ehci driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 - -; USB storage driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 - ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Mar 13 00:08:45 2012 @@ -1730,20 +1730,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; USB uhci/ehci driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","ImagePath",0x00020000,"system32\drivers\usbdrv.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\usbdrv","Type",0x00010001,0x00000001 - -; USB storage driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Extended Base" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000003 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 - ; Windows Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Mar 13 00:08:45 2012 @@ -32,7 +32,6 @@ disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,x,,,,,,4 -usbdrv.sys=,,,,,,,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 l_intl.nls=,,,,,,,,,,,,2 ntfs.sys=,,,,,,,,,,,,4 Modified: branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/drive… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/drivers/usb/CMakeLists.txt [iso-8859-1] Tue Mar 13 00:08:45 2012 @@ -1,5 +1,4 @@ -add_subdirectory(nt4compat) add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk Modified: branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/drive… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/drivers/usb/directory.rbuild [iso-8859-1] Tue Mar 13 00:08:45 2012 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="nt4compat"> - <xi:include href="nt4compat/directory.rbuild" /> - </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>

1 0

[pschweitzer] 56137: [FREELDR] Set proper video mode for VESA graphical Remove one magic value usage
by pschweitzer＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: pschweitzer Date: Mon Mar 12 23:00:56 2012 New Revision: 56137 URL: http://svn.reactos.org/svn/reactos?rev=56137&view=rev Log: [FREELDR] Set proper video mode for VESA graphical Remove one magic value usage Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Mon Mar 12 23:00:56 2012 @@ -798,7 +798,7 @@ ScreenHeight = VesaVideoModeInformation.HeightInPixels; BytesPerScanLine = VesaVideoModeInformation.BytesPerScanLine; BiosVideoMode = NewMode; - DisplayMode = VideoTextMode; + DisplayMode = VideoGraphicsMode; VesaVideoMode = TRUE; return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Mon Mar 12 23:00:56 2012 @@ -338,11 +338,11 @@ * harddisks. So, we set the buffer to known contents first, then try to * read. If the BIOS reports success but the buffer contents haven't * changed then we fail anyway */ - memset((PVOID) DISKREADBUFFER, 0xcd, 512); + memset((PVOID) DISKREADBUFFER, 0xcd, DISKREADBUFFER_SIZE); while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, (PVOID)DISKREADBUFFER)) { Changed = FALSE; - for (i = 0; ! Changed && i < 512; i++) + for (i = 0; ! Changed && i < DISKREADBUFFER_SIZE; i++) { Changed = ((PUCHAR)DISKREADBUFFER)[i] != 0xcd; } @@ -353,7 +353,7 @@ break; } DiskCount++; - memset((PVOID) DISKREADBUFFER, 0xcd, 512); + memset((PVOID) DISKREADBUFFER, 0xcd, DISKREADBUFFER_SIZE); } DiskReportError(TRUE); TRACE("BIOS reports %d harddisk%s\n",

1 0

[tfaber] 56136: [CLT2012] - Include the Lautus visual style by Pisarz (as a blob for now), and enable it by default
by tfaber＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: tfaber Date: Mon Mar 12 22:50:39 2012 New Revision: 56136 URL: http://svn.reactos.org/svn/reactos?rev=56136&view=rev Log: [CLT2012] - Include the Lautus visual style by Pisarz (as a blob for now), and enable it by default Added: branches/ros-branch-0_3_14-clt2012/media/themes/CMakeLists.txt (with props) branches/ros-branch-0_3_14-clt2012/media/themes/Lautus.msstyles (with props) branches/ros-branch-0_3_14-clt2012/media/themes/themes.rbuild (with props) Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in branches/ros-branch-0_3_14-clt2012/media/CMakeLists.txt branches/ros-branch-0_3_14-clt2012/media/media.rbuild Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -1666,7 +1666,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Group",0x00000000,"UIGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ImagePath",0x00020000,"%SystemRoot%\system32\thmsvc.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 ; Sound Blaster (NT4) Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -21,6 +21,7 @@ 6 = inf 7 = bin 8 = media +9 = Resources\Themes\Lautus .InfEnd @@ -694,6 +695,9 @@ ; Media Files media\sounds\ReactOS_LogOn.wav 8 +; Lautus Theme +media\themes\Lautus.msstyles 9 optional + ; Ini Files boot\bootdata\system.ini 4 Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -22,6 +22,7 @@ 6 = inf 7 = bin 8 = media +9 = Resources\Themes\Lautus .InfEnd @@ -53,4 +54,4 @@ modules\optional\vmx_svga.sys 2 optional modules\optional\wine_gecko-1.0.0-x86.cab 4 optional -modules\wallpaper\dark-clt2012.bmp 4 optional +modules\wallpaper\dark-clt2012.bmp 4 optional Modified: branches/ros-branch-0_3_14-clt2012/media/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/media… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/media/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/media/CMakeLists.txt [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -1,6 +1,7 @@ add_subdirectory(fonts) add_subdirectory(inf) add_subdirectory(nls) +add_subdirectory(themes) add_subdirectory(vgafonts) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts DESTINATION reactos/system32/drivers/etc FOR all) Modified: branches/ros-branch-0_3_14-clt2012/media/media.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/media… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/media/media.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/media/media.rbuild [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -16,6 +16,9 @@ <directory name="sounds"> <xi:include href="sounds/sounds.rbuild" /> </directory> + <directory name="themes"> + <xi:include href="themes/themes.rbuild" /> + </directory> <directory name="vgafonts"> <xi:include href="vgafonts/vgafonts.rbuild" /> </directory> Added: branches/ros-branch-0_3_14-clt2012/media/themes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/media… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/media/themes/CMakeLists.txt (added) +++ branches/ros-branch-0_3_14-clt2012/media/themes/CMakeLists.txt [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -1,0 +1,2 @@ + +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Lautus.msstyles DESTINATION reactos/Resources/Themes/Lautus FOR all) Propchange: branches/ros-branch-0_3_14-clt2012/media/themes/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-branch-0_3_14-clt2012/media/themes/Lautus.msstyles URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/media… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14-clt2012/media/themes/Lautus.msstyles ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ros-branch-0_3_14-clt2012/media/themes/themes.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/media… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/media/themes/themes.rbuild (added) +++ branches/ros-branch-0_3_14-clt2012/media/themes/themes.rbuild [iso-8859-1] Mon Mar 12 22:50:39 2012 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <installfile installbase="Resources/Themes/Lautus">Lautus.msstyles</installfile> +</group> Propchange: branches/ros-branch-0_3_14-clt2012/media/themes/themes.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 56135: [DDK/PSDK] Put NOP_FUNCTION where it belongs!
by tkreuzer＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: tkreuzer Date: Mon Mar 12 21:27:15 2012 New Revision: 56135 URL: http://svn.reactos.org/svn/reactos?rev=56135&view=rev Log: [DDK/PSDK] Put NOP_FUNCTION where it belongs! Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5613… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Mon Mar 12 21:27:15 2012 @@ -128,16 +128,6 @@ #define ALLOC_DATA_PRAGMA 1 #endif -/* Add NOP_FUNCTION support */ -#ifndef NOP_FUNCTION && (_MSC_VER >= 1210) -#define NOP_FUNCTION __noop -#else -#define NOP_FUNCTION (void)0 -#endif -#else -#ifndef NOP_FUNCTION -#define NOP_FUNCTION (void)0 -#endif #endif #if defined(_WIN64) Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Mon Mar 12 21:27:15 2012 @@ -236,6 +236,14 @@ #define DECLSPEC_ADDRSAFE #endif #endif /* DECLSPEC_ADDRSAFE */ + +#ifndef NOP_FUNCTION +#if (_MSC_VER >= 1210) +#define NOP_FUNCTION __noop +#else +#define NOP_FUNCTION (void)0 +#endif +#endif #if !defined(_NTSYSTEM_) #define NTSYSAPI DECLSPEC_IMPORT Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Mar 12 21:27:15 2012 @@ -79,6 +79,14 @@ # else # define DECLSPEC_ALIGN(x) # endif +#endif + +#ifndef NOP_FUNCTION +#if (_MSC_VER >= 1210) +#define NOP_FUNCTION __noop +#else +#define NOP_FUNCTION (void)0 +#endif #endif # define DECLSPEC_HIDDEN

1 0

[tfaber] 56134: [CLT2012] - Add CLT wallpaper based on Angelus_ReactOS7_Dark_4-3
by tfaber＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: tfaber Date: Mon Mar 12 16:06:54 2012 New Revision: 56134 URL: http://svn.reactos.org/svn/reactos?rev=56134&view=rev Log: [CLT2012] - Add CLT wallpaper based on Angelus_ReactOS7_Dark_4-3 Added: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/CMakeLists.txt - copied, changed from r56095, trunk/wallpaper/CMakeLists.txt branches/ros-branch-0_3_14-clt2012/modules/wallpaper/dark-clt2012.bmp - copied, changed from r56094, branches/ros-branch-0_3_14-clt2012/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp Removed: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp branches/ros-branch-0_3_14-clt2012/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp branches/ros-branch-0_3_14-clt2012/modules/wallpaper/RainInTheScreen_4x3.bmp Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivedef_i386.inf branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in branches/ros-branch-0_3_14-clt2012/modules/CMakeLists.txt branches/ros-branch-0_3_14-clt2012/modules/wallpaper/directory.rbuild Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Mar 12 16:06:54 2012 @@ -888,6 +888,4 @@ modules\rostests\kmtests\ntos_io\iodeviceobject_drv.sys 7 optional modules\rostests\kmtests\ntos_io\iohelper_drv.sys 7 optional -modules\wallpaper\Angelus_ReactOS7_Dark_4-3.bmp 4 optional -modules\wallpaper\Angelus_Sea04_FarBeyondTheSea_4x3.bmp 4 optional -modules\wallpaper\RainInTheScreen_4x3.bmp 4 optional +modules\wallpaper\dark-clt2012.bmp 4 optional Modified: branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Mon Mar 12 16:06:54 2012 @@ -53,4 +53,4 @@ modules\optional\vmx_svga.sys 2 optional modules\optional\wine_gecko-1.0.0-x86.cab 4 optional -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional +modules\wallpaper\dark-clt2012.bmp 4 optional Modified: branches/ros-branch-0_3_14-clt2012/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/modules/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/modules/CMakeLists.txt [iso-8859-1] Mon Mar 12 16:06:54 2012 @@ -6,3 +6,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rosapps/) add_subdirectory(rosapps) endif() + +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/) +add_subdirectory(wallpaper) +endif() Removed: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== Binary file - no diff available. Copied: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/CMakeLists.txt (from r56095, trunk/wallpaper/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== --- trunk/wallpaper/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/modules/wallpaper/CMakeLists.txt [iso-8859-1] Mon Mar 12 16:06:54 2012 @@ -1,2 +1,2 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP.bmp DESTINATION reactos FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/dark-clt2012.bmp DESTINATION reactos FOR all) Removed: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/RainInTheScreen_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== Binary file - no diff available. Copied: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/dark-clt2012.bmp (from r56094, branches/ros-branch-0_3_14-clt2012/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_14-clt2012/modules/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/modul… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/modules/wallpaper/directory.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/modules/wallpaper/directory.rbuild [iso-8859-1] Mon Mar 12 16:06:54 2012 @@ -1,7 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <installfile>Angelus_ReactOS7_Dark_4-3.bmp</installfile> - <installfile>Angelus_Sea04_FarBeyondTheSea_4x3.bmp</installfile> - <installfile>RainInTheScreen_4x3.bmp</installfile> + <installfile>dark-clt2012.bmp</installfile> </group>

1 0

[rharabien] 56133: [COMCTL32] - Update diff file
by rharabien＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: rharabien Date: Mon Mar 12 14:24:25 2012 New Revision: 56133 URL: http://svn.reactos.org/svn/reactos?rev=56133&view=rev Log: [COMCTL32] - Update diff file Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Mon Mar 12 14:24:25 2012 @@ -2,7 +2,108 @@ =================================================================== --- commctrl.c (revision 55577) +++ commctrl.c (working copy) -@@ -1593,12 +1593,114 @@ +@@ -71,6 +71,19 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(commctrl); + ++#define NAME L"microsoft.windows.common-controls" ++#define VERSION L"6.0.2600.2982" ++#define PUBLIC_KEY L"6595b64144ccf1df" ++ ++#ifdef __i386__ ++#define ARCH L"x86" ++#elif defined __x86_64__ ++#define ARCH L"amd64" ++#else ++#define ARCH L"none" ++#endif ++ ++static const WCHAR manifest_filename[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION L"_none_deadbeef.manifest"; + + static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +@@ -92,6 +105,67 @@ + 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 + }; + ++static BOOL create_manifest(BOOL install) ++{ ++ WCHAR *pwszBuf; ++ HRSRC hResInfo; ++ HGLOBAL hResData; ++ PVOID pManifest; ++ DWORD cchBuf, cbManifest, cbWritten; ++ HANDLE hFile; ++ BOOL bRet = FALSE; ++ ++ hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", RT_MANIFEST); ++ if (!hResInfo) ++ return FALSE; ++ ++ cbManifest = SizeofResource(COMCTL32_hModule, hResInfo); ++ if (!cbManifest) ++ return FALSE; ++ ++ hResData = LoadResource(COMCTL32_hModule, hResInfo); ++ if (!hResData) ++ return FALSE; ++ ++ pManifest = LockResource(hResData); ++ if (!pManifest) ++ return FALSE; ++ ++ cchBuf = GetWindowsDirectoryW(NULL, 0) * sizeof(WCHAR) + sizeof(L"\\winsxs\\manifests\\") + sizeof(manifest_filename); ++ pwszBuf = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchBuf * sizeof(WCHAR)); ++ if (!pwszBuf) ++ return FALSE; ++ ++ GetWindowsDirectoryW(pwszBuf, cchBuf); ++ lstrcatW(pwszBuf, L"\\winsxs"); ++ CreateDirectoryW(pwszBuf, NULL); ++ lstrcatW(pwszBuf, L"\\manifests\\"); ++ CreateDirectoryW(pwszBuf, NULL); ++ lstrcatW(pwszBuf, manifest_filename); ++ if (install) ++ { ++ hFile = CreateFileW(pwszBuf, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ++ if (hFile != INVALID_HANDLE_VALUE) ++ { ++ if (WriteFile(hFile, pManifest, cbManifest, &cbWritten, NULL) && cbWritten == cbManifest) ++ bRet = TRUE; ++ ++ CloseHandle(hFile); ++ ++ if (!bRet) ++ DeleteFileW(pwszBuf); ++ else ++ TRACE("created %s\n", debugstr_w(pwszBuf)); ++ } ++ } ++ else ++ bRet = DeleteFileW(pwszBuf); ++ ++ HeapFree(GetProcessHeap(), 0, pwszBuf); ++ ++ return bRet; ++} ++ + + /*********************************************************************** + * DllMain [Internal] +@@ -930,6 +1004,12 @@ + HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) + { + TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); ++ if (!create_manifest(bInstall)) ++ { ++ ERR("create_manifest failed!\n"); ++ return HRESULT_FROM_WIN32(GetLastError()); ++ } ++ + return S_OK; + } + +@@ -1593,12 +1673,114 @@ * * Draw text with shadow. */

1 0

[rharabien] 56132: [COMCTL32] - When installing dll copy manifest to winsxs\manifests directory as comctl32 before sync did. Fixes Firefox 10 regression. See issue #6910 for more details.
by rharabien＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: rharabien Date: Mon Mar 12 14:16:58 2012 New Revision: 56132 URL: http://svn.reactos.org/svn/reactos?rev=56132&view=rev Log: [COMCTL32] - When installing dll copy manifest to winsxs\manifests directory as comctl32 before sync did. Fixes Firefox 10 regression. See issue #6910 for more details. Modified: trunk/reactos/dll/win32/comctl32/commctrl.c Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Mon Mar 12 14:16:58 2012 @@ -71,6 +71,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); +#define NAME L"microsoft.windows.common-controls" +#define VERSION L"6.0.2600.2982" +#define PUBLIC_KEY L"6595b64144ccf1df" + +#ifdef __i386__ +#define ARCH L"x86" +#elif defined __x86_64__ +#define ARCH L"amd64" +#else +#define ARCH L"none" +#endif + +static const WCHAR manifest_filename[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION L"_none_deadbeef.manifest"; static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -91,6 +104,67 @@ static const WCHAR strCC32SubclassInfo[] = { 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 }; + +static BOOL create_manifest(BOOL install) +{ + WCHAR *pwszBuf; + HRSRC hResInfo; + HGLOBAL hResData; + PVOID pManifest; + DWORD cchBuf, cbManifest, cbWritten; + HANDLE hFile; + BOOL bRet = FALSE; + + hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", RT_MANIFEST); + if (!hResInfo) + return FALSE; + + cbManifest = SizeofResource(COMCTL32_hModule, hResInfo); + if (!cbManifest) + return FALSE; + + hResData = LoadResource(COMCTL32_hModule, hResInfo); + if (!hResData) + return FALSE; + + pManifest = LockResource(hResData); + if (!pManifest) + return FALSE; + + cchBuf = GetWindowsDirectoryW(NULL, 0) * sizeof(WCHAR) + sizeof(L"\\winsxs\\manifests\\") + sizeof(manifest_filename); + pwszBuf = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchBuf * sizeof(WCHAR)); + if (!pwszBuf) + return FALSE; + + GetWindowsDirectoryW(pwszBuf, cchBuf); + lstrcatW(pwszBuf, L"\\winsxs"); + CreateDirectoryW(pwszBuf, NULL); + lstrcatW(pwszBuf, L"\\manifests\\"); + CreateDirectoryW(pwszBuf, NULL); + lstrcatW(pwszBuf, manifest_filename); + if (install) + { + hFile = CreateFileW(pwszBuf, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (hFile != INVALID_HANDLE_VALUE) + { + if (WriteFile(hFile, pManifest, cbManifest, &cbWritten, NULL) && cbWritten == cbManifest) + bRet = TRUE; + + CloseHandle(hFile); + + if (!bRet) + DeleteFileW(pwszBuf); + else + TRACE("created %s\n", debugstr_w(pwszBuf)); + } + } + else + bRet = DeleteFileW(pwszBuf); + + HeapFree(GetProcessHeap(), 0, pwszBuf); + + return bRet; +} /*********************************************************************** @@ -930,6 +1004,12 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); + if (!create_manifest(bInstall)) + { + ERR("create_manifest failed!\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + return S_OK; }

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