Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 24957: fix compilation of RC files
by cwittich＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: cwittich Date: Wed Nov 29 02:46:26 2006 New Revision: 24957 URL: http://svn.reactos.org/svn/reactos?rev=24957&view=rev Log: fix compilation of RC files Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Wed Nov 29 02:46:26 2006 @@ -341,6 +341,7 @@ string cbproj_path = module.GetBasePath(); string CompilerVar; string baseaddr; + string windres_defines; string project_linker_flags = "-Wl,--enable-stdcall-fixup "; project_linker_flags += GenerateProjectLinkerFlags(); @@ -433,10 +434,12 @@ { const string& escaped = _replace_str(defs[i]->value, "\"","""); common_defines.push_back( defs[i]->name + "=" + escaped ); + windres_defines += "-D" + defs[i]->name + "=" + escaped + " "; } else { common_defines.push_back( defs[i]->name ); + windres_defines += "-D" + defs[i]->name + " "; } } /*const vector<Property*>& variables = data.properties; @@ -482,7 +485,7 @@ if ( configuration.UseConfigurationInPath ) { - if ( module.type == StaticLibrary ) + if ( module.type == StaticLibrary ||module.type == ObjectLibrary ) fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.GetBasePath ().c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); else fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.GetBasePath ().c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c_str()); @@ -490,7 +493,7 @@ } else { - if ( module.type == StaticLibrary ) + if ( module.type == StaticLibrary || module.type == ObjectLibrary ) fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", intdir.c_str (), module.GetBasePath ().c_str (), module.name.c_str(), module_type.c_str() ); else fprintf ( OUT, "\t\t\t\t<Option output=\"%s\\%s\\%s%s\" prefix_auto=\"0\" extension_auto=\"0\" />\r\n", outdir.c_str (), module.GetBasePath ().c_str (), module.name.c_str(), module_type.c_str() ); @@ -711,6 +714,8 @@ const string& resource_file = resource_files[i]; fprintf ( OUT, "\t\t<Unit filename=\"%s\">\r\n", resource_file.c_str() ); fprintf ( OUT, "\t\t\t<Option compilerVar=\"WINDRES\" />\r\n" ); + string extension = GetExtension ( resource_file ); + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o kernel32.kernel32.rci.tmp\\n%s\\tools\\wrc\\wrc.exe $includes %s kernel32.kernel32.rci.tmp kernel32.kernel32.res.tmp\\n$rescomp --output-format=coff kernel32.kernel32.res.tmp -o $resource_output\" />\r\n" , windres_defines.c_str(), outdir.c_str(), windres_defines.c_str() ); for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { const CBConfiguration& cfg = *m_configurations[icfg];

1 0

[greatlrd] 24956: tempary fix : adding HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PROCESSOR_ARCHITECTURE =x86 fixing some installer like WinPcap, this should freeldr setup up not be hardcode here.
by greatlrd＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: greatlrd Date: Wed Nov 29 01:56:08 2006 New Revision: 24956 URL: http://svn.reactos.org/svn/reactos?rev=24956&view=rev Log: tempary fix : adding HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PROCESSOR_ARCHITECTURE =x86 fixing some installer like WinPcap, this should freeldr setup up not be hardcode here. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Wed Nov 29 01:56:08 2006 @@ -423,6 +423,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PATHEXT",0x00020000,".COM;.EXE;.BAT;.CMD" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","PROCESSOR_ARCHITECTURE",0x00020000,"x86" + ; Known DLLs HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","DllDirectory",0x00020000,"%SystemRoot%\system32"

1 0

[janderwald] 24955: revert commit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Wed Nov 29 01:04:31 2006 New Revision: 24955 URL: http://svn.reactos.org/svn/reactos?rev=24955&view=rev Log: revert commit Added: trunk/reactos/base/setup/reactos/cs-CZ.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/cs-CZ.rc trunk/reactos/base/setup/reactos/de-DE.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/de-DE.rc trunk/reactos/base/setup/reactos/en-US.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/en-US.rc trunk/reactos/base/setup/reactos/fi-FI.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/fi-FI.rc trunk/reactos/base/setup/reactos/fr-FR.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/fr-FR.rc trunk/reactos/base/setup/reactos/hu-HU.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/hu-HU.rc trunk/reactos/base/setup/reactos/it-IT.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/it-IT.rc trunk/reactos/base/setup/reactos/ja-JP.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/ja-JP.rc trunk/reactos/base/setup/reactos/nb-NO.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/nb-NO.rc trunk/reactos/base/setup/reactos/nl-NL.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/nl-NL.rc trunk/reactos/base/setup/reactos/ru-RU.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/ru-RU.rc trunk/reactos/base/setup/reactos/sv-SE.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/sv-SE.rc trunk/reactos/base/setup/reactos/uk-UA.rc - copied unchanged from r24951, trunk/reactos/base/setup/reactos/uk-UA.rc Removed: trunk/reactos/base/setup/reactos/lang/ trunk/reactos/base/setup/reactos/rsrc.rc Modified: trunk/reactos/base/setup/reactos/reactos.rc Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc (original) +++ trunk/reactos/base/setup/reactos/reactos.rc Wed Nov 29 01:04:31 2006 @@ -8,6 +8,26 @@ #define REACTOS_STR_ORIGINAL_FILENAME "reactos.exe\0" #include <reactos/version.rc> -#include "rsrc.rc" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* Icons */ +IDI_MAIN ICON "res/reactos.ico" + + +/* Language-specific resources */ +#include "cs-CZ.rc" +#include "de-DE.rc" +#include "en-US.rc" +#include "fi-FI.rc" +#include "fr-FR.rc" +#include "hu-HU.rc" +#include "it-IT.rc" +#include "ja-JP.rc" +#include "nl-NL.rc" +#include "nb-NO.rc" +#include "ru-RU.rc" +#include "sv-SE.rc" +#include "uk-UA.rc" /* EOF */ Removed: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc (removed) @@ -1,23 +1,0 @@ -#include <windows.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* Icons */ -IDI_MAIN ICON "res/reactos.ico" - - -/* Language-specific resources */ -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/fi-FI.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/nb-NO.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc"

1 0

[janderwald] 24954: oops i did it again
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Wed Nov 29 00:46:54 2006 New Revision: 24954 URL: http://svn.reactos.org/svn/reactos?rev=24954&view=rev Log: oops i did it again Added: trunk/reactos/base/applications/sndvol32/rsrc.rc (with props) Added: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc (added) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc Wed Nov 29 00:46:54 2006 @@ -1,0 +1,18 @@ +#include <windows.h> +#include "resources.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 24 DISCARDABLE "manifest.xml" + +IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Propchange: trunk/reactos/base/applications/sndvol32/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 24953: start fixing dections of DDCREATE_HARDWAREONLY and DDCREATE_EMULATIONONLY, we are now swicting betwin mix HEL and HAL, only HAL, or only HEL. But this is not complete yet
by greatlrd＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: greatlrd Date: Wed Nov 29 00:45:51 2006 New Revision: 24953 URL: http://svn.reactos.org/svn/reactos?rev=24953&view=rev Log: start fixing dections of DDCREATE_HARDWAREONLY and DDCREATE_EMULATIONONLY, we are now swicting betwin mix HEL and HAL, only HAL, or only HEL. But this is not complete yet Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed Nov 29 00:45:51 2006 @@ -173,105 +173,108 @@ /* Fixme the mix betwin hel and hal */ This->lpLcl->lpDDCB->cbDDCallbacks.dwSize = sizeof(This->lpLcl->lpDDCB->cbDDCallbacks); - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CANCREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface = This->lpLcl->lpDDCB->HALDD.CanCreateSurface; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CANCREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface = This->lpLcl->lpDDCB->HELDD.CanCreateSurface; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface = This->lpLcl->lpDDCB->HALDD.CreateSurface; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATESURFACE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATESURFACE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface = This->lpLcl->lpDDCB->HELDD.CreateSurface; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATEPALETTE) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATEPALETTE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATEPALETTE; This->lpLcl->lpDDCB->cbDDCallbacks.CreatePalette = This->lpLcl->lpDDCB->HALDD.CreatePalette; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATEPALETTE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATEPALETTE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATEPALETTE; This->lpLcl->lpDDCB->cbDDCallbacks.CreatePalette = This->lpLcl->lpDDCB->HELDD.CreatePalette; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_DESTROYDRIVER; This->lpLcl->lpDDCB->cbDDCallbacks.DestroyDriver = This->lpLcl->lpDDCB->HALDD.DestroyDriver; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_DESTROYDRIVER; This->lpLcl->lpDDCB->cbDDCallbacks.DestroyDriver = This->lpLcl->lpDDCB->HELDD.DestroyDriver; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_FLIPTOGDISURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.FlipToGDISurface = This->lpLcl->lpDDCB->HALDD.FlipToGDISurface; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_FLIPTOGDISURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.FlipToGDISurface = This->lpLcl->lpDDCB->HELDD.FlipToGDISurface; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_GETSCANLINE; This->lpLcl->lpDDCB->cbDDCallbacks.GetScanLine = This->lpLcl->lpDDCB->HALDD.GetScanLine; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_GETSCANLINE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_GETSCANLINE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_GETSCANLINE; This->lpLcl->lpDDCB->cbDDCallbacks.GetScanLine = This->lpLcl->lpDDCB->HELDD.GetScanLine; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETCOLORKEY) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETCOLORKEY) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETCOLORKEY; This->lpLcl->lpDDCB->cbDDCallbacks.SetColorKey = This->lpLcl->lpDDCB->HALDD.SetColorKey; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETCOLORKEY) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETCOLORKEY) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETCOLORKEY; This->lpLcl->lpDDCB->cbDDCallbacks.SetColorKey = This->lpLcl->lpDDCB->HELDD.SetColorKey; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETEXCLUSIVEMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetExclusiveMode = This->lpLcl->lpDDCB->HALDD.SetExclusiveMode; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETEXCLUSIVEMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetExclusiveMode = This->lpLcl->lpDDCB->HELDD.SetExclusiveMode; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETMODE) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETMODE) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetMode = This->lpLcl->lpDDCB->HALDD.SetMode; } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETMODE) + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETMODE) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetMode = This->lpLcl->lpDDCB->HELDD.SetMode; } - if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + if ((This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) && (devicetypes !=3)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_WAITFORVERTICALBLANK; - This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = This->lpLcl->lpDDCB->HALDD.WaitForVerticalBlank; - } - else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = + This->lpLcl->lpDDCB->HALDD.WaitForVerticalBlank; + } + else if ((This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) && (devicetypes !=2)) { This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_WAITFORVERTICALBLANK; - This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank; + This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = + This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank; }

1 0

[janderwald] 24952: - shuffle resource files a bit - a priori: - mea culpa - hominem est erratum
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Wed Nov 29 00:44:53 2006 New Revision: 24952 URL: http://svn.reactos.org/svn/reactos?rev=24952&view=rev Log: - shuffle resource files a bit - a priori: - mea culpa - hominem est erratum Added: trunk/reactos/base/setup/reactos/lang/ trunk/reactos/base/setup/reactos/rsrc.rc (with props) trunk/reactos/base/setup/vmwinst/lang/ trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/da-DK.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/da-DK.rc trunk/reactos/base/setup/vmwinst/lang/de-DE.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/de-DE.rc trunk/reactos/base/setup/vmwinst/lang/en-US.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/en-US.rc trunk/reactos/base/setup/vmwinst/lang/es-ES.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/es-ES.rc trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/hu-HU.rc trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/ja-JP.rc trunk/reactos/base/setup/vmwinst/lang/ru-RU.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/ru-RU.rc trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc - copied unchanged from r24951, trunk/reactos/base/setup/vmwinst/uk-UA.rc trunk/reactos/base/setup/vmwinst/rsrc.rc (with props) trunk/reactos/base/setup/welcome/lang/ trunk/reactos/base/setup/welcome/lang/bg-BG.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/bg-BG.rc trunk/reactos/base/setup/welcome/lang/cs-CZ.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/cs-CZ.rc trunk/reactos/base/setup/welcome/lang/da-DK.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/da-DK.rc trunk/reactos/base/setup/welcome/lang/de-DE.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/de-DE.rc trunk/reactos/base/setup/welcome/lang/el-GR.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/el-GR.rc trunk/reactos/base/setup/welcome/lang/en-US.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/en-US.rc trunk/reactos/base/setup/welcome/lang/es-ES.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/es-ES.rc trunk/reactos/base/setup/welcome/lang/fr-FR.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/fr-FR.rc trunk/reactos/base/setup/welcome/lang/hu-HU.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/hu-HU.rc trunk/reactos/base/setup/welcome/lang/it-IT.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/it-IT.rc trunk/reactos/base/setup/welcome/lang/ja-JP.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/ja-JP.rc trunk/reactos/base/setup/welcome/lang/nb-NO.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/nb-NO.rc trunk/reactos/base/setup/welcome/lang/nl-NL.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/nl-NL.rc trunk/reactos/base/setup/welcome/lang/ru-RU.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/ru-RU.rc trunk/reactos/base/setup/welcome/lang/sv-SE.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/sv-SE.rc trunk/reactos/base/setup/welcome/lang/uk-UA.rc - copied unchanged from r24951, trunk/reactos/base/setup/welcome/uk-UA.rc trunk/reactos/base/setup/welcome/rsrc.rc (with props) Removed: trunk/reactos/base/setup/reactos/cs-CZ.rc trunk/reactos/base/setup/reactos/de-DE.rc trunk/reactos/base/setup/reactos/en-US.rc trunk/reactos/base/setup/reactos/fi-FI.rc trunk/reactos/base/setup/reactos/fr-FR.rc trunk/reactos/base/setup/reactos/hu-HU.rc trunk/reactos/base/setup/reactos/it-IT.rc trunk/reactos/base/setup/reactos/ja-JP.rc trunk/reactos/base/setup/reactos/nb-NO.rc trunk/reactos/base/setup/reactos/nl-NL.rc trunk/reactos/base/setup/reactos/ru-RU.rc trunk/reactos/base/setup/reactos/sv-SE.rc trunk/reactos/base/setup/reactos/uk-UA.rc trunk/reactos/base/setup/vmwinst/cs-CZ.rc trunk/reactos/base/setup/vmwinst/da-DK.rc trunk/reactos/base/setup/vmwinst/de-DE.rc trunk/reactos/base/setup/vmwinst/en-US.rc trunk/reactos/base/setup/vmwinst/es-ES.rc trunk/reactos/base/setup/vmwinst/hu-HU.rc trunk/reactos/base/setup/vmwinst/ja-JP.rc trunk/reactos/base/setup/vmwinst/ru-RU.rc trunk/reactos/base/setup/vmwinst/uk-UA.rc trunk/reactos/base/setup/welcome/bg-BG.rc trunk/reactos/base/setup/welcome/cs-CZ.rc trunk/reactos/base/setup/welcome/da-DK.rc trunk/reactos/base/setup/welcome/de-DE.rc trunk/reactos/base/setup/welcome/el-GR.rc trunk/reactos/base/setup/welcome/en-US.rc trunk/reactos/base/setup/welcome/es-ES.rc trunk/reactos/base/setup/welcome/fr-FR.rc trunk/reactos/base/setup/welcome/hu-HU.rc trunk/reactos/base/setup/welcome/it-IT.rc trunk/reactos/base/setup/welcome/ja-JP.rc trunk/reactos/base/setup/welcome/nb-NO.rc trunk/reactos/base/setup/welcome/nl-NL.rc trunk/reactos/base/setup/welcome/ru-RU.rc trunk/reactos/base/setup/welcome/sv-SE.rc trunk/reactos/base/setup/welcome/uk-UA.rc Modified: trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/vmwinst/vmwinst.rc trunk/reactos/base/setup/welcome/welcome.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/setup/reactos/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/cs-CZ.r… Removed: trunk/reactos/base/setup/reactos/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/de-DE.r… Removed: trunk/reactos/base/setup/reactos/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/en-US.r… Removed: trunk/reactos/base/setup/reactos/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/fi-FI.r… Removed: trunk/reactos/base/setup/reactos/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/fr-FR.r… Removed: trunk/reactos/base/setup/reactos/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/hu-HU.r… Removed: trunk/reactos/base/setup/reactos/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/it-IT.r… Removed: trunk/reactos/base/setup/reactos/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/ja-JP.r… Removed: trunk/reactos/base/setup/reactos/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/nb-NO.r… Removed: trunk/reactos/base/setup/reactos/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/nl-NL.r… Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Added: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… Removed: trunk/reactos/base/setup/reactos/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/ru-RU.r… Removed: trunk/reactos/base/setup/reactos/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/sv-SE.r… Removed: trunk/reactos/base/setup/reactos/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/uk-UA.r… Removed: trunk/reactos/base/setup/vmwinst/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/cs-CZ.r… Removed: trunk/reactos/base/setup/vmwinst/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/da-DK.r… Removed: trunk/reactos/base/setup/vmwinst/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/de-DE.r… Removed: trunk/reactos/base/setup/vmwinst/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/en-US.r… Removed: trunk/reactos/base/setup/vmwinst/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/es-ES.r… Removed: trunk/reactos/base/setup/vmwinst/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/hu-HU.r… Removed: trunk/reactos/base/setup/vmwinst/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/ja-JP.r… Added: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Removed: trunk/reactos/base/setup/vmwinst/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/ru-RU.r… Removed: trunk/reactos/base/setup/vmwinst/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/uk-UA.r… Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… Removed: trunk/reactos/base/setup/welcome/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/bg-BG.r… Removed: trunk/reactos/base/setup/welcome/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/cs-CZ.r… Removed: trunk/reactos/base/setup/welcome/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/da-DK.r… Removed: trunk/reactos/base/setup/welcome/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/de-DE.r… Removed: trunk/reactos/base/setup/welcome/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/el-GR.r… Removed: trunk/reactos/base/setup/welcome/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/en-US.r… Removed: trunk/reactos/base/setup/welcome/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/es-ES.r… Removed: trunk/reactos/base/setup/welcome/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/fr-FR.r… Removed: trunk/reactos/base/setup/welcome/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/hu-HU.r… Removed: trunk/reactos/base/setup/welcome/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/it-IT.r… Removed: trunk/reactos/base/setup/welcome/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/ja-JP.r… Removed: trunk/reactos/base/setup/welcome/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/nb-NO.r… Removed: trunk/reactos/base/setup/welcome/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/nl-NL.r… Added: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… Removed: trunk/reactos/base/setup/welcome/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/ru-RU.r… Removed: trunk/reactos/base/setup/welcome/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/sv-SE.r… Removed: trunk/reactos/base/setup/welcome/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/uk-UA.r… Modified: trunk/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome…

1 0

[janderwald] 24951: - mea culpa - hominem est erratum
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Wed Nov 29 00:30:54 2006 New Revision: 24951 URL: http://svn.reactos.org/svn/reactos?rev=24951&view=rev Log: - mea culpa - hominem est erratum Added: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc (with props) Added: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc Wed Nov 29 00:30:54 2006 @@ -1,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE { + IDS_APPNAME, "Minesveiper" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Valg" { + MENUITEM "&Nytt", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Merk spørsmål", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Nybegynner", IDM_BEGINNER + MENUITEM "&Anvansert", IDM_ADVANCED + MENUITEM "&Ekspert", IDM_EXPERT + MENUITEM "&Egendefinert", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "A&vslutt", IDM_EXIT + } + POPUP "&Informasjon" { + MENUITEM "&Beste tider", IDM_TIMES + MENUITEM "&Om", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Beste tider" +{ + GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 + LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 + LTEXT "Anvansert", IDNONE, 20, 30, 40, 8 + LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Congratulations!" +{ + LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Egendefinert spill" +{ + LTEXT "Høyde", IDNONE, 5, 5, 30, 10 + LTEXT "Bredde", IDNONE, 5, 35, 30, 10 + LTEXT "Miner", IDNONE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Om" +{ + LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 + ICON "Minesveiper", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} Propchange: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 24950: fixing some of the mix betwin hel and hal. (still not complete)
by greatlrd＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: greatlrd Date: Wed Nov 29 00:28:12 2006 New Revision: 24950 URL: http://svn.reactos.org/svn/reactos?rev=24950&view=rev Log: fixing some of the mix betwin hel and hal. (still not complete) Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed Nov 29 00:28:12 2006 @@ -175,318 +175,106 @@ if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CANCREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CANCREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface = This->lpLcl->lpDDCB->HALDD.CanCreateSurface; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CANCREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CANCREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface = This->lpLcl->lpDDCB->HELDD.CanCreateSurface; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface = This->lpLcl->lpDDCB->HALDD.CreateSurface; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATESURFACE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATESURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATESURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface = This->lpLcl->lpDDCB->HELDD.CreateSurface; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_CREATEPALETTE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATEPALETTE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATEPALETTE; This->lpLcl->lpDDCB->cbDDCallbacks.CreatePalette = This->lpLcl->lpDDCB->HALDD.CreatePalette; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_CREATEPALETTE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_CREATEPALETTE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_CREATEPALETTE; This->lpLcl->lpDDCB->cbDDCallbacks.CreatePalette = This->lpLcl->lpDDCB->HELDD.CreatePalette; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_DESTROYDRIVER; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_DESTROYDRIVER; This->lpLcl->lpDDCB->cbDDCallbacks.DestroyDriver = This->lpLcl->lpDDCB->HALDD.DestroyDriver; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_DESTROYDRIVER) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_DESTROYDRIVER; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_DESTROYDRIVER; This->lpLcl->lpDDCB->cbDDCallbacks.DestroyDriver = This->lpLcl->lpDDCB->HELDD.DestroyDriver; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_FLIPTOGDISURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_FLIPTOGDISURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.FlipToGDISurface = This->lpLcl->lpDDCB->HALDD.FlipToGDISurface; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_FLIPTOGDISURFACE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_FLIPTOGDISURFACE; This->lpLcl->lpDDCB->cbDDCallbacks.FlipToGDISurface = This->lpLcl->lpDDCB->HELDD.FlipToGDISurface; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_GETSCANLINE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_GETSCANLINE; This->lpLcl->lpDDCB->cbDDCallbacks.GetScanLine = This->lpLcl->lpDDCB->HALDD.GetScanLine; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_GETSCANLINE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_GETSCANLINE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_GETSCANLINE; This->lpLcl->lpDDCB->cbDDCallbacks.GetScanLine = This->lpLcl->lpDDCB->HELDD.GetScanLine; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETCOLORKEY) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETCOLORKEY; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETCOLORKEY; This->lpLcl->lpDDCB->cbDDCallbacks.SetColorKey = This->lpLcl->lpDDCB->HALDD.SetColorKey; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETCOLORKEY) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETCOLORKEY; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETCOLORKEY; This->lpLcl->lpDDCB->cbDDCallbacks.SetColorKey = This->lpLcl->lpDDCB->HELDD.SetColorKey; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETEXCLUSIVEMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETEXCLUSIVEMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetExclusiveMode = This->lpLcl->lpDDCB->HALDD.SetExclusiveMode; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETEXCLUSIVEMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETEXCLUSIVEMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetExclusiveMode = This->lpLcl->lpDDCB->HELDD.SetExclusiveMode; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_SETMODE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetMode = This->lpLcl->lpDDCB->HALDD.SetMode; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_SETMODE) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_SETMODE; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_SETMODE; This->lpLcl->lpDDCB->cbDDCallbacks.SetMode = This->lpLcl->lpDDCB->HELDD.SetMode; } if (This->lpLcl->lpDDCB->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_WAITFORVERTICALBLANK; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_WAITFORVERTICALBLANK; This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = This->lpLcl->lpDDCB->HALDD.WaitForVerticalBlank; } else if (This->lpLcl->lpDDCB->HELDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) { - This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags = DDHAL_CB32_WAITFORVERTICALBLANK; + This->lpLcl->lpDDCB->cbDDCallbacks.dwFlags |= DDHAL_CB32_WAITFORVERTICALBLANK; This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank = This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank; } - - - - - - - - - - /* Fill some basic info for Surface */ - ddSurfGbl.lpDD = &ddgbl; - - - return DD_OK; -} - - -HRESULT WINAPI -StartDirectDrawHal(LPDIRECTDRAW* iface) -{ - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - DDHAL_GETDRIVERINFODATA DriverInfo; - - DDHALINFO mHALInfo; - DDHAL_CALLBACKS mCallbacks; - DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; - D3DHAL_CALLBACKS mD3dCallbacks; - D3DHAL_GLOBALDRIVERDATA mD3dDriverData; - UINT mcvmList; - VIDMEM *mpvmList; - - UINT mcFourCC; - DWORD *mpFourCC; - UINT mcTextures; - DDSURFACEDESC *mpTextures; - - /* HAL Startup process */ - BOOL newmode = FALSE; - - - RtlZeroMemory(&mHALInfo, sizeof(DDHALINFO)); - RtlZeroMemory(&mCallbacks, sizeof(DDHAL_CALLBACKS)); - - /* - Startup DX HAL step one of three - */ - if (!DdCreateDirectDrawObject(This->lpLcl->lpGbl, (HDC)This->lpLcl->hDC)) - { - DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - return DD_FALSE; - } - - // Do not relase HDC it have been map in kernel mode - // DeleteDC(hdc); - - if (!DdReenableDirectDrawObject(This->lpLcl->lpGbl, &newmode)) - { - DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - return DD_FALSE; - } - - - /* - Startup DX HAL step two of three - */ - - if (!DdQueryDirectDrawObject(This->lpLcl->lpGbl, - &mHALInfo, - &mCallbacks.HALDD, - &mCallbacks.HALDDSurface, - &mCallbacks.HALDDPalette, - &mD3dCallbacks, - &mD3dDriverData, - &mD3dBufferCallbacks, - NULL, - NULL, - NULL)) - { - DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - // FIXME Close DX fristcall and second call - return DD_FALSE; - } - - mcvmList = mHALInfo.vmiData.dwNumHeaps; - mpvmList = (VIDMEM*) DxHeapMemAlloc(sizeof(VIDMEM) * mcvmList); - if (mpvmList == NULL) - { - DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - // FIXME Close DX fristcall and second call - return DD_FALSE; - } - - mcFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; - mpFourCC = (DWORD *) DxHeapMemAlloc(sizeof(DWORD) * mcFourCC); - if (mpFourCC == NULL) - { - DxHeapMemFree(mpvmList); - DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - // FIXME Close DX fristcall and second call - return DD_FALSE; - } - - mcTextures = mD3dDriverData.dwNumTextureFormats; - mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mcTextures); - if (mpTextures == NULL) - { - DxHeapMemFree( mpFourCC); - DxHeapMemFree( mpvmList); - DxHeapMemFree( This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - // FIXME Close DX fristcall and second call - return DD_FALSE; - } - - mHALInfo.vmiData.pvmList = mpvmList; - mHALInfo.lpdwFourCC = mpFourCC; - mD3dDriverData.lpTextureFormats = (DDSURFACEDESC*) mpTextures; - - if (!DdQueryDirectDrawObject( - This->lpLcl->lpGbl, - &mHALInfo, - &mCallbacks.HALDD, - &mCallbacks.HALDDSurface, - &mCallbacks.HALDDPalette, - &mD3dCallbacks, - &mD3dDriverData, - &mCallbacks.HALDDExeBuf, - (DDSURFACEDESC*)mpTextures, - mpFourCC, - mpvmList)) - - { - DxHeapMemFree(mpTextures); - DxHeapMemFree(mpFourCC); - DxHeapMemFree(mpvmList); - DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); - DeleteDC((HDC)This->lpLcl->hDC); - // FIXME Close DX fristcall and second call - return DD_FALSE; - } - - /* - Copy over from HalInfo to DirectDrawGlobal - */ - - // this is wrong, cDriverName need be in ASC code not UNICODE - //memcpy(mDDrawGlobal.cDriverName, mDisplayAdapter, sizeof(wchar)*MAX_DRIVER_NAME); - - memcpy(&ddgbl.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); - memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); - - mHALInfo.dwNumModes = 1; - mHALInfo.lpModeInfo = This->lpLcl->lpGbl->lpModeInfo; - mHALInfo.dwMonitorFrequency = This->lpLcl->lpGbl->lpModeInfo[0].wRefreshRate; - - This->lpLcl->lpGbl->dwMonitorFrequency = mHALInfo.dwMonitorFrequency; - This->lpLcl->lpGbl->dwModeIndex = mHALInfo.dwModeIndex; - This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; - This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; - This->lpLcl->lpGbl->hInstance = mHALInfo.hInstance; - - This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; - - - memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); - DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); - DriverInfo.dwContext = This->lpLcl->lpGbl->hDD; - - /* Get the MiscellaneousCallbacks */ - DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; - DriverInfo.lpvData = &ddgbl.lpDDCBtmp->HALDDMiscellaneous; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); - mHALInfo.GetDriverInfo(&DriverInfo); - - - return DD_OK; -} - -HRESULT WINAPI -StartDirectDrawHel(LPDIRECTDRAW* iface) -{ - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - This->lpLcl->lpDDCB->HELDD.CanCreateSurface = HelDdCanCreateSurface; - This->lpLcl->lpDDCB->HELDD.CreateSurface = HelDdCreateSurface; - This->lpLcl->lpDDCB->HELDD.CreatePalette = HelDdCreatePalette; - This->lpLcl->lpDDCB->HELDD.DestroyDriver = HelDdDestroyDriver; - //This->lpLcl->lpDDCB->HELDD.FlipToGDISurface = HelDdFlipToGDISurface - This->lpLcl->lpDDCB->HELDD.GetScanLine = HelDdGetScanLine; - // This->lpLcl->lpDDCB->HELDD.SetColorKey = HelDdSetColorKey; - This->lpLcl->lpDDCB->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; - This->lpLcl->lpDDCB->HELDD.SetMode = HelDdSetMode; - This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; - - This->lpLcl->lpDDCB->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | - DDHAL_CB32_CREATESURFACE | - DDHAL_CB32_CREATEPALETTE | - DDHAL_CB32_DESTROYDRIVER | - // DDHAL_CB32_FLIPTOGDISURFACE | - DDHAL_CB32_GETSCANLINE | - // DDHAL_CB32_SETCOLORKEY | - DDHAL_CB32_SETEXCLUSIVEMODE | - DDHAL_CB32_SETMODE | - DDHAL_CB32_WAITFORVERTICALBLANK ; - - - This->lpLcl->lpDDCB->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); - + /* This->lpLcl->lpDDCB->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; This->lpLcl->lpDDCB->HELDDSurface.Blt = HelDdSurfBlt; @@ -510,6 +298,298 @@ This->lpLcl->lpDDCB->HELDDPalette.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDPalette); */ + if (This->lpLcl->lpDDCB->HALDDSurface.dwFlags & DDHAL_EXEBUFCB32_CANCREATEEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.CanCreateExecuteBuffer = + This->lpLcl->lpDDCB->HALDDExeBuf.CanCreateExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_CANCREATEEXEBUF; + } + else if (This->lpLcl->lpDDCB->HELDDSurface.dwFlags & DDHAL_EXEBUFCB32_CANCREATEEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.CanCreateExecuteBuffer = + This->lpLcl->lpDDCB->HELDDExeBuf.CanCreateExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_CANCREATEEXEBUF; + } + + if (This->lpLcl->lpDDCB->HALDDSurface.dwFlags & DDHAL_EXEBUFCB32_CREATEEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.CreateExecuteBuffer = + This->lpLcl->lpDDCB->HALDDExeBuf.CreateExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_CREATEEXEBUF; + } + else if (This->lpLcl->lpDDCB->HELDDSurface.dwFlags & DDHAL_EXEBUFCB32_CREATEEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.CreateExecuteBuffer = + This->lpLcl->lpDDCB->HELDDExeBuf.CreateExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_CREATEEXEBUF; + } + + if (This->lpLcl->lpDDCB->HALDDSurface.dwFlags & DDHAL_EXEBUFCB32_DESTROYEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.DestroyExecuteBuffer = + This->lpLcl->lpDDCB->HALDDExeBuf.DestroyExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_DESTROYEXEBUF; + } + else if (This->lpLcl->lpDDCB->HELDDSurface.dwFlags & DDHAL_EXEBUFCB32_DESTROYEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.DestroyExecuteBuffer = + This->lpLcl->lpDDCB->HELDDExeBuf.DestroyExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_DESTROYEXEBUF; + } + + if (This->lpLcl->lpDDCB->HALDDSurface.dwFlags & DDHAL_EXEBUFCB32_LOCKEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.LockExecuteBuffer = + This->lpLcl->lpDDCB->HALDDExeBuf.LockExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_LOCKEXEBUF; + } + else if (This->lpLcl->lpDDCB->HELDDSurface.dwFlags & DDHAL_EXEBUFCB32_LOCKEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.LockExecuteBuffer = + This->lpLcl->lpDDCB->HELDDExeBuf.LockExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_LOCKEXEBUF; + } + + if (This->lpLcl->lpDDCB->HALDDSurface.dwFlags & DDHAL_EXEBUFCB32_UNLOCKEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.UnlockExecuteBuffer = + This->lpLcl->lpDDCB->HALDDExeBuf.UnlockExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_UNLOCKEXEBUF; + } + else if (This->lpLcl->lpDDCB->HELDDSurface.dwFlags & DDHAL_EXEBUFCB32_UNLOCKEXEBUF) + { + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.UnlockExecuteBuffer = + This->lpLcl->lpDDCB->HELDDExeBuf.UnlockExecuteBuffer; + This->lpLcl->lpDDCB->cbDDExeBufCallbacks.dwFlags |= DDHAL_EXEBUFCB32_UNLOCKEXEBUF; + } + + /* Fill some basic info for Surface */ + ddSurfGbl.lpDD = &ddgbl; + + + return DD_OK; +} + + +HRESULT WINAPI +StartDirectDrawHal(LPDIRECTDRAW* iface) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DDHAL_GETDRIVERINFODATA DriverInfo; + + DDHALINFO mHALInfo; + DDHAL_CALLBACKS mCallbacks; + DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; + D3DHAL_CALLBACKS mD3dCallbacks; + D3DHAL_GLOBALDRIVERDATA mD3dDriverData; + UINT mcvmList; + VIDMEM *mpvmList; + + UINT mcFourCC; + DWORD *mpFourCC; + UINT mcTextures; + DDSURFACEDESC *mpTextures; + + /* HAL Startup process */ + BOOL newmode = FALSE; + + + RtlZeroMemory(&mHALInfo, sizeof(DDHALINFO)); + RtlZeroMemory(&mCallbacks, sizeof(DDHAL_CALLBACKS)); + + /* + Startup DX HAL step one of three + */ + if (!DdCreateDirectDrawObject(This->lpLcl->lpGbl, (HDC)This->lpLcl->hDC)) + { + DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + return DD_FALSE; + } + + // Do not relase HDC it have been map in kernel mode + // DeleteDC(hdc); + + if (!DdReenableDirectDrawObject(This->lpLcl->lpGbl, &newmode)) + { + DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + return DD_FALSE; + } + + + /* + Startup DX HAL step two of three + */ + + if (!DdQueryDirectDrawObject(This->lpLcl->lpGbl, + &mHALInfo, + &mCallbacks.HALDD, + &mCallbacks.HALDDSurface, + &mCallbacks.HALDDPalette, + &mD3dCallbacks, + &mD3dDriverData, + &mD3dBufferCallbacks, + NULL, + NULL, + NULL)) + { + DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + mcvmList = mHALInfo.vmiData.dwNumHeaps; + mpvmList = (VIDMEM*) DxHeapMemAlloc(sizeof(VIDMEM) * mcvmList); + if (mpvmList == NULL) + { + DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + mcFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; + mpFourCC = (DWORD *) DxHeapMemAlloc(sizeof(DWORD) * mcFourCC); + if (mpFourCC == NULL) + { + DxHeapMemFree(mpvmList); + DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + mcTextures = mD3dDriverData.dwNumTextureFormats; + mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mcTextures); + if (mpTextures == NULL) + { + DxHeapMemFree( mpFourCC); + DxHeapMemFree( mpvmList); + DxHeapMemFree( This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + mHALInfo.vmiData.pvmList = mpvmList; + mHALInfo.lpdwFourCC = mpFourCC; + mD3dDriverData.lpTextureFormats = (DDSURFACEDESC*) mpTextures; + + if (!DdQueryDirectDrawObject( + This->lpLcl->lpGbl, + &mHALInfo, + &mCallbacks.HALDD, + &mCallbacks.HALDDSurface, + &mCallbacks.HALDDPalette, + &mD3dCallbacks, + &mD3dDriverData, + &mCallbacks.HALDDExeBuf, + (DDSURFACEDESC*)mpTextures, + mpFourCC, + mpvmList)) + + { + DxHeapMemFree(mpTextures); + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpvmList); + DxHeapMemFree(This->lpLcl->lpGbl->lpModeInfo); + DeleteDC((HDC)This->lpLcl->hDC); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + /* + Copy over from HalInfo to DirectDrawGlobal + */ + + // this is wrong, cDriverName need be in ASC code not UNICODE + //memcpy(mDDrawGlobal.cDriverName, mDisplayAdapter, sizeof(wchar)*MAX_DRIVER_NAME); + + memcpy(&ddgbl.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); + memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); + + mHALInfo.dwNumModes = 1; + mHALInfo.lpModeInfo = This->lpLcl->lpGbl->lpModeInfo; + mHALInfo.dwMonitorFrequency = This->lpLcl->lpGbl->lpModeInfo[0].wRefreshRate; + + This->lpLcl->lpGbl->dwMonitorFrequency = mHALInfo.dwMonitorFrequency; + This->lpLcl->lpGbl->dwModeIndex = mHALInfo.dwModeIndex; + This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; + This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; + This->lpLcl->lpGbl->hInstance = mHALInfo.hInstance; + + This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; + + + memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); + DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); + DriverInfo.dwContext = This->lpLcl->lpGbl->hDD; + + /* Get the MiscellaneousCallbacks */ + DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DriverInfo.lpvData = &ddgbl.lpDDCBtmp->HALDDMiscellaneous; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + mHALInfo.GetDriverInfo(&DriverInfo); + + + return DD_OK; +} + +HRESULT WINAPI +StartDirectDrawHel(LPDIRECTDRAW* iface) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + This->lpLcl->lpDDCB->HELDD.CanCreateSurface = HelDdCanCreateSurface; + This->lpLcl->lpDDCB->HELDD.CreateSurface = HelDdCreateSurface; + This->lpLcl->lpDDCB->HELDD.CreatePalette = HelDdCreatePalette; + This->lpLcl->lpDDCB->HELDD.DestroyDriver = HelDdDestroyDriver; + //This->lpLcl->lpDDCB->HELDD.FlipToGDISurface = HelDdFlipToGDISurface + This->lpLcl->lpDDCB->HELDD.GetScanLine = HelDdGetScanLine; + // This->lpLcl->lpDDCB->HELDD.SetColorKey = HelDdSetColorKey; + This->lpLcl->lpDDCB->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; + This->lpLcl->lpDDCB->HELDD.SetMode = HelDdSetMode; + This->lpLcl->lpDDCB->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; + + This->lpLcl->lpDDCB->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | + DDHAL_CB32_CREATESURFACE | + DDHAL_CB32_CREATEPALETTE | + DDHAL_CB32_DESTROYDRIVER | + // DDHAL_CB32_FLIPTOGDISURFACE | + DDHAL_CB32_GETSCANLINE | + // DDHAL_CB32_SETCOLORKEY | + DDHAL_CB32_SETEXCLUSIVEMODE | + DDHAL_CB32_SETMODE | + DDHAL_CB32_WAITFORVERTICALBLANK ; + + + This->lpLcl->lpDDCB->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); + + /* + This->lpLcl->lpDDCB->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; + This->lpLcl->lpDDCB->HELDDSurface.Blt = HelDdSurfBlt; + This->lpLcl->lpDDCB->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; + This->lpLcl->lpDDCB->HELDDSurface.Flip = HelDdSurfFlip; + This->lpLcl->lpDDCB->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; + This->lpLcl->lpDDCB->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; + This->lpLcl->lpDDCB->HELDDSurface.Lock = HelDdSurfLock; + This->lpLcl->lpDDCB->HELDDSurface.reserved4 = HelDdSurfreserved4; + This->lpLcl->lpDDCB->HELDDSurface.SetClipList = HelDdSurfSetClipList; + This->lpLcl->lpDDCB->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; + This->lpLcl->lpDDCB->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; + This->lpLcl->lpDDCB->HELDDSurface.SetPalette = HelDdSurfSetPalette; + This->lpLcl->lpDDCB->HELDDSurface.Unlock = HelDdSurfUnlock; + This->lpLcl->lpDDCB->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; + */ + + /* + This->lpLcl->lpDDCB->HELDDPalette.DestroyPalette = HelDdPalDestroyPalette; + This->lpLcl->lpDDCB->HELDDPalette.SetEntries = HelDdPalSetEntries; + This->lpLcl->lpDDCB->HELDDPalette.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDPalette); + */ + /* This->lpLcl->lpDDCB->HELDDExeBuf.CanCreateExecuteBuffer = HelDdExeCanCreateExecuteBuffer; This->lpLcl->lpDDCB->HELDDExeBuf.CreateExecuteBuffer = HelDdExeCreateExecuteBuffer;

1 0

[janderwald] 24949: - shuffle resource files a bit
by janderwald＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: janderwald Date: Wed Nov 29 00:20:25 2006 New Revision: 24949 URL: http://svn.reactos.org/svn/reactos?rev=24949&view=rev Log: - shuffle resource files a bit Added: trunk/reactos/base/system/rundll32/lang/ trunk/reactos/base/system/rundll32/lang/de-DE.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/de-DE.rc trunk/reactos/base/system/rundll32/lang/el-GR.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/el-GR.rc trunk/reactos/base/system/rundll32/lang/en-US.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/en-US.rc trunk/reactos/base/system/rundll32/lang/fr-FR.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/fr-FR.rc trunk/reactos/base/system/rundll32/lang/hu-HU.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/hu-HU.rc trunk/reactos/base/system/rundll32/lang/ja-JP.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/ja-JP.rc trunk/reactos/base/system/rundll32/lang/nb-NO.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/nb-NO.rc trunk/reactos/base/system/rundll32/lang/ru-RU.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/ru-RU.rc trunk/reactos/base/system/rundll32/lang/uk-UA.rc - copied unchanged from r24947, trunk/reactos/base/system/rundll32/uk-UA.rc trunk/reactos/base/system/rundll32/rsrc.rc (with props) trunk/reactos/base/system/winlogon/lang/ trunk/reactos/base/system/winlogon/lang/cs-CZ.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/cs-CZ.rc trunk/reactos/base/system/winlogon/lang/de-DE.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/de-DE.rc trunk/reactos/base/system/winlogon/lang/en-US.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/en-US.rc trunk/reactos/base/system/winlogon/lang/es-ES.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/es-ES.rc trunk/reactos/base/system/winlogon/lang/fr-FR.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/fr-FR.rc trunk/reactos/base/system/winlogon/lang/hu-HU.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/hu-HU.rc trunk/reactos/base/system/winlogon/lang/ja-JP.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/ja-JP.rc trunk/reactos/base/system/winlogon/lang/nb-NO.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/nb-NO.rc trunk/reactos/base/system/winlogon/lang/nl-NL.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/nl-NL.rc trunk/reactos/base/system/winlogon/lang/pl-PL.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/pl-PL.rc trunk/reactos/base/system/winlogon/lang/ru-RU.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/ru-RU.rc trunk/reactos/base/system/winlogon/lang/sv-SE.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/sv-SE.rc trunk/reactos/base/system/winlogon/lang/uk-UA.rc - copied unchanged from r24947, trunk/reactos/base/system/winlogon/uk-UA.rc trunk/reactos/base/system/winlogon/rsrc.rc (with props) Removed: trunk/reactos/base/system/rundll32/de-DE.rc trunk/reactos/base/system/rundll32/el-GR.rc trunk/reactos/base/system/rundll32/en-US.rc trunk/reactos/base/system/rundll32/fr-FR.rc trunk/reactos/base/system/rundll32/hu-HU.rc trunk/reactos/base/system/rundll32/ja-JP.rc trunk/reactos/base/system/rundll32/nb-NO.rc trunk/reactos/base/system/rundll32/ru-RU.rc trunk/reactos/base/system/rundll32/uk-UA.rc trunk/reactos/base/system/winlogon/cs-CZ.rc trunk/reactos/base/system/winlogon/de-DE.rc trunk/reactos/base/system/winlogon/en-US.rc trunk/reactos/base/system/winlogon/es-ES.rc trunk/reactos/base/system/winlogon/fr-FR.rc trunk/reactos/base/system/winlogon/hu-HU.rc trunk/reactos/base/system/winlogon/ja-JP.rc trunk/reactos/base/system/winlogon/nb-NO.rc trunk/reactos/base/system/winlogon/nl-NL.rc trunk/reactos/base/system/winlogon/pl-PL.rc trunk/reactos/base/system/winlogon/ru-RU.rc trunk/reactos/base/system/winlogon/sv-SE.rc trunk/reactos/base/system/winlogon/uk-UA.rc Modified: trunk/reactos/base/system/rundll32/rundll32.rc trunk/reactos/base/system/winlogon/winlogon.rc Removed: trunk/reactos/base/system/rundll32/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/de-DE… ============================================================================== --- trunk/reactos/base/system/rundll32/de-DE.rc (original) +++ trunk/reactos/base/system/rundll32/de-DE.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" -/* - * Translated into German. - * By Rouven Wessling 2005 pentiumforever(a)gmail.com - */ - -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary laden von '%s' fehlgeschlagen" -IDS_MissingEntry, "Fehlender Eintrag:%s\nIn %s" -} Removed: trunk/reactos/base/system/rundll32/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/el-GR… ============================================================================== --- trunk/reactos/base/system/rundll32/el-GR.rc (original) +++ trunk/reactos/base/system/rundll32/el-GR.rc (removed) @@ -1,13 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - * Gr.rc by Dj Apal® - */ - -LANGUAGE LANG_GREEK, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary äåí êáôÜöåñå íá öïñôþóåé '%s'" -IDS_MissingEntry, "Ëåßðåé ôï óçìåßï åêêßíçóçò:%s\nIn %s" -} Removed: trunk/reactos/base/system/rundll32/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/en-US… ============================================================================== --- trunk/reactos/base/system/rundll32/en-US.rc (original) +++ trunk/reactos/base/system/rundll32/en-US.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary failed to load '%s'" -IDS_MissingEntry, "Missing entry point:%s\nIn %s" -} Removed: trunk/reactos/base/system/rundll32/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/fr-FR… ============================================================================== --- trunk/reactos/base/system/rundll32/fr-FR.rc (original) +++ trunk/reactos/base/system/rundll32/fr-FR.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary a échoué lors du chargement de '%s'" -IDS_MissingEntry, "Point d'entrée manquant:%s\ndans %s" -} Removed: trunk/reactos/base/system/rundll32/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/hu-HU… ============================================================================== --- trunk/reactos/base/system/rundll32/hu-HU.rc (original) +++ trunk/reactos/base/system/rundll32/hu-HU.rc (removed) @@ -1,13 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com> - */ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "A(z) '%s' állományt, vagy valamelyik összetevõjét nem sikerült megnyitni" -IDS_MissingEntry, "Hiányzó bejegyzés: %s\nIn A Következõ állomány nem tölthetõ be: %s" -} Removed: trunk/reactos/base/system/rundll32/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/ja-JP… ============================================================================== --- trunk/reactos/base/system/rundll32/ja-JP.rc (original) +++ trunk/reactos/base/system/rundll32/ja-JP.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary Í '%s' ÌÇÝÝÉ¸sµÜµ½B" -IDS_MissingEntry, "Gg |Cgª èÜ¹ñ:%s\n( %s )" -} Removed: trunk/reactos/base/system/rundll32/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/nb-NO… ============================================================================== --- trunk/reactos/base/system/rundll32/nb-NO.rc (original) +++ trunk/reactos/base/system/rundll32/nb-NO.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" -IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" -} Added: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc (added) +++ trunk/reactos/base/system/rundll32/rsrc.rc Wed Nov 29 00:20:25 2006 @@ -1,0 +1,13 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/en-US.rc" +#include "lang/de-DE.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/ru-RU.rc" +#include "lang/el-GR.rc" +#include "lang/nb-NO.rc" +#include "lang/uk-UA.rc" Propchange: trunk/reactos/base/system/rundll32/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/base/system/rundll32/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/ru-RU… ============================================================================== --- trunk/reactos/base/system/rundll32/ru-RU.rc (original) +++ trunk/reactos/base/system/rundll32/ru-RU.rc (removed) @@ -1,12 +1,0 @@ -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó '%s'" -IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nÂ áèáëèîòåêå %s" -} Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc Wed Nov 29 00:20:25 2006 @@ -6,11 +6,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "rundll32.exe\0" #include <reactos/version.rc> -#include "en-US.rc" -#include "de-DE.rc" -#include "fr-FR.rc" -#include "hu-HU.rc" -#include "ru-RU.rc" -#include "el-GR.rc" -#include "nb-NO.rc" -#include "uk-UA.rc" +#include "rsrc.rc" Removed: trunk/reactos/base/system/rundll32/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/uk-UA… ============================================================================== --- trunk/reactos/base/system/rundll32/uk-UA.rc (original) +++ trunk/reactos/base/system/rundll32/uk-UA.rc (removed) @@ -1,17 +1,0 @@ -/* - * PROJECT: ReactOS rundll32.exe - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/rundll32/Uk.rc - * PURPOSE: Ukraianian Language File for rundll32 - * TRANSLATOR: Artem Reznikov - */ - -#include "resource.h" - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ -IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" -IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" -} Removed: trunk/reactos/base/system/winlogon/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/cs-CZ… ============================================================================== --- trunk/reactos/base/system/winlogon/cs-CZ.rc (original) +++ trunk/reactos/base/system/winlogon/cs-CZ.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Vypnutí poèítaèe" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Nyní mùete bez obav vypnout Vá poèítaè.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Restartovat", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Chyba uivatelského rozhraní" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Dynamická knihovna %s selhala pøi nahrávaní.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontaktujte správce poèítaèe pro nahrazení dynamickì knihovny nebo obnovte pùvodní dynamickou knihovnu.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Pøíprava síových pøipojení..." - IDS_APPLYINGCOMPUTERSETTINGS "Nastavení poèítaèe..." - IDS_RUNNINGSTARTUPSCRIPTS "Spoutìcí skripty..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Ukonèovací skripty..." - IDS_APPLYINGYOURPERSONALSETTINGS "Osobní nastavení..." - IDS_RUNNINGLOGOFFSCRIPTS "Skripty po odhláení..." - IDS_RUNNINGLOGONSCRIPTS "Skripty po pøihláení..." - IDS_LOADINGYOURPERSONALSETTINGS "Nahrávání osobního nastavení..." - IDS_CLOSINGNETWORKCONNECTIONS "Ukonèení síových pøipojení..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS se vypíná..." - IDS_PREPARETOSTANDBY "Pøíprava k pøechodu do úsporného reimu..." - IDS_PREPARETOHIBERNATE "Pøíprava k pøechodu do reimu hibernace..." - IDS_SAVEYOURSETTINGS "Ukládání osobního nastavení..." - IDS_REACTOSISSTARTINGUP "ReactOS se spoutí..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Aplikace Winlogon selhala pøi aktivaci shellu!" -END - Removed: trunk/reactos/base/system/winlogon/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/de-DE… ============================================================================== --- trunk/reactos/base/system/winlogon/de-DE.rc (original) +++ trunk/reactos/base/system/winlogon/de-DE.rc (removed) @@ -1,46 +1,0 @@ -//German translation by Michael Wirth - -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Computer herunterfahren" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Sie können den Computer jetzt ausschalten.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "Neusta&rt", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Benutzer Interface Fehler" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Die Logon Benutzer Schnittstelle DLL %s konnte nicht geladen werden.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontaktieren Sie Ihren Systemadministrator um die DLL zu ersetzen, oder stellen Sie die Original-DLL wieder her.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Netzwerkverbindungen vorbereiten..." - IDS_APPLYINGCOMPUTERSETTINGS "Computereinstellungen laden..." - IDS_RUNNINGSTARTUPSCRIPTS "Startskripte ausführen..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Skripte um den Computer herunterzufahren ausführen..." - IDS_APPLYINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen setzen..." - IDS_RUNNINGLOGOFFSCRIPTS "Skripte um abzumelden ausführen..." - IDS_RUNNINGLOGONSCRIPTS "Skripte um anzumelden ausführen..." - IDS_LOADINGYOURPERSONALSETTINGS "Ihr persönlichen Einstellungen laden..." - IDS_CLOSINGNETWORKCONNECTIONS "Netzwerkverbindungen schliessen..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS fährt herunter..." - IDS_PREPARETOSTANDBY "Vorbereiten für den StandBy Modus..." - IDS_PREPARETOHIBERNATE "Vorbereiten für den Nachtmodus..." - IDS_SAVEYOURSETTINGS "Speichern Ihrer persönlichen Einstellungen..." - IDS_REACTOSISSTARTINGUP "ReactOS startet..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon konnte die Benutzershell nicht aktivieren!" -END Removed: trunk/reactos/base/system/winlogon/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/en-US… ============================================================================== --- trunk/reactos/base/system/winlogon/en-US.rc (original) +++ trunk/reactos/base/system/winlogon/en-US.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Shutdown Computer" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "It is now safe to turn off your computer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Restart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "User Interface Failure" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "The Logon User Interface DLL %s failed to load.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Contact your system administrator to replace the DLL, or restore the original DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Preparing network connections..." - IDS_APPLYINGCOMPUTERSETTINGS "Applying computer settings..." - IDS_RUNNINGSTARTUPSCRIPTS "Running startup scripts..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Running shutdown scripts..." - IDS_APPLYINGYOURPERSONALSETTINGS "Applying your personal settings..." - IDS_RUNNINGLOGOFFSCRIPTS "Running logoff scripts..." - IDS_RUNNINGLOGONSCRIPTS "Running logon scripts..." - IDS_LOADINGYOURPERSONALSETTINGS "Loading your personal settings..." - IDS_CLOSINGNETWORKCONNECTIONS "Closing network connections..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS is shutting down..." - IDS_PREPARETOSTANDBY "Preparing to Standby..." - IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." - IDS_SAVEYOURSETTINGS "Saving your settings..." - IDS_REACTOSISSTARTINGUP "ReactOS is starting up..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon failed to activate user shell!" -END - Removed: trunk/reactos/base/system/winlogon/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/es-ES… ============================================================================== --- trunk/reactos/base/system/winlogon/es-ES.rc (original) +++ trunk/reactos/base/system/winlogon/es-ES.rc (removed) @@ -1,47 +1,0 @@ -//Spanish translation by Lucio Diaz-Flores Varela. Reviewed by Jose Pedro Fernandez Pascual. - -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Apagar Equipo" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ahora es seguro apagar el ordenador.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Reiniciar", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Error del Interfaz de Usuario" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "La DLL %s del interfaz de Logon dió un error al cargar.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Contacte con el administrador de su sistema para sustituir la DLL, ó reinstale la DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Preparando las conexiones de red..." - IDS_APPLYINGCOMPUTERSETTINGS "Aplicando los parámetros de configuración..." - IDS_RUNNINGSTARTUPSCRIPTS "Ejecutando los scripts de inicio..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Ejecutando los scripts de apagado..." - IDS_APPLYINGYOURPERSONALSETTINGS "Aplicando su configuración personal..." - IDS_RUNNINGLOGOFFSCRIPTS "Ejecutando los scripts de fin de sesión..." - IDS_RUNNINGLOGONSCRIPTS "Ejecutando los scripts de inicio de sesión..." - IDS_LOADINGYOURPERSONALSETTINGS "Cargando su configuración personal..." - IDS_CLOSINGNETWORKCONNECTIONS "Cerrando las conexiones de red..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS se está apagando..." - IDS_PREPARETOSTANDBY "Preparando para entrar en estado de espera (Standby)..." - IDS_PREPARETOHIBERNATE "Preparando para hibernar..." - IDS_SAVEYOURSETTINGS "Guardando su configuración personal..." - IDS_REACTOSISSTARTINGUP "ReactOS se está iniciando..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "!Winlogon falló al activar el shell de usuario!" -END - Removed: trunk/reactos/base/system/winlogon/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/fr-FR… ============================================================================== --- trunk/reactos/base/system/winlogon/fr-FR.rc (original) +++ trunk/reactos/base/system/winlogon/fr-FR.rc (removed) @@ -1,47 +1,0 @@ -/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ - -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Arrêter l'ordinateur" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Vous pouvez maintenant éteindre votre ordinateur en toute sécurité", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Redémarrer", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Échec de l'interface utilisateur" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Le chargement du DLL %s de l'interface utilisateur a échoué", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Contactez votre administrateur système pour remplacer le DLL, ou restaurez le DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Préparation des connections réseau..." - IDS_APPLYINGCOMPUTERSETTINGS "Application des paramètres de l'ordinateur..." - IDS_RUNNINGSTARTUPSCRIPTS "Exécution des scripts de démarrage..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Exécution des scripts de fermeture..." - IDS_APPLYINGYOURPERSONALSETTINGS "Application de vos paramètres personnels..." - IDS_RUNNINGLOGOFFSCRIPTS "Exécution des scripts de fermeture de session..." - IDS_RUNNINGLOGONSCRIPTS "Exécution des scripts d'ouverture de session..." - IDS_LOADINGYOURPERSONALSETTINGS "Chargement de vos paramètres personnels..." - IDS_CLOSINGNETWORKCONNECTIONS "Fermeture des connections réseau..." - IDS_REACTOSISSHUTTINGDOWN "Fermeture de ReactOS..." - IDS_PREPARETOSTANDBY "Préparation de la Mise en Veille..." - IDS_PREPARETOHIBERNATE "Préparation de l'hibernation..." - IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." - IDS_REACTOSISSTARTINGUP "Démarrage de ReactOS..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon a échoué lors de l'activation du shell!" -END - Removed: trunk/reactos/base/system/winlogon/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/hu-HU… ============================================================================== --- trunk/reactos/base/system/winlogon/hu-HU.rc (original) +++ trunk/reactos/base/system/winlogon/hu-HU.rc (removed) @@ -1,49 +1,0 @@ -/* -* Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu -*/ - -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Számítógép kikapcsolása" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Mostmár biztonságos a gép kikapcsolása.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Újraindítás", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Felhasználói felületet érintõ hiba" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "A Felhasználó beléptetését kezelõ DLL (%s) nem tudott betöltõdni.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Értesítsd a rendszergazdát, hogy javítsa ki a DLL állományt.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Hálózati kapcsolatok elõkészítése..." - IDS_APPLYINGCOMPUTERSETTINGS "Beállítások érvényesítése..." - IDS_RUNNINGSTARTUPSCRIPTS "Indító szkriptek futtatása..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Leállító szkriptek futtatása..." - IDS_APPLYINGYOURPERSONALSETTINGS "Személyes beállítások érvényesítése..." - IDS_RUNNINGLOGOFFSCRIPTS "Kijelentkezési szkriptek futtatása..." - IDS_RUNNINGLOGONSCRIPTS "Bejelentkezési szkriptek futtatása..." - IDS_LOADINGYOURPERSONALSETTINGS "Személyes beállítások betöltése..." - IDS_CLOSINGNETWORKCONNECTIONS "Hálózati kapcsolatok lezárása..." - IDS_REACTOSISSHUTTINGDOWN "A ReactOS leáll..." - IDS_PREPARETOSTANDBY "Készenléti üzemmód elõkészítése..." - IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." - IDS_SAVEYOURSETTINGS "Beállítások mentése..." - IDS_REACTOSISSTARTINGUP "A ReactOS indul..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "A Winlogon nemtudta elindítani a felhasználói felületet!" -END - Removed: trunk/reactos/base/system/winlogon/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/ja-JP… ============================================================================== --- trunk/reactos/base/system/winlogon/ja-JP.rc (original) +++ trunk/reactos/base/system/winlogon/ja-JP.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Rs[^ÌVbg_E" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "Rs[^Ìd¹ðØÁÄàÀSÅ·B", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "ÄN®(&R)", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "[U[ C^[tFCXÉâèª¶µÜµ½" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "OI [U[ C^[tFCX DLL %s ÌÇÝÝÉ¸sµÜµ½B", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "VXeÌÇÒÉAðÆèADLL ðu«·¦Äàç¤©AIWiÌ DLL ðµÄàçÁÄ¾³¢B", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "ÄN®(&R)", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "lbg[NÚ±ðõµÄ¢Ü·..." - IDS_APPLYINGCOMPUTERSETTINGS "Rs[^ÌÝèðKpµÄ¢Ü·..." - IDS_RUNNINGSTARTUPSCRIPTS "X^[gAbv XNvgðÀsµÄ¢Ü·..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Vbg_E XNvgðÀsµÄ¢Ü·..." - IDS_APPLYINGYOURPERSONALSETTINGS "ÂlÌÝèðKpµÄ¢Ü·..." - IDS_RUNNINGLOGOFFSCRIPTS "OIt XNvgðÀsµÄ¢Ü·..." - IDS_RUNNINGLOGONSCRIPTS "OI XNvgðÀsµÄ¢Ü·..." - IDS_LOADINGYOURPERSONALSETTINGS "ÂlÌÝèðÇÝñÅ¢Ü·..." - IDS_CLOSINGNETWORKCONNECTIONS "lbg[NÚ±ðØfµÄ¢Ü·..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS ðI¹µÄ¢Ü·..." - IDS_PREPARETOSTANDBY "X^oCÌõðµÄ¢Ü·..." - IDS_PREPARETOHIBERNATE "x~óÔÌõðµÄ¢Ü·..." - IDS_SAVEYOURSETTINGS "ÝèðÛ¶µÄ¢Ü·..." - IDS_REACTOSISSTARTINGUP "ReactOS ðN®µÄ¢Ü·..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon Í[U[ VFðÀsÅ«Ü¹ñÅµ½!" -END - Removed: trunk/reactos/base/system/winlogon/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/nb-NO… ============================================================================== --- trunk/reactos/base/system/winlogon/nb-NO.rc (original) +++ trunk/reactos/base/system/winlogon/nb-NO.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Slår av datamaskin" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Du kan slå av datamaskinen nå.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Restart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Bruker grensesnitt mislykkes" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Logg på bruker Interface DLL %s mislykkes å laste.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontakt din system administrator for å erstatte DLL, eller få tilbake orginale DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Forbreder nettverk tilkoblinger..." - IDS_APPLYINGCOMPUTERSETTINGS "Bruker datamaskin innstillinger..." - IDS_RUNNINGSTARTUPSCRIPTS "Kjører oppstart skripter..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Kjører avsluttende skripter..." - IDS_APPLYINGYOURPERSONALSETTINGS "Bruker dine personlige innstillinger..." - IDS_RUNNINGLOGOFFSCRIPTS "Kjører logg av skripter..." - IDS_RUNNINGLOGONSCRIPTS "Kjører pålogging skripter..." - IDS_LOADINGYOURPERSONALSETTINGS "Laster dine personlige innstillinger..." - IDS_CLOSINGNETWORKCONNECTIONS "Avslutter nettverk tilkoblinger..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS avsluttes..." - IDS_PREPARETOSTANDBY "Forbreder ventemodus..." - IDS_PREPARETOHIBERNATE "Forbreder dvalemodus..." - IDS_SAVEYOURSETTINGS "Lagrer innstillingene..." - IDS_REACTOSISSTARTINGUP "ReactOS starter opp..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon mislykket å aktivere bruker skall!" -END - Removed: trunk/reactos/base/system/winlogon/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/nl-NL… ============================================================================== --- trunk/reactos/base/system/winlogon/nl-NL.rc (original) +++ trunk/reactos/base/system/winlogon/nl-NL.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_DUTCH, SUBLANG_DUTCH //Vertaald door Eric Janssen - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Computer Afsluiten" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "U kunt nu de computer uitschakelen.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Herstart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Gebruikers Interface Fout" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "De gebruikers interface logon DLL %s kon niet worden geladen.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Neem contact op met de systeemadministrator om de DLL te vervangen, of plaats de oude DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Netwerkverbindingen voorbereiden..." - IDS_APPLYINGCOMPUTERSETTINGS "Computerinstellingen aanbrengen..." - IDS_RUNNINGSTARTUPSCRIPTS "Opstart scripts uitvoeren..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Afsluit scripts uitvoeren..." - IDS_APPLYINGYOURPERSONALSETTINGS "Persoonlijke instellingen aanbrengen..." - IDS_RUNNINGLOGOFFSCRIPTS "Uitlog scripts uitvoeren..." - IDS_RUNNINGLOGONSCRIPTS "Inlog scripts uitvoeren..." - IDS_LOADINGYOURPERSONALSETTINGS "Uw persoonlijke instelling laden..." - IDS_CLOSINGNETWORKCONNECTIONS "Netwerkverbindingen sluiten..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS is aan het afsluiten..." - IDS_PREPARETOSTANDBY "Standby wordt voorbereid..." - IDS_PREPARETOHIBERNATE "Slaapstand wordt voorbereid..." - IDS_SAVEYOURSETTINGS "Persoonlijke instellingen worden opgeslagen..." - IDS_REACTOSISSTARTINGUP "ReactOS is aan het opstarten..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon heeft de gebruikers shell niet kunnen activeren!" -END - Removed: trunk/reactos/base/system/winlogon/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/pl-PL… ============================================================================== --- trunk/reactos/base/system/winlogon/pl-PL.rc (original) +++ trunk/reactos/base/system/winlogon/pl-PL.rc (removed) @@ -1,46 +1,0 @@ -//Polish translation by Sebastian Gasiorek -LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wy³¹czanie komputera" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Mo¿na bezpiecznie wy³¹czyæ komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "B³¹d interfejsu u¿ytkownika" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Nie mo¿na za³adowaæ biblioteki DLL interfejsu logowania u¿ytkownika %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Skontaktuj siê z administratorem systemu, aby zamieni³ bibliotekê DLL lub odtworzy³ jej oryginaln¹ wersjê.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Trwa przygotowywanie po³¹czeñ sieciowych..." - IDS_APPLYINGCOMPUTERSETTINGS "Trwa wprowadzanie ustawieñ komputera..." - IDS_RUNNINGSTARTUPSCRIPTS "Trwa uruchamianie skryptów uruchamiania..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Trwa uruchamianie skryptów zamykania..." - IDS_APPLYINGYOURPERSONALSETTINGS "Trwa wprowadzanie ustawieñ osobistych..." - IDS_RUNNINGLOGOFFSCRIPTS "Trwa uruchamianie skryptów wylogowania..." - IDS_RUNNINGLOGONSCRIPTS "Trwa uruchamianie skryptów logowania..." - IDS_LOADINGYOURPERSONALSETTINGS "Trwa ³adowanie ustawieñ osobistych..." - IDS_CLOSINGNETWORKCONNECTIONS "Trwa zamykanie po³¹czeñ sieciowych..." - IDS_REACTOSISSHUTTINGDOWN "Trwa zamykanie systemu ReactOS..." - IDS_PREPARETOSTANDBY "Trwa przygotowywanie do przejcia w stan wstrzymania..." - IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." - IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawieñ..." - IDS_REACTOSISSTARTINGUP "Trwa uruchamianie systemu ReactOS..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon nie móg³ aktywowaæ pow³oki u¿ytkownika!" -END - Added: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc (added) +++ trunk/reactos/base/system/winlogon/rsrc.rc Wed Nov 29 00:20:25 2006 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* IDI_WINLOGON ICON "resources/winlogon.ico" */ + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/nb-NO.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" + Propchange: trunk/reactos/base/system/winlogon/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/base/system/winlogon/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/ru-RU… ============================================================================== --- trunk/reactos/base/system/winlogon/ru-RU.rc (original) +++ trunk/reactos/base/system/winlogon/ru-RU.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Âûêëþ÷åíèå êîìïüþòåðà" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Òåïåðü ìîæíî áåçîïàñíî âûêëþ÷èòü êîìïüþòåð.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Ïåðåçàãðóçêà", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Îøèáêà çàãðóçêè èíòåðôåéñà" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Íåâîçìîæíî çàãðóçèòü DLL-áèáëèîòåêó %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Ñâÿæèòåñü ñ ñèñòåìíûì àäìèíèñòðàòîðîì, ÷òîáû çàìåíèòü èëè âîññòàíîâèòü îðèãèíàëüíûé ôàéë DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Ïåðåçàãðóçêà", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Ïîäãîòàâëèâàþòñÿ ñåòåâûå ïîäêëþ÷åíèÿ..." - IDS_APPLYINGCOMPUTERSETTINGS "Ïðèìåíÿþòñÿ íàñòðîéêè..." - IDS_RUNNINGSTARTUPSCRIPTS "Âûïîëíÿþòñÿ ñêðèïòû àâòîçàïóñêà..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Âûïîëíÿþòñÿ ñêðèïòû âûêëþ÷åíèÿ..." - IDS_APPLYINGYOURPERSONALSETTINGS "Ïðèìåíÿþòñÿ âàøè ïåðñîíàëüíûå íàñòðîéêè..." - IDS_RUNNINGLOGOFFSCRIPTS "Âûïîëíÿþòñÿ ñêðèïòû âûõîäà èç ñèñòåìû..." - IDS_RUNNINGLOGONSCRIPTS "Âûïîëíÿþòñÿ ñêðèïòû âõîäà â ñèñòåìó..." - IDS_LOADINGYOURPERSONALSETTINGS "Çàãðóæàþòñÿ ïåðñîíàëüíûå íàñòðîéêè..." - IDS_CLOSINGNETWORKCONNECTIONS "Îòêëþ÷àþòñÿ ñåòåâûå ñîåäèíåíèÿ..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS çàâåðøàåò ðàáîòó.." - IDS_PREPARETOSTANDBY "Ïîäãîòîâêà ê ïåðåõîäó â ðåæèì îæèäàíèÿ..." - IDS_PREPARETOHIBERNATE "Ïîäãîòîâêà ê ïåðåõîäó â ñïÿùèé ðåæèì..." - IDS_SAVEYOURSETTINGS "Ñîõðàíÿþòñÿ íàñòðîéêè..." - IDS_REACTOSISSTARTINGUP "ReactOS çàãðóæàåòñÿ..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon íå ìîæåò àêòèâèðîâàòü ïîëüçîâàòåëüñêèé èíòåðôåéñ!" -END - Removed: trunk/reactos/base/system/winlogon/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sv-SE… ============================================================================== --- trunk/reactos/base/system/winlogon/sv-SE.rc (original) +++ trunk/reactos/base/system/winlogon/sv-SE.rc (removed) @@ -1,47 +1,0 @@ -//Swedish resources by David Nordenberg 2005-04-29 - -LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Stäng av datorn" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Du kan nu stänga av datorn.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Starta om", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Användargränssnittet kunde inte starta" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "DLL-filen %s kunde inte laddas.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontakta din systemadministratör för att ersätta eller återställa DLL-filen.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Starta om", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Förbereder nätverksanslutningar..." - IDS_APPLYINGCOMPUTERSETTINGS "Verkställer datorns inställningar..." - IDS_RUNNINGSTARTUPSCRIPTS "Kör uppstartsskript..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Kör avstängningsskript..." - IDS_APPLYINGYOURPERSONALSETTINGS "Verkställer dina personliga inställningar..." - IDS_RUNNINGLOGOFFSCRIPTS "Kör utloggningsskript..." - IDS_RUNNINGLOGONSCRIPTS "Kör inloggningsskript..." - IDS_LOADINGYOURPERSONALSETTINGS "Laddar dina personliga inställningar..." - IDS_CLOSINGNETWORKCONNECTIONS "Stänger nätverksanslutningar..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS håller på att stängas av..." - IDS_PREPARETOSTANDBY "Förbereder för vänteläge..." - IDS_PREPARETOHIBERNATE "Förbereder för viloläge..." - IDS_SAVEYOURSETTINGS "Sparar dina inställningar..." - IDS_REACTOSISSTARTINGUP "ReactOS startas..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon kunde inte ladda användarskalet!" -END - Removed: trunk/reactos/base/system/winlogon/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/uk-UA… ============================================================================== --- trunk/reactos/base/system/winlogon/uk-UA.rc (original) +++ trunk/reactos/base/system/winlogon/uk-UA.rc (removed) @@ -1,45 +1,0 @@ -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Çàâåðøåííÿ ðîáîòè ç êîìï'þòåðîì" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Òåïåð ìîæíà âèìêíóòè êîìï'þòåð.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 - ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Ïåðåçàâàíòàæåííÿ", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 -END - -IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ïîìèëêà ³íòåðôåéñó êîðèñòóâà÷à" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Íå âäàëîñÿ çàâàíòàæèòè á³áë³îòåêó ³íòåðôåéñó âõîäó êîðèñòóâà÷à %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Çâåðí³òüñÿ äî ñèñòåìíîãî àäì³í³ñòðàòîðà ùîá çàì³íèòè íàÿâíó, àáî â³äíîâ³òü ïî÷àòêîâó á³áë³îòåêó.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Ïåðåçàâàíòàæåííÿ", 1, 80, 91, 68, 14 -END - -STRINGTABLE -BEGIN - IDS_PREPARENETWORKCONNECTIONS "Ï³äãîòîâêà ìåðåæíèõ ï³äêëþ÷åíü..." - IDS_APPLYINGCOMPUTERSETTINGS "Çàñòîñóâàííÿ ïàðàìåòð³â êîìï'þòåðà..." - IDS_RUNNINGSTARTUPSCRIPTS "Âèêîíàííÿ ñöåíàð³¿â çàïóñêó..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Âèêîíàííÿ ñöåíàð³¿â çàâåðøåííÿ ðîáîòè..." - IDS_APPLYINGYOURPERSONALSETTINGS "Çàñòîñóâàííÿ îñîáèñòèõ ïàðàìåòð³â..." - IDS_RUNNINGLOGOFFSCRIPTS "Âèêîíàííÿ ñöåíàð³¿â âèõîäó ³ç ñèñòåìè..." - IDS_RUNNINGLOGONSCRIPTS "Âèêîíàííÿ ñöåíàð³¿â âõîäó äî ñèñòåìè..." - IDS_LOADINGYOURPERSONALSETTINGS "Çàâàíòàæåííÿ îñîáèñòèõ ïàðàìåòð³â..." - IDS_CLOSINGNETWORKCONNECTIONS "Çàêðèòòÿ ìåðåæíèõ ï³äêëþ÷åíü..." - IDS_REACTOSISSHUTTINGDOWN "Çàâåðøåííÿ ðîáîòè ReactOS..." - IDS_PREPARETOSTANDBY "Ï³äãîòîâêà äî ðåæèìó î÷³êóâàííÿ..." - IDS_PREPARETOHIBERNATE "Ï³äãîòîâêà äî ñïëÿ÷îãî ðåæèìó..." - IDS_SAVEYOURSETTINGS "Çáåðåæåííÿ ïàðàìåòð³â..." - IDS_REACTOSISSTARTINGUP "Çàïóñê ReactOS..." -END - -STRINGTABLE -BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon íå âäàëîñÿ àêòèâóâàòè îáîëîíêó êîðèñòóâà÷à!" -END - Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rc (original) +++ trunk/reactos/base/system/winlogon/winlogon.rc Wed Nov 29 00:20:25 2006 @@ -8,21 +8,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "winlogon.exe\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -/* IDI_WINLOGON ICON "resources/winlogon.ico" */ - -#include "cs-CZ.rc" -#include "de-DE.rc" -#include "en-US.rc" -#include "es-ES.rc" -#include "fr-FR.rc" -#include "hu-HU.rc" -#include "ja-JP.rc" -#include "nl-NL.rc" -#include "nb-NO.rc" -#include "pl-PL.rc" -#include "ru-RU.rc" -#include "sv-SE.rc" -#include "uk-UA.rc" - +#include "rsrc.rc"

1 0

[greatlrd] 24948: prepare work for StartDirectDrawHel Now I need write stub for each HEL that we do not have. I slather all this HEL even partly working once, when I did redesign ReactOS ddraw.
by greatlrd＠svn.reactos.org 28 Nov '06

28 Nov '06

Author: greatlrd Date: Wed Nov 29 00:14:30 2006 New Revision: 24948 URL: http://svn.reactos.org/svn/reactos?rev=24948&view=rev Log: prepare work for StartDirectDrawHel Now I need write stub for each HEL that we do not have. I slather all this HEL even partly working once, when I did redesign ReactOS ddraw. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Wed Nov 29 00:14:30 2006 @@ -461,13 +461,7 @@ StartDirectDrawHel(LPDIRECTDRAW* iface) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - /* - FIXME : - FlipToGDISurface - SetColorKey - Hel api - */ + This->lpLcl->lpDDCB->HELDD.CanCreateSurface = HelDdCanCreateSurface; This->lpLcl->lpDDCB->HELDD.CreateSurface = HelDdCreateSurface; This->lpLcl->lpDDCB->HELDD.CreatePalette = HelDdCreatePalette; @@ -489,6 +483,40 @@ DDHAL_CB32_SETEXCLUSIVEMODE | DDHAL_CB32_SETMODE | DDHAL_CB32_WAITFORVERTICALBLANK ; + + + This->lpLcl->lpDDCB->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); + + /* + This->lpLcl->lpDDCB->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; + This->lpLcl->lpDDCB->HELDDSurface.Blt = HelDdSurfBlt; + This->lpLcl->lpDDCB->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; + This->lpLcl->lpDDCB->HELDDSurface.Flip = HelDdSurfFlip; + This->lpLcl->lpDDCB->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; + This->lpLcl->lpDDCB->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; + This->lpLcl->lpDDCB->HELDDSurface.Lock = HelDdSurfLock; + This->lpLcl->lpDDCB->HELDDSurface.reserved4 = HelDdSurfreserved4; + This->lpLcl->lpDDCB->HELDDSurface.SetClipList = HelDdSurfSetClipList; + This->lpLcl->lpDDCB->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; + This->lpLcl->lpDDCB->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; + This->lpLcl->lpDDCB->HELDDSurface.SetPalette = HelDdSurfSetPalette; + This->lpLcl->lpDDCB->HELDDSurface.Unlock = HelDdSurfUnlock; + This->lpLcl->lpDDCB->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; + */ + + /* + This->lpLcl->lpDDCB->HELDDPalette.DestroyPalette = HelDdPalDestroyPalette; + This->lpLcl->lpDDCB->HELDDPalette.SetEntries = HelDdPalSetEntries; + This->lpLcl->lpDDCB->HELDDPalette.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDPalette); + */ + + /* + This->lpLcl->lpDDCB->HELDDExeBuf.CanCreateExecuteBuffer = HelDdExeCanCreateExecuteBuffer; + This->lpLcl->lpDDCB->HELDDExeBuf.CreateExecuteBuffer = HelDdExeCreateExecuteBuffer; + This->lpLcl->lpDDCB->HELDDExeBuf.DestroyExecuteBuffer = HelDdExeDestroyExecuteBuffer; + This->lpLcl->lpDDCB->HELDDExeBuf.LockExecuteBuffer = HelDdExeLockExecuteBuffer; + This->lpLcl->lpDDCB->HELDDExeBuf.UnlockExecuteBuffer = HelDdExeUnlockExecuteBuffer; + */ return DD_OK; }

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