Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 31102: Updated French translation for butterflies
by pschweitzer＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: pschweitzer Date: Sun Dec 9 16:03:07 2007 New Revision: 31102 URL: http://svn.reactos.org/svn/reactos?rev=31102&view=rev Log: Updated French translation for butterflies Modified: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Modified: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Sun Dec 9 16:03:07 2007 @@ -30,5 +30,5 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Butterflies ScreenSaver" + IDS_DESCRIPTION "Écran de veille de papillons" END

1 0

[hpoussin] 31101: Merge 28311. WinLdr is now merged up to r28364 (included)
by hpoussin＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: hpoussin Date: Sun Dec 9 15:58:21 2007 New Revision: 31101 URL: http://svn.reactos.org/svn/reactos?rev=31101&view=rev Log: Merge 28311. WinLdr is now merged up to r28364 (included) Modified: branches/winldr/reactos/setupldr.c Modified: branches/winldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/setupldr.c?rev=3… ============================================================================== --- branches/winldr/reactos/setupldr.c (original) +++ branches/winldr/reactos/setupldr.c Sun Dec 9 15:58:21 2007 @@ -282,7 +282,7 @@ ULONG_PTR Base; ULONG Size; const char *SourcePath; - const char *LoadOptions; + const char *LoadOptions = "", *DbgLoadOptions = ""; UINT i; char szKernelName[256]; PCONFIGURATION_COMPONENT_DATA ConfigRoot; @@ -384,8 +384,18 @@ return; } - /* Get load options */ - if (!InfFindFirstLine (InfHandle, +#ifdef DBG + /* Get load options */ + if (InfFindFirstLine (InfHandle, + "SetupData", + "DbgOsLoadOptions", + &InfContext)) + { + if (!InfGetDataField (&InfContext, 1, &DbgLoadOptions)) + DbgLoadOptions = ""; + } +#endif + if (!strlen(DbgLoadOptions) && !InfFindFirstLine (InfHandle, "SetupData", "OsLoadOptions", &InfContext)) @@ -418,8 +428,8 @@ /* Set kernel command line */ MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline)); - strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), - LoadOptions); + strcat(strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), + LoadOptions), DbgLoadOptions); /* Setup the boot path and kernel path */ strcpy(szBootPath, SourcePath);

1 0

[greatlrd] 31100: BugFix : Main_DirectDraw_EnumDisplayModes and Main_DirectDraw_EnumDisplayModes4 it did never entry the callbacks loops it was wrong logic check in the begin of the function. This change are base on Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) patch and once again Thank you Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to notice it. and provide a partly fix for it.
by greatlrd＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: greatlrd Date: Sun Dec 9 15:51:50 2007 New Revision: 31100 URL: http://svn.reactos.org/svn/reactos?rev=31100&view=rev Log: BugFix : Main_DirectDraw_EnumDisplayModes and Main_DirectDraw_EnumDisplayModes4 it did never entry the callbacks loops it was wrong logic check in the begin of the function. This change are base on Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) patch and once again Thank you Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to notice it. and provide a partly fix for it. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Sun Dec 9 15:51:50 2007 @@ -29,15 +29,19 @@ _SEH_TRY { - if - ((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK))) || - (!IsBadWritePtr(pCallback,sizeof(LPDDENUMMODESCALLBACK))) || - (!IsBadReadPtr(pDDSD,sizeof(DDSURFACEDESC))) || - (!IsBadWritePtr(pDDSD,sizeof(DDSURFACEDESC)))) + if (pDDSD != NULL) + { + if (pDDSD->dwSize != sizeof(DDSURFACEDESC)) + { + ret = DDERR_INVALIDPARAMS; + } + } + + if (IsBadCodePtr(pCallback)) { ret = DDERR_INVALIDPARAMS; } - else + else if ( ret == DD_OK) { DevMode.dmSize = sizeof(DEVMODE); @@ -123,15 +127,19 @@ _SEH_TRY { - if - ((!IsBadReadPtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || - (!IsBadWritePtr(pCallback,sizeof(LPDDENUMMODESCALLBACK2))) || - (!IsBadReadPtr(pDDSD,sizeof(DDSURFACEDESC2))) || - (!IsBadWritePtr(pDDSD,sizeof(DDSURFACEDESC2)))) + if (pDDSD != NULL) + { + if (pDDSD->dwSize != sizeof(DDSURFACEDESC2)) + { + ret = DDERR_INVALIDPARAMS; + } + } + + if (IsBadCodePtr(pCallback)) { ret = DDERR_INVALIDPARAMS; } - else + else if ( ret == DD_OK) { DevMode.dmSize = sizeof(DEVMODE);

1 0

[greatlrd] 31099: fix one smaller mistake in ddraw.h LPDDENUMMODESCALLBACK, LPDDENUMMODESCALLBACK2, LPDDENUMSURFACESCALLBACK, LPDDENUMSURFACESCALLBACK2, LPDDENUMSURFACESCALLBACK4, LPDDENUMSURFACESCALLBACK7 is STDCALL and I did miss that. Thank you Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to notice it. and provide a partly fix for it.
by greatlrd＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: greatlrd Date: Sun Dec 9 15:38:49 2007 New Revision: 31099 URL: http://svn.reactos.org/svn/reactos?rev=31099&view=rev Log: fix one smaller mistake in ddraw.h LPDDENUMMODESCALLBACK, LPDDENUMMODESCALLBACK2, LPDDENUMSURFACESCALLBACK, LPDDENUMSURFACESCALLBACK2, LPDDENUMSURFACESCALLBACK4, LPDDENUMSURFACESCALLBACK7 is STDCALL and I did miss that. Thank you Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to notice it. and provide a partly fix for it. Modified: trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h (original) +++ trunk/reactos/include/dxsdk/ddraw.h Sun Dec 9 15:38:49 2007 @@ -1239,11 +1239,11 @@ #endif -typedef HRESULT (*LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); -typedef HRESULT (*LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); -typedef HRESULT (*LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); -typedef HRESULT (*LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID); -typedef HRESULT (*LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (WINAPI *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); +typedef HRESULT (WINAPI *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (WINAPI *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); +typedef HRESULT (WINAPI *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (WINAPI *LPDDENUMSURFACESCALLBACK7)(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2, LPVOID); typedef DWORD (*LPCLIPPERCALLBACK)(LPDIRECTDRAWCLIPPER lpDDClipper, HWND hWnd, DWORD code, LPVOID lpContext ); #ifdef STREAMING

1 0

[dreimer] 31098: Add and Update German RC Files of the Screensavers.
by dreimer＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: dreimer Date: Sun Dec 9 14:58:39 2007 New Revision: 31098 URL: http://svn.reactos.org/svn/reactos?rev=31098&view=rev Log: Add and Update German RC Files of the Screensavers. Added: trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Modified: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc Sun Dec 9 14:58:39 2007 @@ -30,5 +30,5 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Butterflies ScreenSaver" + IDS_DESCRIPTION "Butterflies Bildschirmschoner" END Added: trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc Sun Dec 9 14:58:39 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Maze Bildschirmschoner" + IDS_TITLE "Über" + IDS_TEXT "Keinerlei Einstellungen notwendig." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Sun Dec 9 14:58:39 2007 @@ -10,5 +10,6 @@ #include <reactos/version.rc> +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/lt-LT.rc"

1 0

[mpiulachs] 31097: - Trimed space from shlfldr_mydocuments.c in shell32.rbuild don't yet understand how rbuild was happy with it. I haven't modified what seems to be a typo on filename. - Properly express paths with rbuild syntax (when possible)
by mpiulachs＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: mpiulachs Date: Sun Dec 9 14:56:11 2007 New Revision: 31097 URL: http://svn.reactos.org/svn/reactos?rev=31097&view=rev Log: - Trimed space from shlfldr_mydocuments.c in shell32.rbuild don't yet understand how rbuild was happy with it. I haven't modified what seems to be a typo on filename. - Properly express paths with rbuild syntax (when possible) Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/drivers/bus/acpi/acpi.rbuild Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhcp.rb… ============================================================================== --- trunk/reactos/base/services/dhcp/dhcp.rbuild (original) +++ trunk/reactos/base/services/dhcp/dhcp.rbuild Sun Dec 9 14:56:11 2007 @@ -9,7 +9,6 @@ <library>ws2_32</library> <library>iphlpapi</library> <library>advapi32</library> - <pch>include/rosdhcp.h</pch> <file>adapter.c</file> <file>alloc.c</file> <file>api.c</file> @@ -25,4 +24,7 @@ <file>timer.c</file> <file>util.c</file> <file>dhcp.rc</file> + <directory name="include"> + <pch>rosdhcp.h</pch> + </directory> </module> 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Sun Dec 9 14:56:11 2007 @@ -79,5 +79,7 @@ <file>version.c</file> <file>cmdline.c</file> <file>machine.c</file> - <pch>include/freeldr.h</pch> + <directory name="include"> + <pch>freeldr.h</pch> + </directory> </module> Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Sun Dec 9 14:56:11 2007 @@ -52,7 +52,7 @@ <file>shfldr_desktop.c</file> <file>shfldr_fs.c</file> <file>shfldr_mycomp.c</file> - <file> shlfldr_mydocuments.c</file> + <file>shlfldr_mydocuments.c</file> <file>shfldr_printers.c</file> <file>shlexec.c</file> <file>shlfileop.c</file> Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpi.rbuild (original) +++ trunk/reactos/drivers/bus/acpi/acpi.rbuild Sun Dec 9 14:56:11 2007 @@ -136,5 +136,7 @@ <file>cmxface.c</file> </directory> <file>acpi.rc</file> - <pch>include/acpi.h</pch> + <directory name="include"> + <pch>acpi.h</pch> + </directory> </module>

1 0

[mpiulachs] 31096: Partly applied patch from bug 2874 by Vytis Girdzijauskas "CMan" cman<at>cman<dot>us * Added description string to Butterflies screensaver for all languages. * Use string resources in Maze screensaver. My notes: I haven't added butterflies.scr to reactos.dff as opengl screen savers are still broken under reactos , we already have 3dtext added for testing no need to add another one I have modified mazescr installname to have the same name as the module has inset of changing it
by mpiulachs＠svn.reactos.org 09 Dec '07

09 Dec '07

Author: mpiulachs Date: Sun Dec 9 14:27:23 2007 New Revision: 31096 URL: http://svn.reactos.org/svn/reactos?rev=31096&view=rev Log: Partly applied patch from bug 2874 by Vytis Girdzijauskas "CMan" cman<at>cman<dot>us * Added description string to Butterflies screensaver for all languages. * Use string resources in Maze screensaver. My notes: I haven't added butterflies.scr to reactos.dff as opengl screen savers are still broken under reactos , we already have 3dtext added for testing no need to add another one I have modified mazescr installname to have the same name as the module has inset of changing it on reactos.dff See issue #2874 for more details. Added: trunk/rosapps/applications/screensavers/mazescr/lang/ trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc trunk/rosapps/applications/screensavers/butterflies/resource.h trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild trunk/rosapps/applications/screensavers/mazescr/scrnsave.c trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Modified: trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc Sun Dec 9 14:27:23 2007 @@ -27,3 +27,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Butterflies ScreenSaver" +END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc Sun Dec 9 14:27:23 2007 @@ -27,3 +27,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Butterflies ScreenSaver" +END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Sun Dec 9 14:27:23 2007 @@ -27,3 +27,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Butterflies ScreenSaver" +END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc Sun Dec 9 14:27:23 2007 @@ -27,3 +27,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Butterflies ScreenSaver" +END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Sun Dec 9 14:27:23 2007 @@ -27,3 +27,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Butterflies ScreenSaver" +END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc Sun Dec 9 14:27:23 2007 @@ -36,3 +36,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Drugeliai" +END Modified: trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc Sun Dec 9 14:27:23 2007 @@ -27,3 +27,8 @@ CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | NOT WS_GROUP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Butterflies ScreenSaver" +END Modified: trunk/rosapps/applications/screensavers/butterflies/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/resource.h (original) +++ trunk/rosapps/applications/screensavers/butterflies/resource.h Sun Dec 9 14:27:23 2007 @@ -1,6 +1,6 @@ #define IDC_STATIC -1 -#define IDS_STR_DESCRIP 1 +#define IDS_DESCRIPTION 1 #define IDABOUT 3 #define IDI_ICON_SCREEN 100 #define IDB_BUTTERFLY1 103 Added: trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc Sun Dec 9 14:27:23 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Maze ScreenSaver" + IDS_TITLE "About" + IDS_TEXT "No options need to be set." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc Sun Dec 9 14:27:23 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Labirintas" + IDS_TITLE "Apie" + IDS_TEXT "Nëra keièiamø parametrø." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild (original) +++ trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild Sun Dec 9 14:27:23 2007 @@ -1,4 +1,4 @@ -<module name="mazescr" type="win32scr" installbase="system32" installname="maze.scr"> +<module name="mazescr" type="win32scr" installbase="system32"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.c (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.c Sun Dec 9 14:27:23 2007 @@ -19,6 +19,7 @@ #include <windows.h> #include <tchar.h> +#include "resource.h" #define APPNAME _T("Scrnsave") @@ -156,6 +157,27 @@ *hwndParent = 0; } +void Configure(void) +{ + TCHAR szTitle[256]; + TCHAR szText[256]; + + LoadString(hInstance, + IDS_TITLE, + szTitle, + 256); + + LoadString(hInstance, + IDS_TEXT, + szText, + 256); + + MessageBox(0, + szText, + szTitle, + MB_OK | MB_ICONWARNING); +} + int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, @@ -184,10 +206,7 @@ case 'c': default: - MessageBox(0, - _T("No options need to be set."), - _T("About"), - MB_OK | MB_ICONWARNING); + Configure(); return 0; } Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Sun Dec 9 14:27:23 2007 @@ -10,10 +10,5 @@ #include <reactos/version.rc> - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Maze ScreenSaver" -END +#include "lang/en-US.rc" +#include "lang/lt-LT.rc"

1 0

[fireball] 31095: - Convert msvcrt.def to msvcrt.spec (it better suits dll with stubbed functions).
by fireball＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: fireball Date: Sun Dec 9 00:04:06 2007 New Revision: 31095 URL: http://svn.reactos.org/svn/reactos?rev=31095&view=rev Log: - Convert msvcrt.def to msvcrt.spec (it better suits dll with stubbed functions). Added: trunk/reactos/dll/win32/msvcrt/msvcrt.spec (with props) Removed: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Removed: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def (removed) @@ -1,846 +1,0 @@ -; $Id$ -; -; ReactOS MSVCRT Compatibility Library -; -LIBRARY MSVCRT.DLL -EXPORTS -;---------------------------------------------------------------------- -; C++ Mangled Symbols -;---------------------------------------------------------------------- -$I10_OUTPUT=MSVCRT_I10_OUTPUT @1 -??0__non_rtti_object@@QAE@ABV0@@Z=__thiscall_MSVCRT___non_rtti_object_copy_ctor @2 -??0__non_rtti_object@@QAE@PBD@Z=__thiscall_MSVCRT___non_rtti_object_ctor @3 -??0bad_cast@@QAE@ABQBD@Z=__thiscall_MSVCRT_bad_cast_ctor @4 -??0bad_cast@@QAE@ABV0@@Z=__thiscall_MSVCRT_bad_cast_copy_ctor @5 -??0bad_typeid@@QAE@ABV0@@Z=__thiscall_MSVCRT_bad_typeid_copy_ctor @6 -??0bad_typeid@@QAE@PBD@Z=__thiscall_MSVCRT_bad_typeid_ctor @7 -??0exception@@QAE@ABQBD@Z=__thiscall_MSVCRT_exception_ctor @8 -??0exception@@QAE@ABV0@@Z=__thiscall_MSVCRT_exception_copy_ctor @9 -??0exception@@QAE@XZ=__thiscall_MSVCRT_exception_default_ctor @10 -??1__non_rtti_object@@UAE@XZ=__thiscall_MSVCRT___non_rtti_object_dtor @11 -??1bad_cast@@UAE@XZ=__thiscall_MSVCRT_bad_cast_dtor @12 -??1bad_typeid@@UAE@XZ=__thiscall_MSVCRT_bad_typeid_dtor @13 -??1exception@@UAE@XZ=__thiscall_MSVCRT_exception_dtor @14 -??1type_info@@UAE@XZ=__thiscall_MSVCRT_type_info_dtor @15 -??2@YAPAXI@Z=MSVCRT_operator_new @16 -??_U@YAPAXI@Z=MSVCRT_operator_new @36 -??3@YAXPAX@Z=MSVCRT_operator_delete @17 -??_V@YAXPAX@Z=MSVCRT_operator_delete @37 -??4__non_rtti_object@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT___non_rtti_object_opequals @18 -??4bad_cast@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_cast_opequals @19 -??4bad_typeid@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_bad_typeid_opequals @20 -??4exception@@QAEAAV0@ABV0@@Z=__thiscall_MSVCRT_exception_opequals @21 -??8type_info@@QBEHABV0@@Z=__thiscall_MSVCRT_type_info_opequals_equals @22 -??9type_info@@QBEHABV0@@Z=__thiscall_MSVCRT_type_info_opnot_equals @23 -??_7__non_rtti_object@@6B@=MSVCRT___non_rtti_object_vtable @24 DATA -??_7bad_cast@@6B@=MSVCRT_bad_cast_vtable @25 DATA -??_7bad_typeid@@6B@=MSVCRT_bad_typeid_vtable @26 DATA -??_7exception@@6B@=MSVCRT_exception_vtable @27 DATA -??_E__non_rtti_object@@UAEPAXI@Z=__thiscall_MSVCRT___non_rtti_object_vector_dtor @28 -??_Ebad_cast@@UAEPAXI@Z=__thiscall_MSVCRT_bad_cast_vector_dtor @29 -??_Ebad_typeid@@UAEPAXI@Z=__thiscall_MSVCRT_bad_typeid_vector_dtor @30 -??_Eexception@@UAEPAXI@Z=__thiscall_MSVCRT_exception_vector_dtor @31 -??_G__non_rtti_object@@UAEPAXI@Z=__thiscall_MSVCRT___non_rtti_object_scalar_dtor @32 -??_Gbad_cast@@UAEPAXI@Z=__thiscall_MSVCRT_bad_cast_scalar_dtor @33 -??_Gbad_typeid@@UAEPAXI@Z=__thiscall_MSVCRT_bad_typeid_scalar_dtor @34 -??_Gexception@@UAEPAXI@Z=__thiscall_MSVCRT_exception_scalar_dtor @35 -?_query_new_handler@@YAP6AHI@ZXZ=MSVCRT__query_new_handler @38 -?_query_new_mode@@YAHXZ=MSVCRT__query_new_mode @39 -?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=MSVCRT__set_new_handler @40 -?_set_new_mode@@YAHH@Z=MSVCRT__set_new_mode @41 -?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z=MSVCRT__set_se_translator @42 -?before@type_info@@QBEHABV1@@Z=__thiscall_MSVCRT_type_info_before @43 -?raw_name@type_info@@QBEPBDXZ=__thiscall_MSVCRT_type_info_raw_name @45 -?set_new_handler@@YAP6AXXZP6AXXZ@Z=MSVCRT__set_new_handler @46 -?set_terminate@@YAP6AXXZP6AXXZ@Z=MSVCRT_set_terminate @47 -?set_unexpected@@YAP6AXXZP6AXXZ@Z=MSVCRT_set_unexpected @48 -?terminate@@YAXXZ=MSVCRT_terminate @49 -?unexpected@@YAXXZ=MSVCRT_unexpected @50 -?what@exception@@UBEPBDXZ=__thiscall_MSVCRT_what_exception @51 -??1type_info@@UAE@XZ=MSVCRT_type_info_dtor@4 - -?name@type_info@@QBEPBDXZ=__thiscall_MSVCRT_type_info_name @44 -;??0bad_cast@@QAE@PBD@Z -;??0bad_cast@@AAE@PBQBD@Z -;??_Fbad_cast@@QAEXXZ -;??_Fbad_typeid@@QAEXXZ - -;---------------------------------------------------------------------- -; C Undecorated Symbols -;---------------------------------------------------------------------- -_CIacos -_CIasin -_CIatan -_CIatan2 -_CIcos -_CIcosh -_CIexp -_CIfmod -_CIlog -_CIlog10 -_CIpow -_CIsin -_CIsinh -_CIsqrt -_CItan -_CItanh -_CxxThrowException -_EH_prolog -_Getdays -_Getmonths -_Gettnames -_HUGE DATA -_Strftime -_XcptFilter -__CxxCallUnwindDtor=stub -__CxxDetectRethrow -__CxxExceptionFilter=stub -__CxxFrameHandler -__CxxLongjmpUnwind=stub -__CxxQueryExceptionSize -__CxxRegisterExceptionObject=stub -__CxxUnregisterExceptionObject=stub -__DestructExceptionObject=stub -__RTCastToVoid=MSVCRT___RTCastToVoid -__RTDynamicCast=MSVCRT___RTDynamicCast -__RTtypeid=MSVCRT___RTtypeid -__STRINGTOLD=stub -__argc DATA -__argv DATA -__badioinfo DATA -__crtCompareStringA -__crtGetLocaleInfoW -__crtLCMapStringA -__dllonexit -__doserrno -__fpecode -__getmainargs -__initenv DATA -__isascii=NTDLL.__isascii -__iscsym=NTDLL.__iscsym -__iscsymf=NTDLL.__iscsymf -__lc_codepage -__lc_collate_cp -__lc_handle -__lconv_init -__mb_cur_max DATA -__p___argc -__p___argv -__p___wargv -__p___initenv -__p___mb_cur_max -__p___winitenv -__p__acmdln -__p__amblksiz -__p__commode -__p__daylight -__p__dstbias -__p__environ -__p__fileinfo=stub -__p__fmode -__p__iob -__p__mbcasemap=stub -__p__mbctype=_mbctype -__p__osver -__p__pctype -__p__pgmptr -__p__pwctype -__p__timezone -__p__tzname=_tzname -__p__wcmdln -__p__wenviron -__p__winmajor -__p__winminor -__p__winver -__p__wpgmptr -__pioinfo -__pxcptinfoptrs -__set_app_type -__setlc_active DATA -__setusermatherr -__threadhandle -__threadid -__toascii=NTDLL.__toascii -__unDName=stub -__unDNameEx=stub -__unguarded_readlc_active DATA -__wargv -__wgetmainargs -__winitenv -___lc_codepage_func=stub -___lc_handle_func=stub -___mb_cur_max_func=stub -___setlc_active_func=stub -___unguarded_readlc_active_add_func=stub -__crtCompareStringW=stub -__crtGetStringTypeW=stub -__crtLCMapStringW=stub -__iob_func=stub -__pctype_func=stub -__uncaught_exception=stub -__wcserror=stub -_abnormal_termination -_access -_acmdln DATA -_adj_fdiv_m16i=stub -_adj_fdiv_m32 = _adj_fdiv_m32@4 -_adj_fdiv_m32i = _adj_fdiv_m32i@4 -_adj_fdiv_m64 = _adj_fdiv_m64@8 -_adj_fdiv_r -_adj_fdivr_m16i=stub -_adj_fdivr_m32 = _adj_fdivr_m32@4 -_adj_fdivr_m32i = _adj_fdivr_m32i@4 -_adj_fdivr_m64 = _adj_fdivr_m64@8 -_adj_fpatan -_adj_fprem=stub -_adj_fprem1=stub -_adj_fptan=stub -_adjust_fdiv DATA -_aexit_rtn -_aligned_free=stub -_aligned_malloc=stub -_aligned_offset_malloc=stub -_aligned_offset_realloc=stub -_aligned_realloc=stub -_amsg_exit -_assert -_atodbl=stub -_atoi64=NTDLL._atoi64 -_atoldbl=stub -_beep -_beginthread -_beginthreadex -_c_exit -_cabs -_callnewh=stub -_cexit -_cgets -_cgetws=stub -_chdir -_chdrive -_chgsign -_chkesp=stub -_chmod -_chsize -_clearfp -_close -_commit -_commode DATA -_control87 -_controlfp -_copysign -_cprintf -_cputs -_cputws=stub -_creat -_cscanf -_ctime64=stub -_ctype DATA -_cwait -_cwprintf=stub -_cwscanf=stub -_daylight DATA -_dstbias=stub -_dup -_dup2 -_ecvt -_endthread -_endthreadex -_environ=stub -_eof -_errno -_except_handler2 -_except_handler3 -_execl -_execle -_execlp -_execlpe -_execv -_execve -_execvp -_execvpe -_exit -_expand -_fcloseall -_fcvt -_fdopen -_fgetchar -_fgetwchar -_filbuf -_fileinfo=stub DATA -_filelength -_filelengthi64 -_fileno -_findclose -_findfirst -_findfirst64=stub -_findfirsti64 -_findnext -_findnext64=stub -_findnexti64 -_finite -_flsbuf -_flushall -_fmode DATA -_fpclass -_fpieee_flt -_fpreset -_fputchar -_fputwchar -_fsopen -_fstat -_fstat64=stub -_fstati64 -_ftime -_ftime64=stub -_ftol=NTDLL._ftol -_fullpath -_futime -_futime64=stub -_gcvt -_get_osfhandle -_get_sbh_threshold=stub -_getch -_getche -_getcwd -_getdcwd -_getdiskfree -_getdllprocaddr -_getdrive -_getdrives -_get_heap_handle=stub -_getmaxstdio=stub -_getmbcp=stub -_getpid -_getsystime -_getw -_getwch=stub -_getwche=stub -_getws=stub -_gmtime64=stub -_global_unwind2 -_heapadd -_heapchk -_heapmin -_heapset -_heapused=stub -_heapwalk -_hypot -_i64toa -_i64tow -_initterm -_inp=stub -_inpd=stub -_inpw=stub -_iob -_isatty -_isctype -_ismbbalnum -_ismbbalpha -_ismbbgraph -_ismbbkalnum -_ismbbkana -_ismbbkprint=stub -_ismbbkpunct -_ismbblead -_ismbbprint -_ismbbpunct -_ismbbtrail -_ismbcalnum -_ismbcalpha -_ismbcdigit -_ismbcgraph=stub -_ismbchira -_ismbckata -_ismbcl0 -_ismbcl1 -_ismbcl2 -_ismbclegal -_ismbclower -_ismbcprint -_ismbcpunct=stub -_ismbcspace -_ismbcsymbol -_ismbcupper -_ismbslead -_ismbstrail -_isnan -_itoa=NTDLL._itoa -_itow=NTDLL._itow -_j0 -_j1 -_jn -_kbhit -_localtime64=stub -_lfind -_loaddll -_local_unwind2 -_lock -_locking -_logb -_longjmpex=stub -_lrotl -_lrotr -_lsearch -_lseek -_lseeki64 -_ltoa=NTDLL._ltoa -_ltow -_makepath -_mbbtombc -_mbbtype -_mbcasemap=stub -_mbccpy -_mbcjistojms -_mbcjmstojis -_mbclen -_mbctohira -_mbctokata -_mbctolower -_mbctombb -_mbctoupper -_mbctype DATA -_mbsbtype -_mbscat -_mbschr -_mbscmp -_mbscoll -_mbscpy -_mbscspn -_mbsdec -_mbsdup -_mbsicmp -_mbsicoll -_mbsinc -_mbslen -_mbslwr -_mbsnbcat -_mbsnbcmp -_mbsnbcnt -_mbsnbcoll -_mbsnbcpy -_mbsnbicmp -_mbsnbicoll -_mbsnbset -_mbsncat -_mbsnccnt -_mbsncmp -_mbsncoll -_mbsncpy -_mbsnextc -_mbsnicmp -_mbsnicoll -_mbsninc -_mbsnset -_mbspbrk -_mbsrchr -_mbsrev -_mbsset -_mbsspn -_mbsspnp -_mbsstr -_mbstok -_mbstrlen -_mbsupr -_memccpy -_memicmp=NTDLL._memicmp -_mkdir -_mktemp -_mktime64=stub -_msize -_nextafter -_onexit -_open -_open_osfhandle -_osver DATA -_osplatform=stub -_outp=stub -_outpd=stub -_outpw=stub -_pclose -_pctype DATA -_pgmptr DATA -_pipe -_popen -_purecall -_putch -_putenv -_putw -_putwch=stub -_putws -_pwctype DATA -_read -_resetstkoflw=stub -_rmdir -_rmtmp -_rotl -_rotr -_safe_fdiv=stub -_safe_fdivr=stub -_safe_fprem=stub -_safe_fprem1=stub -_scalb -_scprintf=stub -_scwprintf=stub -_searchenv -_seh_longjmp_unwind=_seh_longjmp_unwind@4 -_set_error_mode=stub -_set_SSE2_enable=stub -_set_sbh_threshold=stub -_seterrormode -_setjmp -_setjmp3 -_setmaxstdio=stub -_setmbcp -_setmode -_setsystime -_sleep -_snprintf=crt__snprintf -_snscanf=stub -_snwscanf=stub -_snwprintf=crt__snwprintf -_sopen -_spawnl -_spawnle -_spawnlp -_spawnlpe -_spawnv -_spawnve -_spawnvp -_spawnvpe -_splitpath=NTDLL._splitpath -_stat -_stat64=stub -_stati64 -_statusfp -_strcmpi -_strdate -_strdup -_strerror -_stricmp=NTDLL._stricmp -_stricoll -_strlwr=NTDLL._strlwr -_strncoll -_strnicmp=NTDLL._strnicmp -_strnicoll -_strnset -_strrev -_strset -_strtime -_strtoi64=stub -_strtoui64=strtoull -_strupr -_swab -_sys_errlist DATA -_sys_nerr DATA -_tell -_telli64 -_tempnam -_time64=stub -_timezone DATA -_tolower=NTDLL._tolower -_toupper=NTDLL._toupper -_tzname DATA -_tzset -_ui64toa=NTDLL._i64toa -_ui64tow=NTDLL._i64tow -_ultoa=NTDLL._ultoa -_ultow=NTDLL._ultow -_umask -_ungetch -_unlink -_unloaddll -_unlock -_utime -_utime64=stub -_vscprintf=stub -_vscwprintf=stub -_vsnprintf -_vsnwprintf -_waccess -_wasctime -_wchdir -_wchmod -_wcmdln DATA -_wcreat -_wcsdup -_wcserror=stub -_wcsicmp -_wcsicoll -_wcslwr -_wcsncoll -_wcsnicmp -_wcsnicoll -_wcsnset -_wcsrev -_wcsset -_wcstoi64=stub -_wcstoui64=stub -_wctime64=stub -_wcsupr -_wctime -_wenviron -_wexecl -_wexecle -_wexeclp -_wexeclpe -_wexecv -_wexecve -_wexecvp -_wexecvpe -_wfdopen -_wfindfirst -_wfindfirst64=stub -_wfindfirsti64 -_wfindnext -_wfindnext64=stub -_wfindnexti64 -_wfopen -_wfreopen -_wfsopen -_wfullpath -_wgetcwd -_wgetdcwd -_wgetenv -_winmajor DATA -_winminor DATA -_winver DATA -_wmakepath -_wmkdir -_wmktemp -_wopen -_wperror -_wpgmptr=stub DATA -_wpopen -_wputenv -_wremove -_wrename -_write -_wrmdir -_wsearchenv -_wsetlocale=stub -_wsopen -_wspawnl -_wspawnle -_wspawnlp -_wspawnlpe -_wspawnv -_wspawnve -_wspawnvp -_wspawnvpe -_wsplitpath -_wstat -_wstat64=stub -_wstati64 -_wstrdate -_wstrtime -_wsystem=stub -_wtempnam -_wtmpnam -_wtof=stub -_wtoi=NTDLL._wtoi -_wtoi64=NTDLL._wtoi64 -_wtol -_wunlink -_wutime -_wutime64=stub -_y0 -_y1 -_yn -abort -abs=NTDLL.abs -acos -asctime -asin -atan=NTDLL.atan -atan2 -atexit -atof -atoi=NTDLL.atoi -atol=NTDLL.atol -bsearch=NTDLL.bsearch -calloc -ceil=NTDLL.ceil -clearerr -clock -cos=NTDLL.cos -cosh -ctime -difftime -div -exit -exp -fabs=NTDLL.fabs -fclose -feof -ferror -fflush -fgetc -fgetpos -fgets -fgetwc -fgetws -floor=NTDLL.floor -fmod -fopen -fprintf -fputc -fputs -fputwc -fputws -fread -free -freopen -frexp -fscanf -fseek -fsetpos -ftell -fwprintf -fwrite -fwscanf -getc -getchar -getenv -gets -getwc -getwchar -gmtime -is_wctype -isalnum=NTDLL.isalnum -isalpha=NTDLL.isalpha -iscntrl=NTDLL.iscntrl -isdigit=NTDLL.isdigit -isgraph=NTDLL.isgraph -isleadbyte -islower=NTDLL.islower -isprint=NTDLL.isprint -ispunct=NTDLL.ispunct -isspace=NTDLL.isspace -isupper=NTDLL.isupper -iswalnum -iswalpha=NTDLL.iswalpha -iswascii -iswcntrl -iswctype=NTDLL.iswctype -iswdigit=NTDLL.iswdigit -iswgraph -iswlower=NTDLL.iswlower -iswprint -iswpunct -iswspace=NTDLL.iswspace -iswupper -iswxdigit=NTDLL.iswxdigit -isxdigit=NTDLL.isxdigit -labs=NTDLL.labs -ldexp -ldiv -localeconv -localtime -log=NTDLL.log -log10 -longjmp -malloc -mblen -mbstowcs=NTDLL.mbstowcs -mbtowc -memchr -memcmp -memcpy=memmove -memmove -memset -mktime -modf -perror -pow=NTDLL.pow -printf -putc -putchar -puts -putwc -putwchar -qsort=NTDLL.qsort -raise -rand -realloc -remove -rename -rewind -scanf -setbuf -setlocale -setvbuf -signal -sin=NTDLL.sin -sinh -sprintf=crt_sprintf -sqrt=NTDLL.sqrt -srand -sscanf=crt_sscanf -strcat -strchr -strcmp=NTDLL.strcmp -strcoll -strcpy -strcspn -strerror -strftime -strlen -strncat -strncmp -strncpy -strpbrk -strrchr -strspn -strstr -strtod -strtok -strtol=NTDLL.strtol -strtoul -strxfrm -swprintf=crt_swprintf -swscanf -system -tan=NTDLL.tan -tanh -time -tmpfile -tmpnam -tolower -toupper=NTDLL.toupper -towlower=NTDLL.towlower -towupper=NTDLL.towupper -ungetc -ungetwc -vfprintf -vfwprintf -vprintf -vsprintf -vswprintf -vwprintf -wcscat -wcschr -wcscmp -wcscoll -wcscpy -wcscspn -wcsftime -wcslen -wcsncat -wcsncmp -wcsncpy -wcspbrk -wcsrchr -wcsspn -wcsstr -wcstod -wcstok -wcstol=NTDLL.wcstol -wcstombs -wcstoul=NTDLL.wcstoul -wcsxfrm -wctomb -wprintf -wscanf - -; EOF 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 (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Sun Dec 9 00:04:06 2007 @@ -3,7 +3,7 @@ <linkerflag>--enable-stdcall-fixup</linkerflag> <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> - <importlibrary definition="msvcrt.def" /> + <importlibrary definition="msvcrt.spec.def" /> <include base="msvcrt">.</include> <include base="crt">include</include> <define name="_DISABLE_TIDENTS" /> @@ -26,5 +26,6 @@ <library>ntdll</library> <pch>precomp.h</pch> <file>dllmain.c</file> + <file>msvcrt.spec</file> <file>msvcrt.rc</file> </module> Added: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec (added) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec Sun Dec 9 00:04:06 2007 @@ -1,0 +1,785 @@ +# msvcrt.dll - MS VC++ Run Time Library + +@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_copy_ctor +@ cdecl -i386 -norelay ??0__non_rtti_object@@QAE@PBD@Z(ptr) __thiscall_MSVCRT___non_rtti_object_ctor +@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_bad_cast_ctor +@ cdecl -i386 -norelay ??0bad_cast@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_copy_ctor +@ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor +@ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor +@ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor +@ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor +@ cdecl -i386 -norelay ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor +@ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() __thiscall_MSVCRT___non_rtti_object_dtor +@ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor +@ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor +@ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor +@ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor +@ cdecl ??2@YAPAXI@Z(long) MSVCRT_operator_new +@ cdecl ??_U@YAPAXI@Z(long) MSVCRT_operator_new +@ cdecl ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete +@ cdecl ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete +@ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals +@ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals +@ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals +@ cdecl -i386 -norelay ??4exception@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_opequals +@ cdecl -i386 -norelay ??8type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opequals_equals +@ cdecl -i386 -norelay ??9type_info@@QBEHABV0@@Z(ptr) __thiscall_MSVCRT_type_info_opnot_equals +@ extern -i386 ??_7__non_rtti_object@@6B@ MSVCRT___non_rtti_object_vtable +@ extern -i386 ??_7bad_cast@@6B@ MSVCRT_bad_cast_vtable +@ extern -i386 ??_7bad_typeid@@6B@ MSVCRT_bad_typeid_vtable +@ extern -i386 ??_7exception@@6B@ MSVCRT_exception_vtable +@ cdecl -i386 -norelay ??_E__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_vector_dtor +@ cdecl -i386 -norelay ??_Ebad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_vector_dtor +@ cdecl -i386 -norelay ??_Ebad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_vector_dtor +@ cdecl -i386 -norelay ??_Eexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_vector_dtor +@ cdecl -i386 -norelay ??_G__non_rtti_object@@UAEPAXI@Z(long) __thiscall_MSVCRT___non_rtti_object_scalar_dtor +@ cdecl -i386 -norelay ??_Gbad_cast@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_cast_scalar_dtor +@ cdecl -i386 -norelay ??_Gbad_typeid@@UAEPAXI@Z(long) __thiscall_MSVCRT_bad_typeid_scalar_dtor +@ cdecl -i386 -norelay ??_Gexception@@UAEPAXI@Z(long) __thiscall_MSVCRT_exception_scalar_dtor +@ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler +@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode +@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler +@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode +@ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator +@ cdecl -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) __thiscall_MSVCRT_type_info_before +@ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_name +@ cdecl -i386 -norelay ?raw_name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_raw_name +@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT__set_new_handler +@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_terminate +@ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_unexpected +@ cdecl ?terminate@@YAXXZ() MSVCRT_terminate +@ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected +@ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception +@ cdecl _CIacos() +@ cdecl _CIasin() +@ cdecl _CIatan() +@ cdecl _CIatan2() +@ cdecl _CIcos() +@ cdecl _CIcosh() +@ cdecl _CIexp() +@ cdecl _CIfmod() +@ cdecl _CIlog() +@ cdecl _CIlog10() +@ cdecl _CIpow() +@ cdecl _CIsin() +@ cdecl _CIsinh() +@ cdecl _CIsqrt() +@ cdecl _CItan() +@ cdecl _CItanh() +@ cdecl _CxxThrowException(long long) +@ cdecl -i386 -norelay _EH_prolog() +@ cdecl _Getdays() +@ cdecl _Getmonths() +@ cdecl _Gettnames() +@ extern _HUGE +@ cdecl _Strftime(str long str ptr ptr) +@ cdecl _XcptFilter(long ptr) +@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) +@ stdcall -i386 __CxxLongjmpUnwind(ptr) +@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid +@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast +@ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid +@ stub __STRINGTOLD #(ptr ptr str long) +@ extern __argc +@ extern __argv +@ extern __badioinfo +@ cdecl __crtCompareStringA(long long str long str long) +@ stub __crtCompareStringW #(long long wstr long wstr long) +@ cdecl __crtGetLocaleInfoW(long long ptr long) +@ cdecl __crtLCMapStringA(long long str long ptr long long long) +@ cdecl __dllonexit(ptr ptr ptr) +@ cdecl __doserrno() +@ cdecl __fpecode() +@ stub __get_app_type +@ cdecl __getmainargs(ptr ptr ptr long ptr) +@ extern __initenv +@ cdecl __isascii(long) ntdll.__isascii +@ cdecl __iscsym(long) ntdll.__iscsym +@ cdecl __iscsymf(long) ntdll.__iscsymf +@ extern __lc_codepage +@ stub __lc_collate +@ extern __lc_collate_cp +@ extern __lc_handle +@ cdecl __lconv_init() +@ extern __mb_cur_max +@ cdecl __p___argc() +@ cdecl __p___argv() +@ cdecl __p___initenv() +@ cdecl __p___mb_cur_max() +@ cdecl __p___wargv() +@ cdecl __p___winitenv() +@ cdecl __p__acmdln() +@ cdecl __p__amblksiz() +@ cdecl __p__commode() +@ cdecl __p__daylight() +@ cdecl __p__dstbias() +@ cdecl __p__environ() +@ stub __p__fileinfo #() +@ cdecl __p__fmode() +@ cdecl __p__iob() +@ stub __p__mbcasemap #() +@ cdecl __p__mbctype() _mbctype +@ cdecl __p__osver() +@ cdecl __p__pctype() +@ cdecl __p__pgmptr() +@ stub __p__pwctype #() +@ cdecl __p__timezone() +@ cdecl __p__tzname() _tzname +@ cdecl __p__wcmdln() +@ cdecl __p__wenviron() +@ cdecl __p__winmajor() +@ cdecl __p__winminor() +@ cdecl __p__winver() +@ cdecl __p__wpgmptr() +@ extern __pioinfo +@ stub __pxcptinfoptrs #() +@ cdecl __set_app_type(long) +@ extern __setlc_active +@ cdecl __setusermatherr(ptr) +@ cdecl __threadhandle() +@ cdecl __threadid() +@ cdecl __toascii(long) ntdll.__toascii +@ cdecl __unDName(ptr str long ptr ptr long) +@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) +@ extern __unguarded_readlc_active +@ extern __wargv +@ cdecl __wgetmainargs(ptr ptr ptr long ptr) +@ extern __winitenv +@ cdecl _abnormal_termination() +@ cdecl _access(str long) +@ extern _acmdln +@ stub _adj_fdiv_m16i #stdcall _adj_fdiv_m16i(long) +@ stdcall _adj_fdiv_m32(long) +@ stdcall _adj_fdiv_m32i(long) +@ stdcall _adj_fdiv_m64(double) +@ cdecl _adj_fdiv_r() +@ stub _adj_fdivr_m16i #stdcall _adj_fdivr_m16i(long) +@ stdcall _adj_fdivr_m32(long) +@ stdcall _adj_fdivr_m32i(long) +@ stdcall _adj_fdivr_m64(double) +@ stub _adj_fpatan #() +@ stub _adj_fprem #() +@ stub _adj_fprem1 #() +@ stub _adj_fptan #() +@ extern _adjust_fdiv +# extern _aexit_rtn +@ stub _aligned_free #(ptr) +@ stub _aligned_malloc #(long long) +@ stub _aligned_offset_malloc #(long long long) +@ stub _aligned_offset_realloc #(ptr long long long) +@ stub _aligned_realloc #(ptr long long) +@ cdecl _amsg_exit(long) +@ cdecl _assert(str str long) +@ stub _atodbl #(ptr str) +@ cdecl -ret64 _atoi64(str) ntdll._atoi64 +@ stub _atoldbl #(ptr str) MSVCRT__atoldbl +@ cdecl _beep(long long) +@ cdecl _beginthread (ptr long ptr) +@ cdecl _beginthreadex (ptr long ptr ptr long ptr) +@ cdecl _c_exit() +@ cdecl _cabs(long) +@ stub _callnewh #(long) +@ cdecl _cexit() +@ cdecl _cgets(str) +@ cdecl _chdir(str) +@ cdecl _chdrive(long) +@ cdecl _chgsign( double ) +@ stub _chkesp #cdecl -i386 -norelay _chkesp() +@ cdecl _chmod(str long) +@ cdecl _chsize (long long) +@ cdecl _clearfp() +@ cdecl _close(long) +@ cdecl _commit(long) +@ extern _commode +@ cdecl _control87(long long) +@ cdecl _controlfp(long long) +@ cdecl _copysign( double double ) +@ varargs _cprintf(str) +@ cdecl _cputs(str) +@ cdecl _creat(str long) +@ varargs _cscanf(str) +@ extern _ctype +@ cdecl _cwait(ptr long long) +@ extern _daylight +@ stub _dstbias #extern _dstbias MSVCRT__dstbias +@ cdecl _dup (long) +@ cdecl _dup2 (long long) +@ cdecl _ecvt(double long ptr ptr) +@ cdecl _endthread () +@ cdecl _endthreadex(long) +@ extern _environ +@ cdecl _eof(long) +@ cdecl _errno() +@ cdecl _except_handler2(ptr ptr ptr ptr) +@ cdecl _except_handler3(ptr ptr ptr ptr) +@ varargs _execl(str str) +@ varargs _execle(str str) +@ varargs _execlp(str str) +@ varargs _execlpe(str str) +@ cdecl _execv(str str) +@ cdecl _execve(str str str) +@ cdecl _execvp(str str) +@ cdecl _execvpe(str str str) +@ cdecl _exit(long) +@ cdecl _expand(ptr long) +@ cdecl _fcloseall() +@ cdecl _fcvt(double long ptr ptr) +@ cdecl _fdopen(long str) +@ cdecl _fgetchar() +@ cdecl _fgetwchar() +@ cdecl _filbuf(ptr) +# extern _fileinfo +@ cdecl _filelength(long) +@ cdecl -ret64 _filelengthi64(long) +@ cdecl _fileno(ptr) +@ cdecl _findclose(long) +@ cdecl _findfirst(str ptr) +@ cdecl _findfirsti64(str ptr) +@ stub _findnext #(long ptr) MSVCRT__findnext +@ cdecl _findnexti64(long ptr) +@ cdecl _finite( double ) +@ cdecl _flsbuf(long ptr) +@ cdecl _flushall() +@ extern _fmode +@ cdecl _fpclass(double) +@ stub _fpieee_flt #(long ptr ptr) +@ cdecl _fpreset() +@ cdecl _fputchar(long) +@ cdecl _fputwchar(long) +@ cdecl _fsopen(str str long) +@ cdecl _fstat(long ptr) +@ stub _fstat64 #(long ptr) MSVCRT__fstat64 +@ cdecl _fstati64(long ptr) +@ cdecl _ftime(ptr) +@ cdecl -ret64 _ftol() ntdll._ftol +@ cdecl _fullpath(ptr str long) +@ cdecl _futime(long ptr) +@ cdecl _gcvt(double long str) +@ cdecl _get_osfhandle(long) +@ stub _get_sbh_threshold #() +@ stub _get_terminate +@ stub _get_unexpected +@ cdecl _getch() +@ cdecl _getche() +@ cdecl _getcwd(str long) +@ cdecl _getdcwd(long str long) +@ cdecl _getdiskfree(long ptr) +@ cdecl _getdllprocaddr(long str long) +@ cdecl _getdrive() +@ cdecl _getdrives() kernel32.GetLogicalDrives +@ stub _getmaxstdio #() +@ stub _getmbcp #() +@ cdecl _getpid() kernel32.GetCurrentProcessId +@ stub _getsystime #(ptr) +@ cdecl _getw(ptr) +@ cdecl _getws(ptr) +@ cdecl _global_unwind2(ptr) +@ cdecl _heapadd (ptr long) +@ cdecl _heapchk() +@ cdecl _heapmin() +@ cdecl _heapset(long) +@ stub _heapused #(ptr ptr) +@ cdecl _heapwalk(ptr) +@ cdecl _hypot(double double) +@ cdecl _i64toa(long long ptr long) ntdll._i64toa +@ cdecl _i64tow(long long ptr long) ntdll._i64tow +@ cdecl _initterm(ptr ptr) +@ stub _inp #(long) -i386 +@ stub _inpd #(long) -i386 +@ stub _inpw #(long) -i386 +@ extern _iob +@ cdecl _isatty(long) +@ cdecl _isctype(long long) +@ stub _ismbbalnum #(long) +@ stub _ismbbalpha #(long) +@ stub _ismbbgraph #(long) +@ stub _ismbbkalnum #(long) +@ cdecl _ismbbkana(long) +@ stub _ismbbkprint #(long) +@ stub _ismbbkpunct #(long) +@ cdecl _ismbblead(long) +@ stub _ismbbprint #(long) +@ stub _ismbbpunct #(long) +@ cdecl _ismbbtrail(long) +@ cdecl _ismbcalnum(long) +@ cdecl _ismbcalpha(long) +@ cdecl _ismbcdigit(long) +@ stub _ismbcgraph #(long) +@ cdecl _ismbchira(long) +@ cdecl _ismbckata(long) +@ stub _ismbcl0 #(long) +@ stub _ismbcl1 #(long) +@ stub _ismbcl2 #(long) +@ stub _ismbclegal #(long) +@ cdecl _ismbclower(long) +@ cdecl _ismbcprint(long) +@ stub _ismbcpunct #(long) +@ cdecl _ismbcspace(long) +@ cdecl _ismbcsymbol(long) +@ cdecl _ismbcupper(long) +@ cdecl _ismbslead(ptr ptr) +@ cdecl _ismbstrail(ptr ptr) +@ cdecl _isnan( double ) +@ cdecl _itoa(long ptr long) ntdll._itoa +@ cdecl _itow(long ptr long) ntdll._itow +@ cdecl _j0(double) +@ cdecl _j1(double) +@ cdecl _jn(long double) +@ cdecl _kbhit() +@ cdecl _lfind(ptr ptr ptr long ptr) +@ cdecl _loaddll(str) +@ cdecl -i386 _local_unwind2(ptr long) +@ cdecl _lock(long) +@ cdecl _locking(long long long) +@ cdecl _logb( double ) +@ stub -i386 _longjmpex #(ptr long) MSVCRT_longjmp +@ cdecl _lrotl(long long) +@ cdecl _lrotr(long long) +@ cdecl _lsearch(ptr ptr long long ptr) +@ cdecl _lseek(long long long) +@ cdecl -ret64 _lseeki64(long double long) +@ cdecl _ltoa(long ptr long) ntdll._ltoa +@ cdecl _ltow(long ptr long) +@ cdecl _makepath(ptr str str str str) +@ stub _matherr #(ptr) MSVCRT__matherr +@ cdecl _mbbtombc(long) +@ cdecl _mbbtype(long long) +# extern _mbcasemap +@ cdecl _mbccpy (str str) +@ cdecl _mbcjistojms(long) +@ cdecl _mbcjmstojis(long) +@ cdecl _mbclen(ptr) +@ cdecl _mbctohira(long) +@ cdecl _mbctokata(long) +@ cdecl _mbctolower(long) +@ cdecl _mbctombb(long) +@ cdecl _mbctoupper(long) +@ extern _mbctype +@ cdecl _mbsbtype(str long) +@ cdecl _mbscat(str str) +@ cdecl _mbschr(str long) +@ cdecl _mbscmp(str str) +@ cdecl _mbscoll(str str) +@ cdecl _mbscpy(ptr str) +@ cdecl _mbscspn (str str) +@ cdecl _mbsdec(ptr ptr) +@ cdecl _mbsdup(str) _strdup +@ cdecl _mbsicmp(str str) +@ cdecl _mbsicoll(str str) +@ cdecl _mbsinc(str) +@ cdecl _mbslen(str) +@ cdecl _mbslwr(str) +@ cdecl _mbsnbcat (str str long) +@ cdecl _mbsnbcmp(str str long) +@ cdecl _mbsnbcnt(ptr long) +@ cdecl _mbsnbcoll(str str long) +@ cdecl _mbsnbcpy(ptr str long) +@ stub _mbsnbcpy_s #(ptr long str long) +@ cdecl _mbsnbicmp(str str long) +@ cdecl _mbsnbicoll(str str long) +@ cdecl _mbsnbset(str long long) +@ cdecl _mbsncat(str str long) +@ cdecl _mbsnccnt(str long) +@ cdecl _mbsncmp(str str long) +@ cdecl _mbsncoll (str str long) +@ cdecl _mbsncpy(str str long) +@ cdecl _mbsnextc(str) +@ cdecl _mbsnicmp(str str long) +@ cdecl _mbsnicoll (str str long) +@ cdecl _mbsninc(str long) +@ cdecl _mbsnset(str long long) +@ cdecl _mbspbrk(str str) +@ cdecl _mbsrchr(str long) +@ cdecl _mbsrev(str) +@ cdecl _mbsset(str long) +@ cdecl _mbsspn(str str) +@ cdecl _mbsspnp(str str) +@ cdecl _mbsstr(str str) +@ cdecl _mbstok(str str) +@ cdecl _mbstrlen(str) +@ cdecl _mbsupr(str) +@ cdecl _memccpy(ptr ptr long long) +@ cdecl _memicmp(str str long) ntdll._memicmp +@ cdecl _mkdir(str) +@ cdecl _mktemp(str) +@ cdecl _msize(ptr) +@ cdecl _nextafter(double double) +@ cdecl _onexit(ptr) +@ varargs _open(str long) +@ cdecl _open_osfhandle(long long) +@ extern _osver +@ stub _outp #(long long) +@ stub _outpd #(long long) +@ stub _outpw #(long long) +@ cdecl _pclose (ptr) +@ extern _pctype +@ extern _pgmptr +@ cdecl _pipe (ptr long long) +@ cdecl _popen (str str) +@ cdecl _purecall() +@ cdecl _putch(long) +@ cdecl _putenv(str) +@ cdecl _putw(long ptr) +@ cdecl _putws(wstr) +# extern _pwctype +@ cdecl _read(long ptr long) +@ cdecl _rmdir(str) +@ cdecl _rmtmp() +@ cdecl _rotl(long long) +@ cdecl _rotr(long long) +@ stub _safe_fdiv #() +@ stub _safe_fdivr #() +@ stub _safe_fprem #() +@ stub _safe_fprem1 #() +@ cdecl _scalb( double long) +@ cdecl _searchenv(str str ptr) +@ stdcall -i386 _seh_longjmp_unwind(ptr) +@ stub _set_error_mode #(long) +@ stub _set_sbh_threshold #(long) +@ cdecl _seterrormode(long) +@ cdecl -i386 -norelay _setjmp(ptr) +@ cdecl -i386 -norelay _setjmp3(ptr long) +@ stub _setmaxstdio #(long) +@ cdecl _setmbcp(long) +@ cdecl _setmode(long long) +@ cdecl _setsystime (ptr long) +@ cdecl _sleep(long) +@ varargs _snprintf(str long str) crt__snprintf +@ varargs _snwprintf(wstr long wstr) crt__snwprintf +@ varargs _sopen(str long long) +@ varargs _spawnl(long str str) +@ varargs _spawnle(long str str) +@ varargs _spawnlp(long str str) +@ varargs _spawnlpe(long str str) +@ cdecl _spawnv(long str ptr) +@ cdecl _spawnve(long str ptr ptr) +@ cdecl _spawnvp(long str ptr) +@ cdecl _spawnvpe(long str ptr ptr) +@ cdecl _splitpath(str ptr ptr ptr ptr) ntdll._splitpath +@ cdecl _stat(str ptr) +@ stub _stat64 #(str ptr) MSVCRT__stat64 +@ cdecl _stati64(str ptr) +@ cdecl _statusfp() +@ cdecl _strcmpi(str str) +@ cdecl _strdate(ptr) +@ cdecl _strdup(str) +@ cdecl _strerror(long) +@ cdecl _stricmp(str str) ntdll._stricmp +@ cdecl _stricoll(str str) +@ cdecl _strlwr(str) ntdll._strlwr +@ cdecl _strncoll(str str long) +@ cdecl _strnicmp(str str long) ntdll._strnicmp +@ cdecl _strnicoll(str str long) +@ cdecl _strnset(str long long) +@ cdecl _strrev(str) +@ cdecl _strset(str long) +@ cdecl _strtime(ptr) +@ cdecl _strupr(str) +@ cdecl _swab(str str long) +@ extern _sys_errlist +@ extern _sys_nerr +@ cdecl _tell(long) +@ cdecl -ret64 _telli64(long) +@ cdecl _tempnam(str str) +@ extern _timezone +@ cdecl _tolower(long) ntdll._tolower +@ cdecl _toupper(long) ntdll._toupper +@ extern _tzname +@ cdecl _tzset() +@ cdecl _ui64toa(long long ptr long) ntdll._ui64toa +@ cdecl _ui64tow(long long ptr long) ntdll._ui64tow +@ cdecl _ultoa(long ptr long) ntdll._ultoa +@ cdecl _ultow(long ptr long) ntdll._ultow +@ cdecl _umask(long) +@ cdecl _ungetch(long) +@ cdecl _unlink(str) +@ cdecl _unloaddll(long) +@ cdecl _unlock(long) +@ cdecl _utime(str ptr) +@ cdecl _vsnprintf(ptr long ptr ptr) +@ cdecl _vsnwprintf(ptr long wstr long) +@ cdecl _waccess(wstr long) +@ cdecl _wasctime(ptr) +@ cdecl _wchdir(wstr) +@ cdecl _wchmod(wstr long) +@ extern _wcmdln +@ cdecl _wcreat(wstr long) +@ cdecl _wcsdup(wstr) +@ cdecl _wcsicmp(wstr wstr) +@ cdecl _wcsicoll(wstr wstr) +@ cdecl _wcslwr(wstr) +@ cdecl _wcsncoll (wstr wstr long) +@ cdecl _wcsnicmp(wstr wstr long) +@ cdecl _wcsnicoll (wstr wstr long) +@ cdecl _wcsnset(wstr long long) +@ cdecl _wcsrev(wstr) +@ cdecl _wcsset(wstr long) +@ cdecl _wcsupr(wstr) +@ cdecl _wctime(ptr) +@ extern _wenviron +@ varargs _wexecl (wstr wstr) +@ varargs _wexecle (wstr wstr) +@ varargs _wexeclp (wstr wstr) +@ varargs _wexeclpe (wstr wstr) +@ cdecl _wexecv (wstr ptr) +@ cdecl _wexecve (wstr ptr ptr) +@ cdecl _wexecvp (wstr ptr) +@ cdecl _wexecvpe (wstr ptr ptr) +@ cdecl _wfdopen(long wstr) +@ cdecl _wfindfirst(wstr ptr) +@ cdecl _wfindfirsti64(wstr ptr) +@ cdecl _wfindnext(long ptr) +@ cdecl _wfindnexti64 (long ptr) +@ cdecl _wfopen(wstr wstr) +@ cdecl _wfreopen (wstr wstr ptr) +@ cdecl _wfsopen(wstr wstr long) +@ cdecl _wfullpath(ptr wstr long) +@ cdecl _wgetcwd(wstr long) +@ cdecl _wgetdcwd(long wstr long) +@ cdecl _wgetenv(wstr) +@ extern _winmajor +@ extern _winminor +@ extern _winver +@ cdecl _wmakepath(wstr wstr wstr wstr wstr) +@ cdecl _wmkdir(wstr) +@ cdecl _wmktemp(wstr) +@ varargs _wopen(wstr long) +@ stub _wperror #(wstr) +@ stub _wpgmptr #extern _wpgmptr MSVCRT__wpgmptr +@ cdecl _wpopen (wstr wstr) +@ cdecl _wputenv(wstr) +@ cdecl _wremove(wstr) +@ cdecl _wrename(wstr wstr) +@ cdecl _write(long ptr long) +@ cdecl _wrmdir(wstr) +@ cdecl _wsearchenv(wstr wstr ptr) +@ stub _wsetlocale #(long wstr) MSVCRT__wsetlocale +@ varargs _wsopen (wstr long long) +@ stub _wspawnl #(long wstr wstr) varargs +@ stub _wspawnle #(long wstr wstr) varargs +@ stub _wspawnlp #(long wstr wstr) varargs +@ stub _wspawnlpe #(long wstr wstr) varargs +@ cdecl _wspawnv(long wstr ptr) +@ cdecl _wspawnve(long wstr ptr ptr) +@ cdecl _wspawnvp(long wstr ptr) +@ cdecl _wspawnvpe(long wstr ptr ptr) +@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) +@ cdecl _wstat(wstr ptr) +@ cdecl _wstati64(wstr ptr) +@ stub _wstat64 #(wstr ptr) MSVCRT__wstat64 +@ cdecl _wstrdate(ptr) +@ cdecl _wstrtime(ptr) +@ stub _wsystem #(wstr) +@ cdecl _wtempnam(wstr wstr) +@ stub _wtmpnam #(ptr) +@ cdecl _wtoi(wstr) ntdll._wtoi +@ cdecl _wtoi64(wstr) ntdll._wtoi64 +@ cdecl _wtol(wstr) ntdll._wtol +@ cdecl _wunlink(wstr) +@ cdecl _wutime(wstr ptr) +@ cdecl _y0(double) +@ cdecl _y1(double) +@ cdecl _yn(long double ) +@ cdecl abort() abort +@ cdecl abs(long) ntdll.abs +@ cdecl acos(double) acos +@ cdecl asctime(ptr) asctime +@ cdecl asin(double) asin +@ cdecl atan(double) ntdll.atan +@ cdecl atan2(double double) atan2 +@ cdecl atexit(ptr) atexit +@ cdecl atof(str) atof +@ cdecl atoi(str) ntdll.atoi +@ cdecl atol(str) ntdll.atol +@ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch +@ cdecl calloc(long long) calloc +@ cdecl ceil(double) ntdll.ceil +@ cdecl clearerr(ptr) clearerr +@ cdecl clock() clock +@ cdecl cos(double) ntdll.cos +@ cdecl cosh(double) cosh +@ cdecl ctime(ptr) ctime +@ cdecl difftime(long long) difftime +@ cdecl div(long long) div +@ cdecl exit(long) exit +@ cdecl exp(double) exp +@ cdecl fabs(double) ntdll.fabs +@ cdecl fclose(ptr) fclose +@ cdecl feof(ptr) feof +@ cdecl ferror(ptr) ferror +@ cdecl fflush(ptr) fflush +@ cdecl fgetc(ptr) fgetc +@ cdecl fgetpos(ptr ptr) fgetpos +@ cdecl fgets(ptr long ptr) fgets +@ cdecl fgetwc(ptr) fgetwc +@ cdecl fgetws(ptr long ptr) fgetws +@ cdecl floor(double) ntdll.floor +@ cdecl fmod(double double) fmod +@ cdecl fopen(str str) fopen +@ varargs fprintf(ptr str) fprintf +@ cdecl fputc(long ptr) fputc +@ cdecl fputs(str ptr) fputs +@ cdecl fputwc(long ptr) fputwc +@ cdecl fputws(wstr ptr) fputws +@ cdecl fread(ptr long long ptr) fread +@ cdecl free(ptr) free +@ cdecl freopen(str str ptr) freopen +@ cdecl frexp(double ptr) frexp +@ varargs fscanf(ptr str) fscanf +@ cdecl fseek(ptr long long) fseek +@ cdecl fsetpos(ptr ptr) fsetpos +@ cdecl ftell(ptr) ftell +@ varargs fwprintf(ptr wstr) fwprintf +@ cdecl fwrite(ptr long long ptr) fwrite +@ varargs fwscanf(ptr wstr) fwscanf +@ cdecl getc(ptr) getc +@ cdecl getchar() getchar +@ cdecl getenv(str) getenv +@ cdecl gets(str) gets +@ cdecl getwc(ptr) getwc +@ cdecl getwchar() getwchar +@ cdecl gmtime(ptr) gmtime +@ cdecl is_wctype(long long) is_wctype +@ cdecl isalnum(long) ntdll.isalnum +@ cdecl isalpha(long) ntdll.isalpha +@ cdecl iscntrl(long) ntdll.iscntrl +@ cdecl isdigit(long) ntdll.isdigit +@ cdecl isgraph(long) ntdll.isgraph +@ cdecl isleadbyte(long) isleadbyte +@ cdecl islower(long) ntdll.islower +@ cdecl isprint(long) ntdll.isprint +@ cdecl ispunct(long) ntdll.ispunct +@ cdecl isspace(long) ntdll.isspace +@ cdecl isupper(long) ntdll.isupper +@ cdecl iswalnum(long) iswalnum +@ cdecl iswalpha(long) ntdll.iswalpha +@ cdecl iswascii(long) iswascii +@ cdecl iswcntrl(long) iswcntrl +@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswdigit(long) ntdll.iswdigit +@ cdecl iswgraph(long) iswgraph +@ cdecl iswlower(long) ntdll.iswlower +@ cdecl iswprint(long) iswprint +@ cdecl iswpunct(long) iswpunct +@ cdecl iswspace(long) ntdll.iswspace +@ cdecl iswupper(long) iswupper +@ cdecl iswxdigit(long) ntdll.iswxdigit +@ cdecl isxdigit(long) ntdll.isxdigit +@ cdecl labs(long) ntdll.labs +@ cdecl ldexp( double long) ldexp +@ cdecl ldiv(long long) ldiv +@ cdecl localeconv() localeconv +@ cdecl localtime(ptr) localtime +@ cdecl log(double) ntdll.log +@ cdecl log10(double) log10 +@ cdecl -i386 longjmp(ptr long) longjmp +@ cdecl malloc(long) malloc +@ cdecl mblen(ptr long) mblen +@ cdecl mbstowcs(ptr str long) ntdll.mbstowcs +@ cdecl mbtowc(wstr str long) mbtowc +@ cdecl memchr(ptr long long) memchr +@ cdecl memcmp(ptr ptr long) memcmp +@ cdecl memcpy(ptr ptr long) memcpy +@ cdecl memmove(ptr ptr long) memmove +@ cdecl memset(ptr long long) memset +@ cdecl mktime(ptr) mktime +@ cdecl modf(double ptr) modf +@ cdecl perror(str) perror +@ cdecl pow(double double) ntdll.pow +@ varargs printf(str) printf +@ cdecl putc(long ptr) putc +@ cdecl putchar(long) putchar +@ cdecl puts(str) puts +@ cdecl putwc(long ptr) putwc +@ cdecl putwchar(long) putwchar +@ cdecl qsort(ptr long long ptr) ntdll.qsort +@ cdecl raise(long) raise +@ cdecl rand() rand +@ cdecl realloc(ptr long) realloc +@ cdecl remove(str) remove +@ cdecl rename(str str) rename +@ cdecl rewind(ptr) rewind +@ varargs scanf(str) scanf +@ cdecl setbuf(ptr ptr) setbuf +@ cdecl setlocale(long str) setlocale +@ cdecl setvbuf(ptr str long long) setvbuf +@ cdecl signal(long long) signal +@ cdecl sin(double) ntdll.sin +@ cdecl sinh(double) sinh +@ varargs sprintf(ptr str) crt_sprintf +@ cdecl sqrt(double) ntdll.sqrt +@ cdecl srand(long) srand +@ varargs sscanf(str str) crt_sscanf +@ cdecl strcat(str str) ntdll.strcat +@ stub strcat_s #(str long str) MSVCRT_strcat_s +@ cdecl strchr(str long) strchr +@ cdecl strcmp(str str) ntdll.strcmp +@ cdecl strcoll(str str) strcoll +@ cdecl strcpy(ptr str) strcpy +@ stub strcpy_s #(ptr long str) +@ cdecl strcspn(str str) strcspn +@ cdecl strerror(long) strerror +@ cdecl strftime(str long str ptr) strftime +@ cdecl strlen(str) strlen +@ cdecl strncat(str str long) strncat +@ cdecl strncmp(str str long) strncmp +@ cdecl strncpy(ptr str long) strncpy +@ cdecl strpbrk(str str) strpbrk +@ cdecl strrchr(str long) strrchr +@ cdecl strspn(str str) strspn +@ cdecl strstr(str str) strstr +@ cdecl strtod(str ptr) strtod +@ cdecl strtok(str str) strtok +@ cdecl strtol(str ptr long) ntdll.strtol +@ cdecl strtoul(str ptr long) strtoul + +# ReactOS hack { +@ cdecl _strtoui64(str ptr long) strtoull +# ReactOS hack } + +@ cdecl strxfrm(ptr str long) strxfrm +@ varargs swprintf(wstr wstr) crt_swprintf +@ varargs swscanf(wstr wstr) swscanf +@ cdecl system(str) system +@ cdecl tan(double) ntdll.tan +@ cdecl tanh(double) tanh +@ cdecl time(ptr) time +@ cdecl tmpfile() tmpfile +@ cdecl tmpnam(ptr) tmpnam +@ cdecl tolower(long) ntdll.tolower +@ cdecl toupper(long) ntdll.toupper +@ cdecl towlower(long) ntdll.towlower +@ cdecl towupper(long) ntdll.towupper +@ cdecl ungetc(long ptr) ungetc +@ cdecl ungetwc(long ptr) ungetwc +@ cdecl vfprintf(ptr str long) vfprintf +@ cdecl vfwprintf(ptr wstr long) vfwprintf +@ cdecl vprintf(str long) vprintf +@ cdecl vsprintf(ptr str ptr) vsprintf +@ cdecl vswprintf(ptr wstr long) vswprintf +@ cdecl vwprintf(wstr long) vwprintf +@ cdecl wcscat(wstr wstr) wcscat +@ cdecl wcschr(wstr long) wcschr +@ cdecl wcscmp(wstr wstr) wcscmp +@ cdecl wcscoll(wstr wstr) wcscoll +@ cdecl wcscpy(ptr wstr) wcscpy +@ cdecl wcscspn(wstr wstr) wcscspn +@ cdecl wcsftime(ptr long wstr ptr) wcsftime +@ cdecl wcslen(wstr) wcslen +@ cdecl wcsncat(wstr wstr long) wcsncat +@ cdecl wcsncmp(wstr wstr long) wcsncmp +@ cdecl wcsncpy(ptr wstr long) wcsncpy +@ cdecl wcspbrk(wstr wstr) wcspbrk +@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsspn(wstr wstr) ntdll.wcsspn +@ cdecl wcsstr(wstr wstr) ntdll.wcsstr +@ cdecl wcstod(wstr ptr) wcstod +@ cdecl wcstok(wstr wstr) wcstok +@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstombs(ptr ptr long) wcstombs +@ cdecl wcstoul(wstr ptr long) ntdll.wcstoul +@ cdecl wcsxfrm (ptr wstr long) wcsxfrm +@ cdecl wctomb(ptr long) wctomb +@ varargs wprintf(wstr) wprintf +@ varargs wscanf(wstr) wscanf Propchange: trunk/reactos/dll/win32/msvcrt/msvcrt.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 31094: - Move NtCreateKey to regobj.c, delete ntfunc.c, now all those routines exist solely for creating keys. - Move NtOpenKey to ntapi.c and rewrite it to use the new parse routine. It's now 6 lines of code instead of 80. - Fix a bug in CmpDereferenceNameCnotrolBlockWithLock. - Fix bugs during reference and dereference of KCB. - Fix KCB structure. - CmpDelayDerefKCBWorker is now called, don't make it assert anymore, just print out that it's not completed. - Remove debug output from
by fireball＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: fireball Date: Sun Dec 9 00:00:45 2007 New Revision: 31094 URL: http://svn.reactos.org/svn/reactos?rev=31094&view=rev Log: - Move NtCreateKey to regobj.c, delete ntfunc.c, now all those routines exist solely for creating keys. - Move NtOpenKey to ntapi.c and rewrite it to use the new parse routine. It's now 6 lines of code instead of 80. - Fix a bug in CmpDereferenceNameCnotrolBlockWithLock. - Fix bugs during reference and dereference of KCB. - Fix KCB structure. - CmpDelayDerefKCBWorker is now called, don't make it assert anymore, just print out that it's not completed. - Remove debug output from new parse routine, since it's now called for each key open. - Add one more case to handle: opening the root \REGISTRY node. - Don't dereference KCBs in the parse routine anymore: we have some bugs related to this and it would make ReactOS crash. Removed: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Removed: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c (removed) @@ -1,289 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/cm/ntfunc.c - * PURPOSE: Ntxxx function for registry access - * - * PROGRAMMERS: Hartmut Birr - * Casper Hornstrup - * Alex Ionescu - * Rex Jolliff - * Eric Kohl - * Filip Navara - * Thomas Weidenmueller - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#include "cm.h" - -/* GLOBALS ******************************************************************/ - -NTSTATUS -NTAPI -CmpCreateHandle(PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleAttributes, - PHANDLE HandleReturn); - -/* FUNCTIONS ****************************************************************/ - -NTSTATUS -NTAPI -NtCreateKey(OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG TitleIndex, - IN PUNICODE_STRING Class, - IN ULONG CreateOptions, - OUT PULONG Disposition) -{ - UNICODE_STRING RemainingPath = {0}, ReturnedPath = {0}; - ULONG LocalDisposition; - PCM_KEY_BODY KeyObject, Parent; - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - ULONG i; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - HANDLE hKey; - PCM_KEY_NODE Node, ParentNode; - CM_PARSE_CONTEXT ParseContext = {0}; - PAGED_CODE(); - - /* Setup the parse context */ - ParseContext.CreateOperation = TRUE; - ParseContext.CreateOptions = CreateOptions; - if (Class) ParseContext.Class = *Class; - - /* Capture all the info */ - Status = ObpCaptureObjectAttributes(ObjectAttributes, - PreviousMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) return Status; - - /* Find the key object */ - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&Parent, - &ReturnedPath, - CmpKeyObjectType, - NULL, - NULL); - if (!NT_SUCCESS(Status)) goto Cleanup; - - /* Check if we found the entire path */ - RemainingPath = ReturnedPath; - if (!RemainingPath.Length) - { - /* Check if the parent has been deleted */ - if (Parent->KeyControlBlock->Delete) - { - /* Fail */ - DPRINT1("Object marked for delete!\n"); - Status = STATUS_UNSUCCESSFUL; - goto Cleanup; - } - - /* Create a new handle to the parent */ - Status = CmpCreateHandle(Parent, - DesiredAccess, - ObjectCreateInfo.Attributes, - &hKey); - if (!NT_SUCCESS(Status)) goto Cleanup; - - /* Tell the caller we did this */ - LocalDisposition = REG_OPENED_EXISTING_KEY; - goto SuccessReturn; - } - - /* Loop every leading slash */ - while ((RemainingPath.Length) && - (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) - { - /* And remove it */ - RemainingPath.Length -= sizeof(WCHAR); - RemainingPath.MaximumLength -= sizeof(WCHAR); - RemainingPath.Buffer++; - } - - /* Loop every terminating slash */ - while ((RemainingPath.Length) && - (RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == - OBJ_NAME_PATH_SEPARATOR)) - { - /* And remove it */ - RemainingPath.Length -= sizeof(WCHAR); - RemainingPath.MaximumLength -= sizeof(WCHAR); - } - - /* Now loop the entire path */ - for (i = 0; i < RemainingPath.Length / sizeof(WCHAR); i++) - { - /* And check if we found slahes */ - if (RemainingPath.Buffer[i] == OBJ_NAME_PATH_SEPARATOR) - { - /* We don't create trees -- parent key doesn't exist, so fail */ - Status = STATUS_OBJECT_NAME_NOT_FOUND; - goto Cleanup; - } - } - - /* Now check if we're left with no name by this point */ - if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) - { - /* Then fail since we can't do anything */ - Status = STATUS_OBJECT_NAME_NOT_FOUND; - goto Cleanup; - } - - /* Lock the registry */ - CmpLockRegistry(); - - /* Create the key */ - Status = CmpDoCreate(Parent->KeyControlBlock->KeyHive, - Parent->KeyControlBlock->KeyCell, - NULL, - &RemainingPath, - KernelMode, - &ParseContext, - Parent->KeyControlBlock, - (PVOID*)&KeyObject); - if (!NT_SUCCESS(Status)) goto Cleanup; - - /* If we got here, this is a new key */ - LocalDisposition = REG_CREATED_NEW_KEY; - - /* Get the parent node and the child node */ - ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->ParentKcb->KeyHive, - KeyObject->KeyControlBlock->ParentKcb->KeyCell); - Node = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->KeyHive, - KeyObject->KeyControlBlock->KeyCell); - - /* Inherit some information */ - Node->Parent = KeyObject->KeyControlBlock->ParentKcb->KeyCell; - Node->Security = ParentNode->Security; - KeyObject->KeyControlBlock->ValueCache.ValueList = Node->ValueList.List; - KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; - - /* Link child to parent */ - InsertTailList(&Parent->KeyControlBlock->KeyBodyListHead, &KeyObject->KeyBodyList); - - /* Create the actual handle to the object */ - Status = CmpCreateHandle(KeyObject, - DesiredAccess, - ObjectCreateInfo.Attributes, - &hKey); - - /* Free the create information */ - ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(KeyObject)->ObjectCreateInfo); - OBJECT_TO_OBJECT_HEADER(KeyObject)->ObjectCreateInfo = NULL; - if (!NT_SUCCESS(Status)) goto Cleanup; - - /* Add the keep-alive reference */ - ObReferenceObject(KeyObject); - - /* Unlock registry */ - CmpUnlockRegistry(); - - /* Force a lazy flush */ - CmpLazyFlush(); - -SuccessReturn: - /* Return data to user */ - *KeyHandle = hKey; - if (Disposition) *Disposition = LocalDisposition; - -Cleanup: - /* Cleanup */ - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - RtlFreeUnicodeString(&ReturnedPath); - if (Parent) ObDereferenceObject(Parent); - return Status; -} - -NTSTATUS -NTAPI -NtOpenKey(OUT PHANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) -{ - UNICODE_STRING RemainingPath = {0}; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PCM_KEY_BODY Object = NULL; - HANDLE hKey = NULL; - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - PAGED_CODE(); - - /* Capture all the info */ - Status = ObpCaptureObjectAttributes(ObjectAttributes, - PreviousMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) return Status; - - /* Loop every terminating slash */ - while ((ObjectName.Length) && - (ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == - OBJ_NAME_PATH_SEPARATOR)) - { - /* And remove it */ - ObjectName.Length -= sizeof(WCHAR); - ObjectName.MaximumLength -= sizeof(WCHAR); - } - - /* Find the key */ - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&Object, - &RemainingPath, - CmpKeyObjectType, - NULL, - NULL); - if (!NT_SUCCESS(Status)) goto openkey_cleanup; - - /* Make sure we don't have any remaining path */ - if ((RemainingPath.Buffer) && (RemainingPath.Buffer[0] != UNICODE_NULL)) - { - /* Fail */ - Status = STATUS_OBJECT_NAME_NOT_FOUND; - goto openkey_cleanup; - } - - /* Check if the key has been deleted */ - if (Object->KeyControlBlock->Delete) - { - /* Fail */ - Status = STATUS_UNSUCCESSFUL; - goto openkey_cleanup; - } - - /* Create the actual handle */ - Status = CmpCreateHandle(Object, - DesiredAccess, - ObjectCreateInfo.Attributes, - &hKey); - -openkey_cleanup: - /* Cleanup */ - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - RtlFreeUnicodeString(&RemainingPath); - if (Object) ObDereferenceObject(Object); - - /* Return information and status to user */ - *KeyHandle = hKey; - return Status; -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Sun Dec 9 00:00:45 2007 @@ -875,4 +875,181 @@ return(STATUS_SUCCESS); } +NTSTATUS +NTAPI +NtCreateKey(OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG TitleIndex, + IN PUNICODE_STRING Class, + IN ULONG CreateOptions, + OUT PULONG Disposition) +{ + UNICODE_STRING RemainingPath = {0}, ReturnedPath = {0}; + ULONG LocalDisposition; + PCM_KEY_BODY KeyObject, Parent; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + ULONG i; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + HANDLE hKey; + PCM_KEY_NODE Node, ParentNode; + CM_PARSE_CONTEXT ParseContext = {0}; + PAGED_CODE(); + + /* Setup the parse context */ + ParseContext.CreateOperation = TRUE; + ParseContext.CreateOptions = CreateOptions; + if (Class) ParseContext.Class = *Class; + + /* Capture all the info */ + Status = ObpCaptureObjectAttributes(ObjectAttributes, + PreviousMode, + FALSE, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) return Status; + + /* Find the key object */ + Status = CmFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&Parent, + &ReturnedPath, + CmpKeyObjectType, + NULL, + NULL); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Check if we found the entire path */ + RemainingPath = ReturnedPath; + if (!RemainingPath.Length) + { + /* Check if the parent has been deleted */ + if (Parent->KeyControlBlock->Delete) + { + /* Fail */ + DPRINT1("Object marked for delete!\n"); + Status = STATUS_UNSUCCESSFUL; + goto Cleanup; + } + + /* Create a new handle to the parent */ + Status = CmpCreateHandle(Parent, + DesiredAccess, + ObjectCreateInfo.Attributes, + &hKey); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Tell the caller we did this */ + LocalDisposition = REG_OPENED_EXISTING_KEY; + goto SuccessReturn; + } + + /* Loop every leading slash */ + while ((RemainingPath.Length) && + (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) + { + /* And remove it */ + RemainingPath.Length -= sizeof(WCHAR); + RemainingPath.MaximumLength -= sizeof(WCHAR); + RemainingPath.Buffer++; + } + + /* Loop every terminating slash */ + while ((RemainingPath.Length) && + (RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == + OBJ_NAME_PATH_SEPARATOR)) + { + /* And remove it */ + RemainingPath.Length -= sizeof(WCHAR); + RemainingPath.MaximumLength -= sizeof(WCHAR); + } + + /* Now loop the entire path */ + for (i = 0; i < RemainingPath.Length / sizeof(WCHAR); i++) + { + /* And check if we found slahes */ + if (RemainingPath.Buffer[i] == OBJ_NAME_PATH_SEPARATOR) + { + /* We don't create trees -- parent key doesn't exist, so fail */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Cleanup; + } + } + + /* Now check if we're left with no name by this point */ + if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) + { + /* Then fail since we can't do anything */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Cleanup; + } + + /* Lock the registry */ + CmpLockRegistry(); + + /* Create the key */ + Status = CmpDoCreate(Parent->KeyControlBlock->KeyHive, + Parent->KeyControlBlock->KeyCell, + NULL, + &RemainingPath, + KernelMode, + &ParseContext, + Parent->KeyControlBlock, + (PVOID*)&KeyObject); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* If we got here, this is a new key */ + LocalDisposition = REG_CREATED_NEW_KEY; + + /* Get the parent node and the child node */ + ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->ParentKcb->KeyHive, + KeyObject->KeyControlBlock->ParentKcb->KeyCell); + Node = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->KeyHive, + KeyObject->KeyControlBlock->KeyCell); + + /* Inherit some information */ + Node->Parent = KeyObject->KeyControlBlock->ParentKcb->KeyCell; + Node->Security = ParentNode->Security; + KeyObject->KeyControlBlock->ValueCache.ValueList = Node->ValueList.List; + KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; + + /* Link child to parent */ + InsertTailList(&Parent->KeyControlBlock->KeyBodyListHead, &KeyObject->KeyBodyList); + + /* Create the actual handle to the object */ + Status = CmpCreateHandle(KeyObject, + DesiredAccess, + ObjectCreateInfo.Attributes, + &hKey); + + /* Free the create information */ + ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(KeyObject)->ObjectCreateInfo); + OBJECT_TO_OBJECT_HEADER(KeyObject)->ObjectCreateInfo = NULL; + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Add the keep-alive reference */ + ObReferenceObject(KeyObject); + + /* Unlock registry */ + CmpUnlockRegistry(); + + /* Force a lazy flush */ + CmpLazyFlush(); + +SuccessReturn: + /* Return data to user */ + *KeyHandle = hKey; + if (Disposition) *Disposition = LocalDisposition; + +Cleanup: + /* Cleanup */ + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + RtlFreeUnicodeString(&ReturnedPath); + if (Parent) ObDereferenceObject(Parent); + return Status; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sun Dec 9 00:00:45 2007 @@ -231,11 +231,14 @@ { USHORT RefCount; USHORT Flags; - ULONG ExtFlags:8; - ULONG PrivateAlloc:1; - ULONG Delete:1; - ULONG DelayedCloseIndex:12; - ULONG TotalLevels:10; + struct + { + ULONG ExtFlags:8; + ULONG PrivateAlloc:1; + ULONG Delete:1; + ULONG DelayedCloseIndex:12; + ULONG TotalLevels:10; + }; union { CM_KEY_HASH KeyHash; @@ -251,9 +254,12 @@ PCM_NAME_CONTROL_BLOCK NameBlock; PCM_KEY_SECURITY_CACHE CachedSecurity; CACHED_CHILD_LIST ValueCache; - PCM_INDEX_HINT_BLOCK IndexHint; - ULONG HashKey; - ULONG SubKeyCount; + union + { + PCM_INDEX_HINT_BLOCK IndexHint; + ULONG HashKey; + ULONG SubKeyCount; + }; union { LIST_ENTRY KeyBodyListHead; Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c Sun Dec 9 00:00:45 2007 @@ -107,6 +107,8 @@ ASSERT(CmpDelayDerefKCBWorkItemActive); /* FIXME: TODO */ + DPRINT1("CmpDelayDerefKCBWorker has work to do!\n"); + return; ASSERT(FALSE); } @@ -307,3 +309,4 @@ } + Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Sun Dec 9 00:00:45 2007 @@ -312,9 +312,10 @@ CmpDereferenceNameControlBlockWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) { PCM_NAME_HASH Current, *Next; + ULONG ConvKey = Ncb->ConvKey; /* Lock the NCB */ - CmpAcquireNcbLockExclusive(Ncb); + CmpAcquireNcbLockExclusiveByKey(ConvKey); /* Decrease the reference count */ if (!(--Ncb->RefCount)) @@ -342,7 +343,7 @@ } /* Release the lock */ - CmpReleaseNcbLock(Ncb); + CmpReleaseNcbLockByKey(ConvKey); } BOOLEAN @@ -363,13 +364,13 @@ /* Increase the reference count while we release the lock */ InterlockedIncrement((PLONG)&Kcb->RefCount); - + /* Go from shared to exclusive */ CmpConvertKcbSharedToExclusive(Kcb); /* Decrement the reference count; the lock is now held again */ InterlockedDecrement((PLONG)&Kcb->RefCount); - + /* Check if we still control the index */ if (Kcb->DelayedCloseIndex == 1) { @@ -387,7 +388,7 @@ } /* Increase the reference count */ - if (InterlockedIncrement((PLONG)&Kcb->RefCount) == 0) + if ((InterlockedIncrement((PLONG)&Kcb->RefCount) & 0xFFFF) == 0) { /* We've overflown to 64K references, bail out */ InterlockedDecrement((PLONG)&Kcb->RefCount); @@ -511,9 +512,9 @@ /* Get the ref count and update it */ OldRefCount = *(PLONG)&Kcb->RefCount; NewRefCount = OldRefCount - 1; - - /* Check if we still have refenreces */ - if( (NewRefCount & 0xffff) > 0) + + /* Check if we still have references */ + if( (NewRefCount & 0xFFFF) > 0) { /* Do the dereference */ if (InterlockedCompareExchange((PLONG)&Kcb->RefCount, @@ -544,7 +545,7 @@ (CmpTestRegistryLockExclusive() == TRUE)); /* Check if this is the last reference */ - if (InterlockedDecrement((PLONG)&Kcb->RefCount) == 0) + if ((InterlockedDecrement((PLONG)&Kcb->RefCount) & 0xFFFF) == 0) { /* Check if we should do a direct delete */ if (((CmpHoldLazyFlush) && @@ -783,7 +784,7 @@ } } } - + /* Sanity check */ ASSERT((!Kcb) || (Kcb->Delete == FALSE)); @@ -821,3 +822,4 @@ /* FIXME: Implement once we don't link parents to children anymore */ } + Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Sun Dec 9 00:00:45 2007 @@ -782,7 +782,7 @@ /* Release it */ HvReleaseCell(Context->ChildHive.KeyHive, ChildCell); - /* Set the parent adn flags */ + /* Set the parent and flags */ KeyNode->Parent = LinkCell; KeyNode->Flags |= KEY_HIVE_ENTRY | KEY_NO_DELETE; @@ -977,7 +977,6 @@ PULONG LockedKcbs = NULL; BOOLEAN Result, Last; PAGED_CODE(); - DPRINT1("New style parse routine called: %wZ %wZ!\n", CompleteName, RemainingName); /* Loop path separators at the end */ while ((RemainingName->Length) && @@ -1003,7 +1002,6 @@ /* Grab the KCB */ Kcb = ((PCM_KEY_BODY)ParseObject)->KeyControlBlock; - DPRINT1("KCB Parse: %p\n", Kcb); /* Lookup in the cache */ Status = CmpBuildHashStackAndLookupCache(ParseObject, @@ -1019,9 +1017,6 @@ /* This is now the parent */ ParentKcb = Kcb; - DPRINT1("ParentKcb Parse: %p\n", ParentKcb); - DPRINT1("Hive Parse: %p\n", Hive); - DPRINT1("Cell Parse: %p\n", Cell); /* Check if everything was found cached */ if (!TotalRemainingSubkeys) ASSERTMSG("Caching not implemented", FALSE); @@ -1032,9 +1027,6 @@ /* Check if this is a symlink */ if (Kcb->Flags & KEY_SYM_LINK) { - DPRINT1("Parsing sym link: %lx %lx %lx\n", Kcb->Flags, Status, - CompleteName); - /* Get the next name */ Result = CmpGetNextName(&Current, &NextName, &Last); Current.Buffer = NextName.Buffer; @@ -1071,10 +1063,6 @@ /* Couldn't find symlink */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - - /* Not implemented */ - DPRINT1("Parsing sym link: %lx %wZ %wZ\n", Status, - CompleteName, &Current); /* We're done */ goto Quickie; @@ -1083,7 +1071,6 @@ /* Get the key node */ Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); if (!Node) return STATUS_INSUFFICIENT_RESOURCES; - DPRINT1("Node Parse: %p\n", Node); /* Start parsing */ Status = STATUS_NOT_IMPLEMENTED; @@ -1091,7 +1078,6 @@ { /* Get the next component */ Result = CmpGetNextName(&Current, &NextName, &Last); - DPRINT1("Result Parse: %p\n", Result); if ((Result) && (NextName.Length)) { /* See if this is a sym link */ @@ -1099,13 +1085,11 @@ { /* Find the subkey */ NextCell = CmpFindSubKeyByName(Hive, Node, &NextName); - DPRINT1("NextCell Parse: %lx %wZ\n", NextCell, &NextName); if (NextCell != HCELL_NIL) { /* Get the new node */ Cell = NextCell; Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); - DPRINT1("Node Parse: %p\n", Node); if (!Node) ASSERT(FALSE); /* Check if this was the last key */ @@ -1115,13 +1099,11 @@ if (Node->Flags & KEY_HIVE_EXIT) { /* Handle it */ - DPRINT1("Exit node\n"); CmpHandleExitNode(&Hive, &Cell, &Node, &HiveToRelease, &CellToRelease); - DPRINT1("Node Parse: %p\n", Node); if (!Node) ASSERT(FALSE); } @@ -1139,9 +1121,6 @@ Object); if (Status == STATUS_REPARSE) { - DPRINT1("Parsing sym link: %lx %lx\n", Status, - CompleteName); - /* Parse the symlink */ if (!CmpGetSymbolicLink(Hive, CompleteName, @@ -1151,15 +1130,9 @@ /* Symlink parse failed */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - - /* Not implemented */ - DPRINT1("Parsing sym link: %lx %wZ\n", Status, - CompleteName); - while (TRUE); } /* We are done */ - DPRINT1("Open of last key\n"); break; } @@ -1167,13 +1140,11 @@ if (Node->Flags & KEY_HIVE_EXIT) { /* Handle it */ - DPRINT1("Exit node: %lx\n", Node->Flags); CmpHandleExitNode(&Hive, &Cell, &Node, &HiveToRelease, &CellToRelease); - DPRINT1("Node Parse: %p\n", Node); if (!Node) ASSERT(FALSE); } @@ -1185,10 +1156,9 @@ 0, &NextName); if (!Kcb) ASSERT(FALSE); - DPRINT1("Kcb Parse: %p\n", Kcb); /* Dereference the parent and set the new one */ - CmpDereferenceKeyControlBlock(ParentKcb); + //CmpDereferenceKeyControlBlock(ParentKcb); ParentKcb = Kcb; } else @@ -1211,7 +1181,6 @@ ParseContext, ParentKcb, Object); - DPRINT1("Link created: %lx\n", Status); } else { @@ -1242,9 +1211,6 @@ } else { - DPRINT1("Parsing sym link: %lx %lx\n", Status, - CompleteName); - /* Save the next name */ Current.Buffer = NextName.Buffer; @@ -1280,20 +1246,47 @@ /* Couldn't find symlink */ Status = STATUS_OBJECT_NAME_NOT_FOUND; } - - /* Not implemented */ - DPRINT1("Parsing sym link: %lx %wZ %wZ\n", Status, - CompleteName, &Current); - + /* We're done */ break; } } else if ((Result) && (Last)) { - /* Opening root: unexpected */ - DPRINT1("Unexpected: Opening root\n"); - while (TRUE); + /* Opening the root. Is this an exit node? */ + if (Node->Flags & KEY_HIVE_EXIT) + { + /* Handle it */ + CmpHandleExitNode(&Hive, + &Cell, + &Node, + &HiveToRelease, + &CellToRelease); + if (!Node) ASSERT(FALSE); + } + + /* FIXME: This hack seems required? */ + RtlInitUnicodeString(&NextName, L"\\REGISTRY"); + + /* Do the open */ + Status = CmpDoOpen(Hive, + Cell, + Node, + AccessState, + AccessMode, + Attributes, + ParseContext, + 0, + &Kcb, + &NextName, + Object); + if (Status == STATUS_REPARSE) + { + /* Nothing to do */ + } + + /* We're done */ + break; } else { @@ -1305,7 +1298,7 @@ /* Dereference the parent if it exists */ Quickie: - if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); + //if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); /* Unlock the registry */ CmpUnlockRegistry(); Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Sun Dec 9 00:00:45 2007 @@ -17,6 +17,25 @@ BOOLEAN CmFirstTime = TRUE; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +NtOpenKey(OUT PHANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + CM_PARSE_CONTEXT ParseContext = {0}; + PAGED_CODE(); + + /* Just let the object manager handle this */ + return ObOpenObjectByName(ObjectAttributes, + CmpKeyObjectType, + ExGetPreviousMode(), + NULL, + DesiredAccess, + &ParseContext, + KeyHandle); +} NTSTATUS NTAPI @@ -472,26 +491,10 @@ NTSTATUS NTAPI -NtCompactKeys(IN ULONG Count, - IN PHANDLE KeyArray) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -NtCompressKey(IN HANDLE Key) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI NtLoadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes, IN POBJECT_ATTRIBUTES FileObjectAttributes) { + /* Call the newer API */ return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); } @@ -501,6 +504,7 @@ IN POBJECT_ATTRIBUTES FileObjectAttributes, IN ULONG Flags) { + /* Call the newer API */ return NtLoadKeyEx(KeyObjectAttributes, FileObjectAttributes, Flags, NULL); } @@ -553,6 +557,34 @@ /* Return status */ return Status; +} + +NTSTATUS +NTAPI +NtNotifyChangeKey(IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchTree, + OUT PVOID Buffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + /* Call the newer API */ + return NtNotifyChangeMultipleKeys(KeyHandle, + 0, + NULL, + Event, + ApcRoutine, + ApcContext, + IoStatusBlock, + CompletionFilter, + WatchTree, + Buffer, + Length, + Asynchronous); } NTSTATUS @@ -619,6 +651,23 @@ NTSTATUS NTAPI +NtCompactKeys(IN ULONG Count, + IN PHANDLE KeyArray) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtCompressKey(IN HANDLE Key) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI NtLockProductActivationKeys(IN PULONG pPrivateVer, IN PULONG pSafeMode) { @@ -655,33 +704,6 @@ NTSTATUS NTAPI -NtNotifyChangeKey(IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchTree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - return NtNotifyChangeMultipleKeys(KeyHandle, - 0, - NULL, - Event, - ApcRoutine, - ApcContext, - IoStatusBlock, - CompletionFilter, - WatchTree, - Buffer, - Length, - Asynchronous); -} - -NTSTATUS -NTAPI NtQueryMultipleValueKey(IN HANDLE KeyHandle, IN OUT PKEY_VALUE_ENTRY ValueList, IN ULONG NumberOfValues, Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Dec 9 00:00:45 2007 @@ -139,7 +139,6 @@ <file>ntapi.c</file> </directory> <directory name="cm"> - <file>ntfunc.c</file> <file>regobj.c</file> </directory> <directory name="dbgk">

1 0

[fireball] 31093: - Temporary disable PnP in 1st stage, until a problem with CM is resolved.
by fireball＠svn.reactos.org 08 Dec '07

08 Dec '07

Author: fireball Date: Sat Dec 8 23:55:38 2007 New Revision: 31093 URL: http://svn.reactos.org/svn/reactos?rev=31093&view=rev Log: - Temporary disable PnP in 1st stage, until a problem with CM is resolved. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sat Dec 8 23:55:38 2007 @@ -703,7 +703,8 @@ /* Start PnP thread */ if (hPnpThread != INVALID_HANDLE_VALUE) { - NtResumeThread(hPnpThread, NULL); + //HACK: Commented out till the problem with CM is solved + //NtResumeThread(hPnpThread, NULL); hPnpThread = INVALID_HANDLE_VALUE; }

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