Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 41450: - Implement ProcessQuotaLimits case for NtQueryInformationProcess. Based on Dmitry Chapyshev's patch.
by fireball＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: fireball Date: Thu Jun 18 23:46:18 2009 New Revision: 41450 URL: http://svn.reactos.org/svn/reactos?rev=41450&view=rev Log: - Implement ProcessQuotaLimits case for NtQueryInformationProcess. Based on Dmitry Chapyshev's patch. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Thu Jun 18 23:46:18 2009 @@ -74,6 +74,7 @@ (PPROCESS_SESSION_INFORMATION)ProcessInformation; PVM_COUNTERS VmCounters = (PVM_COUNTERS)ProcessInformation; PIO_COUNTERS IoCounters = (PIO_COUNTERS)ProcessInformation; + PQUOTA_LIMITS QuotaLimits = (PQUOTA_LIMITS)ProcessInformation; PROCESS_DEVICEMAP_INFORMATION DeviceMap; PUNICODE_STRING ImageName; ULONG Cookie; @@ -151,7 +152,7 @@ ObDereferenceObject(Process); break; - /* Quote limits: not implemented */ + /* Process quota limits */ case ProcessQuotaLimits: Length = sizeof(QUOTA_LIMITS); @@ -170,9 +171,46 @@ NULL); if (!NT_SUCCESS(Status)) break; - /* TODO: Implement this case */ - DPRINT1("Query ProcessQuotaLimits unimplemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + /* Indicate success */ + Status = STATUS_SUCCESS; + + _SEH2_TRY + { + /* Set max/min working set sizes */ + QuotaLimits->MaximumWorkingSetSize = + Process->Vm.MaximumWorkingSetSize << PAGE_SHIFT; + QuotaLimits->MinimumWorkingSetSize = + Process->Vm.MinimumWorkingSetSize << PAGE_SHIFT; + + /* Set default time limits */ + QuotaLimits->TimeLimit.LowPart = (ULONG)-1; + QuotaLimits->TimeLimit.HighPart = (ULONG)-1; + + /* Is quota block a default one? */ + if (Process->QuotaBlock == &PspDefaultQuotaBlock) + { + /* Set default pools and pagefile limits */ + QuotaLimits->PagedPoolLimit = (SIZE_T)-1; + QuotaLimits->NonPagedPoolLimit = (SIZE_T)-1; + QuotaLimits->PagefileLimit = (SIZE_T)-1; + } + else + { + /* Get limits from non-default quota block */ + QuotaLimits->PagedPoolLimit = + Process->QuotaBlock->QuotaEntry[PagedPool].Limit; + QuotaLimits->NonPagedPoolLimit = + Process->QuotaBlock->QuotaEntry[NonPagedPool].Limit; + QuotaLimits->PagefileLimit = + Process->QuotaBlock->QuotaEntry[2].Limit; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Dereference the process */ ObDereferenceObject(Process);

1 0

[sginsberg] 41449: - Add missing NTAPI to DriverEntry
by sginsberg＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: sginsberg Date: Thu Jun 18 23:13:05 2009 New Revision: 41449 URL: http://svn.reactos.org/svn/reactos?rev=41449&view=rev Log: - Add missing NTAPI to DriverEntry Modified: trunk/rostests/drivers/kmtest/kmtestassist.c Modified: trunk/rostests/drivers/kmtest/kmtestassist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtestassi… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtestassist.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtestassist.c [iso-8859-1] Thu Jun 18 23:13:05 2009 @@ -60,7 +60,9 @@ IoDeleteDevice(DriverObject->DeviceObject); } -NTSTATUS DriverEntry(IN PDRIVER_OBJECT DriverObject,IN PUNICODE_STRING path) +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject,IN PUNICODE_STRING path) { PDEVICE_OBJECT pDeviceObject; UNICODE_STRING DriverString;

1 0

[sginsberg] 41448: - Do not pass gcc and ld flags to other tools
by sginsberg＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: sginsberg Date: Thu Jun 18 22:18:57 2009 New Revision: 41448 URL: http://svn.reactos.org/svn/reactos?rev=41448&view=rev Log: - Do not pass gcc and ld flags to other tools Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/nls/idndl/idndl.rbuild trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/psapi/psapi.rbuild trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/syssetup/syssetup.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/input/mouclass/mouclass.rbuild trunk/reactos/drivers/network/afd/afd.rbuild trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/nls/idna/idna.rbuild trunk/reactos/lib/nls/normalize/normalize.rbuild trunk/reactos/lib/nls/scripts/scripts.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/mkhive/mkhive.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -13,8 +13,10 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <linkerflag>-static</linkerflag> - <linkerflag>-lgcc</linkerflag> + <group linkerset="ld"> + <linkerflag>-static</linkerflag> + <linkerflag>-lgcc</linkerflag> + </group> </module> </if> <if property="ARCH" value="arm"> @@ -29,9 +31,11 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-static</linkerflag> - <linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag> + <group linkerset="ld"> + <linkerflag>-lgcc</linkerflag> + <linkerflag>-static</linkerflag> + <linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag> + </group> </module> </if> <if property="ARCH" value="powerpc"> @@ -60,8 +64,10 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <linkerflag>-static</linkerflag> - <linkerflag>-lgcc</linkerflag> + <group linkerset="ld"> + <linkerflag>-static</linkerflag> + <linkerflag>-lgcc</linkerflag> + </group> </module> </if> </group> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -7,13 +7,17 @@ <include base="ReactOS">include/reactos/libs</include> <include base="ReactOS">include/reactos/elf</include> <define name="_NTHAL_" /> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <group compilerset="gcc"> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + </group> <if property="ARCH" value="arm"> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-Os</compilerflag> + <group compilerset="gcc"> + <compilerflag>-ffreestanding</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-Os</compilerflag> + </group> </if> <directory name="arch"> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -7,8 +7,10 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <define name="_NTSYSTEM_" /> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <group compilerset="gcc"> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + </group> <directory name="cache"> <file>blocklist.c</file> <file>cache.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -4,8 +4,10 @@ <include base="freeldr_base64k">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <group compilerset="gcc"> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + </group> <directory name="arch"> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -4,7 +4,9 @@ <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <group compilerset="gcc"> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + </group> <file>bootmgr.c</file> </module> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -3,8 +3,10 @@ <module name="freeldr_startup" type="objectlibrary"> <include base="freeldr_startup">include</include> <include base="ntoskrnl">include</include> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <group compilerset="gcc"> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + </group> <directory name="arch"> <if property="ARCH" value="i386"> <directory name="i386"> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -11,7 +11,9 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> + <group linkerset="ld"> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + </group> </module> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -5,11 +5,13 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <define name="FREELDR_REACTOS_SETUP" /> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> + <group compilerset="gcc"> + <compilerflag>-ffreestanding</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <compilerflag>-Os</compilerflag> + </group> <file>bootmgr.c</file> <directory name="inffile"> <file>inffile.c</file> Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -2,8 +2,8 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="src/drivers/windows/icd/mesa.def" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> - <compilerflag>-w</compilerflag> + <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> + <compilerflag compilerset="gcc">-w</compilerflag> <library>ntdll</library> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -71,5 +71,5 @@ <file>DirectD3D7_Vtable.c</file> </directory>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -43,5 +43,5 @@ <dependency>wineheaders</dependency>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/nls/idndl/idndl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/idndl.rbuild… ============================================================================== --- trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -2,8 +2,10 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="idndl" type="win32dll" installname="idndl.dll" entrypoint="0"> <library>kernel32</library> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <redefine name="WINVER">0x600</redefine> <file>idndl.cpp</file> <importlibrary definition="idndl.def" /> Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl… ============================================================================== --- trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -3,9 +3,11 @@ <module name="idndl_redist" type="win32dll" installname="idndl_redist.dll" crt="libcntpr"> <library>kernel32</library> <library>scripts</library> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> - <linkerflag>--entry=0</linkerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> + <linkerflag linkerset="ld">--entry=0</linkerflag> <include base="icu4ros">icu/source/common</include> <include base="scripts">.</include> <importlibrary definition="idndl.def" /> Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no… ============================================================================== --- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -9,8 +9,10 @@ <library>idna</library> <library>normaliz_redist_data</library> <library>kernel32</library> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <include base="icu4ros">icu/source/common</include> <importlibrary definition="normaliz.def" /> <file>normaliz.cpp</file> Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -16,7 +16,7 @@ <library>rpcrt4</library> <library>pseh</library> <file>usrmarshal.c</file> - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="actxprxy_interface" type="idlinterface"> <file>actxprxy_servprov.idl</file> Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -60,5 +60,5 @@ <file>token.c</file> </directory> <file>advapi32.rc</file> - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -37,5 +37,5 @@ <file>message.c</file> <file>crypt32.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -51,5 +51,5 @@ </directory> <file>gdi32.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> 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] Thu Jun 18 22:18:57 2009 @@ -13,8 +13,12 @@  -  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <group compilerset="gcc"> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <directory name="debug"> <file>debugger.c</file> <file>output.c</file> @@ -129,9 +133,6 @@ </if> </directory> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> - <directory name="misc"> <file>icustubs.cpp</file> </directory> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -9,7 +9,7 @@ <define name="__NO_CTYPE_INLINES" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> + <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>  Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -65,7 +65,7 @@ <file>irot.idl</file> <include base="ole32" root="intermediate">.</include>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="ole32_irot_server" type="rpcserver"> <file>irot.idl</file> Modified: trunk/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.rbui… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -13,5 +13,5 @@ <file>psapi.c</file> <file>psapi.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/qmgrprx… ============================================================================== --- trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -16,7 +16,7 @@ <library>rpcrt4</library> <library>pseh</library> <file>version.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="qmgrprxy_interface" type="idlinterface"> <file>qmgrprxy.idl</file> Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -6,7 +6,7 @@ <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> + <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag> <file>caret.c</file> <file>clipboard.c</file> <file>context.c</file> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -41,7 +41,7 @@ <file>epm.idl</file> <include base="rpcrt4" root="intermediate">.</include>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="rpcrt4_epm_client" type="rpcclient"> <file>epm.idl</file> Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -37,5 +37,5 @@ <file>rpc.c</file> <file>setupapi.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -22,5 +22,5 @@ <file>wizard.c</file> <file>syssetup.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -77,5 +77,5 @@ </directory> <file>user32.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -20,5 +20,5 @@ <file>softpub.c</file> <file>version.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -10,5 +10,5 @@ <library>ntdll</library> <file>main.c</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -10,5 +10,5 @@ <file>setup.c</file> <file>kbdclass.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -9,5 +9,5 @@ <file>mouclass.c</file> <file>mouclass.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/drivers/network/afd/afd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd.rb… ============================================================================== --- trunk/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -28,5 +28,5 @@ </directory> <file>afd.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -40,5 +40,5 @@ </directory> <file>tcpip.rc</file>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -6,5 +6,5 @@ <library>hal</library> <file>ramdisk.c</file> <file>ramdisk.rc</file> - <compilerflag>-fms-extensions</compilerflag> + <compilerflag compilerset="gcc">-fms-extensions</compilerflag> </module> Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -4,8 +4,10 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group>  <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -3,8 +3,10 @@ <module name="mpu401" type="kernelmodedriver" installbase="system32/drivers" installname="mpu401.sys" allowwarnings="true"> <include base="mpu401">.</include> <include base="mpu401">..</include> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <library>ntoskrnl</library> <library>portcls</library> <file>mpu401.rc</file> Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -4,8 +4,10 @@ <include base="drmk">.</include> <include base="drmk">..</include> <include base="drmk">../include</include> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <importlibrary definition="drmk.spec" /> <library>ntoskrnl</library> <define name="BUILDING_DRMK" /> Modified: trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu4r… ============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -5,8 +5,10 @@ <define name="U_HAVE_INTTYPES_H" /> <define name="UCONFIG_NO_FILE_IO">1</define> <define name="ICU_NO_USER_DATA_OVERRIDE">1</define> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <include base="icu4ros">icu/source/common</include> <include base="icu4ros">icu/source/i18n</include> <file>stubs.cpp</file> Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -20,8 +20,10 @@ <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> - <compilerflag>-Wwrite-strings</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> + <group compilerset="gcc"> + <compilerflag>-Wwrite-strings</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + </group> <define name="CMLIB_HOST" /> <file>cminit.c</file> <file>hivebin.c</file> Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r… ============================================================================== --- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -14,10 +14,12 @@ <module name="inflibhost" type="hoststaticlibrary" allowwarnings="true"> <include base="inflibhost">.</include> <define name="__NO_CTYPE_INLINES" /> - <compilerflag>-Wpointer-arith</compilerflag> - <compilerflag>-Wconversion</compilerflag> - <compilerflag>-Wstrict-prototypes</compilerflag> - <compilerflag>-Wmissing-prototypes</compilerflag> + <group compilerset="gcc"> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wconversion</compilerflag> + <compilerflag>-Wstrict-prototypes</compilerflag> + <compilerflag>-Wmissing-prototypes</compilerflag> + </group> <define name="INFLIB_HOST" /> <file>infcore.c</file> <file>infget.c</file> Modified: trunk/reactos/lib/nls/idna/idna.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/idna/idna.rbuild?r… ============================================================================== --- trunk/reactos/lib/nls/idna/idna.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/nls/idna/idna.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -5,8 +5,10 @@ <redefine name="WINVER">0x600</redefine> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <include base="icu4ros">icu/source/common</include> <file>idna.cpp</file> <file>nameprep.cpp</file> Modified: trunk/reactos/lib/nls/normalize/normalize.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/normalize/normaliz… ============================================================================== --- trunk/reactos/lib/nls/normalize/normalize.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/nls/normalize/normalize.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -3,8 +3,10 @@ <module name="normalize" type="staticlibrary"> <library>icu4ros</library> <redefine name="WINVER">0x600</redefine> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <include base="icu4ros">icu/source/common</include> <file>normalize.cpp</file> </module> Modified: trunk/reactos/lib/nls/scripts/scripts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/scripts/scripts.rb… ============================================================================== --- trunk/reactos/lib/nls/scripts/scripts.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/nls/scripts/scripts.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -3,8 +3,10 @@ <module name="scripts" type="staticlibrary"> <library>icu4ros</library> <redefine name="WINVER">0x600</redefine> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> + <group compilerset="gcc"> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> <include base="icu4ros">icu/source/common</include> <file>scripts.cpp</file> </module> Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=414… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -101,5 +101,5 @@ <pch>rtl.h</pch> -->  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -472,5 +472,5 @@ <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </group> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -195,7 +195,7 @@ </directory>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> <module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" crt="libcntpr"> <importlibrary definition="win32k.pspec" /> Modified: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009 @@ -6,7 +6,7 @@ <include base="zlibhost">.</include> <include base="rtl">.</include> <define name="MKHIVE_HOST" /> - <compilerflag>-fshort-wchar</compilerflag> + <compilerflag compilerset="gcc">-fshort-wchar</compilerflag> <library>inflibhost</library> <library>cmlibhost</library> <library>host_wcsfuncs</library>

1 0

[dreimer] 41447: Bug 4620: Incorrect code page output in shutdown.exe (Russian locale) by John White Polish Translation Updates by Maciej Bialas
by dreimer＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: dreimer Date: Thu Jun 18 19:47:41 2009 New Revision: 41447 URL: http://svn.reactos.org/svn/reactos?rev=41447&view=rev Log: Bug 4620: Incorrect code page output in shutdown.exe (Russian locale) by John White Polish Translation Updates by Maciej Bialas Modified: trunk/reactos/base/applications/downloader/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/paint/lang/pl-PL.rc trunk/reactos/base/applications/shutdown/lang/ru-RU.rc trunk/reactos/base/applications/shutdown/shutdown.c trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Modified: trunk/reactos/base/applications/downloader/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -52,7 +52,7 @@ IDS_XMLERROR_2 "Nie uda³o siê przetworzyæ pliku XML !" IDS_DOWNLOAD_ERROR "Sci¹ganie pliku nieudane.\nProszê sprawdziæ po³¹czenie z internetem." IDS_VERSION "Wersja: " - IDS_LICENCE "Licenccja: " + IDS_LICENCE "Licencja: " IDS_MAINTAINER "Opiekun: " IDS_APPS_TITLE "Programy" IDS_CATS_TITLE "Kategorie" Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -62,7 +62,7 @@ RTEXT "GPU:", -1, 20, 45, 70, 10 RTEXT "Typ DAC:", -1, 20, 55, 70, 10 RTEXT "Pamiêæ:", -1, 20, 65, 70, 10 - RTEXT "Bierz¹ca rozdzielczoæ:", -1, 20, 75, 70, 10 + RTEXT "Bie¿¹ca rozdzielczoæ:", -1, 20, 75, 70, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10 @@ -188,7 +188,7 @@ IDS_NETWORK_DIALOG "Sieæ" IDS_HELP_DIALOG "Pomoc" IDS_FORMAT_MB "%I64uMB RAM" - IDS_FORMAT_SWAP "%I64u MB used, %I64u MB available" + IDS_FORMAT_SWAP "%I64u MB u¿ytych, %I64u MB dostêpnych" IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" IDS_VERSION_UNKNOWN "Wersja nieznana" Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -158,7 +158,7 @@ IDS_TOOLS_INFO_CMD "winver.exe" IDS_TOOLS_REGEDIT_NAME "Edytor rejestru" - IDS_TOOLS_REGEDIT_DESCR "Opens the Registry-Editor." + IDS_TOOLS_REGEDIT_DESCR "Otwiera edytor rejestru." IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "W³aciwoci systemu" Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -43,7 +43,7 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU -CAPTION "About" +CAPTION "O programie" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 @@ -54,7 +54,7 @@ IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER -CAPTION "Wait.." +CAPTION "Czekaj.." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CTEXT "£adowanie logów zdarzeñ. Proszê czekaæ ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX @@ -63,7 +63,7 @@ IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Event Detail" +CAPTION "Szczegó³y zdarzenia" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "&Zamknij",IDOK,12,258,50,14 @@ -77,13 +77,13 @@ LTEXT "Czas:",IDC_STATIC,14,27,36,8 LTEXT "Statycznie",IDC_EVENTTIMESTATIC,56,27,72,8 LTEXT "&U¿ytkownik:",IDC_STATIC,14,41,36,8 - LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 - LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Statycznie",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Komputer:",IDC_STATIC,14,54,36,8 LTEXT "Statycznie",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 LTEXT "Numer ID:",IDC_STATIC,133,15,36,8 LTEXT "Statycznie",IDC_EVENTIDSTATIC,175,15,87,8 LTEXT "¯ród³o:",IDC_STATIC,133,28,36,8 - LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Statycznie",IDC_EVENTSOURCESTATIC,175,28,87,8 LTEXT "Typ:",IDC_STATIC,133,42,36,8 LTEXT "Statycznie",IDC_EVENTTYPESTATIC,175,42,87,8 LTEXT "Kategoria:",IDC_STATIC,133,55,36,8 @@ -102,7 +102,7 @@ IDC_EVENTLOG_WARNING_TYPE "Ostrze¿enie" IDC_EVENTLOG_INFORMATION_TYPE "Informacja" IDC_EVENTLOG_AUDIT_SUCCESS "Udany Audyt" - IDC_EVENTLOG_AUDIT_FAILURE "Nieudany Audit" + IDC_EVENTLOG_AUDIT_FAILURE "Nieudany Audyt" IDC_EVENTLOG_SUCCESS "Sukces" IDC_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" END Modified: trunk/reactos/base/applications/paint/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -64,13 +64,13 @@ MENUITEM "Kadrowanie", IDM_IMAGECROP MENUITEM "Odwrócenie kolorów\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "Atrybuty...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "Wyczyæ obraz\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Rysuj nieprzezroczyste", IDM_IMAGEDRAWOPAQUE END POPUP "&Kolory" BEGIN - MENUITEM "Edit palette...", IDM_COLORSEDITPALETTE + MENUITEM "Edytuj kolory...", IDM_COLORSEDITPALETTE END POPUP "&?" @@ -131,9 +131,9 @@ LTEXT "Data:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Rozmiar:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 LTEXT "Rozdzielczoæ:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + LTEXT "Niedostêpny", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "Niedostêpny", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "Niedostêpny", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 GROUPBOX "Jednostki", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 AUTORADIOBUTTON "Cale", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 @@ -186,7 +186,7 @@ IDS_TOOLTIP12, "Krzywa Beziera" IDS_TOOLTIP13, "Prostok¹t" IDS_TOOLTIP14, "Polygon" - IDS_TOOLTIP15, "Ellipsa" + IDS_TOOLTIP15, "Elipsa" IDS_TOOLTIP16, "Zaokr¹glony Prostok¹t" IDS_OPENFILTER, "Pliki Bitmapy (*.bmp;*.dib)\1*.bmp;*.dib\1Wszystkie pliki (*.*)\1*.*\1" IDS_SAVEFILTER, "Bitmapa 24 bit (*.bmp;*.dib)\1*.bmp;*.dib\1" Modified: trunk/reactos/base/applications/shutdown/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/lang/ru-RU.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -10,7 +10,8 @@ -l\t\t\tÇàâåðøåíèå ñåàíñà\n\ -s\t\t\tÂûêëþ÷åíèå ýòîãî êîìïüþòåðà\n\ -r\t\t\tÏåðåçàãðóçêà ýòîãî êîìïüþòåðà\n\ - -f\t\t\tÈãíîðèðîâàíèå çàïóùåííûõ ïðîãðàìì è çàâåðøåíèå èõ áåç ïðåäóïðåæäåíèÿ\n\ - \t\t\tÅñëè âû íå óêàçàëè äðóãèå ïàðàìåòðû, òî ýòà îïöèÿ ïðèâåäåò ê\n\ - \t\t\tçàâåðøåíèþ ñåàíñà." + -f\t\t\tÈãíîðèðîâàíèå çàïóùåííûõ ïðîãðàìì è çàâåðøåíèå èõ áåç\n\ + \t\t\tïðåäóïðåæäåíèÿ\n\ + \t\t\tÅñëè âû íå óêàçàëè äðóãèå ïàðàìåòðû, òî ýòà îïöèÿ\n\ + \t\t\tïðèâåäåò ê çàâåðøåíèþ ñåàíñà." END Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -10,12 +10,21 @@ // Print information about which commandline arguments the program accepts. static void PrintUsage() { LPTSTR lpUsage = NULL; + DWORD errLength; // error message length + LPTSTR resMsg; // for error message in OEM symbols if( AllocAndLoadString( &lpUsage, GetModuleHandle(NULL), IDS_USAGE ) ) { - _putts( lpUsage ); + errLength = strlen(lpUsage) + 1; + resMsg = (LPTSTR)LocalAlloc(LPTR, errLength * sizeof(TCHAR)); + CharToOemBuff(lpUsage, resMsg, errLength); + + _putts( resMsg ); + + LocalFree(lpUsage); + LocalFree(resMsg); } } @@ -126,20 +135,28 @@ void DisplayLastError() { int errorCode = GetLastError(); - LPTSTR lpMsgBuf; + LPTSTR lpMsgBuf = NULL; + DWORD errLength; // error message length + LPTSTR resMsg; // for error message in OEM symbols // Display the error message to the user - FormatMessage( + errLength = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, errorCode, LANG_USER_DEFAULT, (LPTSTR) &lpMsgBuf, 0, - NULL); - - _ftprintf(stderr, lpMsgBuf); + NULL) + 1; + + resMsg = (LPTSTR)LocalAlloc(LPTR, errLength * sizeof(TCHAR)); + CharToOemBuff(lpMsgBuf, resMsg, errLength); + + _ftprintf(stderr, resMsg); _ftprintf(stderr, _T("Error code: %d\n"), errorCode); + + LocalFree(lpMsgBuf); + LocalFree(resMsg); } void EnableShutdownPrivileges() Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -148,5 +148,5 @@ IDS_PROBELISTTITLE "Poni¿sze urz¹dzenia s¹ ju¿ zainstalowane na tym komputerze" IDS_ADDNEWDEVICE "Dodaj nowe urz¹dzenie sprzêtowe" IDS_SELECTWAYTITLE "Kreator mo¿e pomóc Tobie zainstalowaæ inne urz¹dzenie" - IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" + IDS_HDTYPESTITLE "Wybierz z poni¿szej listy typ urz¹dzenia, które chcesz zainstalowaæ" END Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -111,7 +111,7 @@ CAPTION "Zapisz schemat jako..." FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Zapisz bierz¹cy schemat dzwiêkowy jako:", -1, 7, 7, 212, 9 + LTEXT "&Zapisz bie¿¹cy schemat dzwiêkowy jako:", -1, 7, 7, 212, 9 EDITTEXT 8960, 7, 17, 211, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 93, 36, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 157, 36, 60, 14 @@ -191,38 +191,38 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Opis ma byæ tutaj.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 + LTEXT "Ma³a", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Du¿a", 9474, 202, 31, 17, 8 + LTEXT "Ma³a", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Du¿a", 9478, 202, 50, 17, 8 + LTEXT "Ma³a", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Du¿a", 9482, 202, 69, 17, 8 + LTEXT "Ma³a", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Du¿a", 9486, 202, 88, 17, 8 + LTEXT "Ma³a", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Du¿a", 9490, 202, 107, 17, 8 + LTEXT "Ma³a", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Du¿a", 9494, 202, 126, 17, 8 + LTEXT "Ma³a", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Du¿a", 9498, 202, 145, 17, 8 + LTEXT "Ma³a", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 + LTEXT "Du¿a", 9502, 202, 164, 17, 8 AUTOCHECKBOX "&Po³¹cz wszystkie suwaki", 9504, 5, 185, 216, 9 PUSHBUTTON "Odtwórz &domylne", 9505, 110, 199, 110, 14 END @@ -258,12 +258,12 @@ 5835 "Wywo³anie Menu" 5836 "Minimalizuj" 5837 "Powiadomienie o nowej poczcie" - 5838 "Start Navigation" + 5838 "Rozpoczêcie nawigacji" 5839 "Uruchomienie programu" 5840 "Zakoñczenie programu" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" + 5841 "Przywrócenie w dó³" + 5842 "Przywrócenie w górê" + 5843 "Gwiazdka" 5844 "Dwiêk domylny" 5845 "Wykrzyknik" 5846 "Zamkniêcie ReactOS" @@ -271,7 +271,7 @@ 5848 "Powiadomienie systemowe" 5849 "Znak zapytania" 5850 "Uruchomienie ReactOS" - 5851 "Start Menu" + 5851 "Menu Start" 5852 "Wylogowanie z ReactOS" 5853 "Logowanie do ReactOS" END Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Thu Jun 18 19:47:41 2009 @@ -222,7 +222,7 @@ IDS_CMT_RDESKTOP "Uruchom Zdalny pulpit" IDS_CMT_EVENTVIEW "Uruchom Podgl¹d Zdarzeñ" IDS_CMT_MSCONFIG "Uruchom Narzêdzie konfiguracji systemu" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_PAINT "Uruchom Paint" END

1 0

[gedmurphy] 41446: Fix the version data in the registry to match what the kernel reports.
by gedmurphy＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: gedmurphy Date: Thu Jun 18 14:59:15 2009 New Revision: 41446 URL: http://svn.reactos.org/svn/reactos?rev=41446&view=rev Log: Fix the version data in the registry to match what the kernel reports. Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Jun 18 14:59:15 2009 @@ -44,9 +44,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc",,0x00000012 ; Version Information -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.0" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 3" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"2195" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"3790" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Jun 18 14:59:15 2009 @@ -49,9 +49,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc",,0x00000012 ; Version Information -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.0" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 3" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"2195" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"3790" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe)

1 0

[dreimer] 41445: Bug 4610: Dutch translation for Solitaire by reFly <wouterdevlieger@gmail.com> Bug 4619: Japanese translation update for syssetup and downloader by Tomoya Kitagawa
by dreimer＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: dreimer Date: Thu Jun 18 13:30:33 2009 New Revision: 41445 URL: http://svn.reactos.org/svn/reactos?rev=41445&view=rev Log: Bug 4610: Dutch translation for Solitaire by reFly <wouterdevlieger(a)gmail.com> Bug 4619: Japanese translation update for syssetup and downloader by Tomoya Kitagawa Added: trunk/reactos/base/applications/downloader/lang/ja-JP.rc (with props) trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc (with props) Modified: trunk/reactos/base/applications/downloader/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Added: trunk/reactos/base/applications/downloader/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/downloader/lang/ja-JP.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -1,0 +1,61 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "_E[h..." +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "LZ", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "[UÝè" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "_E[h·étH_:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ið(&H)...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "ZbgAbvãÉCXg[t@Cðí·é(&D)", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Abvf[gÉgp·éT[o:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK(&O)", IDOK, 147, 90, 54, 15 + PUSHBUTTON "LZ(&C)", IDCANCEL, 207, 90, 54, 15 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "_E[h ! - ReactOS _E[_" + IDS_WELCOME_TITLE "ReactOS _E[_Öæ¤±»" + IDS_WELCOME "¶¤©çJeSðIðµÄ¾³¢B o[W 1.1Å·B" + IDS_NO_APP_TITLE "AvP[VªIð³êÄ¢Ü¹ñ" + IDS_NO_APP "_E[h{^ðNbN·éOÉAvP[VðIðµÄ¾³¢ wvªKvÈêAêÔEãÌH}[N{^ðNbNµÄ¾³¢B" + IDS_UPDATE_TITLE "Abvf[g" + IDS_UPDATE "\µó èÜ¹ñB±Ì@\Í¢ÀÅ·B" + IDS_HELP_TITLE "wv" + IDS_HELP "¶¤©çJeSðIðµAAvP[VðIðµÄ_E[h{^ðNbNµÄ¾³¢B AvP[VÌîñðAbvf[g·éÉÍwv{^×Ì{^ðNbNµÄ¾³¢B" + IDS_NO_APPS "\µó èÜ¹ñB±ÌJeSÉÍAvP[VªÜ¾ èÜ¹ñB è`ÁÄAàÁÆAvP[VðÇÁÅ«Ü·B" + IDS_CHOOSE_APP "AvP[VðIðµÄ¾³¢B" + IDS_CHOOSE_SUB "TuJeSðIðµÄ¾³¢B" + IDS_CHOOSE_CATEGORY "JeSðIðµÄ¾³¢B" + IDS_CHOOSE_BOTH "TuJeSàµÍAvP[VðIðµÄ¾³¢B" + IDS_XMLERROR_1 "xml t@Cª©Â©èÜ¹ñÅµ½ !" + IDS_XMLERROR_2 "xml t@CððÍÅ«Ü¹ñÅµ½ !" + IDS_DOWNLOAD_ERROR "t@Cð_E[hÅ«Ü¹ñÅµ½B\nC^[lbgÚ±ðmFµÄ¾³¢B" + IDS_VERSION "o[W: " + IDS_LICENCE "CZX: " + IDS_MAINTAINER "ÇÒ: " + IDS_APPS_TITLE "AvP[V" + IDS_CATS_TITLE "JeS" + IDS_CHOOSE_FOLDER "tH_ðIðµÄ¾³¢..." + IDS_NOTCREATE_REGKEY "WXgL[ðì¬Å«Ü¹ñÅµ½B" + IDS_DOWNLOAD_FOLDER "_E[_" + IDS_UNABLECREATE_FOLDER "±Ì¼OÅtH_ðì¬Å«Ü¹ñ!" + IDS_UPDATE_URL "http://svn.reactos.org" + IDS_INSTALL_DEP "%sÍ%sÌÀsÉKvÅ·B %sð¡·®CXg[µÜ·©?" + TTT_HELPBUTTON "±Ì_E[_ÉÖ·éwvðüè·é" + TTT_UPDATEBUTTON "Ü¾pÅ«Ü¹ñ" + TTT_PROFBUTTON "_E[_ðÝè³¹Ü·" +END Propchange: trunk/reactos/base/applications/downloader/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/rsrc.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -32,6 +32,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/lt-LT.rc" Added: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -1,0 +1,86 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/nl-NL.rc + * PURPOSE: Dutch Language Resource File for Solitaire + * TRANSLATOR: Wouter De Vlieger + */ +#include "resource.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Opties" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Delen", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "&Eén kaart", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Drie kaarten", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "Tijd &weergeven", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatusbalk", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 101, 97, 50, 14 +END + + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Achterzijde selecteren" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Annuleren", IDCANCEL, 162, 77, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire door J Brown\n\nCardLib versie 1.0." + IDS_SOL_QUIT "Het huidige spel afsluiten?" + IDS_SOL_WIN "Gefeliciteerd, u heeft gewonnen!" + IDS_SOL_DEAL "Nogmaals spelen?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Spel" + BEGIN + MENUITEM "&Delen\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Kaarten...", IDM_GAME_DECK + MENUITEM "&Opties...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDM_GAME_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "Help-onder&werpen\tF1", IDM_HELP_CONTENTS + MENUITEM "&Over Solitaire", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -18,6 +18,7 @@ #include "lang/it-IT.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -43,8 +43,8 @@ IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS ÍGPLÌºÉCZX³êÄ¨èA·×ÄÜ½ÍêðÄpAÄzz·é "\ - "êÍGPLÉ]¤Kvª èÜ·B", + LTEXT "ReactOSÍGPLÌºÉCZX³êÄ¨èA·×ÄÜ½ÍêðÄpA "\ + "Äzz·éêÍGPLÉ]¤Kvª èÜ·B", IDC_STATIC,15,110,227,19 PUSHBUTTON "GPLð\\¦(&V)...",IDC_VIEWGPL,251,110,50,19 LTEXT "ZbgAbvð±s·éÉÍ [Ö] ðNbNµÄ¾³¢B",IDC_STATIC,15,136, @@ -79,7 +79,7 @@ LTEXT "Rs[^¼(&C):", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "AdministratorÆÄÎêé[U[AJEgðì¬µÜ·B"\ + LTEXT "AdministratorÆÄÎêé[U[AJEgðì¬µÜ·B "\ "Rs[^ÉtANZXªKvÈÆ«A±ÌAJEgðgpµÜ·B", IDC_STATIC, 54, 57, 250, 25 LTEXT "AdministratorÌpX[hð¼p 14 ¶ÈàÅüÍµÄ¾³¢B", @@ -214,7 +214,7 @@ IDS_CMT_SCREENSHOT "XN[VbgðBèÜ·" IDS_CMT_SERVMAN "T[rX }l[WðN®µÜ·" IDS_CMT_WORDPAD "hLgGfB^ðN®µÜ·" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_PAINT "yCgðN®µÜ·" END STRINGTABLE @@ -281,7 +281,7 @@ IDS_SHORT_SOLITAIRE "\\eBA.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" - IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_PAINT "yCg.lnk" END STRINGTABLE

1 0

[janderwald] 41444: - mmreg uses for all structures contained byte-aligned packing
by janderwald＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: janderwald Date: Thu Jun 18 12:03:40 2009 New Revision: 41444 URL: http://svn.reactos.org/svn/reactos?rev=41444&view=rev Log: - mmreg uses for all structures contained byte-aligned packing Modified: trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Thu Jun 18 12:03:40 2009 @@ -20,6 +20,11 @@ #ifndef __WINE_MMREG_H #define __WINE_MMREG_H + +#ifndef RC_INVOKED +#include "pshpack1.h" +#endif + /*********************************************************************** * Defines/Enums @@ -509,4 +514,8 @@ #endif +#ifndef RC_INVOKED +#include "poppack.h" +#endif + #endif /* __WINE_MMREG_H */

1 0

[cgutman] 41443: - Make NdisGeneratePartialCancelId safe by using Interlocked functions
by cgutman＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: cgutman Date: Thu Jun 18 06:24:19 2009 New Revision: 41443 URL: http://svn.reactos.org/svn/reactos?rev=41443&view=rev Log: - Make NdisGeneratePartialCancelId safe by using Interlocked functions Modified: trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Thu Jun 18 06:24:19 2009 @@ -20,6 +20,8 @@ ULONG DebugTraceLevel = MIN_TRACE; #endif /* DBG */ + +UCHAR CancelId; VOID NTAPI MainUnload( @@ -60,6 +62,8 @@ KeInitializeSpinLock(&AdapterListLock); DriverObject->DriverUnload = MainUnload; + + CancelId = 0; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Thu Jun 18 06:24:19 2009 @@ -5,6 +5,8 @@ */ #include "ndissys.h" + +extern UCHAR CancelId; /* * @implemented @@ -518,13 +520,13 @@ EXPORT NdisGeneratePartialCancelId(VOID) { - static UCHAR CancelId = 0; - - CancelId++; - - NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", CancelId)); - - return CancelId; + UCHAR PartialCancelId; + + PartialCancelId = InterlockedIncrement((PLONG)&CancelId); + + NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", PartialCancelId)); + + return PartialCancelId; } /* EOF */

1 0

[hyperion] 41442: Miscellaneous Visual C++ compilation fixes modified include/crt/mingw32/intrin_x86.h modified include/crt/msc/intrin.h Fixed declarations of _InterlockedDecrement16 and _InterlockedIncrement16 Fixed declarations of __readcr0, __readcr2, __readcr3 and __readcr4 for x86 Implement __readdr and __writedr for x86 too Added missing semicolon modified include/crt/stdlib.h modified lib/3rdparty/mingw/crtexe.c Use Visual C++-compatible attribute placement modified lib/3rdparty/mingw/crt
by hyperion＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: hyperion Date: Thu Jun 18 04:41:56 2009 New Revision: 41442 URL: http://svn.reactos.org/svn/reactos?rev=41442&view=rev Log: Miscellaneous Visual C++ compilation fixes modified include/crt/mingw32/intrin_x86.h modified include/crt/msc/intrin.h Fixed declarations of _InterlockedDecrement16 and _InterlockedIncrement16 Fixed declarations of __readcr0, __readcr2, __readcr3 and __readcr4 for x86 Implement __readdr and __writedr for x86 too Added missing semicolon modified include/crt/stdlib.h modified lib/3rdparty/mingw/crtexe.c Use Visual C++-compatible attribute placement modified lib/3rdparty/mingw/crtexe.c Get rid of useless assembly, replace with __writefsdword (it's still useless) modified lib/3rdparty/mingw/mingw.rbuild Disable Visual C++ warning C4733 ("Inline asm assigning to 'FS:0' : handler not registered as safe handler") for mingw_wmain modified lib/sdk/scrnsave/scrnsave.c Silence a warning modified ReactOS-generic.rbuild Disable Visual C++ warning C4711 ("function 'function' selected for inline expansion") globally modified tools/rbuild/backend/mingw/compilers/msc.mak Fix Visual C++ compiler rules to emit an uniquely named PDB for each object file Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/stdlib.h trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak 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] Thu Jun 18 04:41:56 2009 @@ -127,4 +127,6 @@ </directory> <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> + + <compilerflag compilerset="msc">/wd4711</compilerflag> </group> Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -479,12 +479,12 @@ return _InterlockedExchangeAdd(lpAddend, 1) + 1; } -__INTRIN_INLINE long _InterlockedDecrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) { return _InterlockedExchangeAdd16(lpAddend, -1) - 1; } -__INTRIN_INLINE long _InterlockedIncrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) { return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } @@ -1132,7 +1132,6 @@ { __asm__("mov %[Data], %%cr8" : : [Data] "q" (Data) : "memory"); } -#endif __INTRIN_INLINE unsigned __int64 __readcr0(void) { @@ -1162,11 +1161,38 @@ return value; } -#ifdef _M_AMD64 __INTRIN_INLINE unsigned __int64 __readcr8(void) { unsigned __int64 value; __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=q" (value)); + return value; +} +#else +__INTRIN_INLINE unsigned long __readcr0(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); + return value; +} + +__INTRIN_INLINE unsigned long __readcr2(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); + return value; +} + +__INTRIN_INLINE unsigned long __readcr3(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); + return value; +} + +__INTRIN_INLINE unsigned long __readcr4(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); return value; } #endif @@ -1206,6 +1232,70 @@ } __INTRIN_INLINE void __writedr(unsigned reg, unsigned __int64 value) +{ + switch (reg) + { + case 0: + __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + break; + case 1: + __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + break; + case 2: + __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + break; + case 3: + __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + break; + case 4: + __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + break; + case 5: + __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + break; + case 6: + __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + break; + case 7: + __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + break; + } +} +#else +__INTRIN_INLINE unsigned int __readdr(unsigned int reg) +{ + unsigned int value; + switch (reg) + { + case 0: + __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + break; + case 1: + __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + break; + case 2: + __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + break; + case 3: + __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + break; + case 4: + __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + break; + case 5: + __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + break; + case 6: + __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + break; + case 7: + __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + break; + } + return value; +} + +__INTRIN_INLINE void __writedr(unsigned reg, unsigned int value) { switch (reg) { Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -35,8 +35,8 @@ long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); long _InterlockedDecrement(volatile long * const lpAddend); long _InterlockedIncrement(volatile long * const lpAddend); -long _InterlockedDecrement16(volatile short * const lpAddend); -long _InterlockedIncrement16(volatile short * const lpAddend); +short _InterlockedDecrement16(volatile short * const lpAddend); +short _InterlockedIncrement16(volatile short * const lpAddend); unsigned char _interlockedbittestandreset(volatile long * a, const long b); unsigned char _interlockedbittestandset(volatile long * a, const long b); @@ -92,7 +92,7 @@ void __incfsdword(const unsigned long Offset); void __addfsbyte(const unsigned long Offset, const unsigned char Data); void __addfsword(const unsigned long Offset, const unsigned short Data); -void __addfsdword(const unsigned long Offset, const unsigned int Data) +void __addfsdword(const unsigned long Offset, const unsigned int Data); #endif @@ -153,19 +153,21 @@ #ifdef _M_AMD64 void __writecr8(const unsigned __int64 Data); -#endif - unsigned __int64 __readcr0(void); unsigned __int64 __readcr2(void); unsigned __int64 __readcr3(void); unsigned __int64 __readcr4(void); - -#ifdef _M_AMD64 unsigned __int64 __readcr8(void); -#endif - unsigned __int64 __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned __int64 value); +#else +unsigned long __readcr0(void); +unsigned long __readcr2(void); +unsigned long __readcr3(void); +unsigned long __readcr4(void); +unsigned int __readdr(unsigned int reg); +void __writedr(unsigned reg, unsigned int value); +#endif void __invlpg(void * const Address); Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -304,7 +304,7 @@ _CRTIMP __declspec(noreturn) void __cdecl _exit(int _Code); #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */ /* C99 function name */ - void __cdecl __declspec(noreturn) _Exit(int); /* Declare to get noreturn attribute. */ + __declspec(noreturn) void __cdecl _Exit(int); /* Declare to get noreturn attribute. */ __CRT_INLINE void __cdecl _Exit(int status) { _exit(status); } #endif @@ -312,7 +312,7 @@ #pragma push_macro("abort") #undef abort #endif - void __cdecl __declspec(noreturn) abort(void); + __declspec(noreturn) void __cdecl abort(void); #if __MINGW_GNUC_PREREQ(4,4) #pragma pop_macro("abort") #endif Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -20,6 +20,7 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> +#include <intrin.h> #ifndef __winitenv extern wchar_t ***_imp____winitenv; @@ -86,7 +87,7 @@ static _startupinfo startinfo; extern void _pei386_runtime_relocator (void); -static CALLBACK long _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); +static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data); #ifdef WPRFLAG static void duplicate_ppstrings (int ac, wchar_t ***av); @@ -169,7 +170,7 @@ STARTUPINFO StartupInfo; BOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); - + if (mingw_app_type) GetStartupInfo (&StartupInfo); { @@ -206,26 +207,18 @@ _ASSERTE(__native_startup_state == __initialized); if (! nested) (VOID)InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); - + if (__dyn_tls_init_callback != NULL && _IsNonwritableInCurrentImage ((PBYTE) &__dyn_tls_init_callback)) __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL); - + _pei386_runtime_relocator (); - - #ifdef _WIN64 - __asm__ __volatile__ ( - "xorq %rax,%rax\n\t" - "decq %rax\n\t" - "movq %rax,%gs:0" "\n"); - #else - __asm__ __volatile__ ( - "xorl %eax,%eax\n\t" - "decl %eax\n\t" - "movl %eax,%fs:0" "\n"); - #endif + +#if defined(__i386__) || defined(_M_IX86) + __writefsdword(0, 0xffffffff); +#endif AddVectoredExceptionHandler (0, (PVECTORED_EXCEPTION_HANDLER)__mingw_vex); SetUnhandledExceptionFilter (_gnu_exception_handler); - + _fpreset (); if (mingw_app_type) @@ -330,7 +323,7 @@ return 0; } -static CALLBACK long +static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data) { void (*old_handler) (int); @@ -466,7 +459,7 @@ char **avl; int i; char **n = (char **) malloc (sizeof (char *) * (ac + 1)); - + avl=*av; for (i=0; i < ac; i++) { Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -39,6 +39,7 @@ <define name="_CRTBLD" /> <define name="WPRFLAG" /> <include base="ReactOS">include/reactos/mingw-w64</include> + <compilerflag compilerset="msc">/wd4733</compilerflag> <file>crt0_w.c</file> <file>crtexe.c</file> <file>dllargv.c</file> Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -204,6 +204,9 @@ { LPTSTR p; + UNREFERENCED_PARAMETER(nCmdShow); + UNREFERENCED_PARAMETER(hPrevInst); + hMainInstance = hInst; // Parse the arguments Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -47,13 +47,13 @@ $(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TC /Fo$$@ ${call RBUILD_cflags,$(1),$(4)} /c $$< + $${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$< else $(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TC /Fo$$@ ${call RBUILD_cflags,$(1),$(4)} /c $$< + $${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$< endif @@ -71,13 +71,13 @@ $(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TP /Fo$$@ ${call RBUILD_cxxflags,$(1),$(4)} /c $$< + $${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$< else $(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TP /Fo$$@ ${call RBUILD_cxxflags,$(1),$(4)} /c $$< + $${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$< endif

1 0

[hyperion] 41441: modified tools/rbuild/backend/mingw/rules.mak For now, only pass the -I, -D and -U preprocessor options to gas
by hyperion＠svn.reactos.org 18 Jun '09

18 Jun '09

Author: hyperion Date: Thu Jun 18 04:27:18 2009 New Revision: 41441 URL: http://svn.reactos.org/svn/reactos?rev=41441&view=rev Log: modified tools/rbuild/backend/mingw/rules.mak For now, only pass the -I, -D and -U preprocessor options to gas Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Thu Jun 18 04:27:18 2009 @@ -86,7 +86,8 @@ #(module, flags, includes) RBUILD_cflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),C} RBUILD_cxxflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),CXX} -RBUILD_asflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),AS} +#~ RBUILD_asflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),AS} +RBUILD_asflags=${call RBUILD_compiler_flags_builtin_cpp,$(1),$(2),$(3),AS} RBUILD_nasmflags=${call RBUILD_compiler_flags_builtin_cpp,$(1),$(2),$(3),NASM} RBUILD_rc_pp_flags=${call RBUILD_compiler_flags_cpp,$(1),-DRC_INVOKED=1 -D__WIN32__=1 -D__FLAT__=1,$(3) -I.,RC} RBUILD_rc_flags=${call RBUILD_compiler_flags_with_includes,$(1),$(2),$(3),RC}

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