Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 46520: update asm.h from trunk
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Sun Mar 28 21:25:40 2010 New Revision: 46520 URL: http://svn.reactos.org/svn/reactos?rev=46520&view=rev Log: update asm.h from trunk Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sun Mar 28 21:25:40 2010 @@ -6,10 +6,13 @@ * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#ifdef _MSC_VER +#ifdef _USE_ML /* Allow ".name" identifiers */ OPTION DOTNAME + +.586 +.MODEL FLAT /* Hex numbers need to be in 01ABh format */ #define HEX(x) 0##x##h @@ -48,7 +51,11 @@ ENDM .code64 MACRO - .code + .code +ENDM + +.code32 MACRO + .code ENDM UNIMPLEMENTED MACRO name @@ -107,6 +114,13 @@ /* MASM needs an END tag */ #define END + +.macro .MODEL model +.endm + +.macro .code + .text +.endm /* Macros for x64 stack unwind OPs */ @@ -171,5 +185,6 @@ #define if .if #define endif .endif #define else .else +#define elseif .elseif #endif

1 0

[cgutman] 46519: [NTOSKRNL] - Revert part of r46495 and replace it with much better code
by cgutman＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: cgutman Date: Sun Mar 28 21:22:28 2010 New Revision: 46519 URL: http://svn.reactos.org/svn/reactos?rev=46519&view=rev Log: [NTOSKRNL] - Revert part of r46495 and replace it with much better code 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 21:22:28 2010 @@ -2180,10 +2180,10 @@ const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController"); UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0"); static ULONG DeviceIndexMouse = 0; - const UNICODE_STRING IdentifierParallel = RTL_CONSTANT_STRING(L"PARALLEL"); + const UNICODE_STRING IdentifierParallel = RTL_CONSTANT_STRING(L"ParallelController"); UNICODE_STRING HardwareIdParallel = RTL_CONSTANT_STRING(L"*PNP0400\0"); static ULONG DeviceIndexParallel = 0; - const UNICODE_STRING IdentifierFloppy = RTL_CONSTANT_STRING(L"FLOPPY"); + const UNICODE_STRING IdentifierFloppy = RTL_CONSTANT_STRING(L"FloppyDiskPeripheral"); UNICODE_STRING HardwareIdFloppy = RTL_CONSTANT_STRING(L"*PNP0700\0"); static ULONG DeviceIndexFloppy = 0; const UNICODE_STRING IdentifierIsa = RTL_CONSTANT_STRING(L"ISA"); @@ -2433,6 +2433,18 @@ DeviceIndex = DeviceIndexMouse++; IsDeviceDesc = FALSE; } + else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierParallel, FALSE) == 0) + { + pHardwareId = &HardwareIdParallel; + DeviceIndex = DeviceIndexParallel++; + IsDeviceDesc = FALSE; + } + else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierFloppy, FALSE) == 0) + { + pHardwareId = &HardwareIdFloppy; + DeviceIndex = DeviceIndexFloppy++; + IsDeviceDesc = FALSE; + } else if (NT_SUCCESS(Status)) { /* Try to also match the device identifier */ @@ -2456,35 +2468,10 @@ IsDeviceDesc = FALSE; } #endif - else /* Now let's detect devices with a device number at the end */ + else { - /* First, we remove the number */ - ValueName.Length -= sizeof(WCHAR); - - /* Let's see if it is a floppy device */ - if (RtlCompareUnicodeString(&ValueName, &IdentifierFloppy, FALSE) == 0) - { - pHardwareId = &HardwareIdFloppy; - DeviceIndex = DeviceIndexFloppy++; - IsDeviceDesc = FALSE; - } - /* Nope, is it a parallel port? */ - else if (RtlCompareUnicodeString(&ValueName, &IdentifierParallel, FALSE) == 0) - { - pHardwareId = &HardwareIdParallel; - DeviceIndex = DeviceIndexParallel++; - IsDeviceDesc = FALSE; - } - /* Nope, out of ideas so let's skip this one */ - else - { - ValueName.Length += sizeof(WCHAR); - DPRINT("Unknown device '%wZ'\n", &ValueName); - goto nextdevice; - } - - /* Add the number back */ - ValueName.Length += sizeof(WCHAR); + DPRINT("Unknown device '%wZ'\n", &ValueName); + goto nextdevice; } } else

1 0

[janderwald] 46518: [KSPROXY, MSDVBNP, MSVIDCTL, BDAPLGIN] - Implement DllRegisterServer, DllUnregisterServer for those components - Add msdvbnp, msvidctl to build - Add msdvbnp, bdaplgin, msvidctl to bootcd
by janderwald＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: janderwald Date: Sun Mar 28 21:06:48 2010 New Revision: 46518 URL: http://svn.reactos.org/svn/reactos?rev=46518&view=rev Log: [KSPROXY, MSDVBNP, MSVIDCTL, BDAPLGIN] - Implement DllRegisterServer, DllUnregisterServer for those components - Add msdvbnp, msvidctl to build - Add msdvbnp, bdaplgin, msvidctl to bootcd Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/directx/ksproxy/ksproxy.cpp trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp trunk/reactos/dll/directx/msvidctl/msvidctl.cpp Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=465… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -24,6 +24,7 @@ <property name="BASEADDRESS_PSTOREC" value="0x513d0000" /> <property name="BASEADDRESS_LPK" value="0x516c0000" /> <property name="BASEADDRESS_MSGSM32ACM" value="0x56db0000" /> + <property name="BASEADDRESS_MSDVBNP" value="0x58280000" /> <property name="BASEADDRESS_MSG711ACM" value="0x584f0000" /> <property name="BASEADDRESS_IMAADP32ACM" value="0x585e0000" /> <property name="BASEADDRESS_BDAPLGIN" value="0x58600000" /> @@ -32,6 +33,7 @@ <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> <property name="BASEADDRESS_JOY" value="0x589b0000" /> <property name="BASEADDRESS_QMGR" value="0x59620000" /> + <property name="BASEADDRESS_MSVIDCTL" value="0x59660000" /> <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_UNTFS" value="0x5b340000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -151,6 +151,7 @@ ;dll\cpl\usrmgr\usrmgr.cpl 1 dll\directx\amstream\amstream.dll 1 +dll\directx\bdaplgin\bdaplgin.ax 1 dll\directx\dinput\dinput.dll 1 dll\directx\dinput8\dinput8.dll 1 dll\directx\dmusic\dmusic.dll 1 @@ -164,6 +165,8 @@ dll\directx\ksproxy\ksproxy.ax 1 dll\directx\ksuser\ksuser.dll 1 dll\directx\msdmo\msdmo.dll 1 +dll\directx\msdvbnp\msdvbnp.ax 1 +dll\directx\msvidctl\msvidctl.dll 1 dll\directx\quartz\quartz.dll 1 dll\directx\qedit\qedit.dll 1 dll\directx\wine\d3d8\d3d8.dll 1 Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -52,7 +52,27 @@ WINAPI DllUnregisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_SET_VALUE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + RegDeleteKeyW(hClass, pStr); + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } extern "C" @@ -61,7 +81,39 @@ WINAPI DllRegisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass, hKey, hSubKey; + static LPCWSTR ModuleName = L"bdaplgin.ax"; + static LPCWSTR ThreadingModel = L"Both"; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_WRITE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + if (RegCreateKeyExW(hClass, pStr, 0, 0, 0, KEY_WRITE, NULL, &hKey, 0) == ERROR_SUCCESS) + { + if (RegCreateKeyExW(hKey, L"InprocServer32", 0, 0, 0, KEY_WRITE, NULL, &hSubKey, 0) == ERROR_SUCCESS) + { + RegSetValueExW(hSubKey, 0, 0, REG_SZ, (const BYTE*)ModuleName, (wcslen(ModuleName) + 1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (const BYTE*)ThreadingModel, (wcslen(ThreadingModel) + 1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + RegCloseKey(hKey); + } + + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } KSDDKAPI Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -43,6 +43,12 @@ <directory name="msdmo"> <xi:include href="msdmo/msdmo.rbuild" /> </directory> + <directory name="msdvbnp"> + <xi:include href="msdvbnp/msdvbnp.rbuild" /> + </directory> + <directory name="msvidctl"> + <xi:include href="msvidctl/msvidctl.rbuild" /> + </directory> <directory name="qedit"> <xi:include href="qedit/qedit.rbuild" /> </directory> Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -343,7 +343,27 @@ WINAPI DllUnregisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_SET_VALUE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + RegDeleteKeyW(hClass, pStr); + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } extern "C" @@ -352,7 +372,39 @@ WINAPI DllRegisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass, hKey, hSubKey; + static LPCWSTR ModuleName = L"ksproxy.ax"; + static LPCWSTR ThreadingModel = L"Both"; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_WRITE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + if (RegCreateKeyExW(hClass, pStr, 0, 0, 0, KEY_WRITE, NULL, &hKey, 0) == ERROR_SUCCESS) + { + if (RegCreateKeyExW(hKey, L"InprocServer32", 0, 0, 0, KEY_WRITE, NULL, &hSubKey, 0) == ERROR_SUCCESS) + { + RegSetValueExW(hSubKey, 0, 0, REG_SZ, (const BYTE*)ModuleName, (wcslen(ModuleName) + 1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (const BYTE*)ThreadingModel, (wcslen(ThreadingModel) + 1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + RegCloseKey(hKey); + } + + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } KSDDKAPI Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.cpp [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -48,7 +48,27 @@ WINAPI DllUnregisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_SET_VALUE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + RegDeleteKeyW(hClass, pStr); + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } extern "C" @@ -57,7 +77,39 @@ WINAPI DllRegisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass, hKey, hSubKey; + static LPCWSTR ModuleName = L"msdvbnp.ax"; + static LPCWSTR ThreadingModel = L"Both"; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_WRITE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + if (RegCreateKeyExW(hClass, pStr, 0, 0, 0, KEY_WRITE, NULL, &hKey, 0) == ERROR_SUCCESS) + { + if (RegCreateKeyExW(hKey, L"InprocServer32", 0, 0, 0, KEY_WRITE, NULL, &hSubKey, 0) == ERROR_SUCCESS) + { + RegSetValueExW(hSubKey, 0, 0, REG_SZ, (const BYTE*)ModuleName, (wcslen(ModuleName) + 1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (const BYTE*)ThreadingModel, (wcslen(ThreadingModel) + 1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + RegCloseKey(hKey); + } + + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } KSDDKAPI Modified: trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/scanni… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -287,7 +287,7 @@ IDVBTuneRequest * pDVBTRequest, IDVBTLocator *pDVBTLocator) { - HRESULT hr; + HRESULT hr = S_OK; ULONG Index; IBDA_Topology *pTopo; IUnknown *pNode; Modified: trunk/reactos/dll/directx/msvidctl/msvidctl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msvidctl/msvid… ============================================================================== --- trunk/reactos/dll/directx/msvidctl/msvidctl.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msvidctl/msvidctl.cpp [iso-8859-1] Sun Mar 28 21:06:48 2010 @@ -48,7 +48,27 @@ WINAPI DllUnregisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_SET_VALUE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + RegDeleteKeyW(hClass, pStr); + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } extern "C" @@ -57,7 +77,39 @@ WINAPI DllRegisterServer(void) { - return S_OK; + ULONG Index = 0; + LPOLESTR pStr; + HRESULT hr = S_OK; + HKEY hClass, hKey, hSubKey; + static LPCWSTR ModuleName = L"msvidctl.ax"; + static LPCWSTR ThreadingModel = L"Both"; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_WRITE, &hClass) != ERROR_SUCCESS) + return E_FAIL; + + do + { + hr = StringFromCLSID(*InterfaceTable[Index].riid, &pStr); + if (FAILED(hr)) + break; + + if (RegCreateKeyExW(hClass, pStr, 0, 0, 0, KEY_WRITE, NULL, &hKey, 0) == ERROR_SUCCESS) + { + if (RegCreateKeyExW(hKey, L"InprocServer32", 0, 0, 0, KEY_WRITE, NULL, &hSubKey, 0) == ERROR_SUCCESS) + { + RegSetValueExW(hSubKey, 0, 0, REG_SZ, (const BYTE*)ModuleName, (wcslen(ModuleName) + 1) * sizeof(WCHAR)); + RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (const BYTE*)ThreadingModel, (wcslen(ThreadingModel) + 1) * sizeof(WCHAR)); + RegCloseKey(hSubKey); + } + RegCloseKey(hKey); + } + + CoTaskMemFree(pStr); + Index++; + }while(InterfaceTable[Index].lpfnCI != 0); + + RegCloseKey(hClass); + return hr; } KSDDKAPI

1 0

[cgutman] 46517: [NTOSKRNL] - Add a missing OBJ_CASE_INSENSITIVE attribute so IopIsAcpiComputer doesn't always fail
by cgutman＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: cgutman Date: Sun Mar 28 21:02:07 2010 New Revision: 46517 URL: http://svn.reactos.org/svn/reactos?rev=46517&view=rev Log: [NTOSKRNL] - Add a missing OBJ_CASE_INSENSITIVE attribute so IopIsAcpiComputer doesn't always fail 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 21:02:07 2010 @@ -2629,7 +2629,7 @@ NTSTATUS Status; BOOLEAN ret = FALSE; - InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_KERNEL_HANDLE, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &MultiKeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&hDevicesKey, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); if (!NT_SUCCESS(Status)) {

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