Ros-diffs

ros-diffs@reactos.org

81390 discussions

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Mar 15 16:55:41 2009 New Revision: 40033 URL: http://svn.reactos.org/svn/reactos?rev=40033&view=rev Log: add a dummy wlansvc Added: trunk/reactos/base/services/wlansvc/ (with props) trunk/reactos/base/services/wlansvc/wlansvc.c (with props) trunk/reactos/base/services/wlansvc/wlansvc.rbuild (with props) Modified: trunk/reactos/base/services/services.rbuild Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/services.rbuild [iso-8859-1] Sun Mar 15 16:55:41 2009 @@ -25,4 +25,7 @@ <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> + <directory name="wlansvc"> + <xi:include href="wlansvc/wlansvc.rbuild" /> + </directory> </group> Propchange: trunk/reactos/base/services/wlansvc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 16:55:41 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/services/wlansvc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/services/wlansvc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/services/wlansvc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/services/wlansvc/wlansvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.c (added) +++ trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] Sun Mar 15 16:55:41 2009 @@ -1,0 +1,87 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/wlansvc/wlansvc.c + * PURPOSE: WLAN Service + * PROGRAMMER: Christoph von Wittich + */ + +/* INCLUDES *****************************************************************/ + +#define WIN32_NO_STATUS +#include <windows.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ******************************************************************/ + +#define SERVICE_NAME L"WLAN Service" + +SERVICE_STATUS_HANDLE ServiceStatusHandle; + + +/* FUNCTIONS *****************************************************************/ + + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + return ERROR_SUCCESS; + + default : + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + + +static VOID CALLBACK +ServiceMain(DWORD argc, LPWSTR *argv) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(SERVICE_NAME, + ServiceControlHandler, + NULL); + + + + DPRINT("ServiceMain() done\n"); +} + + +int +wmain(int argc, WCHAR *argv[]) +{ + SERVICE_TABLE_ENTRYW ServiceTable[2] = + { + {SERVICE_NAME, ServiceMain}, + {NULL, NULL} + }; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("wlansvc: main() started\n"); + + StartServiceCtrlDispatcherW(ServiceTable); + + DPRINT("wlansvc: main() done\n"); + + ExitThread(0); + + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/services/wlansvc/wlansvc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/wlansvc/wlansvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.rbuild (added) +++ trunk/reactos/base/services/wlansvc/wlansvc.rbuild [iso-8859-1] Sun Mar 15 16:55:41 2009 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="wlansvc" type="win32cui" installbase="system32" installname="wlansvc.exe" unicode="yes"> + <include base="wlansvc">.</include> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>wlansvc.c</file> +</module> Propchange: trunk/reactos/base/services/wlansvc/wlansvc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 4 months

[fireball] 40032: - Give winldr's PE loader its own debug mask.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 15 16:29:13 2009 New Revision: 40032 URL: http://svn.reactos.org/svn/reactos?rev=40032&view=rev Log: - Give winldr's PE loader its own debug mask. Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Sun Mar 15 16:29:13 2009 @@ -34,6 +34,7 @@ #define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader +#define DPRINT_PELOADER 0x00001000 // OR this with DebugPrintMask to enable messages from PE images loader extern char* g_file; extern int g_line; Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Sun Mar 15 16:29:13 2009 @@ -56,7 +56,7 @@ PLDR_DATA_TABLE_ENTRY DataTableEntry; LIST_ENTRY *ModuleEntry; - DPRINTM(DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: DllName %X, LoadedEntry: %X\n", + DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: DllName %X, LoadedEntry: %X\n", DllName, LoadedEntry); /* Just go through each entry in the LoadOrderList and compare loaded module's @@ -69,7 +69,7 @@ LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - DPRINTM(DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: DTE %p, EP %p\n", + DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: DTE %p, EP %p\n", DataTableEntry, DataTableEntry->EntryPoint); /* Compare names */ @@ -79,7 +79,7 @@ to the caller and increase load count for it */ *LoadedEntry = DataTableEntry; DataTableEntry->LoadCount++; - DPRINTM(DPRINT_WINDOWS, "WinLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); + DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: LoadedEntry %X\n", DataTableEntry); return TRUE; } @@ -111,7 +111,7 @@ BaseName.Buffer = VaToPa(ScanDTE->BaseDllName.Buffer); BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; BaseName.Length = ScanDTE->BaseDllName.Length; - DPRINTM(DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", + DPRINTM(DPRINT_PELOADER, "WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", &BaseName, ImportTable); } @@ -124,7 +124,7 @@ { /* Get pointer to the name */ ImportName = (PCH)VaToPa(RVA(ScanDTE->DllBase, ImportTable->Name)); - DPRINTM(DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable(): Looking at %s\n", ImportName); + DPRINTM(DPRINT_PELOADER, "WinLdrScanImportDescriptorTable(): Looking at %s\n", ImportName); /* In case we get a reference to ourselves - just skip it */ if (WinLdrpCompareDllName(ImportName, &ScanDTE->BaseDllName)) @@ -140,7 +140,7 @@ if (!Status) { - DPRINTM(DPRINT_WINDOWS, "WinLdrpLoadAndScanReferencedDll() failed\n"); + DPRINTM(DPRINT_PELOADER, "WinLdrpLoadAndScanReferencedDll() failed\n"); return Status; } } @@ -154,7 +154,7 @@ if (!Status) { - DPRINTM(DPRINT_WINDOWS, "WinLdrpScanImportAddressTable() failed\n"); + DPRINTM(DPRINT_PELOADER, "WinLdrpScanImportAddressTable() failed\n"); return Status; } } @@ -337,7 +337,7 @@ /* This is the real image base - in form of a virtual address */ VirtualBase = PaToVa(PhysicalBase); - DPRINTM(DPRINT_WINDOWS, "Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); + DPRINTM(DPRINT_PELOADER, "Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); /* Set to 0 position and fully load the file image */ FsSetFilePointer(FileHandle, 0); @@ -390,14 +390,14 @@ /* Seek to the correct position */ FsSetFilePointer(FileHandle, SectionHeader->PointerToRawData); - DPRINTM(DPRINT_WINDOWS, "SH->VA: 0x%X\n", SectionHeader->VirtualAddress); + DPRINTM(DPRINT_PELOADER, "SH->VA: 0x%X\n", SectionHeader->VirtualAddress); /* Read this section from the file, size = SizeOfRawData */ Status = FsReadFile(FileHandle, SizeOfRawData, &BytesRead, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress); if (!Status && (BytesRead == 0)) { - DPRINTM(DPRINT_WINDOWS, "WinLdrLoadImage(): Error reading section from file!\n"); + DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage(): Error reading section from file!\n"); break; } } @@ -405,7 +405,7 @@ /* Size of data is less than the virtual size - fill up the remainder with zeroes */ if (SizeOfRawData < VirtualSize) { - DPRINTM(DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); + DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); } @@ -423,7 +423,7 @@ /* Relocate the image, if it needs it */ if (NtHeaders->OptionalHeader.ImageBase != (ULONG)VirtualBase) { - DPRINTM(DPRINT_WINDOWS, "Relocating %p -> %p\n", + DPRINTM(DPRINT_PELOADER, "Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); Status = (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, @@ -453,7 +453,7 @@ UnicodeNamePA.Length = UnicodeName->Length; UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); - DPRINTM(DPRINT_WINDOWS, "WinLdrpCompareDllName: %s and %wZ, Length = %d " + DPRINTM(DPRINT_PELOADER, "WinLdrpCompareDllName: %s and %wZ, Length = %d " "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); if ((Length * sizeof(WCHAR)) > UnicodeName->Length) @@ -500,13 +500,13 @@ LONG High, Low, Middle, Result; ULONG Hint; - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase param */ if(DllBase == NULL) { - DPRINTM(DPRINT_WINDOWS, "WARNING: DllBase == NULL!\n"); + DPRINTM(DPRINT_PELOADER, "WARNING: DllBase == NULL!\n"); return FALSE; } @@ -518,7 +518,7 @@ { /* Yes, calculate the ordinal */ Ordinal = (ULONG)(IMAGE_ORDINAL(ThunkData->u1.Ordinal) - (UINT32)ExportDirectory->Base); - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); } else { @@ -526,22 +526,22 @@ if (!ProcessForwards) { /* AddressOfData in thunk entry will become a virtual address (from relative) */ - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ThunkData->u1.AOD was %p\n", ThunkData->u1.AddressOfData); ThunkData->u1.AddressOfData = (ULONG)RVA(ImageBase, ThunkData->u1.AddressOfData); - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ThunkData->u1.AOD became %p\n", ThunkData->u1.AddressOfData); } /* Get pointers to Name and Ordinal tables (RVA -> VA) */ NameTable = (PULONG)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNames)); OrdinalTable = (PUSHORT)VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); - //DPRINTM(DPRINT_WINDOWS, "NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", + //DPRINTM(DPRINT_PELOADER, "NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); /* Get the hint, convert it to a physical pointer */ Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; - //DPRINTM(DPRINT_WINDOWS, "HintIndex %d\n", Hint); + //DPRINTM(DPRINT_PELOADER, "HintIndex %d\n", Hint); /* If Hint is less than total number of entries in the export directory, and import name == export name, then we can just get it from the OrdinalTable */ @@ -554,14 +554,14 @@ ) { Ordinal = OrdinalTable[Hint]; - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): Ordinal %d\n", Ordinal); } else { /* It's not the easy way, we have to lookup import name in the name table. Let's use a binary search for this task. */ - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName() looking up the import name using binary search...\n"); + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName() looking up the import name using binary search...\n"); /* Low boundary is set to 0, and high boundary to the maximum index */ Low = 0; @@ -577,11 +577,11 @@ Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Name[0]), (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); - /*DPRINTM(DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n",*/ + /*DPRINTM(DPRINT_PELOADER, "Binary search: comparing Import '__', Export '%s'\n",*/ /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])));*/ - /*DPRINTM(DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", + /*DPRINTM(DPRINT_PELOADER, "TE->u1.AOD %p, fulladdr %p\n", ThunkData->u1.AddressOfData, ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name );*/ @@ -608,21 +608,21 @@ if (High < Low) { //Print(L"Error in binary search\n"); - DPRINTM(DPRINT_WINDOWS, "Error in binary search!\n"); + DPRINTM(DPRINT_PELOADER, "Error in binary search!\n"); return FALSE; } /* Everything allright, get the ordinal */ Ordinal = OrdinalTable[Middle]; - //DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName() found Ordinal %d\n", Ordinal); + //DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName() found Ordinal %d\n", Ordinal); } } /* Check ordinal number for validity! */ if (Ordinal >= ExportDirectory->NumberOfFunctions) { - DPRINTM(DPRINT_WINDOWS, "Ordinal number is invalid!\n"); + DPRINTM(DPRINT_PELOADER, "Ordinal number is invalid!\n"); return FALSE; } @@ -647,12 +647,12 @@ /* Strip out its extension */ *strchr(ForwardDllName,'.') = '\0'; - DPRINTM(DPRINT_WINDOWS, "WinLdrpBindImportName(): ForwardDllName %s\n", ForwardDllName); + DPRINTM(DPRINT_PELOADER, "WinLdrpBindImportName(): ForwardDllName %s\n", ForwardDllName); if (!WinLdrCheckForLoadedDll(WinLdrBlock, ForwardDllName, &DataTableEntry)) { /* We can't continue if DLL couldn't be loaded, so bomb out with an error */ //Print(L"Error loading DLL!\n"); - DPRINTM(DPRINT_WINDOWS, "Error loading DLL!\n"); + DPRINTM(DPRINT_PELOADER, "Error loading DLL!\n"); return FALSE; } @@ -728,7 +728,7 @@ strcpy(FullDllName, DirectoryPath); strcat(FullDllName, ImportName); - DPRINTM(DPRINT_WINDOWS, "Loading referenced DLL: %s\n", FullDllName); + DPRINTM(DPRINT_PELOADER, "Loading referenced DLL: %s\n", FullDllName); //Print(L"Loading referenced DLL: %s\n", FullDllName); /* Load the image */ @@ -736,7 +736,7 @@ if (!Status) { - DPRINTM(DPRINT_WINDOWS, "WinLdrLoadImage() failed\n"); + DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage() failed\n"); return Status; } @@ -749,20 +749,20 @@ if (!Status) { - DPRINTM(DPRINT_WINDOWS, + DPRINTM(DPRINT_PELOADER, "WinLdrAllocateDataTableEntry() failed with Status=0x%X\n", Status); return Status; } /* Scan its dependencies too */ - DPRINTM(DPRINT_WINDOWS, + DPRINTM(DPRINT_PELOADER, "WinLdrScanImportDescriptorTable() calling ourselves for %S\n", VaToPa((*DataTableEntry)->BaseDllName.Buffer)); Status = WinLdrScanImportDescriptorTable(WinLdrBlock, DirectoryPath, *DataTableEntry); if (!Status) { - DPRINTM(DPRINT_WINDOWS, + DPRINTM(DPRINT_PELOADER, "WinLdrScanImportDescriptorTable() failed with Status=0x%X\n", Status); return Status; } @@ -780,7 +780,7 @@ BOOLEAN Status; ULONG ExportSize; - DPRINTM(DPRINT_WINDOWS, "WinLdrpScanImportAddressTable(): DllBase 0x%X, " + DPRINTM(DPRINT_PELOADER, "WinLdrpScanImportAddressTable(): DllBase 0x%X, " "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); /* Obtain the export table from the DLL's base */ @@ -798,7 +798,7 @@ &ExportSize); } - DPRINTM(DPRINT_WINDOWS, "WinLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); + DPRINTM(DPRINT_PELOADER, "WinLdrpScanImportAddressTable(): ExportDirectory 0x%X\n", ExportDirectory); /* If pointer to Export Directory is */ if (ExportDirectory == NULL)

16 years, 4 months

[dchapyshev] 40031: - Add mssign32, msisip, query, updspapi, wintab32 from Wine

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Mar 15 14:22:15 2009 New Revision: 40031 URL: http://svn.reactos.org/svn/reactos?rev=40031&view=rev Log: - Add mssign32, msisip, query, updspapi, wintab32 from Wine Added: trunk/reactos/dll/win32/msisip/ (with props) trunk/reactos/dll/win32/msisip/main.c (with props) trunk/reactos/dll/win32/msisip/msisip.rbuild (with props) trunk/reactos/dll/win32/msisip/msisip.spec (with props) trunk/reactos/dll/win32/mssign32/ (with props) trunk/reactos/dll/win32/mssign32/mssign32.rbuild (with props) trunk/reactos/dll/win32/mssign32/mssign32.spec (with props) trunk/reactos/dll/win32/mssign32/mssign32_main.c (with props) trunk/reactos/dll/win32/mssip32/ (with props) trunk/reactos/dll/win32/mssip32/main.c (with props) trunk/reactos/dll/win32/mssip32/mssip32.rbuild (with props) trunk/reactos/dll/win32/mssip32/mssip32.spec (with props) trunk/reactos/dll/win32/query/ (with props) trunk/reactos/dll/win32/query/query.rbuild (with props) trunk/reactos/dll/win32/query/query.spec (with props) trunk/reactos/dll/win32/query/query_main.c (with props) trunk/reactos/dll/win32/updspapi/ (with props) trunk/reactos/dll/win32/updspapi/main.c (with props) trunk/reactos/dll/win32/updspapi/updspapi.rbuild (with props) trunk/reactos/dll/win32/updspapi/updspapi.spec (with props) trunk/reactos/dll/win32/wintab32/ (with props) trunk/reactos/dll/win32/wintab32/context.c (with props) trunk/reactos/dll/win32/wintab32/manager.c (with props) trunk/reactos/dll/win32/wintab32/wintab.h (with props) trunk/reactos/dll/win32/wintab32/wintab.spec (with props) trunk/reactos/dll/win32/wintab32/wintab16.c (with props) trunk/reactos/dll/win32/wintab32/wintab32.c (with props) trunk/reactos/dll/win32/wintab32/wintab32.rbuild (with props) trunk/reactos/dll/win32/wintab32/wintab32.spec (with props) trunk/reactos/dll/win32/wintab32/wintab_internal.h (with props) trunk/reactos/include/psdk/cierror.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=400… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/msisip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/main.c?re… Added: trunk/reactos/dll/win32/msisip/msisip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/msisip.rb… Added: trunk/reactos/dll/win32/msisip/msisip.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/msisip.sp… Added: trunk/reactos/dll/win32/mssign32/mssign32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… Added: trunk/reactos/dll/win32/mssign32/mssign32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… Added: trunk/reactos/dll/win32/mssign32/mssign32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… Added: trunk/reactos/dll/win32/mssip32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/main.c?r… Added: trunk/reactos/dll/win32/mssip32/mssip32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/mssip32.… Added: trunk/reactos/dll/win32/mssip32/mssip32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/mssip32.… Added: trunk/reactos/dll/win32/query/query.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query.rbui… Added: trunk/reactos/dll/win32/query/query.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query.spec… Added: trunk/reactos/dll/win32/query/query_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/query_main… Added: trunk/reactos/dll/win32/updspapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/updspapi/main.c?… Added: trunk/reactos/dll/win32/updspapi/updspapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/updspapi/updspap… Added: trunk/reactos/dll/win32/updspapi/updspapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/updspapi/updspap… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Added: trunk/reactos/dll/win32/wintab32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/context… Added: trunk/reactos/dll/win32/wintab32/manager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/manager… Added: trunk/reactos/dll/win32/wintab32/wintab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab.… Added: trunk/reactos/dll/win32/wintab32/wintab.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab.… Added: trunk/reactos/dll/win32/wintab32/wintab16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab1… Added: trunk/reactos/dll/win32/wintab32/wintab32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab3… Added: trunk/reactos/dll/win32/wintab32/wintab32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab3… Added: trunk/reactos/dll/win32/wintab32/wintab32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab3… Added: trunk/reactos/dll/win32/wintab32/wintab_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintab32/wintab_… Added: trunk/reactos/include/psdk/cierror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cierror.h?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

16 years, 4 months

[fireball] 40030: - Implement NLS data loading.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 15 14:10:52 2009 New Revision: 40030 URL: http://svn.reactos.org/svn/reactos?rev=40030&view=rev Log: - Implement NLS data loading. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Sun Mar 15 14:10:52 2009 @@ -36,6 +36,12 @@ PCHAR SystemPath, PCHAR BootPath, USHORT VersionToBoot); +BOOLEAN +WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR DirectoryPath, + IN LPCSTR AnsiFileName, + IN LPCSTR OemFileName, + IN LPCSTR LanguageFileName); @@ -46,6 +52,53 @@ extern BOOLEAN UseRealHeap; extern ULONG LoaderPagesSpanned; + + +VOID +SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) +{ + INFCONTEXT InfContext; + BOOLEAN Status; + LPCSTR AnsiName, OemName, LangName; + + /* Get ANSI codepage file */ + if (!InfFindFirstLine(InfHandle, "NLS", "AnsiCodepage", &InfContext)) + { + printf("Failed to find 'NLS/AnsiCodepage'\n"); + return; + } + if (!InfGetDataField(&InfContext, 1, &AnsiName)) + { + printf("Failed to get load options\n"); + return; + } + + /* Get OEM codepage file */ + if (!InfFindFirstLine(InfHandle, "NLS", "OemCodepage", &InfContext)) + { + printf("Failed to find 'NLS/AnsiCodepage'\n"); + return; + } + if (!InfGetDataField(&InfContext, 1, &OemName)) + { + printf("Failed to get load options\n"); + return; + } + + if (!InfFindFirstLine(InfHandle, "NLS", "UnicodeCasetable", &InfContext)) + { + printf("Failed to find 'NLS/AnsiCodepage'\n"); + return; + } + if (!InfGetDataField(&InfContext, 1, &LangName)) + { + printf("Failed to get load options\n"); + return; + } + + Status = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); + DPRINTM(DPRINT_WINDOWS, "NLS data loaded with status %d\n", Status); +} VOID LoadReactOSSetup2(VOID) { @@ -183,9 +236,8 @@ if (KdComDTE) WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); - /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ - //Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); - DPRINTM(DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status); + /* Load NLS data */ + SetupLdrLoadNlsData(LoaderBlock, InfHandle, BootPath); /* Load boot drivers */ //Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath);

16 years, 4 months

[dchapyshev] 40029: - Add shortcut for dxdiag

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Mar 15 13:57:55 2009 New Revision: 40029 URL: http://svn.reactos.org/svn/reactos?rev=40029&view=rev Log: - Add shortcut for dxdiag Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -784,6 +784,7 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_DXDIAG, _T("%SystemRoot%\\system32\\dxdiag.exe"), IDS_CMT_DXDIAG, TRUE); } /* Create Accessibility subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -227,6 +227,7 @@ IDS_SYS_TOOLS "Ñèñòåìíè ñðåäñòâà" IDS_CMT_CHARMAP "Çíàêîâà òàáëèöà" IDS_CMT_KBSWITCH "Ïðåâêëþ÷âàòåë íà êëàâèàòóðíèòå ïîäðåäáè" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -277,6 +278,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -222,6 +222,7 @@ IDS_SYS_TOOLS "Systémové nástroje" IDS_CMT_CHARMAP "Mapa znakù" IDS_CMT_KBSWITCH "Pøepínaè rozloení klávesnice" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -273,6 +274,7 @@ IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -222,6 +222,7 @@ IDS_SYS_TOOLS "Systemprogramme" IDS_CMT_CHARMAP "Zeichentabelle" IDS_CMT_KBSWITCH "Tastaturlayout-Umschalter" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -273,6 +274,7 @@ IDS_SHORT_EVENTVIEW "Ereignisanzeige.lnk" IDS_SHORT_MSCONFIG "Systemkonfiguration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -223,6 +223,7 @@ IDS_SYS_TOOLS "Åñãáëåßá ÓõóôÞìáôïò" IDS_CMT_CHARMAP "Ðßíáêáò ×áñáêôÞñùí" IDS_CMT_KBSWITCH "ÁëëáãÞ ÄéÜôáîçò Ðëçêôñïëïãßïõ" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -274,6 +275,7 @@ IDS_SHORT_EVENTVIEW "ÐñïâïëÞ ÓõìâÜíôùí.lnk" IDS_SHORT_MSCONFIG "Âïçèçôéêü ðñüãñáììá ñýèìéóçò ðáñáìÝôñùí.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -223,6 +223,7 @@ IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "Character Map" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -273,6 +274,7 @@ IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -232,6 +232,7 @@ IDS_SYS_TOOLS "Herramientas del sistema" IDS_CMT_CHARMAP "Mapa de caracteres" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -283,6 +284,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -223,6 +223,7 @@ IDS_SYS_TOOLS "Outils système" IDS_CMT_CHARMAP "Table des Caractères" IDS_CMT_KBSWITCH "Sélecteur de configuration clavier" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -273,6 +274,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -235,6 +235,7 @@ IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -286,6 +287,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -221,6 +221,7 @@ IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -271,6 +272,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -214,6 +214,7 @@ IDS_SYS_TOOLS "Strumenti di sistema" IDS_CMT_CHARMAP "Mappa dei caratteri" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -264,6 +265,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -223,6 +223,7 @@ IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -273,6 +274,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -223,6 +223,7 @@ IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "CharMap" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -273,6 +274,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -226,6 +226,7 @@ IDS_SYS_TOOLS "System verktøy" IDS_CMT_CHARMAP "Tegnkart" IDS_CMT_KBSWITCH "Endre tastatur valg" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -276,6 +277,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -238,6 +238,7 @@ IDS_SYS_TOOLS "System Tools" IDS_CMT_CHARMAP "Character Map" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END STRINGTABLE @@ -281,6 +282,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -204,6 +204,7 @@ IDS_SYS_TOOLS "Ñëóæåáíûå" IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" IDS_CMT_KBSWITCH "Ïåðåêëþ÷àòåëü ðàñêëàäêè êëàâèàòóðû" + IDS_CMT_DXDIAG "Çàïóñòèòü ïðîãðàììó äèàãíîñòèêè ReactX" END @@ -255,6 +256,7 @@ IDS_SHORT_EVENTVIEW "Ïðîñìîòð ñîáûòèé.lnk" IDS_SHORT_MSCONFIG "Ïàðàìåòðû ñèñòåìû.lnk" IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" + IDS_SHORT_DXDIAG "Ñðåäñòâî äèàãíîñòèêè ReactX.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -208,6 +208,7 @@ IDS_SYS_TOOLS "Systémové nástroje" IDS_CMT_CHARMAP "Mapa znakov" IDS_CMT_KBSWITCH "Prepínaè rozloenia klávesnice" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -259,6 +260,7 @@ IDS_SHORT_EVENTVIEW "Zobrazovaè udalostí.lnk" IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -212,6 +212,7 @@ IDS_SYS_TOOLS "Ñëóæáîâ³" IDS_CMT_CHARMAP "Òàáëèöÿ ñèìâîë³â" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -263,6 +264,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -211,6 +211,7 @@ IDS_SYS_TOOLS "ÏµÍ³¹¤¾ß" IDS_CMT_CHARMAP "×Ö·ûÓ³Éä±í" IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" END @@ -262,6 +263,7 @@ IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" IDS_SHORT_SNDVOL32 "Volume Control.lnk" + IDS_SHORT_DXDIAG "ReactX Diagnostic.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Mar 15 13:57:55 2009 @@ -113,6 +113,7 @@ #define IDS_CMT_WINEMINE 3227 #define IDS_CMT_WORDPAD 3228 #define IDS_CMT_SNDVOL32 3229 +#define IDS_CMT_DXDIAG 3230 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -144,6 +145,7 @@ #define IDS_SHORT_WINEMINE 3417 #define IDS_SHORT_WORDPAD 3418 #define IDS_SHORT_SNDVOL32 3419 +#define IDS_SHORT_DXDIAG 3420 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

16 years, 4 months

[fireball] 40028: - Implement first part of setupldr: * Constructing boot / system paths * Opening boot device * Getting options string * Loading kernel, hal and kdcom.dll, and their dependencies

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 15 13:46:41 2009 New Revision: 40028 URL: http://svn.reactos.org/svn/reactos?rev=40028&view=rev Log: - Implement first part of setupldr: * Constructing boot / system paths * Opening boot device * Getting options string * Loading kernel, hal and kdcom.dll, and their dependencies Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Sun Mar 15 13:46:41 2009 @@ -23,7 +23,205 @@ #include <ndk/ldrtypes.h> #include <debug.h> +// TODO: Move to .h +VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); +BOOLEAN WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, LPSTR BootPath); +void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock, + PVOID *GdtIdt, + ULONG *PcrBasePage, + ULONG *TssBasePage); +VOID +WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, + PCHAR Options, + PCHAR SystemPath, + PCHAR BootPath, + USHORT VersionToBoot); + + + +//FIXME: Do a better way to retrieve Arc disk information +extern ULONG reactos_disk_count; +extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; +extern char reactos_arc_strings[32][256]; + +extern BOOLEAN UseRealHeap; +extern ULONG LoaderPagesSpanned; + VOID LoadReactOSSetup2(VOID) { + CHAR SystemPath[512], SearchPath[512]; + CHAR FileName[512]; + CHAR BootPath[512]; + LPCSTR BootOptions; + PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; + BOOLEAN Status; + ULONG BootDevice; + ULONG i, ErrorLine; + HINF InfHandle; + INFCONTEXT InfContext; + PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; + KERNEL_ENTRY_POINT KiSystemStartup; + PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; + // Mm-related things + PVOID GdtIdt; + ULONG PcrBasePage=0; + ULONG TssBasePage=0; + LPCSTR SourcePath; + LPCSTR SourcePaths[] = + { + "", /* Only for floppy boot */ +#if defined(_M_IX86) + "\\I386", +#elif defined(_M_MPPC) + "\\PPC", +#elif defined(_M_MRX000) + "\\MIPS", +#endif + "\\reactos", + NULL + }; + + /* Get boot device number */ + MachDiskGetBootDevice(&BootDevice); + + /* Open 'txtsetup.sif' from any of source paths */ + for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) + { + SourcePath = SourcePaths[i]; + if (!SourcePath) + { + printf("Failed to open 'txtsetup.sif'\n"); + return; + } + sprintf(FileName,"%s\\txtsetup.sif", SourcePath); + if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) + break; + } + + /* If we didn't find it anywhere, then just use root */ + if (!*SourcePath) + SourcePath = "\\"; + + /* Load options */ + if (!InfFindFirstLine(InfHandle, + "SetupData", + "OsLoadOptions", + &InfContext)) + { + printf("Failed to find 'SetupData/OsLoadOptions'\n"); + return; + } + + if (!InfGetDataField (&InfContext, 1, &BootOptions)) + { + printf("Failed to get load options\n"); + return; + } + + /* Save source path */ + strcpy(BootPath, SourcePath); + + SetupUiInitialize(); + UiDrawStatusText(""); + UiDrawStatusText("Detecting Hardware..."); + + /* Let user know we started loading */ + UiDrawStatusText("Loading..."); + + /* Try to open system drive */ + FsOpenBootVolume(); + + /* Append a backslash to the bootpath if needed */ + if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') + { + strcat(BootPath, "\\"); + } + + /* Construct the system path */ + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); + strcat(SystemPath, SourcePath); + + DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s', SystemPath: '%s'\n", BootPath, SystemPath); + + /* Allocate and minimalistic-initialize LPB */ + AllocateAndInitLPB(&LoaderBlock); + + /* Detect hardware */ + UseRealHeap = TRUE; + LoaderBlock->ConfigurationRoot = MachHwDetect(); + + /* Load kernel */ + strcpy(FileName, BootPath); + strcat(FileName, "NTOSKRNL.EXE"); + Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase); + DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase); + + /* Load HAL */ + strcpy(FileName, BootPath); + strcat(FileName, "HAL.DLL"); + Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase); + DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase); + + /* Load kernel-debugger support dll */ + strcpy(FileName, BootPath); + strcat(FileName, "KDCOM.DLL"); + Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase); + DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase); + + /* Allocate data table entries for above-loaded modules */ + WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", + "NTOSKRNL.EXE", NtosBase, &KernelDTE); + WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", + "HAL.DLL", HalBase, &HalDTE); + WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", + "KDCOM.DLL", KdComBase, &KdComDTE); + + /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ + strcpy(SearchPath, BootPath); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + if (KdComDTE) + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); + + /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ + //Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); + DPRINTM(DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status); + + /* Load boot drivers */ + //Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); + DPRINTM(DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status); + + /* Alloc PCR, TSS, do magic things with the GDT/IDT */ + WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); + + /* Initialize Phase 1 - no drivers loading anymore */ + WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); + + /* Save entry-point pointer and Loader block VAs */ + KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; + LoaderBlockVA = PaToVa(LoaderBlock); + + /* "Stop all motors", change videomode */ + MachPrepareForReactOS(FALSE); + + /* Debugging... */ + //DumpMemoryAllocMap(); + + /* Turn on paging mode of CPU*/ + WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); + + /* Save final value of LoaderPagesSpanned */ + LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; + + DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", + KiSystemStartup, LoaderBlockVA); + + //WinLdrpDumpMemoryDescriptors(LoaderBlockVA); + //WinLdrpDumpBootDriver(LoaderBlockVA); + //WinLdrpDumpArcDisks(LoaderBlockVA); + + /* Pass control */ + (*KiSystemStartup)(LoaderBlockVA); + + return; } -

16 years, 4 months

[dchapyshev] 40027: - Create Entertainment folder - Add shortcut for sndvol32

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Mar 15 13:25:32 2009 New Revision: 40027 URL: http://svn.reactos.org/svn/reactos?rev=40027&view=rev Log: - Create Entertainment folder - Add shortcut for sndvol32 Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -772,7 +772,6 @@ { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); @@ -791,6 +790,13 @@ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ACCESSIBILITY, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MAGNIFY, _T("%SystemRoot%\\system32\\magnify.exe"), IDS_CMT_MAGNIFY, TRUE); + } + + /* Create Entertainment subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ENTERTAINMENT, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDVOL32, _T("%SystemRoot%\\system32\\sndvol32.exe"), IDS_CMT_SNDVOL32, TRUE); } /* Create Games subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -200,7 +200,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Ïðèíàäëåæíîñòè" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Ïóñêàíå íà èç÷èñëèòåëÿ" IDS_CMT_CMD "Îòâàðÿíå íà êîìàíäíèÿ ïðîçîðåö" IDS_CMT_EXPLORER "Ïóñêàíå íà èçñëåäîâàòåëÿ" @@ -234,6 +233,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Äîñòúïíîñò" IDS_CMT_MAGNIFY "Ëóïà" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -270,6 +276,7 @@ IDS_SHORT_KBSWITCH "Ïðåâêëþ÷âàòåë íà êëàâèàòóðíèòå ïîäðåäáè.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -196,7 +196,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Pøísluenství" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Spustit Kalkulaèku" IDS_CMT_CMD "Otevøít Pøíkazový øádek" IDS_CMT_EXPLORER "Spustit Explorer" @@ -234,6 +233,13 @@ STRINGTABLE BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" IDS_UNKNOWN_ERROR "Neznámá chyba" IDS_REGISTERING_COMPONENTS "Registruji souèásti..." @@ -252,7 +258,6 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Správce slueb.lnk" IDS_SHORT_DEVICE "Správce zaøízení.lnk" - IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Kalkulaèka.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Poznámkový blok.lnk" @@ -266,6 +271,8 @@ IDS_SHORT_KBSWITCH "Pøepínaè rozloení klávesnice.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -196,7 +196,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Zubehör" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Starte Taschenrechner" IDS_CMT_CMD "Öffne Kommandozeilenfenster" IDS_CMT_EXPLORER "Starte Explorer" @@ -230,6 +229,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Eingabehilfen" IDS_CMT_MAGNIFY "Bildschirmlupe" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -266,6 +272,7 @@ IDS_SHORT_KBSWITCH "Tastaturlayout-Umschalter.lnk" IDS_SHORT_EVENTVIEW "Ereignisanzeige.lnk" IDS_SHORT_MSCONFIG "Systemkonfiguration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -197,7 +197,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "ÂïçèÞìáôá" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Áñéèìïìç÷áíÞ" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "ÅîåñåõíçôÞò" @@ -231,6 +230,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Ãéá Üôïìá ìå åéäéêÝò áíÜãêåò" IDS_CMT_MAGNIFY "Ìåãåèõíôéêüò öáêüò" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -267,6 +273,7 @@ IDS_SHORT_KBSWITCH "ÁëëáãÞ ÄéÜôáîçò Ðëçêôñïëïãßïõ.lnk" IDS_SHORT_EVENTVIEW "ÐñïâïëÞ ÓõìâÜíôùí.lnk" IDS_SHORT_MSCONFIG "Âïçèçôéêü ðñüãñáììá ñýèìéóçò ðáñáìÝôñùí.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -202,7 +202,6 @@ IDS_CMT_DEVMGMT "Launch Device Manager" IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_EXPLORER "Launch Explorer" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_MSCONFIG "Launch System Configuration program" IDS_CMT_NOTEPAD "Launch Text Editor" IDS_CMT_RDESKTOP "Launch Remote Desktop" @@ -230,6 +229,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibility" IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -266,6 +272,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -206,7 +206,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accesorios" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Ejecutar Calculadora" IDS_CMT_CMD "Abrir Símbolo del sistema" IDS_CMT_EXPLORER "Ejecutar Explorador" @@ -240,6 +239,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accesibilidad" IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -276,6 +282,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -197,7 +197,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessoires" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Lancer la Calculatrice" IDS_CMT_CMD "Ouvrir l'invite de commandes" IDS_CMT_EXPLORER "Lancer Explorer" @@ -230,6 +229,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibilité" IDS_CMT_MAGNIFY "Loupe" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -266,6 +272,7 @@ IDS_SHORT_KBSWITCH "Sélecteur de configuration clavier.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -209,7 +209,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -243,6 +242,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibility" IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -279,6 +285,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -195,7 +195,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Aksesoris" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Jalankan Kalkulator" IDS_CMT_CMD "Buka prompt perintah" IDS_CMT_EXPLORER "Jalankan Explorer" @@ -228,6 +227,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibility" IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -264,6 +270,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -188,7 +188,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessori" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Calcolatrice" IDS_CMT_CMD "Apri la finestra dei comandi" IDS_CMT_EXPLORER "Lancia Explorer" @@ -221,6 +220,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibilità" IDS_CMT_MAGNIFY "Ingrandisci" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -257,6 +263,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -197,7 +197,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -230,6 +229,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibility" IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -266,6 +272,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -197,7 +197,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -230,6 +229,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Accessibility" IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -266,6 +272,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -200,7 +200,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Tilbehør" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Start Kalkulator" IDS_CMT_CMD "Åpne command prompt" IDS_CMT_EXPLORER "Start Explorer" @@ -233,6 +232,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Tilgjengelighet" IDS_CMT_MAGNIFY "Forstørrelse" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -269,6 +275,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -205,7 +205,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Akcesoria" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Uruchom Kalkulator" IDS_CMT_CMD "Uruchom konsolê" IDS_CMT_EXPLORER "Uruchom Eksplorator" @@ -225,6 +224,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "U³atwienia Dostêpu" IDS_CMT_MAGNIFY "Lupa" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -274,6 +280,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -178,7 +178,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Ñòàíäàðòíûå" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Çàïóñòèòü êàëüêóëÿòîð" IDS_CMT_CMD "Îòêðûòü êîìàíäíóþ ñòðîêó" IDS_CMT_EXPLORER "Çàïóñòèòü Ïðîâîäíèê" @@ -216,6 +215,13 @@ STRINGTABLE BEGIN + IDS_SYS_ENTERTAINMENT "Ðàçâëå÷åíèÿ" + IDS_CMT_MPLAY32 "Çàïóñòèòü ïðîèãðûâàòåëü" + IDS_CMT_SNDVOL32 "Çàïóñòèòü ðåãóëÿòîð ãðîìêîñòè" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" IDS_UNKNOWN_ERROR "Íåèçâåñòíàÿ îøèáêà" IDS_REGISTERING_COMPONENTS "Ðåãèñòðàöèÿ êîìïîíåíòîâ..." @@ -234,7 +240,7 @@ IDS_SHORT_DOWNLOADER "Ñêà÷àòü !.lnk" IDS_SHORT_SERVICE "Äèñïåò÷åð ñëóæá.lnk" IDS_SHORT_DEVICE "Äèñïåò÷åð óñòðîéñòâ.lnk" - IDS_SHORT_MPLAY32 "Multimedia Player.lnk" + IDS_SHORT_MPLAY32 "Ïðîèãðûâàòåëü.lnk" IDS_SHORT_CALC "Êàëüêóëÿòîð.lnk" IDS_SHORT_REGEDIT "Ðåäàêòîð ðååñòðà.lnk" IDS_SHORT_NOTEPAD "Áëîêíîò.lnk" @@ -248,6 +254,7 @@ IDS_SHORT_KBSWITCH "Ïåðåêëþ÷àòåëü ðàñêëàäêè êëàâèàòóðû.lnk" IDS_SHORT_EVENTVIEW "Ïðîñìîòð ñîáûòèé.lnk" IDS_SHORT_MSCONFIG "Ïàðàìåòðû ñèñòåìû.lnk" + IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -182,7 +182,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Prísluenstvo" - IDS_CMT_MPLAY32 "Spusti Multimediálny prehrávaè" IDS_CMT_CALC "Spusti Kalkulaèku" IDS_CMT_CMD "Otvori Príkazový riadok" IDS_CMT_EXPLORER "Spusti Prieskumníka" @@ -216,6 +215,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Zjednoduenie ovládania" //Accessibility IDS_CMT_MAGNIFY "Lupa" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -252,6 +258,7 @@ IDS_SHORT_KBSWITCH "Prepínaè rozloenia klávesnice.lnk" IDS_SHORT_EVENTVIEW "Zobrazovaè udalostí.lnk" IDS_SHORT_MSCONFIG "Program na konfiguráciu systému.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -186,7 +186,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Äîïîì³æí³ ïðîãðàìè" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Çàïóñòèòè Êàëüêóëÿòîð" IDS_CMT_CMD "Â³äêðèòè êîìàíäíèé ðÿäîê" IDS_CMT_EXPLORER "Çàïóñòèòè Ïðîâ³äíèê" @@ -220,6 +219,13 @@ BEGIN IDS_SYS_ACCESSIBILITY "Ñïåö³àëüí³ ìîæëèâîñò³" IDS_CMT_MAGNIFY "Åêðàííà ëóïà" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" END STRINGTABLE @@ -256,6 +262,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -185,7 +185,6 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "¸½¼þ" - IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "¼ÆËãÆ÷" IDS_CMT_CMD "ÃüÁîÌáÊ¾·û" IDS_CMT_EXPLORER "ReactOS ×ÊÔ´¹ÜÀíÆ÷" @@ -220,6 +219,14 @@ IDS_SYS_ACCESSIBILITY "Accessibility" IDS_CMT_MAGNIFY "·Å´ó¾µ" END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Entertainment" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_SNDVOL32 "Launch Volume Control" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS °²×°³ÌÐò" @@ -254,6 +261,7 @@ IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_SNDVOL32 "Volume Control.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Mar 15 13:25:32 2009 @@ -91,6 +91,7 @@ #define IDS_GAMES 3201 #define IDS_SYS_TOOLS 3202 #define IDS_SYS_ACCESSIBILITY 3203 +#define IDS_SYS_ENTERTAINMENT 3204 #define IDS_CMT_CALC 3210 #define IDS_CMT_CHARMAP 3211 @@ -111,6 +112,7 @@ #define IDS_CMT_SOLITAIRE 3226 #define IDS_CMT_WINEMINE 3227 #define IDS_CMT_WORDPAD 3228 +#define IDS_CMT_SNDVOL32 3229 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -141,6 +143,7 @@ #define IDS_SHORT_SOLITAIRE 3416 #define IDS_SHORT_WINEMINE 3417 #define IDS_SHORT_WORDPAD 3418 +#define IDS_SHORT_SNDVOL32 3419 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

16 years, 4 months

[dchapyshev] 40026: - Fix typo

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Mar 15 12:41:13 2009 New Revision: 40026 URL: http://svn.reactos.org/svn/reactos?rev=40026&view=rev Log: - Fix typo Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Mar 15 12:41:13 2009 @@ -752,7 +752,7 @@ } _tcscpy(szLayoutPath, - _T("SYSTEM\\CurrentControlSet\\Control\\KeyboardLayouts\\")); + _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\")); _tcscat(szLayoutPath, szLocaleName);

16 years, 4 months

[dchapyshev] 40025: - Remove win16 stuff

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Mar 15 11:09:25 2009 New Revision: 40025 URL: http://svn.reactos.org/svn/reactos?rev=40025&view=rev Log: - Remove win16 stuff Removed: trunk/reactos/dll/win32/oleaut32/ole2disp.c trunk/reactos/dll/win32/oleaut32/ole2disp.h trunk/reactos/dll/win32/oleaut32/ole2disp.spec trunk/reactos/dll/win32/oleaut32/typelib.spec trunk/reactos/dll/win32/oleaut32/typelib16.c trunk/reactos/dll/win32/olecli32/olecli.spec trunk/reactos/dll/win32/olecli32/olecli16.c Removed: trunk/reactos/dll/win32/oleaut32/ole2disp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ole2dis… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/ole2disp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/ole2disp.c (removed) @@ -1,249 +1,0 @@ -/* - * OLE2DISP library - * - * Copyright 1995 Martin von Loewis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> -#include <string.h> - -#include "wine/windef16.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" -#include "oleauto.h" -#include "winerror.h" - -#include "ole2disp.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -/* This implementation of the BSTR API is 16-bit only. It - represents BSTR as a 16:16 far pointer, and the strings - as ISO-8859 */ - -/****************************************************************************** - * BSTR_AllocBytes [Internal] - */ -static BSTR16 BSTR_AllocBytes(int n) -{ - void *ptr = HeapAlloc( GetProcessHeap(), 0, n ); - return (BSTR16)MapLS(ptr); -} - -/****************************************************************************** - * BSTR_Free [INTERNAL] - */ -static void BSTR_Free(BSTR16 in) -{ - void *ptr = MapSL( (SEGPTR)in ); - UnMapLS( (SEGPTR)in ); - HeapFree( GetProcessHeap(), 0, ptr ); -} - -/****************************************************************************** - * BSTR_GetAddr [INTERNAL] - */ -static void* BSTR_GetAddr(BSTR16 in) -{ - return in ? MapSL((SEGPTR)in) : 0; -} - -/****************************************************************************** - * SysAllocString [OLE2DISP.2] - * - * Create a BSTR16 from an OLESTR16 (16 Bit). - * - * PARAMS - * oleStr [I] Source to create BSTR16 from - * - * RETURNS - * Success: A BSTR16 allocated with SysAllocStringLen16(). - * Failure: NULL, if oleStr is NULL. - */ -BSTR16 WINAPI SysAllocString16(LPCOLESTR16 oleStr) -{ - BSTR16 out; - - if (!oleStr) return 0; - - out = BSTR_AllocBytes(strlen(oleStr)+1); - if (!out) return 0; - strcpy(BSTR_GetAddr(out),oleStr); - return out; -} - -/****************************************************************************** - * SysReallocString [OLE2DISP.3] - * - * Change the length of a previously created BSTR16 (16 Bit). - * - * PARAMS - * pbstr [I] BSTR16 to change the length of - * oleStr [I] New source for pbstr - * - * RETURNS - * Success: 1 - * Failure: 0. - * - * NOTES - * SysAllocStringStringLen16(). - */ -INT16 WINAPI SysReAllocString16(LPBSTR16 pbstr,LPCOLESTR16 oleStr) -{ - BSTR16 new=SysAllocString16(oleStr); - BSTR_Free(*pbstr); - *pbstr=new; - return 1; -} - -/****************************************************************************** - * SysAllocStringLen [OLE2DISP.4] - * - * Create a BSTR16 from an OLESTR16 of a given character length (16 Bit). - * - * PARAMS - * oleStr [I] Source to create BSTR16 from - * len [I] Length of oleStr in wide characters - * - * RETURNS - * Success: A newly allocated BSTR16 from SysAllocStringByteLen16() - * Failure: NULL, if len is >= 0x80000000, or memory allocation fails. - * - * NOTES - * See SysAllocStringByteLen16(). - */ -BSTR16 WINAPI SysAllocStringLen16(const char *oleStr, int len) -{ - BSTR16 out=BSTR_AllocBytes(len+1); - - if (!out) - return 0; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (oleStr != 0) - strcpy(BSTR_GetAddr(out),oleStr); - else - memset(BSTR_GetAddr(out), 0, len+1); - - return out; -} - -/****************************************************************************** - * SysReAllocStringLen [OLE2DISP.5] - * - * Change the length of a previously created BSTR16 (16 Bit). - * - * PARAMS - * pbstr [I] BSTR16 to change the length of - * oleStr [I] New source for pbstr - * len [I] Length of oleStr in characters - * - * RETURNS - * Success: 1. The size of pbstr is updated. - * Failure: 0, if len >= 0x8000 or memory allocation fails. - * - * NOTES - * See SysAllocStringByteLen16(). - * *pbstr may be changed by this function. - */ -int WINAPI SysReAllocStringLen16(BSTR16 *old,const char *in,int len) -{ - /* FIXME: Check input length */ - BSTR16 new=SysAllocStringLen16(in,len); - BSTR_Free(*old); - *old=new; - return 1; -} - -/****************************************************************************** - * SysFreeString [OLE2DISP.6] - * - * Free a BSTR16 (16 Bit). - * - * PARAMS - * str [I] String to free. - * - * RETURNS - * Nothing. - */ -void WINAPI SysFreeString16(BSTR16 str) -{ - BSTR_Free(str); -} - -/****************************************************************************** - * SysStringLen [OLE2DISP.7] - * - * Get the allocated length of a BSTR16 in characters (16 Bit). - * - * PARAMS - * str [I] BSTR16 to find the length of - * - * RETURNS - * The allocated length of str, or 0 if str is NULL. - */ -int WINAPI SysStringLen16(BSTR16 str) -{ - return strlen(BSTR_GetAddr(str)); -} - -/****************************************************************************** - * CreateDispTypeInfo [OLE2DISP.31] - */ -HRESULT WINAPI CreateDispTypeInfo16( - INTERFACEDATA *pidata, - LCID lcid, - ITypeInfo **pptinfo) -{ - FIXME("(%p,%d,%p),stub\n",pidata,lcid,pptinfo); - return E_NOTIMPL; -} - -/****************************************************************************** - * CreateStdDispatch [OLE2DISP.32] - */ -HRESULT WINAPI CreateStdDispatch16( - IUnknown* punkOuter, - void* pvThis, - ITypeInfo* ptinfo, - IUnknown** ppunkStdDisp) -{ - FIXME("(%p,%p,%p,%p),stub\n",punkOuter, pvThis, ptinfo, - ppunkStdDisp); - return 0; -} - -/****************************************************************************** - * RegisterActiveObject [OLE2DISP.35] - */ -HRESULT WINAPI RegisterActiveObject16( - IUnknown *punk, REFCLSID rclsid, DWORD dwFlags, unsigned long *pdwRegister -) { - FIXME("(%p,%s,0x%08x,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); - return E_NOTIMPL; -} Removed: trunk/reactos/dll/win32/oleaut32/ole2disp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ole2dis… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/ole2disp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/ole2disp.h (removed) @@ -1,42 +1,0 @@ -/* - * Copyright 1995 Martin von Loewis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_OLEAUT32_OLE2DISP_H -#define __WINE_OLEAUT32_OLE2DISP_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wine/windef16.h" - -typedef CHAR OLECHAR16; -typedef LPSTR LPOLESTR16; -typedef LPCSTR LPCOLESTR16; -typedef OLECHAR16 *BSTR16; -typedef BSTR16 *LPBSTR16; - -BSTR16 WINAPI SysAllocString16(LPCOLESTR16); -BSTR16 WINAPI SysAllocStringLen16(const char*, int); -VOID WINAPI SysFreeString16(BSTR16); -INT16 WINAPI SysReAllocString16(LPBSTR16,LPCOLESTR16); -int WINAPI SysReAllocStringLen16(BSTR16*, const char*, int); -int WINAPI SysStringLen16(BSTR16); - -#endif /* !defined(__WINE_OLEAUT32_OLE2DISP_H) */ Removed: trunk/reactos/dll/win32/oleaut32/ole2disp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ole2dis… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/ole2disp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/ole2disp.spec (removed) @@ -1,135 +1,0 @@ -1 stub DLLGETCLASSOBJECT -2 pascal SysAllocString(str) SysAllocString16 -3 pascal SysReallocString(ptr str) SysReAllocString16 -4 pascal SysAllocStringLen(str word) SysAllocStringLen16 -5 pascal SysReAllocStringLen(ptr str word) SysReAllocStringLen16 -6 pascal SysFreeString(segstr) SysFreeString16 -7 pascal SysStringLen(segstr) SysStringLen16 -8 stub VARIANTINIT -9 stub VARIANTCLEAR -10 stub VARIANTCOPY -11 stub VARIANTCOPYIND -12 stub VARIANTCHANGETYPE -13 stub VARIANTTIMETODOSDATETIME -14 stub DOSDATETIMETOVARIANTTIME -15 stub SAFEARRAYCREATE -16 stub SAFEARRAYDESTROY -17 stub SAFEARRAYGETDIM -18 stub SAFEARRAYGETELEMSIZE -19 stub SAFEARRAYGETUBOUND -20 stub SAFEARRAYGETLBOUND -21 stub SAFEARRAYLOCK -22 stub SAFEARRAYUNLOCK -23 stub SAFEARRAYACCESSDATA -24 stub SAFEARRAYUNACCESSDATA -25 stub SAFEARRAYGETELEMENT -26 stub SAFEARRAYPUTELEMENT -27 stub SAFEARRAYCOPY -28 stub DISPGETPARAM -29 stub DISPGETIDSOFNAMES -30 stub DISPINVOKE -31 pascal CreateDispTypeInfo(ptr long ptr) CreateDispTypeInfo16 -32 pascal CreateStdDispatch(ptr ptr ptr ptr) CreateStdDispatch16 -33 stub _IID_IDISPATCH -34 stub _IID_IENUMVARIANT -35 pascal RegisterActiveObject(ptr ptr long ptr) RegisterActiveObject16 -36 stub REVOKEACTIVEOBJECT -37 stub GETACTIVEOBJECT -38 stub SAFEARRAYALLOCDESCRIPTOR -39 stub SAFEARRAYALLOCDATA -40 stub SAFEARRAYDESTROYDESCRIPTOR -41 stub SAFEARRAYDESTROYDATA -42 stub SAFEARRAYREDIM -43 stub VARI2FROMI4 -44 stub VARI2FROMR4 -45 stub VARI2FROMR8 -46 stub VARI2FROMCY -47 stub VARI2FROMDATE -48 stub VARI2FROMSTR -49 stub VARI2FROMDISP -50 stub VARI2FROMBOOL -51 stub VARI4FROMI2 -52 stub VARI4FROMR4 -53 stub VARI4FROMR8 -54 stub VARI4FROMCY -55 stub VARI4FROMDATE -56 stub VARI4FROMSTR -57 stub VARI4FROMDISP -58 stub VARI4FROMBOOL -59 stub VARR4FROMI2 -60 stub VARR4FROMI4 -61 stub VARR4FROMR8 -62 stub VARR4FROMCY -63 stub VARR4FROMDATE -64 stub VARR4FROMSTR -65 stub VARR4FROMDISP -66 stub VARR4FROMBOOL -67 stub VARR8FROMI2 -68 stub VARR8FROMI4 -69 stub VARR8FROMR4 -70 stub VARR8FROMCY -71 stub VARR8FROMDATE -72 stub VARR8FROMSTR -73 stub VARR8FROMDISP -74 stub VARR8FROMBOOL -75 stub VARDATEFROMI2 -76 stub VARDATEFROMI4 -77 stub VARDATEFROMR4 -78 stub VARDATEFROMR8 -79 stub VARDATEFROMCY -80 stub VARDATEFROMSTR -81 stub VARDATEFROMDISP -82 stub VARDATEFROMBOOL -83 stub VARCYFROMI2 -84 stub VARCYFROMI4 -85 stub VARCYFROMR4 -86 stub VARCYFROMR8 -87 stub VARCYFROMDATE -88 stub VARCYFROMSTR -89 stub VARCYFROMDISP -90 stub VARCYFROMBOOL -91 stub VARBSTRFROMI2 -92 stub VARBSTRFROMI4 -93 stub VARBSTRFROMR4 -94 stub VARBSTRFROMR8 -95 stub VARBSTRFROMCY -96 stub VARBSTRFROMDATE -97 stub VARBSTRFROMDISP -98 stub VARBSTRFROMBOOL -99 stub VARBOOLFROMI2 -100 stub VARBOOLFROMI4 -101 stub VARBOOLFROMR4 -102 stub VARBOOLFROMR8 -103 stub VARBOOLFROMDATE -104 stub VARBOOLFROMCY -105 stub VARBOOLFROMSTR -106 stub VARBOOLFROMDISP -107 stub DOINVOKEMETHOD -108 stub VARIANTCHANGETYPEEX -109 stub SAFEARRAYPTROFINDEX -110 stub SETERRORINFO -111 stub GETERRORINFO -112 stub CREATEERRORINFO -113 stub _IID_IERRORINFO -114 stub _IID_ICREATEERRORINFO -115 stub _IID_ISUPPORTERRORINFO -116 stub VARUI1FROMI2 -117 stub VARUI1FROMI4 -118 stub VARUI1FROMR4 -119 stub VARUI1FROMR8 -120 stub VARUI1FROMCY -121 stub VARUI1FROMDATE -122 stub VARUI1FROMSTR -123 stub VARUI1FROMDISP -124 stub VARUI1FROMBOOL -125 stub VARI2FROMUI1 -126 stub VARI4FROMUI1 -127 stub VARR4FROMUI1 -128 stub VARR8FROMUI1 -129 stub VARDATEFROMUI1 -130 stub VARCYFROMUI1 -131 stub VARBSTRFROMUI1 -132 stub VARBOOLFROMUI1 -133 stub DLLCANUNLOADNOW -#134 stub WEP -#135 stub ___EXPORTEDSTUB Removed: trunk/reactos/dll/win32/oleaut32/typelib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.spec (removed) @@ -1,12 +1,0 @@ -2 stub CREATETYPELIB -3 pascal LoadTypeLib(ptr ptr) LoadTypeLib16 -4 pascal LHashValOfNameSys(word long str) LHashValOfNameSysA -5 stub _IID_ICREATETYPEINFO -6 stub _IID_ICREATETYPELIB -7 stub _IID_ITYPECOMP -8 stub _IID_ITYPEINFO -9 stub _IID_ITYPELIB -10 stub REGISTERTYPELIB -11 stub LOADREGTYPELIB -14 pascal QueryPathOfRegTypeLib(ptr word word word ptr) QueryPathOfRegTypeLib16 -15 pascal OaBuildVersion() OaBuildVersion16 Removed: trunk/reactos/dll/win32/oleaut32/typelib16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib16.c (removed) @@ -1,187 +1,0 @@ -/* - * TYPELIB 16bit part. - * - * Copyright 1997 Marcus Meissner - * Copyright 1999 Rein Klazes - * Copyright 2000 Francois Jacques - * Copyright 2001 Huw D M Davies for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdlib.h> -#include <string.h> -#include <stdarg.h> -#include <stdio.h> -#include <ctype.h> - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "winuser.h" - -#include "objbase.h" -#include "ole2disp.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -/************************************************************************* - * TYPELIB {TYPELIB} - * - * This dll is the 16 bit version of the Typelib API, part the original - * implementation of Ole automation. It and its companion ole2disp.dll were - * superseded by oleaut32.dll which provides 32 bit implementations of these - * functions and greatly extends the Ole Api. - * - * Winelib developers cannot use these functions directly, they are implemented - * solely for backwards compatibility with existing legacy applications. - * - * SEE ALSO - * oleaut32(), ole2disp(). - */ - -/**************************************************************************** - * QueryPathOfRegTypeLib [TYPELIB.14] - * - * Get the registry key of a registered type library. - * - * RETURNS - * Success: S_OK. path is updated with the key name - * Failure: E_FAIL, if guid was not found in the registry - * - * NOTES - * The key takes the form "Classes\Typelib\<guid>\<major>.<minor>\<lcid>\win16\" - */ -HRESULT WINAPI -QueryPathOfRegTypeLib16( - REFGUID guid, /* [in] Guid to get the key name for */ - WORD wMaj, /* [in] Major version */ - WORD wMin, /* [in] Minor version */ - LCID lcid, /* [in] Locale Id */ - LPBSTR16 path) /* [out] Destination for the registry key name */ -{ - char xguid[80]; - char typelibkey[100],pathname[260]; - LONG plen; - - TRACE("\n"); - - if (HIWORD(guid)) { - sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7], - wMaj,wMin,lcid); - } else { - sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); - return E_FAIL; - } - plen = sizeof(pathname); - if (RegQueryValueA(HKEY_LOCAL_MACHINE,typelibkey,pathname,&plen)) { - /* try again without lang specific id */ - if (SUBLANGID(lcid)) - return QueryPathOfRegTypeLib16(guid,wMaj,wMin,PRIMARYLANGID(lcid),path); - FIXME("key %s not found\n",typelibkey); - return E_FAIL; - } - *path = SysAllocString16(pathname); - return S_OK; -} - -/****************************************************************************** - * LoadTypeLib [TYPELIB.3] - * - * Load and register a type library. - * - * RETURNS - * Success: S_OK. pptLib contains the type libraries ITypeLib interface. - * Failure: An HRESULT error code. - * - * NOTES - * Both parameters are FAR pointers. - */ -HRESULT WINAPI LoadTypeLib16( - LPSTR szFile, /* [in] Name of file to load from */ - ITypeLib** pptLib) /* [out] Destination for loaded ITypeLib interface */ -{ - FIXME("(%s,%p): stub\n",debugstr_a(szFile),pptLib); - - if (pptLib!=0) - *pptLib=0; - - return E_FAIL; -} - -/**************************************************************************** - * OaBuildVersion (TYPELIB.15) - * - * Get the Ole Automation build version. - * - * PARAMS - * None - * - * RETURNS - * The build version. - * - * NOTES - * Known typelib.dll versions: - *| OLE Ver. Comments Date Build Ver. - *| -------- ------------------------- ---- --------- - *| OLE 2.01 Call not available 1993 N/A - *| OLE 2.02 1993-94 02 3002 - *| OLE 2.03 23 730 - *| OLE 2.03 03 3025 - *| OLE 2.03 W98 SE orig. file !! 1993-95 10 3024 - *| OLE 2.1 NT 1993-95 ?? ??? - *| OLE 2.3.1 W95 23 700 - *| OLE2 4.0 NT4SP6 1993-98 40 4277 - *| OLE 2.1 W2K 2000 10 3029 - *| OLE 2.1 WXP 2002 10 3029 - *| OLE 2.1 Vista 2007 10 3029 - */ -DWORD WINAPI OaBuildVersion16(void) -{ - /* FIXME: I'd like to return the highest currently known version value - * in case the user didn't force a --winver, but I don't know how - * to retrieve the "versionForced" info from misc/version.c :( - * (this would be useful in other places, too) */ - FIXME("If you get version error messages, please report them\n"); - switch(GetVersion() & 0x8000ffff) /* mask off build number */ - { - case 0x80000a03: /* WIN31 */ - return MAKELONG(3027, 3); /* WfW 3.11 */ - case 0x80000004: /* WIN95 */ - return MAKELONG(700, 23); /* Win95A */ - case 0x80000a04: /* WIN98 */ - return MAKELONG(3024, 10); /* W98 SE */ - case 0x00000004: /* NT4 */ - return MAKELONG(4277, 40); /* NT4 SP6 */ - case 0x00000005: /* W2K */ - return MAKELONG(3029, 10); /* W2K SP4 */ - case 0x00000105: /* WXP */ - return MAKELONG(3029, 10); /* WXP SP2 */ - case 0x00000006: /* Vista */ - return MAKELONG(3029, 10); /* Vista */ - default: - FIXME("Version value not known yet. Please investigate it!\n"); - return 0; - } -} Removed: trunk/reactos/dll/win32/olecli32/olecli.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli.… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olecli32/olecli.spec (removed) @@ -1,178 +1,0 @@ -#1 WEP -2 stub OLEDELETE -3 stub OLESAVETOSTREAM -4 stub OLELOADFROMSTREAM -6 stub OLECLONE -7 stub OLECOPYFROMLINK -8 stub OLEEQUAL -9 pascal -ret16 OleQueryLinkFromClip(str word word) OleQueryLinkFromClip16 -10 pascal -ret16 OleQueryCreateFromClip(str word word) OleQueryCreateFromClip16 -11 pascal -ret16 OleCreateLinkFromClip (str segptr long str segptr word word) OleCreateLinkFromClip16 -12 pascal -ret16 OleCreateFromClip(str segptr long str long word word) OleCreateFromClip16 -13 stub OLECOPYTOCLIPBOARD -14 pascal -ret16 OleQueryType(ptr segptr) OleQueryType16 -15 stub OLESETHOSTNAMES -16 stub OLESETTARGETDEVICE -17 stub OLESETBOUNDS -18 stub OLEQUERYBOUNDS -19 stub OLEDRAW -20 stub OLEQUERYOPEN -21 stub OLEACTIVATE -22 stub OLEUPDATE -23 stub OLERECONNECT -24 stub OLEGETLINKUPDATEOPTIONS -25 stub OLESETLINKUPDATEOPTIONS -26 stub OLEENUMFORMATS -27 stub OLECLOSE -28 stub OLEGETDATA -29 stub OLESETDATA -30 stub OLEQUERYPROTOCOL -31 stub OLEQUERYOUTOFDATE -32 stub OLEOBJECTCONVERT -33 stub OLECREATEFROMTEMPLATE -34 stub OLECREATE -35 stub OLEQUERYRELEASESTATUS -36 stub OLEQUERYRELEASEERROR -37 stub OLEQUERYRELEASEMETHOD -38 stub OLECREATEFROMFILE -39 stub OLECREATELINKFROMFILE -40 stub OLERELEASE -41 pascal OleRegisterClientDoc(ptr ptr long ptr) OleRegisterClientDoc16 -42 pascal OleRevokeClientDoc(long) OleRevokeClientDoc16 -43 pascal OleRenameClientDoc(long ptr) OleRenameClientDoc16 -44 pascal -ret16 OleRevertClientDoc(long) OleRevertClientDoc16 -45 pascal OleSavedClientDoc(long) OleSavedClientDoc16 -46 stub OLERENAME -47 pascal -ret16 OleEnumObjects(long segptr) OleEnumObjects16 -48 stub OLEQUERYNAME -49 stub OLESETCOLORSCHEME -50 stub OLEREQUESTDATA -54 stub OLELOCKSERVER -55 stub OLEUNLOCKSERVER -56 stub OLEQUERYSIZE -57 stub OLEEXECUTE -58 stub OLECREATEINVISIBLE -59 stub OLEQUERYCLIENTVERSION -60 pascal -ret16 OleIsDcMeta(word) OleIsDcMeta16 -100 stub DOCWNDPROC -101 stub SRVRWNDPROC -102 stub MFCALLBACKFUNC -110 stub DEFLOADFROMSTREAM -111 stub DEFCREATEFROMCLIP -112 stub DEFCREATELINKFROMCLIP -113 stub DEFCREATEFROMTEMPLATE -114 stub DEFCREATE -115 stub DEFCREATEFROMFILE -116 stub DEFCREATELINKFROMFILE -117 stub DEFCREATEINVISIBLE -200 stub LERELEASE -201 stub LESHOW -202 stub LEGETDATA -203 stub LESETDATA -204 stub LESETHOSTNAMES -205 stub LESETTARGETDEVICE -206 stub LESETBOUNDS -207 stub LESAVETOSTREAM -208 stub LECLONE -209 stub LECOPYFROMLINK -210 stub LEEQUAL -211 stub LECOPY -212 stub LEQUERYTYPE -213 stub LEQUERYBOUNDS -214 stub LEDRAW -215 stub LEQUERYOPEN -216 stub LEACTIVATE -218 stub LEUPDATE -219 stub LERECONNECT -220 stub LEENUMFORMAT -221 stub LEQUERYPROTOCOL -222 stub LEQUERYOUTOFDATE -223 stub LEOBJECTCONVERT -224 stub LECHANGEDATA -225 stub LECLOSE -226 stub LEGETUPDATEOPTIONS -227 stub LESETUPDATEOPTIONS -228 stub LEEXECUTE -229 stub LEOBJECTLONG -230 stub LECREATEINVISIBLE -300 stub MFRELEASE -301 stub MFGETDATA -302 stub MFSAVETOSTREAM -303 stub MFCLONE -304 stub MFEQUAL -305 stub MFCOPY -307 stub MFQUERYBOUNDS -308 stub MFDRAW -309 stub MFENUMFORMAT -310 stub MFCHANGEDATA -400 stub BMRELEASE -401 stub BMGETDATA -402 stub BMSAVETOSTREAM -403 stub BMCLONE -404 stub BMEQUAL -405 stub BMCOPY -407 stub BMQUERYBOUNDS -408 stub BMDRAW -409 stub BMENUMFORMAT -410 stub BMCHANGEDATA -500 stub DIBRELEASE -501 stub DIBGETDATA -502 stub DIBSAVETOSTREAM -503 stub DIBCLONE -504 stub DIBEQUAL -505 stub DIBCOPY -507 stub DIBQUERYBOUNDS -508 stub DIBDRAW -509 stub DIBENUMFORMAT -510 stub DIBCHANGEDATA -600 stub GENRELEASE -601 stub GENGETDATA -602 stub GENSETDATA -603 stub GENSAVETOSTREAM -604 stub GENCLONE -605 stub GENEQUAL -606 stub GENCOPY -608 stub GENQUERYBOUNDS -609 stub GENDRAW -610 stub GENENUMFORMAT -611 stub GENCHANGEDATA -701 stub ERRSHOW -702 stub ERRSETDATA -703 stub ERRSETHOSTNAMES -704 stub ERRSETTARGETDEVICE -705 stub ERRSETBOUNDS -706 stub ERRCOPYFROMLINK -707 stub ERRQUERYOPEN -708 stub ERRACTIVATE -709 stub ERRCLOSE -710 stub ERRUPDATE -711 stub ERRRECONNECT -712 stub ERRQUERYPROTOCOL -713 stub ERRQUERYOUTOFDATE -714 stub ERROBJECTCONVERT -715 stub ERRGETUPDATEOPTIONS -716 stub ERRSETUPDATEOPTIONS -717 stub ERREXECUTE -718 stub ERROBJECTLONG -800 stub PBLOADFROMSTREAM -801 stub PBCREATEFROMCLIP -802 stub PBCREATELINKFROMCLIP -803 stub PBCREATEFROMTEMPLATE -804 stub PBCREATE -805 stub PBDRAW -806 stub PBQUERYBOUNDS -807 stub PBCOPYTOCLIPBOARD -808 stub PBCREATEFROMFILE -809 stub PBCREATELINKFROMFILE -810 stub PBENUMFORMATS -811 stub PBGETDATA -812 stub PBCREATEINVISIBLE -910 stub OBJQUERYNAME -911 stub OBJRENAME -912 stub OBJQUERYTYPE -913 stub OBJQUERYSIZE -950 stub CONNECTDLGPROC -951 stub SETNETNAME -952 stub CHECKNETDRIVE -953 stub SETNEXTNETDRIVE -954 stub GETTASKVISIBLEWINDOW Removed: trunk/reactos/dll/win32/olecli32/olecli16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/olecli1… ============================================================================== --- trunk/reactos/dll/win32/olecli32/olecli16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/olecli32/olecli16.c (removed) @@ -1,203 +1,0 @@ -/* - * OLECLI library - * - * Copyright 1995 Martin von Loewis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* At the moment, these are only empty stubs. - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "wine/windef16.h" -#include "winbase.h" -#include "wingdi.h" -#include "wownt32.h" -#include "objbase.h" -#include "olecli.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -typedef struct _OLEOBJECTVTBL16 { - void CALLBACK *(*QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); - OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *Show)(_LPOLEOBJECT,BOOL16); - OLESTATUS (CALLBACK *DoVerb)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16); - OLESTATUS (CALLBACK *GetData)(_LPOLEOBJECT,OLECLIPFORMAT,HANDLE16 *); - OLESTATUS (CALLBACK *SetData)(_LPOLEOBJECT,OLECLIPFORMAT,HANDLE16); - OLESTATUS (CALLBACK *SetTargetDevice)(_LPOLEOBJECT,HGLOBAL16); - OLESTATUS (CALLBACK *SetBounds)(_LPOLEOBJECT,LPRECT16); - OLESTATUS (CALLBACK *EnumFormats)(_LPOLEOBJECT,OLECLIPFORMAT); - OLESTATUS (CALLBACK *SetColorScheme)(_LPOLEOBJECT,struct tagLOGPALETTE*); - OLESTATUS (CALLBACK *Delete)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *SetHostNames)(_LPOLEOBJECT,LPCOLESTR16,LPCOLESTR16); - OLESTATUS (CALLBACK *SaveToStream)(_LPOLEOBJECT,struct _OLESTREAM*); - OLESTATUS (CALLBACK *Clone)(_LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT *); - OLESTATUS (CALLBACK *CopyFromLink)(_LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT *); - OLESTATUS (CALLBACK *Equal)(_LPOLEOBJECT,_LPOLEOBJECT); - OLESTATUS (CALLBACK *CopyToClipBoard)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *Draw)(_LPOLEOBJECT,HDC16,LPRECT16,LPRECT16,HDC16); - OLESTATUS (CALLBACK *Activate)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16,HWND16,LPRECT16); - OLESTATUS (CALLBACK *Execute)(_LPOLEOBJECT,HGLOBAL16,UINT16); - OLESTATUS (CALLBACK *Close)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *Update)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *Reconnect)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *ObjectConvert)(_LPOLEOBJECT,LPCOLESTR16,LPOLECLIENT,LHCLIENTDOC,LPCOLESTR16,_LPOLEOBJECT*); - OLESTATUS (CALLBACK *GetLinkUpdateOptions)(_LPOLEOBJECT,LPOLEOPT_UPDATE); - OLESTATUS (CALLBACK *SetLinkUpdateOptions)(_LPOLEOBJECT,OLEOPT_UPDATE); - OLESTATUS (CALLBACK *Rename)(_LPOLEOBJECT,LPCOLESTR16); - OLESTATUS (CALLBACK *QueryName)(_LPOLEOBJECT,LPSTR,LPUINT16); - OLESTATUS (CALLBACK *QueryType)(_LPOLEOBJECT,LPLONG); - OLESTATUS (CALLBACK *QueryBounds)(_LPOLEOBJECT,LPRECT16); - OLESTATUS (CALLBACK *QuerySize)(_LPOLEOBJECT,LPDWORD); - OLESTATUS (CALLBACK *QueryOpen)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *QueryOutOfDate)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *QueryReleaseStatus)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *QueryReleaseError)(_LPOLEOBJECT); - OLE_RELEASE_METHOD (CALLBACK *QueryReleaseMethod)(_LPOLEOBJECT); - OLESTATUS (CALLBACK *RequestData)(_LPOLEOBJECT,OLECLIPFORMAT); - OLESTATUS (CALLBACK *ObjectLong)(_LPOLEOBJECT,UINT16,LPLONG); -} OLEOBJECTVTBL; -typedef OLEOBJECTVTBL *LPOLEOBJECTVTBL; - -typedef struct _OLEOBJECT -{ - const OLEOBJECTVTBL *lpvtbl; -} OLEOBJECT16; - -static LONG OLE_current_handle; - -/****************************************************************************** - * OleSavedClientDoc [OLECLI.45] - */ -OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc) -{ - FIXME("(%d: stub\n", hDoc); - return OLE_OK; -} - -/****************************************************************************** - * OleRegisterClientDoc [OLECLI.41] - */ -OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname, - LONG reserved, LHCLIENTDOC *hRet ) -{ - FIXME("(%s,%s,...): stub\n",classname,docname); - *hRet=++OLE_current_handle; - return OLE_OK; -} - -/****************************************************************************** - * OleRenameClientDoc [OLECLI.43] - */ -OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) -{ - FIXME("(%d,%s,...): stub\n",hDoc, newName); - return OLE_OK; -} - -/****************************************************************************** - * OleRevokeClientDoc [OLECLI.42] - */ -OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) -{ - FIXME("(%d): stub\n",hServerDoc); - return OLE_OK; -} - -/****************************************************************************** - * OleRevertClientDoc [OLECLI.44] - */ -OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) -{ - FIXME("(%d): stub\n", hServerDoc); - return OLE_OK; -} - -/****************************************************************************** - * OleEnumObjects [OLECLI.47] - */ -OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data) -{ - FIXME("(%d, %04x:%04x): stub\n", hServerDoc, HIWORD(data), - LOWORD(data)); - return OLE_OK; -} - -/****************************************************************************** - * OleCreateLinkFromClip [OLECLI.11] - */ -OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc, - LPCSTR xname, SEGPTR lpoleob, UINT16 render, - UINT16 clipformat ) -{ - FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", - name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), - LOWORD(lpoleob), render, clipformat); - return OLE_OK; -} - -/****************************************************************************** - * OleQueryLinkFromClip [OLECLI.9] - */ -OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) -{ - FIXME("(%s, %d, %d): stub!\n", name, render, clipformat); - return OLE_OK; -} - -/****************************************************************************** - * OleQueryCreateFromClip [OLECLI.10] - */ -OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) -{ - FIXME("(%s, %d, %d): stub!\n", name, render, clipformat); - return OLE_OK; -} - -/****************************************************************************** - * OleIsDcMeta [OLECLI.60] - */ -BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc) -{ - return GetObjectType( HDC_32(hdc) ) == OBJ_METADC; -} - -/****************************************************************************** - * OleQueryType [OLECLI.14] - */ -OLESTATUS WINAPI OleQueryType16(_LPOLEOBJECT oleob, SEGPTR xlong) { - FIXME("(%p, %p): stub!\n", oleob, MapSL(xlong)); - return OLE_OK; -} - -/****************************************************************************** - * OleCreateFromClip [OLECLI.12] - */ -OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hclientdoc, - LPCSTR xname, SEGPTR lpoleob, - UINT16 render, UINT16 clipformat ) -{ - FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", - name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), - LOWORD(lpoleob), render, clipformat); - return OLE_OK; -}

16 years, 4 months

[jmorlan] 40024: Replace a couple hacks supporting specific cases of enhanced variable substitution (%~var) with a more general implementation. All tests in rostests/win32/cmd/script_testsuite can now be passed using ReactOS cmd in Windows, though still not yet in ReactOS itself.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Mar 15 07:54:41 2009 New Revision: 40024 URL: http://svn.reactos.org/svn/reactos?rev=40024&view=rev Log: Replace a couple hacks supporting specific cases of enhanced variable substitution (%~var) with a more general implementation. All tests in rostests/win32/cmd/script_testsuite can now be passed using ReactOS cmd in Windows, though still not yet in ReactOS itself. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Sun Mar 15 07:54:41 2009 @@ -81,16 +81,18 @@ * */ -LPTSTR FindArg (INT n) +LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) { LPTSTR pp; + INT n = Char - _T('0'); TRACE ("FindArg: (%d)\n", n); - if (bc == NULL) + if (bc == NULL || n < 0 || n > 9) return NULL; n += bc->shiftlevel; + *IsParam0 = (n == 0); pp = bc->params; /* Step up the strings till we reach the end */ Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Sun Mar 15 07:54:41 2009 @@ -44,7 +44,7 @@ extern TCHAR textline[BATCH_BUFFSIZE]; /* Buffer for reading Batch file lines */ -LPTSTR FindArg (INT); +LPTSTR FindArg (TCHAR, BOOL *); LPTSTR BatchParams (LPTSTR, LPTSTR); VOID ExitBatch (LPTSTR); BOOL Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Mar 15 07:54:41 2009 @@ -989,52 +989,242 @@ return NULL; } - +/* Handle the %~var syntax */ +static LPTSTR +GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) +{ + static const TCHAR ModifierTable[] = _T("dpnxfsatz"); + enum { + M_DRIVE = 1, /* D: drive letter */ + M_PATH = 2, /* P: path */ + M_NAME = 4, /* N: filename */ + M_EXT = 8, /* X: extension */ + M_FULL = 16, /* F: full path (drive+path+name+ext) */ + M_SHORT = 32, /* S: full path (drive+path+name+ext), use short names */ + M_ATTR = 64, /* A: attributes */ + M_TIME = 128, /* T: modification time */ + M_SIZE = 256, /* Z: file size */ + } Modifiers = 0; + + TCHAR *Format, *FormatEnd; + LPTSTR Variable; + TCHAR *VarEnd; + BOOL VariableIsParam0; + TCHAR FullPath[MAX_PATH]; + TCHAR FixedPath[MAX_PATH], *Filename, *Extension; + HANDLE hFind; + WIN32_FIND_DATA w32fd; + TCHAR *In, *Out; + + static TCHAR Result[CMDLINE_LENGTH]; + + /* There is ambiguity between modifier characters and FOR variables; + * the rule that cmd uses is to pick the longest possible match. + * For example, if there is a %n variable, then out of %~anxnd, + * %~anxn will be substituted rather than just %~an. */ + + /* First, go through as many modifier characters as possible */ + FormatEnd = Format = *pFormat; + while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) + FormatEnd++; + + /* TODO: check for $PATH: syntax */ + + /* Now backtrack if necessary to get a variable name match */ + while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + { + if (FormatEnd == Format) + return NULL; + FormatEnd--; + } + + for (; Format < FormatEnd; Format++) + Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); + + *pFormat = FormatEnd + 1; + + /* Exclude the leading and trailing quotes */ + VarEnd = &Variable[_tcslen(Variable)]; + if (*Variable == _T('"')) + { + Variable++; + if (VarEnd > Variable && VarEnd[-1] == _T('"')) + VarEnd--; + } + + if ((char *)VarEnd - (char *)Variable >= sizeof Result) + return _T(""); + memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); + Result[VarEnd - Variable] = _T('\0'); + + /* For plain %~var with no modifiers, just return the variable without quotes */ + if (Modifiers == 0) + return Result; + + if (VariableIsParam0) + { + /* Special case: If the variable is %0 and modifier characters are present, + * use the batch file's path (which includes the .bat/.cmd extension) + * rather than the actual %0 variable (which might not). */ + _tcscpy(FullPath, bc->BatchFilePath); + } + else + { + /* Convert the variable, now without quotes, to a full path */ + if (!GetFullPathName(Result, MAX_PATH, FullPath, NULL)) + return _T(""); + } + + /* Next step is to change the path to fix letter case (e.g. + * C:\ReAcToS -> C:\ReactOS) and, if requested with the S modifier, + * replace long filenames with short. */ + + In = FullPath; + Out = FixedPath; + + /* Copy drive letter */ + *Out++ = *In++; + *Out++ = *In++; + *Out++ = *In++; + /* Loop over each \-separated component in the path */ + do { + TCHAR *Next = _tcschr(In, _T('\\')); + if (Next) + *Next++ = _T('\0'); + /* Use FindFirstFile to get the correct name */ + if (Out + _tcslen(In) + 1 >= &FixedPath[MAX_PATH]) + return _T(""); + _tcscpy(Out, In); + hFind = FindFirstFile(FixedPath, &w32fd); + /* If it doesn't exist, just leave the name as it was given */ + if (hFind != INVALID_HANDLE_VALUE) + { + LPTSTR FixedComponent = w32fd.cFileName; + if (*w32fd.cAlternateFileName && + ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) + { + FixedComponent = w32fd.cAlternateFileName; + } + FindClose(hFind); + + if (Out + _tcslen(FixedComponent) + 1 >= &FixedPath[MAX_PATH]) + return _T(""); + _tcscpy(Out, FixedComponent); + } + Filename = Out; + Out += _tcslen(Out); + *Out++ = _T('\\'); + + In = Next; + } while (In != NULL); + Out[-1] = _T('\0'); + + /* Build the result string. Start with attributes, modification time, and + * file size. If the file didn't exist, these fields will all be empty. */ + Out = Result; + if (hFind != INVALID_HANDLE_VALUE) + { + if (Modifiers & M_ATTR) + { + static const struct { + TCHAR Character; + WORD Value; + } *Attrib, Table[] = { + { _T('d'), FILE_ATTRIBUTE_DIRECTORY }, + { _T('r'), FILE_ATTRIBUTE_READONLY }, + { _T('a'), FILE_ATTRIBUTE_ARCHIVE }, + { _T('h'), FILE_ATTRIBUTE_HIDDEN }, + { _T('s'), FILE_ATTRIBUTE_SYSTEM }, + { _T('c'), FILE_ATTRIBUTE_COMPRESSED }, + { _T('o'), FILE_ATTRIBUTE_OFFLINE }, + { _T('t'), FILE_ATTRIBUTE_TEMPORARY }, + { _T('l'), FILE_ATTRIBUTE_REPARSE_POINT }, + }; + for (Attrib = Table; Attrib != &Table[9]; Attrib++) + { + *Out++ = w32fd.dwFileAttributes & Attrib->Value + ? Attrib->Character + : _T('-'); + } + *Out++ = _T(' '); + } + if (Modifiers & M_TIME) + { + FILETIME ft; + SYSTEMTIME st; + FileTimeToLocalFileTime(&w32fd.ftLastWriteTime, &ft); + FileTimeToSystemTime(&ft, &st); + + /* TODO: This probably should be locale-dependent */ + Out += _stprintf(Out, + _T("%02d/%02d/%04d %02d:%02d %cM "), + st.wMonth, st.wDay, st.wYear, + (st.wHour + 11) % 12 + 1, st.wMinute, + (st.wHour >= 12) ? _T('P') : _T('A')); + } + if (Modifiers & M_SIZE) + { + ULARGE_INTEGER Size; + Size.LowPart = w32fd.nFileSizeLow; + Size.HighPart = w32fd.nFileSizeHigh; + Out += _stprintf(Out, _T("%I64u "), Size.QuadPart); + } + } + + /* Now add the requested parts of the name. + * With the F or S modifiers, add all parts to form the full path. */ + Extension = _tcsrchr(Filename, _T('.')); + if (Modifiers & (M_DRIVE | M_FULL | M_SHORT)) + { + *Out++ = FixedPath[0]; + *Out++ = FixedPath[1]; + } + if (Modifiers & (M_PATH | M_FULL | M_SHORT)) + { + memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); + Out += Filename - &FixedPath[2]; + } + if (Modifiers & (M_NAME | M_FULL | M_SHORT)) + { + while (*Filename && Filename != Extension) + *Out++ = *Filename++; + } + if (Modifiers & (M_EXT | M_FULL | M_SHORT)) + { + if (Extension) + Out = _stpcpy(Out, Extension); + } + + /* Trim trailing space which otherwise would appear as a + * result of using the A/T/Z modifiers but no others. */ + while (Out != &Result[0] && Out[-1] == _T(' ')) + Out--; + *Out = _T('\0'); + + return Result; +} LPCTSTR -GetBatchVar ( LPCTSTR varName, UINT* varNameLen ) -{ - static LPTSTR ret = NULL; - static UINT retlen = 0; - DWORD len; +GetBatchVar(TCHAR *varName, UINT *varNameLen) +{ + LPCTSTR ret; + TCHAR *varNameEnd; + BOOL dummy; *varNameLen = 1; switch ( *varName ) { case _T('~'): - varName++; - if (_tcsncicmp(varName, _T("dp0"), 3) == 0) - { - *varNameLen = 4; - len = _tcsrchr(bc->BatchFilePath, _T('\\')) + 1 - bc->BatchFilePath; - if (!GrowIfNecessary(len + 1, &ret, &retlen)) - return NULL; - memcpy(ret, bc->BatchFilePath, len * sizeof(TCHAR)); - ret[len] = _T('\0'); - return ret; - } - - *varNameLen = 2; - if (*varName >= _T('0') && *varName <= _T('9')) { - LPTSTR arg = FindArg(*varName - _T('0')); - - if (*arg != _T('"')) - return arg; - - /* Exclude the leading and trailing quotes */ - arg++; - len = _tcslen(arg); - if (arg[len - 1] == _T('"')) - len--; - - if (!GrowIfNecessary(len + 1, &ret, &retlen)) - return NULL; - memcpy(ret, arg, len * sizeof(TCHAR)); - ret[len] = _T('\0'); - return ret; - } - break; + varNameEnd = varName + 1; + ret = GetEnhancedVar(&varNameEnd, FindArg); + if (!ret) + { + error_syntax(varName); + return NULL; + } + *varNameLen = varNameEnd - varName; + return ret; case _T('0'): case _T('1'): case _T('2'): @@ -1045,7 +1235,7 @@ case _T('7'): case _T('8'): case _T('9'): - return FindArg(*varName - _T('0')); + return FindArg(*varName, &dummy); case _T('*'): // @@ -1212,26 +1402,41 @@ #undef APPEND1 } +/* Search the list of FOR contexts for a variable */ +static LPTSTR FindForVar(TCHAR Var, BOOL *IsParam0) +{ + FOR_CONTEXT *Ctx; + *IsParam0 = FALSE; + for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) + if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) + return Ctx->values[Var - Ctx->firstvar]; + return NULL; +} + BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest) { TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; while (*Src) { - if (Src[0] == _T('%') && Src[1] != _T('\0')) - { - /* This might be a variable. Search the list of contexts for it */ - FOR_CONTEXT *Ctx = fc; - while (Ctx && (UINT)(Src[1] - Ctx->firstvar) >= Ctx->varcount) - Ctx = Ctx->prev; - if (Ctx) - { - /* Found it */ - LPTSTR Value = Ctx->values[Src[1] - Ctx->firstvar]; + if (Src[0] == _T('%')) + { + BOOL Dummy; + LPTSTR End = &Src[2]; + LPTSTR Value = NULL; + + if (Src[1] == _T('~')) + Value = GetEnhancedVar(&End, FindForVar); + + if (!Value) + Value = FindForVar(Src[1], &Dummy); + + if (Value) + { if (Dest + _tcslen(Value) > DestEnd) return FALSE; Dest = _stpcpy(Dest, Value); - Src += 2; + Src = End; continue; } }

16 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs