Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[jgardou] 46530: [WIN32K] Close another pair of DC_LockDC/DC_UnlockDC Now gdi32:dc winetests doesn't crash anymore.
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Mon Mar 29 00:27:57 2010 New Revision: 46530 URL: http://svn.reactos.org/svn/reactos?rev=46530&view=rev Log: [WIN32K] Close another pair of DC_LockDC/DC_UnlockDC Now gdi32:dc winetests doesn't crash anymore. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Mon Mar 29 00:27:57 2010 @@ -173,6 +173,8 @@ /* Prevent save dc from being restored */ pdcSave->dclevel.lSaveDepth = 1; + /* Unlock it */ + DC_UnlockDc(pdcSave); /* Delete the saved dc */ GreDeleteObject(hdcSave); }

1 0

[jgardou] 46529: [WIN32K] Forgot this one
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Mon Mar 29 00:18:45 2010 New Revision: 46529 URL: http://svn.reactos.org/svn/reactos?rev=46529&view=rev Log: [WIN32K] Forgot this one Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Mon Mar 29 00:18:45 2010 @@ -39,6 +39,7 @@ { Width = ppdev->gdiinfo.ulHorzRes; Height = ppdev->gdiinfo.ulVertRes; + PDEVOBJ_vRelease(ppdev); } piSysMet = gpsi->aiSysMet;

1 0

[jgardou] 46528: [WIN32K] More PDEVOBJ_vRelease fun
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Mon Mar 29 00:09:45 2010 New Revision: 46528 URL: http://svn.reactos.org/svn/reactos?rev=46528&view=rev Log: [WIN32K] More PDEVOBJ_vRelease fun Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Mon Mar 29 00:09:45 2010 @@ -176,7 +176,7 @@ QueryTable, NULL, NULL); - + if (!dwVgaCompatible) { /* This driver is not a vga driver */ @@ -243,7 +243,7 @@ UNREFERENCED_PARAMETER(Context); UNREFERENCED_PARAMETER(EntryContext); - DPRINT1("DisplayDriverQueryRoutine(%S, %S);\n", + DPRINT1("DisplayDriverQueryRoutine(%S, %S);\n", ValueName, pwszRegKey); /* Check if we have a correct entry */ @@ -408,7 +408,7 @@ PUNICODE_STRING pustrDevice, DWORD iDevNum, PDISPLAY_DEVICEW pDisplayDevice, - DWORD dwFlags) + DWORD dwFlags) { UNICODE_STRING ustrDevice; WCHAR awcDevice[CCHDEVICENAME]; @@ -511,7 +511,8 @@ } *ppdm = ppdev->pdmwDev; - + PDEVOBJ_vRelease(ppdev); + return STATUS_SUCCESS; } @@ -772,7 +773,7 @@ { DPRINT1("Could not open registry key\n"); lResult = DISP_CHANGE_NOTUPDATED; - } + } } /* Check if DEVMODE matches the current mode */ @@ -788,16 +789,16 @@ if (!PDEVOBJ_bSwitchMode(ppdev, pdm)) { DPRINT1("failed to set mode\n"); - lResult = (lResult == DISP_CHANGE_NOTUPDATED) ? + lResult = (lResult == DISP_CHANGE_NOTUPDATED) ? DISP_CHANGE_FAILED : DISP_CHANGE_RESTART; } - + /* Send message */ - + } leave: -// PDEVOBJ_vReleasePdev(ppdev); + PDEVOBJ_vRelease(ppdev); return lResult; }

1 0

[jgardou] 46527: [WIN32K] Release ppdev when deleting DC
by jgardou＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: jgardou Date: Sun Mar 28 23:45:43 2010 New Revision: 46527 URL: http://svn.reactos.org/svn/reactos?rev=46527&view=rev Log: [WIN32K] Release ppdev when deleting DC Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sun Mar 28 23:45:43 2010 @@ -374,6 +374,8 @@ PATH_Delete(pdc->dclevel.hPath); + PDEVOBJ_vRelease(pdc->ppdev) ; + return TRUE; } @@ -653,8 +655,6 @@ /* Allocate a dc attribute */ DC_AllocDcAttr(pdcNew); - PDEVOBJ_vRelease(ppdev); - // HACK! DC_vSelectSurface(pdcNew, psurfDefaultBitmap);

1 0

[tkreuzer] 46526: [FTP/DHCP] - remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common) - protect struct timezone from redefinition
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Sun Mar 28 23:01:25 2010 New Revision: 46526 URL: http://svn.reactos.org/svn/reactos?rev=46526&view=rev Log: [FTP/DHCP] - remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common) - protect struct timezone from redefinition Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.h [iso-8859-1] Sun Mar 28 23:01:25 2010 @@ -9,9 +9,12 @@ #define strcasecmp _stricmp #define strncasecmp _strnicmp +#ifndef _TIMEZONE_DEFINED /* also in sys/time.h */ +#define _TIMEZONE_DEFINED struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ + int tz_minuteswest; + int tz_dsttime; }; -int gettimeofday(struct timeval *tv, struct timezone *tz); + extern int __cdecl gettimeofday (struct timeval *p, struct timezone *z); +#endif Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Sun Mar 28 23:01:25 2010 @@ -3,17 +3,6 @@ <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> <include base="ftp">.</include> <define name="lint" /> - -  - <define name="chdir">_chdir</define> - <define name="getcwd">_getcwd</define> - <define name="mktemp">_mktemp</define> - <define name="unlink">_unlink</define> - <define name="close">_close</define> - <define name="fileno">_fileno</define> - <define name="read">_read</define> - <define name="write">_write</define> - <define name="lseek">_lseek</define> <library>ws2_32</library> <library>iphlpapi</library> Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] Sun Mar 28 23:01:25 2010 @@ -3,13 +3,6 @@ <module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe"> <include base="dhcp">.</include> <include base="dhcp">include</include> - -  - <define name="tzset">_tzset</define> - <define name="close">_close</define> - <define name="read">_read</define> - <define name="write">_write</define> - <define name="NO_OLDNAMES">1</define> <library>ntdll</library> <library>ws2_32</library>

1 0

[cgutman] 46525: [NTOSKRNL] - Don't use REG_OPTION_VOLATILE because it causes ACPI to be reinstalled after every boot
by cgutman＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: cgutman Date: Sun Mar 28 22:23:30 2010 New Revision: 46525 URL: http://svn.reactos.org/svn/reactos?rev=46525&view=rev Log: [NTOSKRNL] - Don't use REG_OPTION_VOLATILE because it causes ACPI to be reinstalled after every boot Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Mar 28 22:23:30 2010 @@ -2771,12 +2771,12 @@ if (IopIsAcpiComputer()) { InitializeObjectAttributes(&ObjectAttributes, &HalAcpiDevice, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hRoot, NULL); - Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + Status = ZwCreateKey(&hHalAcpiDevice, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); ZwClose(hRoot); if (!NT_SUCCESS(Status)) return Status; InitializeObjectAttributes(&ObjectAttributes, &HalAcpiId, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hHalAcpiDevice, NULL); - Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + Status = ZwCreateKey(&hHalAcpiId, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL); ZwClose(hHalAcpiDevice); if (!NT_SUCCESS(Status)) return Status;

1 0

[tkreuzer] 46524: [LIBOLDNAMES] - add snprintf
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Sun Mar 28 22:11:55 2010 New Revision: 46524 URL: http://svn.reactos.org/svn/reactos?rev=46524&view=rev Log: [LIBOLDNAMES] - add snprintf Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/moldname-msvcrt.def Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/moldname-msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/moldname-msvcrt.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/moldname-msvcrt.def [iso-8859-1] Sun Mar 28 22:11:55 2010 @@ -61,6 +61,7 @@ rmtmp==_rmtmp searchenv==_searchenv setmode==_setmode +snprintf=_snprintf sopen==_sopen spawnl==_spawnl spawnle==_spawnle

1 0

[tkreuzer] 46523: - Fix assert macro - Add crt="MSVC" to a number of modules to resolve _assert
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Sun Mar 28 21:56:11 2010 New Revision: 46523 URL: http://svn.reactos.org/svn/reactos?rev=46523&view=rev Log: - Fix assert macro - Add crt="MSVC" to a number of modules to resolve _assert Modified: branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild branches/ros-amd64-bringup/reactos/include/crt/assert.h Modified: branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> +<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="qedit.spec" /> <include base="qedit">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true"> +<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="quartz.spec" /> <include base="quartz">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true"> +<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="avifil32.spec" /> <include base="avifil32">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec" /> <include base="comctl32">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="comdlg32.spec" /> <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="imaadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32" installname="imaadp32.acm" allowwarnings="true" entrypoint="0"> +<module name="imaadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32" installname="imaadp32.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="imaadp32.acm.spec" /> <include base="imaadp32.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true"> +<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="inetmib1.spec" /> <include base="inetmib1">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="mciwave" type="win32dll" baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32" installname="mciwave.dll" allowwarnings="true" entrypoint="0"> +<module name="mciwave" type="win32dll" baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32" installname="mciwave.dll" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="mciwave.spec" /> <include base="mciwave">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes"> +<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes" crt="msvcrt"> <importlibrary definition="msacm32.spec" /> <include base="msacm32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="msadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32" installname="msadp32.acm" allowwarnings="true" entrypoint="0"> +<module name="msadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32" installname="msadp32.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="msadp32.acm.spec" /> <include base="msadp32.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="msg711.acm" type="win32dll" baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32" installname="msg711.acm" allowwarnings="true" entrypoint="0"> +<module name="msg711.acm" type="win32dll" baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32" installname="msg711.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="msg711.acm.spec" /> <include base="msg711.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="msrle32" type="win32dll" baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32" installname="msrle32.dll" allowwarnings="true"> +<module name="msrle32" type="win32dll" baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32" installname="msrle32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="msrle32.spec" /> <include base="msrle32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0"> +<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0" crt="MSVCRT"> <importlibrary definition="odbccp32.spec" /> <include base="odbccp32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true"> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec" /> <include base="ole32">.</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true"> +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true" crt="MSVCRT"> <importlibrary definition="riched20.spec" /> <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="winemp3.acm" type="win32dll" installbase="system32" installname="winemp3.acm" allowwarnings="true" entrypoint="0"> +<module name="winemp3.acm" type="win32dll" installbase="system32" installname="winemp3.acm" allowwarnings="true" entrypoint="0" crt="MSVCRT"> <importlibrary definition="winemp3.acm.spec" /> <include base="winemp3.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -1,4 +1,4 @@ -<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true"> +<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="wintrust.spec" /> <include base="wintrust">.</include> Modified: branches/ros-amd64-bringup/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/assert.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/assert.h [iso-8859-1] Sun Mar 28 21:56:11 2010 @@ -28,8 +28,7 @@ #endif #ifndef assert -//#define assert(_Expression) (void)((!!(_Expression)) || (_assert(#_Expression,__FILE__,__LINE__),0)) -#define assert(_Expression) (void)((!!(_Expression)))// || (_wassert(_CRT_WIDE(#_Expression),_CRT_WIDE(__FILE__),__LINE__),0)) +#define assert(_Expression) (void)((!!(_Expression)) || (_assert(#_Expression,__FILE__,__LINE__),0)) #endif #ifndef wassert

1 0

[tkreuzer] 46522: Fix 32bit RtlInitializeSListHead
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Sun Mar 28 21:46:29 2010 New Revision: 46522 URL: http://svn.reactos.org/svn/reactos?rev=46522&view=rev Log: Fix 32bit RtlInitializeSListHead Modified: branches/ros-amd64-bringup/reactos/lib/rtl/slist.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/slist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/slist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/slist.c [iso-8859-1] Sun Mar 28 21:46:29 2010 @@ -30,11 +30,12 @@ { RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); } + + SListHead->Region = 0; #endif /* Zero it */ SListHead->Alignment = 0; - SListHead->Region = 0; #if defined(_IA64_) FeatureBits = __getReg(CV_IA64_CPUID4);

1 0

[tkreuzer] 46521: [SCSIPORT] DDKAPI -> NTAPI
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Sun Mar 28 21:30:58 2010 New Revision: 46521 URL: http://svn.reactos.org/svn/reactos?rev=46521&view=rev Log: [SCSIPORT] DDKAPI -> NTAPI Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] Sun Mar 28 21:30:58 2010 @@ -14,12 +14,8 @@ #define NDEBUG #include <debug.h> -#ifdef _MSC_VER - #define DDKAPI -#endif - SCSI_PHYSICAL_ADDRESS -DDKAPI +NTAPI ScsiPortConvertUlongToPhysicalAddress( IN ULONG UlongAddress) { @@ -27,7 +23,7 @@ } VOID -DDKAPI +NTAPI ScsiPortReadPortBufferUchar( IN PUCHAR Port, IN PUCHAR Buffer, @@ -37,7 +33,7 @@ } VOID -DDKAPI +NTAPI ScsiPortReadPortBufferUshort( IN PUSHORT Port, IN PUSHORT Buffer, @@ -47,7 +43,7 @@ } VOID -DDKAPI +NTAPI ScsiPortReadPortBufferUlong( IN PULONG Port, IN PULONG Buffer, @@ -57,7 +53,7 @@ } UCHAR -DDKAPI +NTAPI ScsiPortReadPortUchar( IN PUCHAR Port) { @@ -65,7 +61,7 @@ } USHORT -DDKAPI +NTAPI ScsiPortReadPortUshort( IN PUSHORT Port) { @@ -73,7 +69,7 @@ } ULONG -DDKAPI +NTAPI ScsiPortReadPortUlong( IN PULONG Port) { @@ -81,7 +77,7 @@ } VOID -DDKAPI +NTAPI ScsiPortReadRegisterBufferUchar( IN PUCHAR Register, IN PUCHAR Buffer, @@ -91,7 +87,7 @@ } VOID -DDKAPI +NTAPI ScsiPortReadRegisterBufferUshort( IN PUSHORT Register, IN PUSHORT Buffer, @@ -101,7 +97,7 @@ } VOID -DDKAPI +NTAPI ScsiPortReadRegisterBufferUlong( IN PULONG Register, IN PULONG Buffer, @@ -111,7 +107,7 @@ } UCHAR -DDKAPI +NTAPI ScsiPortReadRegisterUchar( IN PUCHAR Register) { @@ -119,7 +115,7 @@ } USHORT -DDKAPI +NTAPI ScsiPortReadRegisterUshort( IN PUSHORT Register) { @@ -127,7 +123,7 @@ } ULONG -DDKAPI +NTAPI ScsiPortReadRegisterUlong( IN PULONG Register) { @@ -135,7 +131,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWritePortBufferUchar( IN PUCHAR Port, IN PUCHAR Buffer, @@ -145,7 +141,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWritePortBufferUshort( IN PUSHORT Port, IN PUSHORT Buffer, @@ -155,7 +151,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWritePortBufferUlong( IN PULONG Port, IN PULONG Buffer, @@ -165,7 +161,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWritePortUchar( IN PUCHAR Port, IN UCHAR Value) @@ -174,7 +170,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWritePortUshort( IN PUSHORT Port, IN USHORT Value) @@ -183,7 +179,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWritePortUlong( IN PULONG Port, IN ULONG Value) @@ -192,7 +188,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWriteRegisterBufferUchar( IN PUCHAR Register, IN PUCHAR Buffer, @@ -202,7 +198,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWriteRegisterBufferUshort( IN PUSHORT Register, IN PUSHORT Buffer, @@ -212,7 +208,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWriteRegisterBufferUlong( IN PULONG Register, IN PULONG Buffer, @@ -222,7 +218,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWriteRegisterUchar( IN PUCHAR Register, IN ULONG Value) @@ -231,7 +227,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWriteRegisterUshort( IN PUSHORT Register, IN USHORT Value) @@ -240,7 +236,7 @@ } VOID -DDKAPI +NTAPI ScsiPortWriteRegisterUlong( IN PULONG Register, IN ULONG Value)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
90
Older →

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 March 2010