Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 37639: God. I hate Batch Hacks soo much.
by dreimer＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: dreimer Date: Tue Nov 25 10:43:42 2008 New Revision: 37639 URL: http://svn.reactos.org/svn/reactos?rev=37639&view=rev Log: God. I hate Batch Hacks soo much. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 10:43:42 2008 @@ -85,15 +85,17 @@ # # First check for a new Updater. # -$_ROSBE_UPDDATE = get-content update.ps1 +rename-item update.ps1 update2.ps1 &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null -$_ROSBE_UPDDATE = get-content update.ps1 -if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { +if ((gi .\update.ps1).LastWriteTime -gt (gi .\update2.ps1).LastWriteTime) { clear-host "Updater got updated and needs to be restarted." + remove-item update2.ps1 -force EOC +} else { + remove-item update.ps1 -force + rename-item update2.ps1 update.ps1 } - # # Get to the Updates Subfolder. #

1 0

[fireball] 37638: - Fix weird code in RtlGetVersion (inspired by Coverity ID 1355 and Daniel's patch in bug 3906). See issue #3906 for more details.
by fireball＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: fireball Date: Tue Nov 25 10:31:07 2008 New Revision: 37638 URL: http://svn.reactos.org/svn/reactos?rev=37638&view=rev Log: - Fix weird code in RtlGetVersion (inspired by Coverity ID 1355 and Daniel's patch in bug 3906). See issue #3906 for more details. Modified: trunk/reactos/dll/ntdll/rtl/version.c trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Tue Nov 25 10:31:07 2008 @@ -104,6 +104,8 @@ NTSTATUS NTAPI RtlGetVersion(RTL_OSVERSIONINFOW *Info) { + ULONG i, MaxLength; + if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { @@ -113,17 +115,19 @@ Info->dwMinorVersion = Peb->OSMinorVersion; Info->dwBuildNumber = Peb->OSBuildNumber; Info->dwPlatformId = Peb->OSPlatformId; + RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion)); if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0) { - int i = _snwprintf(Info->szCSDVersion, - (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1, - L"Service Pack %d", - ((Peb->OSCSDVersion >> 8) & 0xFF)); - Info->szCSDVersion[i] = L'\0'; - } - else - { - RtlZeroMemory(Info->szCSDVersion, sizeof(Info->szCSDVersion)); + MaxLength = (sizeof(Info->szCSDVersion) / sizeof(Info->szCSDVersion[0])) - 1; + i = _snwprintf(Info->szCSDVersion, + MaxLength, + L"Service Pack %d", + ((Peb->OSCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* null-terminate if it was overflowed */ + Info->szCSDVersion[MaxLength] = L'\0'; + } } if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { Modified: trunk/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Tue Nov 25 10:31:07 2008 @@ -39,6 +39,7 @@ NTSTATUS STDCALL RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { + ULONG i, MaxLength; if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { @@ -46,17 +47,19 @@ lpVersionInformation->dwMinorVersion = NtMinorVersion; lpVersionInformation->dwBuildNumber = NtBuildNumber; lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; + RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); if(((CmNtCSDVersion >> 8) & 0xFF) != 0) { - int i = _snwprintf(lpVersionInformation->szCSDVersion, - (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1, - L"Service Pack %d", - ((CmNtCSDVersion >> 8) & 0xFF)); - lpVersionInformation->szCSDVersion[i] = L'\0'; - } - else - { - RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); + MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; + i = _snwprintf(lpVersionInformation->szCSDVersion, + MaxLength, + L"Service Pack %d", + ((CmNtCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* null-terminate if it was overflowed */ + lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; + } } if (lpVersionInformation->dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW)) {

1 0

[dreimer] 37637: oops
by dreimer＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: dreimer Date: Tue Nov 25 09:57:55 2008 New Revision: 37637 URL: http://svn.reactos.org/svn/reactos?rev=37637&view=rev Log: oops Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 09:57:55 2008 @@ -89,9 +89,9 @@ &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null $_ROSBE_UPDDATE = get-content update.ps1 if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { - # clear-host + clear-host "Updater got updated and needs to be restarted." - # EOC + EOC } #

1 0

[fireball] 37636: Daniel Zimmerman - First check for NULL before reference a member in it. See issue #3907 for more details.
by fireball＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: fireball Date: Tue Nov 25 09:57:03 2008 New Revision: 37636 URL: http://svn.reactos.org/svn/reactos?rev=37636&view=rev Log: Daniel Zimmerman - First check for NULL before reference a member in it. See issue #3907 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Tue Nov 25 09:57:03 2008 @@ -1428,9 +1428,10 @@ if (old_irql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &old_irql); - pdev = purb->pdev; if (purb == NULL) goto LBL_LOWER_IRQL; + + pdev = purb->pdev; if (pdev == NULL) goto LBL_LOWER_IRQL;

1 0

[dreimer] 37635: OK, now the PS Port "should" work.
by dreimer＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: dreimer Date: Tue Nov 25 09:51:16 2008 New Revision: 37635 URL: http://svn.reactos.org/svn/reactos?rev=37635&view=rev Log: OK, now the PS Port "should" work. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Tue Nov 25 09:51:16 2008 @@ -21,11 +21,13 @@ } function UPDCHECK { + set-location "$ENV:APPDATA\RosBE\Updates" + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { - break + return } if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - IEX "'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { get-Content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" @@ -34,67 +36,32 @@ $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) { - IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z" + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z 2>&1> $null } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") { - remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force + remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA SilentlyContinue IEX "&'$_ROSBE_BASEDIR\Tools\7z.exe' x '$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z'" set-location "$_ROSBE_VERSION-$_ROSBE_STATCOUNT" - "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1" - break + IEX "& .\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.ps1" + return } else { "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - break + return } } elseif ($YESNO -eq "no") { "Do you want to be asked again to install this update?" $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { - remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force + remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force -EA SilentlyContinue } - break + return } } else { if ($_ROSBE_MULTIUPD -ne "1") { "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - break + return } } -} - -function STATUS { - set-location tmp - if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" - if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { - $_ROSBE_UPDATES = "$_ROSBE_UPDATES $_ROSBE_STATCOUNT" - } - } - set-loaction .. -} - -function UPDINFO { - set-location tmp - if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - IEX "&'$_ROSBE_BASEDIR\Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" - if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { - get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" - } else { - "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." - } - } - set-location .. - remove-item "tmp\*.*" -force -} - -function UPDFIN { - remove-item "tmp\*.*" -force - if ($_ROSBE_UPDATES -ne $null) { - "Following Updates available: $_ROSBE_UPDATES" - } else { - "RosBE is up to Date." - } - EOC } # @@ -107,24 +74,24 @@ # $_ROSBE_OPATH = "$pwd" -if (Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe") { +if (!(Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe")) { set-location "$_ROSBE_BASEDIR\Tools" - IEX "& wget.exe -N --ignore-length --no-verbose $_ROSBE_URL/7z.exe" + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/7z.exe 2>&1> $null set-location $_ROSBE_OPATH } set-location $_ROSBE_BASEDIR # -# First check for a new Updater +# First check for a new Updater. # $_ROSBE_UPDDATE = get-content update.ps1 -IEX "$'Tools\wget.exe' -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1" +&"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null $_ROSBE_UPDDATE = get-content update.ps1 if ($_ROSBE_UPDDATE -ne $_ROSBE_UPDDATE2) { # clear-host "Updater got updated and needs to be restarted." - EOC + # EOC } # @@ -139,62 +106,63 @@ if ("$args" -eq "") { $_ROSBE_MULTIUPD = 1 $_ROSBE_STATCOUNT = 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 - UPDCHECK - $_ROSBE_STATCOUNT += 1 + while ($_ROSBE_STATCOUNT -lt 10) { + UPDCHECK + $_ROSBE_STATCOUNT += 1 + } + EOC +} +if ("$args" -eq "reset") { + remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue + remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue + EOC +} +$arg1 = $args[0] +$arg2 = $args[1] +if ("$arg1" -eq "nr") { + $_ROSBE_STATCOUNT = $arg2 UPDCHECK EOC } -if ("$args" -eq "reset") { - remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force - remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force +if ("$arg1" -eq "info") { + $_ROSBE_STATCOUNT = $arg2 + set-location tmp + if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" + } else { + "ERROR: This Update does not seem to exist or the Internet connection is not working correctly." + } + } + set-location .. + remove-item "tmp\*.*" -force -EA SilentlyContinue EOC } -if ("$args[0]" -eq "nr") { - $_ROSBE_STATCOUNT = $args[1] - UPDCHECK +$arg1 = $null +$arg2 = $null +if ("$args" -eq "status") { + $_ROSBE_STATCOUNT = 1 + if (!(test-path "tmp")) {New-Item -name "tmp" -type directory} + copy-item *.txt .\tmp\. + set-location tmp + while($_ROSBE_STATCOUNT -lt 10) { + if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { + &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { + $_ROSBE_UPDATES += "$_ROSBE_STATCOUNT " + } + } + $_ROSBE_STATCOUNT += 1 + } + set-location .. + remove-item "tmp\*.*" -force -EA SilentlyContinue + if ($_ROSBE_UPDATES -ne $null) { + "Following Updates available: $_ROSBE_UPDATES" + } else { + "RosBE is up to Date." + } EOC -} -if ("$args[0]" -eq "info") { - $_ROSBE_STATCOUNT = $args[1] - UPDINFO - EOC -} -if ("$args" -eq "status") { - if (!(test-path "tmp")) {New-Item -name "Updates" -type directory} - copy-item *.txt .\tmp\. - $_ROSBE_STATCOUNT = 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - $_ROSBE_STATCOUNT += 1 - STATUS - UPDFIN } if ("$args" -ne "") { "Unknown parameter specified. Try 'help update'." @@ -207,4 +175,4 @@ $_ROSBE_UPDATES = $null $_ROSBE_UPDDATE2 = $null $_ROSBE_MULTIUPD = $null -$_ROSBE_STATCOUNT = $null +$_ROSBE_STATCOUNT = $null Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Nov 25 09:51:16 2008 @@ -131,7 +131,7 @@ if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( - set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% + set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% ) ) cd.. @@ -164,6 +164,8 @@ goto :EOC :UPDCHECK + +cd /d "%APPDATA%\RosBE\Updates" if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" ( goto :EOF @@ -221,4 +223,4 @@ set _ROSBE_UPDATES= set _ROSBE_UPDDATE2= set _ROSBE_MULTIUPD= -set _ROSBE_STATCOUNT= +set _ROSBE_STATCOUNT=

1 0

[fireball] 37634: Daniel Zimmerman - Check pdev and purb for NULL before accessing them. Resolves CID 764 and 763. See issue #3908 for more details.
by fireball＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: fireball Date: Tue Nov 25 09:51:09 2008 New Revision: 37634 URL: http://svn.reactos.org/svn/reactos?rev=37634&view=rev Log: Daniel Zimmerman - Check pdev and purb for NULL before accessing them. Resolves CID 764 and 763. See issue #3908 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Tue Nov 25 09:51:09 2008 @@ -698,6 +698,8 @@ pdev = uhci_create_device(drvr_obj, dev_mgr); + if (pdev == NULL) + return pdev; pdev_ext = pdev->DeviceExtension; pdev_ext->pci_addr = bus_addr; @@ -706,9 +708,6 @@ slot_num.u.AsULONG = 0; slot_num.u.bits.DeviceNumber = ((bus_addr & 0xff) >> 3); slot_num.u.bits.FunctionNumber = (bus_addr & 0x07); - - if (pdev == NULL) - return pdev; //now create adapter object RtlZeroMemory(&dev_desc, sizeof(dev_desc)); @@ -3122,9 +3121,10 @@ if (old_irql < DISPATCH_LEVEL) KeRaiseIrql(DISPATCH_LEVEL, &old_irql); - pdev = purb->pdev; if (purb == NULL) return; + + pdev = purb->pdev; if (pdev == NULL) return;

1 0

[sginsberg] 37633: - Change LPTSTR to LPWSTR for NtUserGetAltTabInfo, as this will always be a wide string
by sginsberg＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: sginsberg Date: Tue Nov 25 08:50:53 2008 New Revision: 37633 URL: http://svn.reactos.org/svn/reactos?rev=37633&view=rev Log: - Change LPTSTR to LPWSTR for NtUserGetAltTabInfo, as this will always be a wide string Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Nov 25 08:50:53 2008 @@ -1322,7 +1322,7 @@ HWND hwnd, INT iItem, PALTTABINFO pati, - LPTSTR pszItemText, + LPWSTR pszItemText, UINT cchItemText, BOOL Ansi); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Nov 25 08:50:53 2008 @@ -232,7 +232,7 @@ HWND hwnd, INT iItem, PALTTABINFO pati, - LPTSTR pszItemText, + LPWSTR pszItemText, UINT cchItemText, BOOL Ansi) {

1 0

[hyperion] 37632: Supersedes r37631 Undoing fishy patch for warnings in Wine code (see r37629)
by hyperion＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: hyperion Date: Tue Nov 25 08:17:27 2008 New Revision: 37632 URL: http://svn.reactos.org/svn/reactos?rev=37632&view=rev Log: Supersedes r37631 Undoing fishy patch for warnings in Wine code (see r37629) Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/dll/directx/dxdiagn/container.c trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/main.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/rootstore.c trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/icmp/icmp_main.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -119,4 +119,5 @@ <xi:include href="tools/tools.rbuild" /> </directory> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> </group> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -2,7 +2,6 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes"> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <include base="explorer">.</include> <define name="WIN32" /> <define name="__WINDRES__" /> Modified: trunk/reactos/dll/directx/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/contai… ============================================================================== --- trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -150,7 +150,7 @@ hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (!SUCCEEDED(hr) || NULL == pContainer) goto on_error; - cur++; /* go after '.' (just replaced by \0) */ + *cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); } Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -1817,7 +1817,7 @@ } shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)]; - hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, (UINT*)pSizeOfData); + hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData, pSizeOfData); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -2024,7 +2024,7 @@ } shader = This->shader_handles[pPixelShader - (VS_HIGHESTFIXEDFXF + 1)]; - hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, (UINT*)pSizeOfData); + hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData, pSizeOfData); LeaveCriticalSection(&d3d8_cs); return hr; } Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -277,11 +277,11 @@ surface_desc.Type = &type; surface_desc.Usage = &dummy_dword; surface_desc.Pool = &pool; - surface_desc.Size = (UINT*)&dummy_dword; - surface_desc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *)&dummy_dword; + surface_desc.Size = &dummy_dword; + surface_desc.MultiSampleType = &dummy_dword; surface_desc.MultiSampleQuality = &dummy_dword; - surface_desc.Width = (UINT*)&dummy_dword; - surface_desc.Height = (UINT*)&dummy_dword; + surface_desc.Width = &dummy_dword; + surface_desc.Height = &dummy_dword; IWineD3DSurface_GetDesc((IWineD3DSurface *) resource, &surface_desc); break; @@ -291,10 +291,10 @@ volume_desc.Type = &type; volume_desc.Usage = &dummy_dword; volume_desc.Pool = &pool; - volume_desc.Size = (UINT*)&dummy_dword; - volume_desc.Width = (UINT*)&dummy_dword; - volume_desc.Height = (UINT*)&dummy_dword; - volume_desc.Depth = (UINT*)&dummy_dword; + volume_desc.Size = &dummy_dword; + volume_desc.Width = &dummy_dword; + volume_desc.Height = &dummy_dword; + volume_desc.Depth = &dummy_dword; IWineD3DVolume_GetDesc((IWineD3DVolume *) resource, &volume_desc); break; Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -1047,12 +1047,12 @@ { if(dpiX == Resolutions[i]) IsDefault = TRUE; - sprintf(buf, "%d dpi", (int)Resolutions[i]); + sprintf(buf, "%d dpi", Resolutions[i]); } else { if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1]) IsDefault = TRUE; - sprintf(buf, "%d dpi x %d dpi", (int)Resolutions[i], (int)Resolutions[i+1]); + sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]); } Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf); @@ -2471,15 +2471,15 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) { strcpy(strout,"<undef>"); if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { - sprintf(strout,"%d",(int)(size)/100); + sprintf(strout,"%d",(size)/100); return; } if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { - sprintf(strout,"%din",(int)(size)/1000); + sprintf(strout,"%din",(size)/1000); return; } pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - sprintf(strout,"%d",(int)(size)/100); + sprintf(strout,"%d",(size)/100); return; } static void Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -205,8 +205,9 @@ config.cbSize = sizeof(config); CertCreateCertificateChainEngine(&config, &engine); - HCERTCHAINENGINE Original = (HCERTCHAINENGINE)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, NULL); - if (CRYPT_defaultChainEngine == Original || CRYPT_defaultChainEngine != engine) + InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine, + NULL); + if (CRYPT_defaultChainEngine != engine) CertFreeCertificateChainEngine(engine); } return CRYPT_defaultChainEngine; Modified: trunk/reactos/dll/win32/crypt32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -64,9 +64,9 @@ CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); - HCRYPTPROV Original = (HCRYPTPROV)InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, - NULL);//ugly hax to satisfy GCC - if (Original == hDefProv || hDefProv != prov) + InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov, + NULL); + if (hDefProv != prov) CryptReleaseContext(prov, 0); } return hDefProv; Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -157,7 +157,7 @@ LPCSTR pszOID) { static const char szEncodingTypeFmt[] = - "Software\\Microsoft\\Cryptography\\OID\\EncodingType %u\\%s\\%s"; + "Software\\Microsoft\\Cryptography\\OID\\EncodingType %d\\%s\\%s"; UINT len; char numericOID[7]; /* enough for "#65535" */ const char *oid; @@ -185,7 +185,7 @@ szKey = CryptMemAlloc(len); if (szKey) sprintf(szKey, szEncodingTypeFmt, - (unsigned int)GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid); + GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid); return szKey; } Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -404,7 +404,7 @@ } /* cipher_alg */ - if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg)) + if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg)) { ERR("reading cipher_alg failed!\n"); return FALSE; @@ -433,7 +433,7 @@ } /* hash_alg */ - if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg)) + if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg)) { ERR("reading hash_alg failed!\n"); return FALSE; Modified: trunk/reactos/dll/win32/crypt32/rootstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor… ============================================================================== --- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -314,7 +314,7 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) { BOOL ret = FALSE; - //DIR *dir; + DIR *dir; TRACE("(%s, %p)\n", debugstr_a(path), store); /* UNIX functions = bad for reactos @@ -752,9 +752,9 @@ { HCERTSTORE root = create_root_store(); - HCERTSTORE Original = (HCERTSTORE)InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, + InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, NULL); - if (CRYPT_rootStore == Original || CRYPT_rootStore != root) + if (CRYPT_rootStore != root) CertCloseStore(root, 0); } CertDuplicateStore(CRYPT_rootStore); Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -270,7 +270,7 @@ for (j = 0; j < exports->NumberOfNames; j++) if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; - snprintf(buffer, sizeof(buffer), "%u", (unsigned int)(i + exports->Base)); + snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, TRUE /* FIXME */, TRUE /* FIXME */); } Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -812,7 +812,7 @@ goto done; } - if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, (PUINT)&size)) + if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &size)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto done; Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -486,7 +486,7 @@ HDC hdc = GetDC(0); BOOL ret = FALSE; - if(!EnumFontFamiliesW(hdc, name, (FONTENUMPROCW)is_font_installed_proc, (LPARAM)ntm)) + if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)ntm)) ret = TRUE; ReleaseDC(0, hdc); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -244,7 +244,7 @@ { IStream* stream; HRESULT hr; - LONG size; + INT size; TRACE("%p, %p\n", image, cloneImage); @@ -1060,7 +1060,7 @@ encode_image_func* encode_image; LPVOID output; unsigned int output_size; - ULONG dummy; + unsigned int dummy; int i; old_hbmp = 0; Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… ============================================================================== --- trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -9,7 +9,6 @@ <define name="RESOLVE_3D_TEXTURE_SUPPORT" /> <define name="BUILD_GL32" /> <define name="LIBRARYBUILD" /> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <library>ntdll</library> <library>opengl32</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/icmp/icmp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp_main.c… ============================================================================== --- trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -201,7 +201,7 @@ ) { icmp_t* icp=(icmp_t*)IcmpHandle; - char* reqbuf; + unsigned char* reqbuf; int reqsize; struct icmp_echo_reply* ier; @@ -214,7 +214,7 @@ struct timeval timeout; DWORD send_time,recv_time; struct sockaddr_in addr; - int addrlen; + unsigned int addrlen; unsigned short id,seq,cksum; int res; @@ -257,7 +257,7 @@ if (RequestOptions!=NULL) { int val; if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - int len; + unsigned int len; /* Before we mess with the options, get the default values */ len=sizeof(val); getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len); Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -125,7 +125,6 @@ <compilerflag compiler="cpp">-fno-exceptions</compilerflag> <compilerflag compiler="cpp">-fno-rtti</compilerflag> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <directory name="misc"> <file>icustubs.cpp</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -7,7 +7,6 @@ <linkerflag>-fno-exceptions</linkerflag> <linkerflag>-fno-rtti</linkerflag> --> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <importlibrary definition="portcls.spec" /> <define name="_NTDDK_" /> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -392,7 +392,7 @@ if ( data.includes.size () > 0 ) fprintf ( fMakefile, - "PROJECT_CFLAGS %s %s\n", + "PROJECT_CINCLUDES %s %s\n", assignmentOperation, MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ()); @@ -529,15 +529,16 @@ GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); - fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" ); fprintf ( fMakefile, "\n" ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -752,7 +752,7 @@ { fprintf ( fMakefile, "# MACROS\n" ); GenerateMacro ( assignmentOperation, - cflagsMacro, + commonflagsMacro, data, &used_defs, true ); @@ -1118,7 +1118,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", @@ -1141,12 +1141,12 @@ Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule emptyRule ( "", NULL ); @@ -1658,7 +1658,7 @@ "\t%s -o %s %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), - cflagsMacro.c_str(), + module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; @@ -1709,13 +1709,6 @@ fprintf ( fMakefile, "\n" ); return archiveFilename; -} - -string -MingwModuleHandler::GetCFlagsMacro () const -{ - return ssprintf ( "$(%s_CFLAGS)", - module.name.c_str () ); } /*static*/ string @@ -1847,7 +1840,9 @@ fprintf ( fMakefile, "# OTHER MACROS\n" ); + commonflagsMacro = ssprintf ("%s_COMMONFLAGS", module.name.c_str ()); cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); + cxxflagsMacro = ssprintf ("%s_CXXFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ()); @@ -1890,10 +1885,10 @@ fprintf ( fMakefile, "\n" ); } - string globalCflags = ""; + string globalCflags = " "; + globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ()); if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { - globalCflags += " $(PROJECT_CFLAGS)"; if ( module.dynamicCRT ) globalCflags += " -D_DLL -D__USE_CRTIMP"; } @@ -1926,14 +1921,20 @@ // (TODO: Move to version-specific once this bug is fixed in GCC) globalCflags += " -fno-optimize-sibling-calls"; - fprintf ( - fMakefile, - "%s +=%s\n", - cflagsMacro.c_str (), - globalCflags.c_str () ); - if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { + fprintf ( + fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + (" $(PROJECT_CFLAGS)" + globalCflags).c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () ); + fprintf ( fMakefile, "%s += $(PROJECT_RCFLAGS)\n", @@ -1955,6 +1956,18 @@ { fprintf ( fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + globalCflags.c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + globalCflags.c_str () ); + + fprintf ( + fMakefile, "%s_LFLAGS += $(HOST_LFLAGS)\n", module.name.c_str () ); } @@ -1972,6 +1985,10 @@ "%s += %s\n\n", cflagsMacro.c_str (), cflags ); + fprintf ( fMakefile, + "%s += %s\n\n", + cxxflagsMacro.c_str (), + cflags ); } const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags; @@ -1997,12 +2014,17 @@ fprintf ( fMakefile, "%s += -Wno-main\n\n", cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cxxflagsMacro.c_str () ); } fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values + commonflagsMacro = ssprintf ("$(%s)", commonflagsMacro.c_str ()); cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ()); + cxxflagsMacro = ssprintf ("$(%s)", cxxflagsMacro.c_str ()); nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ()); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Nov 25 08:17:27 2008 @@ -98,7 +98,6 @@ const Module& module ) const; std::string GetPreconditionDependenciesName () const; - std::string GetCFlagsMacro () const; static std::string GetObjectsMacro ( const Module& ); std::string GetLinkingDependenciesMacro () const; std::string GetLibsMacro () const; @@ -172,7 +171,9 @@ public: const Module& module; string_list clean_files; + std::string commonflagsMacro; std::string cflagsMacro; + std::string cxxflagsMacro; std::string nasmflagsMacro; std::string windresflagsMacro; std::string widlflagsMacro;

1 0

[hyperion] 37631: Undoing fishy patch for warnings in Wine code (see r37629)
by hyperion＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: hyperion Date: Tue Nov 25 08:11:55 2008 New Revision: 37631 URL: http://svn.reactos.org/svn/reactos?rev=37631&view=rev Log: Undoing fishy patch for warnings in Wine code (see r37629) Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -119,5 +119,4 @@ <xi:include href="tools/tools.rbuild" /> </directory> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> </group> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -2,6 +2,7 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes"> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <include base="explorer">.</include> <define name="WIN32" /> <define name="__WINDRES__" /> Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… ============================================================================== --- trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -9,6 +9,7 @@ <define name="RESOLVE_3D_TEXTURE_SUPPORT" /> <define name="BUILD_GL32" /> <define name="LIBRARYBUILD" /> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <library>ntdll</library> <library>opengl32</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -125,6 +125,7 @@ <compilerflag compiler="cpp">-fno-exceptions</compilerflag> <compilerflag compiler="cpp">-fno-rtti</compilerflag> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <directory name="misc"> <file>icustubs.cpp</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -7,6 +7,7 @@ <linkerflag>-fno-exceptions</linkerflag> <linkerflag>-fno-rtti</linkerflag> --> + <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <importlibrary definition="portcls.spec" /> <define name="_NTDDK_" /> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -392,7 +392,7 @@ if ( data.includes.size () > 0 ) fprintf ( fMakefile, - "PROJECT_CINCLUDES %s %s\n", + "PROJECT_CFLAGS %s %s\n", assignmentOperation, MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ()); @@ -529,16 +529,15 @@ GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); - fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); - fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "\n" ); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -752,7 +752,7 @@ { fprintf ( fMakefile, "# MACROS\n" ); GenerateMacro ( assignmentOperation, - commonflagsMacro, + cflagsMacro, data, &used_defs, true ); @@ -1118,7 +1118,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", @@ -1141,12 +1141,12 @@ Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", + "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", + "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule emptyRule ( "", NULL ); @@ -1658,7 +1658,7 @@ "\t%s -o %s %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), - module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), + cflagsMacro.c_str(), GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; @@ -1709,6 +1709,13 @@ fprintf ( fMakefile, "\n" ); return archiveFilename; +} + +string +MingwModuleHandler::GetCFlagsMacro () const +{ + return ssprintf ( "$(%s_CFLAGS)", + module.name.c_str () ); } /*static*/ string @@ -1840,9 +1847,7 @@ fprintf ( fMakefile, "# OTHER MACROS\n" ); - commonflagsMacro = ssprintf ("%s_COMMONFLAGS", module.name.c_str ()); cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); - cxxflagsMacro = ssprintf ("%s_CXXFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ()); @@ -1885,10 +1890,10 @@ fprintf ( fMakefile, "\n" ); } - string globalCflags = " "; - globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ()); + string globalCflags = ""; if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { + globalCflags += " $(PROJECT_CFLAGS)"; if ( module.dynamicCRT ) globalCflags += " -D_DLL -D__USE_CRTIMP"; } @@ -1921,20 +1926,14 @@ // (TODO: Move to version-specific once this bug is fixed in GCC) globalCflags += " -fno-optimize-sibling-calls"; + fprintf ( + fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + globalCflags.c_str () ); + if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { - fprintf ( - fMakefile, - "%s +=%s\n", - cflagsMacro.c_str (), - (" $(PROJECT_CFLAGS)" + globalCflags).c_str () ); - - fprintf ( - fMakefile, - "%s +=%s\n", - cxxflagsMacro.c_str (), - (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () ); - fprintf ( fMakefile, "%s += $(PROJECT_RCFLAGS)\n", @@ -1956,18 +1955,6 @@ { fprintf ( fMakefile, - "%s +=%s\n", - cflagsMacro.c_str (), - globalCflags.c_str () ); - - fprintf ( - fMakefile, - "%s +=%s\n", - cxxflagsMacro.c_str (), - globalCflags.c_str () ); - - fprintf ( - fMakefile, "%s_LFLAGS += $(HOST_LFLAGS)\n", module.name.c_str () ); } @@ -1985,10 +1972,6 @@ "%s += %s\n\n", cflagsMacro.c_str (), cflags ); - fprintf ( fMakefile, - "%s += %s\n\n", - cxxflagsMacro.c_str (), - cflags ); } const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags; @@ -2014,17 +1997,12 @@ fprintf ( fMakefile, "%s += -Wno-main\n\n", cflagsMacro.c_str () ); - fprintf ( fMakefile, - "%s += -Wno-main\n\n", - cxxflagsMacro.c_str () ); } fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values - commonflagsMacro = ssprintf ("$(%s)", commonflagsMacro.c_str ()); cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ()); - cxxflagsMacro = ssprintf ("$(%s)", cxxflagsMacro.c_str ()); nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ()); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue Nov 25 08:11:55 2008 @@ -98,6 +98,7 @@ const Module& module ) const; std::string GetPreconditionDependenciesName () const; + std::string GetCFlagsMacro () const; static std::string GetObjectsMacro ( const Module& ); std::string GetLinkingDependenciesMacro () const; std::string GetLibsMacro () const; @@ -171,9 +172,7 @@ public: const Module& module; string_list clean_files; - std::string commonflagsMacro; std::string cflagsMacro; - std::string cxxflagsMacro; std::string nasmflagsMacro; std::string windresflagsMacro; std::string widlflagsMacro;

1 0

[sginsberg] 37630: - Correct some type casts
by sginsberg＠svn.reactos.org 25 Nov '08

25 Nov '08

Author: sginsberg Date: Tue Nov 25 07:57:26 2008 New Revision: 37630 URL: http://svn.reactos.org/svn/reactos?rev=37630&view=rev Log: - Correct some type casts Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Tue Nov 25 07:57:26 2008 @@ -955,7 +955,7 @@ BitmapObj = BITMAPOBJ_LockBitmap(hMem); - BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (LPSTR)&bm); + BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm); if(BitmapObj) { BITMAPOBJ_UnlockBitmap(BitmapObj); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Tue Nov 25 07:57:26 2008 @@ -1524,12 +1524,12 @@ if (istepIfAniCur) DPRINT1("NtUserDrawIconEx: istepIfAniCur is not supported!\n"); - if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), &bmpMask)) + if (!hbmMask || !IntGdiGetObject(hbmMask, sizeof(BITMAP), (PVOID)&bmpMask)) { return FALSE; } - if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), &bmpColor)) + if (hbmColor && !IntGdiGetObject(hbmColor, sizeof(BITMAP), (PVOID)&bmpColor)) { return FALSE; } @@ -1597,7 +1597,7 @@ DPRINT1("GDIOBJ_LockObj() failed!\n"); goto cleanup; } - BITMAP_GetObject(BitmapObj, sizeof(BITMAP), &bm); + BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm); if (bm.bmBitsPixel != 32) bAlpha = FALSE; @@ -1696,7 +1696,7 @@ DPRINT1("GDIOBJ_LockObj() failed!\n"); goto cleanup; } - BITMAP_GetObject(BitmapObj, sizeof(BITMAP), &bm); + BITMAP_GetObject(BitmapObj, sizeof(BITMAP), (PVOID)&bm); pBits = ExAllocatePoolWithTag(PagedPool, bm.bmWidthBytes * abs(bm.bmHeight), TAG_BITMAP); if (pBits == NULL) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Tue Nov 25 07:57:26 2008 @@ -679,7 +679,7 @@ return 0; } - BITMAP_GetObject(Bitmap, sizeof(BITMAP), &bm); + BITMAP_GetObject(Bitmap, sizeof(BITMAP), (PVOID)&bm); bm.bmBits = NULL; if (Bitmap->SurfObj.lDelta >= 0) bm.bmHeight = -bm.bmHeight; Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Tue Nov 25 07:57:26 2008 @@ -846,20 +846,20 @@ { case GdiPalAnimate: if (pEntries) - ret = IntAnimatePalette((HPALETTE)hObj, iStart, cEntries, pEntries); + ret = IntAnimatePalette((HPALETTE)hObj, iStart, cEntries, (CONST PPALETTEENTRY)pEntries); break; case GdiPalSetEntries: if (pEntries) - ret = IntSetPaletteEntries((HPALETTE)hObj, iStart, cEntries, pEntries); + ret = IntSetPaletteEntries((HPALETTE)hObj, iStart, cEntries, (CONST LPPALETTEENTRY)pEntries); break; case GdiPalGetEntries: - ret = IntGetPaletteEntries((HPALETTE)hObj, iStart, cEntries, pEntries); + ret = IntGetPaletteEntries((HPALETTE)hObj, iStart, cEntries, (LPPALETTEENTRY)pEntries); break; case GdiPalGetSystemEntries: - ret = IntGetSystemPaletteEntries((HDC)hObj, iStart, cEntries, pEntries); + ret = IntGetSystemPaletteEntries((HDC)hObj, iStart, cEntries, (LPPALETTEENTRY)pEntries); break; case GdiPalSetColorTable:

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