Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[hbelusca] 69390: [NTVDM] Read global settings from the register (in HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\NTVDM ; note that this is a ReactOS-only configuration key, because no equiv...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 28 01:36:31 2015 New Revision: 69390 URL: http://svn.reactos.org/svn/reactos?rev=69390&view=rev Log: [NTVDM] Read global settings from the register (in HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\NTVDM ; note that this is a ReactOS-only configuration key, because no equivalent functionality exists on windows), and currently initialize: - the BIOS and ROM files to be used; - the hard disks to be mounted at startup (they cannot be unmounted at runtime, contrary to the floppies) (maximum 4 hard disks). Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Mon Sep 28 01:36:31 2015 @@ -475,6 +475,8 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { + USHORT i; + /* Initialize memory */ if (!MemInitialize()) { @@ -551,17 +553,16 @@ return FALSE; } -#if 0 - // The following commands are examples of MountDisk usage. - // NOTE: Those values are hardcoded paths on my local test machines!! - - // MountDisk(FLOPPY_DISK, 0, "H:\\trunk\\ntvdm_studies\\diskette_high.vfd", TRUE); - // MountDisk(FLOPPY_DISK, 0, "H:\\DOS_tests\\Dos5.0.img", TRUE); - // MountDisk(FLOPPY_DISK, 0, "H:\\trunk\\ntvdm_studies\\hdd_10Mo_fixed.vhd", TRUE); - // MountDisk(FLOPPY_DISK, 0, "H:\\DOS_tests\\diskette_test.vfd", FALSE); - - MountDisk(HARD_DISK, 0, "H:\\DOS_tests\\MS-DOS 6_fixed_size.vhd", FALSE); -#endif + /* Mount the available hard disks */ + for (i = 0; i < ARRAYSIZE(GlobalSettings.HardDisks); ++i) + { + if (GlobalSettings.HardDisks[i].Length != 0 && + GlobalSettings.HardDisks[i].Buffer && + GlobalSettings.HardDisks[i].Buffer != '\0') + { + MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE); + } + } /* Initialize the software callback system and register the emulator BOPs */ InitializeInt32(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Mon Sep 28 01:36:31 2015 @@ -25,6 +25,8 @@ static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; + +NTVDM_SETTINGS GlobalSettings; // Command line of NTVDM INT NtVdmArgc; @@ -276,325 +278,171 @@ } } -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -DisplayMessage(IN LPCWSTR Format, ...) -{ -#ifndef WIN2K_COMPLIANT - WCHAR StaticBuffer[256]; - LPWSTR Buffer = StaticBuffer; // Use the static buffer by default. -#else - WCHAR Buffer[2048]; // Large enough. If not, increase it by hand. -#endif - size_t MsgLen; - va_list Parameters; - - va_start(Parameters, Format); - -#ifndef WIN2K_COMPLIANT - /* - * Retrieve the message length and if it is too long, allocate - * an auxiliary buffer; otherwise use the static buffer. - * The string is built to be NULL-terminated. - */ - MsgLen = _vscwprintf(Format, Parameters); - if (MsgLen >= ARRAYSIZE(StaticBuffer)) - { - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(WCHAR)); - if (Buffer == NULL) - { - /* Allocation failed, use the static buffer and display a suitable error message */ - Buffer = StaticBuffer; - Format = L"DisplayMessage()\nOriginal message is too long and allocating an auxiliary buffer failed."; - MsgLen = wcslen(Format); - } - } -#else - MsgLen = ARRAYSIZE(Buffer) - 1; -#endif - - RtlZeroMemory(Buffer, (MsgLen + 1) * sizeof(WCHAR)); - _vsnwprintf(Buffer, MsgLen, Format, Parameters); - - va_end(Parameters); - - /* Display the message */ - DPRINT1("\n\nNTVDM Subsystem\n%S\n\n", Buffer); - MessageBoxW(hConsoleWnd, Buffer, L"NTVDM Subsystem", MB_OK); - -#ifndef WIN2K_COMPLIANT - /* Free the buffer if needed */ - if (Buffer != StaticBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); -#endif -} - -static VOID -ConsoleCleanup(VOID); - -static VOID -VdmShutdown(BOOLEAN Immediate) -{ - /* - * Immediate = TRUE: Immediate shutdown; - * FALSE: Delayed shutdown. - */ - static BOOLEAN MustShutdown = FALSE; - - /* If a shutdown is ongoing, just return */ - if (MustShutdown) - { - DPRINT1("Shutdown is ongoing...\n"); - Sleep(INFINITE); - return; - } - - /* First notify DOS to see whether we can shut down now */ - MustShutdown = DosShutdown(Immediate); - /* - * In case we perform an immediate shutdown, or the DOS says - * we can shut down, do it now. - */ - MustShutdown = MustShutdown || Immediate; - - if (MustShutdown) - { - EmulatorTerminate(); - - BiosCleanup(); - EmulatorCleanup(); - ConsoleCleanup(); - - DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n"); - /* Some VDDs rely on the fact that NTVDM calls ExitProcess on Windows */ - ExitProcess(0); - } -} + +static NTSTATUS +NTAPI +NtVdmConfigureBios(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; + UNICODE_STRING ValueString; + + /* Check for the type of the value */ + if (ValueType != REG_SZ) + { + RtlInitEmptyAnsiString(&Settings->BiosFileName, NULL, 0); + return STATUS_SUCCESS; + } + + /* Convert the UNICODE string to ANSI and store it */ + RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); + ValueString.Length = ValueString.MaximumLength; + RtlUnicodeStringToAnsiString(&Settings->BiosFileName, &ValueString, TRUE); + + return STATUS_SUCCESS; +} + +static NTSTATUS +NTAPI +NtVdmConfigureRom(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; + UNICODE_STRING ValueString; + + /* Check for the type of the value */ + if (ValueType != REG_MULTI_SZ) + { + RtlInitEmptyAnsiString(&Settings->RomFiles, NULL, 0); + return STATUS_SUCCESS; + } + + /* Convert the UNICODE string to ANSI and store it */ + RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); + ValueString.Length = ValueString.MaximumLength; + RtlUnicodeStringToAnsiString(&Settings->RomFiles, &ValueString, TRUE); + + return STATUS_SUCCESS; +} + +static NTSTATUS +NTAPI +NtVdmConfigureHDD(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; + UNICODE_STRING ValueString; + ULONG DiskNumber = (ULONG)EntryContext; + + ASSERT(DiskNumber < ARRAYSIZE(Settings->HardDisks)); + + /* Check whether the Hard Disk entry was not already configured */ + if (Settings->HardDisks[DiskNumber].Buffer != NULL) + { + DPRINT1("Hard Disk %d -- '%Z' already configured\n", DiskNumber, &Settings->HardDisks[DiskNumber]); + return STATUS_SUCCESS; + } + + /* Check for the type of the value */ + if (ValueType != REG_SZ) + { + RtlInitEmptyAnsiString(&Settings->HardDisks[DiskNumber], NULL, 0); + return STATUS_SUCCESS; + } + + /* Convert the UNICODE string to ANSI and store it */ + RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); + ValueString.Length = ValueString.MaximumLength; + RtlUnicodeStringToAnsiString(&Settings->HardDisks[DiskNumber], &ValueString, TRUE); + + return STATUS_SUCCESS; +} + +static RTL_QUERY_REGISTRY_TABLE +NtVdmConfigurationTable[] = +{ + { + NtVdmConfigureBios, + 0, + L"BiosFile", + NULL, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureRom, + RTL_QUERY_REGISTRY_NOEXPAND, + L"RomFiles", + NULL, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureHDD, + 0, + L"HardDisk0", + (PVOID)0, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureHDD, + 0, + L"HardDisk1", + (PVOID)1, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureHDD, + 0, + L"HardDisk2", + (PVOID)2, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureHDD, + 0, + L"HardDisk3", + (PVOID)3, + REG_NONE, + NULL, + 0 + }, + + /* End of table */ + {0} +}; static BOOL -WINAPI -ConsoleCtrlHandler(DWORD ControlType) -{ - switch (ControlType) - { - case CTRL_LAST_CLOSE_EVENT: - { - /* Delayed shutdown */ - DPRINT1("NTVDM delayed killing in the CTRL_LAST_CLOSE_EVENT CtrlHandler!\n"); - VdmShutdown(FALSE); - break; - } - - default: - { - /* Stop the VDM if the user logs out or closes the console */ - DPRINT1("Killing NTVDM in the 'default' CtrlHandler!\n"); - VdmShutdown(TRUE); - } - } - return TRUE; -} - -static VOID -ConsoleInitUI(VOID) -{ - hConsoleWnd = GetConsoleWindow(); - CreateVdmMenu(ConsoleOutput); -} - -static VOID -ConsoleCleanupUI(VOID) -{ - /* Display again properly the mouse pointer */ - if (ShowPointer) ShowHideMousePointer(ConsoleOutput, ShowPointer); - - DestroyVdmMenu(); -} - -BOOL -ConsoleAttach(VOID) -{ - /* Save the original input and output console modes */ - if (!GetConsoleMode(ConsoleInput , &OrgConsoleInputMode ) || - !GetConsoleMode(ConsoleOutput, &OrgConsoleOutputMode)) - { - CloseHandle(ConsoleOutput); - CloseHandle(ConsoleInput); - wprintf(L"FATAL: Cannot save console in/out modes\n"); - return FALSE; - } - - /* Set the console input mode */ - // FIXME: Activate ENABLE_WINDOW_INPUT when we will want to perform actions - // upon console window events (screen buffer resize, ...). - SetConsoleMode(ConsoleInput, 0 /* | ENABLE_WINDOW_INPUT */); - EnableExtraHardware(ConsoleInput); - - /* Set the console output mode */ - // SetConsoleMode(ConsoleOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); - - /* Initialize the UI */ - ConsoleInitUI(); - - return TRUE; -} - -VOID -ConsoleDetach(VOID) -{ - /* Cleanup the UI */ - ConsoleCleanupUI(); - - /* Restore the original input and output console modes */ - SetConsoleMode(ConsoleOutput, OrgConsoleOutputMode); - SetConsoleMode(ConsoleInput , OrgConsoleInputMode ); -} - -static BOOL -ConsoleInit(VOID) -{ - /* Set the handler routine */ - SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); - - /* Enable the CTRL_LAST_CLOSE_EVENT */ - SetLastConsoleEventActive(); - - /* - * NOTE: The CONIN$ and CONOUT$ "virtual" files - * always point to non-redirected console handles. - */ - - /* Get the input handle to the real console, and check for success */ - ConsoleInput = CreateFileW(L"CONIN$", - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (ConsoleInput == INVALID_HANDLE_VALUE) - { - wprintf(L"FATAL: Cannot retrieve a handle to the console input\n"); - return FALSE; - } - - /* Get the output handle to the real console, and check for success */ - ConsoleOutput = CreateFileW(L"CONOUT$", - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (ConsoleOutput == INVALID_HANDLE_VALUE) - { - CloseHandle(ConsoleInput); - wprintf(L"FATAL: Cannot retrieve a handle to the console output\n"); - return FALSE; - } - - /* Effectively attach to the console */ - return ConsoleAttach(); -} - -static VOID -ConsoleCleanup(VOID) -{ - /* Detach from the console */ - ConsoleDetach(); - - /* Close the console handles */ - if (ConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleOutput); - if (ConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleInput); -} - -VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent) -{ - switch (MenuEvent->dwCommandId) - { - case ID_SHOWHIDE_MOUSE: - ShowHideMousePointer(ConsoleOutput, ShowPointer); - ShowPointer = !ShowPointer; - break; - - case ID_VDM_DUMPMEM_TXT: - DumpMemory(TRUE); - break; - - case ID_VDM_DUMPMEM_BIN: - DumpMemory(FALSE); - break; - - /* Drive 0 -- Mount */ - /* Drive 1 -- Mount */ - case ID_VDM_DRIVES + 0: - case ID_VDM_DRIVES + 2: - { - ULONG DiskNumber = (MenuEvent->dwCommandId - ID_VDM_DRIVES) / 2; - MountFloppy(DiskNumber); - break; - } - - /* Drive 0 -- Eject */ - /* Drive 1 -- Eject */ - case ID_VDM_DRIVES + 1: - case ID_VDM_DRIVES + 3: - { - ULONG DiskNumber = (MenuEvent->dwCommandId - ID_VDM_DRIVES - 1) / 2; - EjectFloppy(DiskNumber); - break; - } - - case ID_VDM_QUIT: - /* Stop the VDM */ - // EmulatorTerminate(); - - /* Nothing runs, so exit immediately */ - DPRINT1("Killing NTVDM via console menu!\n"); - VdmShutdown(TRUE); - break; - - default: - break; - } -} - -VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent) -{ - DPRINT1("Focus events not handled\n"); -} - -static BOOL -LoadGlobalSettings(VOID) -{ -// FIXME: These strings should be localized. -#define ERROR_MEMORYVDD L"Insufficient memory to load installable Virtual Device Drivers." -#define ERROR_REGVDD L"Virtual Device Driver format in the registry is invalid." -#define ERROR_LOADVDD L"An installable Virtual Device Driver failed Dll initialization." - - BOOL Success = TRUE; - LONG Error = 0; - - HKEY hNTVDMKey; - LPCWSTR NTVDMKeyName = L"SYSTEM\\CurrentControlSet\\Control\\NTVDM"; - - /* Try to open the NTVDM registry key */ - Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - NTVDMKeyName, - 0, - KEY_QUERY_VALUE, - &hNTVDMKey); - if (Error == ERROR_FILE_NOT_FOUND) - { - /* If the key just doesn't exist, don't do anything else */ - return TRUE; - } - else if (Error != ERROR_SUCCESS) - { - /* The key exists but there was an access error: display an error and quit */ - DisplayMessage(ERROR_REGVDD); - return FALSE; - } +LoadGlobalSettings(IN PNTVDM_SETTINGS Settings) +{ + NTSTATUS Status; + + ASSERT(Settings); /* * Now we can do: @@ -606,11 +454,329 @@ * - Standalone mode? * - Debug settings */ - -// Quit: - RegCloseKey(hNTVDMKey); - return Success; -} + Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"NTVDM", + NtVdmConfigurationTable, + Settings, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NTVDM registry settings cannot be fully initialized, using default ones. Status = 0x%08lx\n", Status); + } + + return NT_SUCCESS(Status); +} + +static VOID +FreeGlobalSettings(IN PNTVDM_SETTINGS Settings) +{ + USHORT i; + + ASSERT(Settings); + + if (Settings->BiosFileName.Buffer) + RtlFreeAnsiString(&Settings->BiosFileName); + + if (Settings->RomFiles.Buffer) + RtlFreeAnsiString(&Settings->RomFiles); + + for (i = 0; i < ARRAYSIZE(Settings->HardDisks); ++i) + { + if (Settings->HardDisks[i].Buffer) + RtlFreeAnsiString(&Settings->HardDisks[i]); + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +DisplayMessage(IN LPCWSTR Format, ...) +{ +#ifndef WIN2K_COMPLIANT + WCHAR StaticBuffer[256]; + LPWSTR Buffer = StaticBuffer; // Use the static buffer by default. +#else + WCHAR Buffer[2048]; // Large enough. If not, increase it by hand. +#endif + size_t MsgLen; + va_list Parameters; + + va_start(Parameters, Format); + +#ifndef WIN2K_COMPLIANT + /* + * Retrieve the message length and if it is too long, allocate + * an auxiliary buffer; otherwise use the static buffer. + * The string is built to be NULL-terminated. + */ + MsgLen = _vscwprintf(Format, Parameters); + if (MsgLen >= ARRAYSIZE(StaticBuffer)) + { + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(WCHAR)); + if (Buffer == NULL) + { + /* Allocation failed, use the static buffer and display a suitable error message */ + Buffer = StaticBuffer; + Format = L"DisplayMessage()\nOriginal message is too long and allocating an auxiliary buffer failed."; + MsgLen = wcslen(Format); + } + } +#else + MsgLen = ARRAYSIZE(Buffer) - 1; +#endif + + RtlZeroMemory(Buffer, (MsgLen + 1) * sizeof(WCHAR)); + _vsnwprintf(Buffer, MsgLen, Format, Parameters); + + va_end(Parameters); + + /* Display the message */ + DPRINT1("\n\nNTVDM Subsystem\n%S\n\n", Buffer); + MessageBoxW(hConsoleWnd, Buffer, L"NTVDM Subsystem", MB_OK); + +#ifndef WIN2K_COMPLIANT + /* Free the buffer if needed */ + if (Buffer != StaticBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); +#endif +} + +static VOID +ConsoleCleanup(VOID); + +static VOID +VdmShutdown(BOOLEAN Immediate) +{ + /* + * Immediate = TRUE: Immediate shutdown; + * FALSE: Delayed shutdown. + */ + static BOOLEAN MustShutdown = FALSE; + + /* If a shutdown is ongoing, just return */ + if (MustShutdown) + { + DPRINT1("Shutdown is ongoing...\n"); + Sleep(INFINITE); + return; + } + + /* First notify DOS to see whether we can shut down now */ + MustShutdown = DosShutdown(Immediate); + /* + * In case we perform an immediate shutdown, or the DOS says + * we can shut down, do it now. + */ + MustShutdown = MustShutdown || Immediate; + + if (MustShutdown) + { + EmulatorTerminate(); + + BiosCleanup(); + EmulatorCleanup(); + ConsoleCleanup(); + + FreeGlobalSettings(&GlobalSettings); + + DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n"); + /* Some VDDs rely on the fact that NTVDM calls ExitProcess on Windows */ + ExitProcess(0); + } +} + +static BOOL +WINAPI +ConsoleCtrlHandler(DWORD ControlType) +{ + switch (ControlType) + { + case CTRL_LAST_CLOSE_EVENT: + { + /* Delayed shutdown */ + DPRINT1("NTVDM delayed killing in the CTRL_LAST_CLOSE_EVENT CtrlHandler!\n"); + VdmShutdown(FALSE); + break; + } + + default: + { + /* Stop the VDM if the user logs out or closes the console */ + DPRINT1("Killing NTVDM in the 'default' CtrlHandler!\n"); + VdmShutdown(TRUE); + } + } + return TRUE; +} + +static VOID +ConsoleInitUI(VOID) +{ + hConsoleWnd = GetConsoleWindow(); + CreateVdmMenu(ConsoleOutput); +} + +static VOID +ConsoleCleanupUI(VOID) +{ + /* Display again properly the mouse pointer */ + if (ShowPointer) ShowHideMousePointer(ConsoleOutput, ShowPointer); + + DestroyVdmMenu(); +} + +BOOL +ConsoleAttach(VOID) +{ + /* Save the original input and output console modes */ + if (!GetConsoleMode(ConsoleInput , &OrgConsoleInputMode ) || + !GetConsoleMode(ConsoleOutput, &OrgConsoleOutputMode)) + { + CloseHandle(ConsoleOutput); + CloseHandle(ConsoleInput); + wprintf(L"FATAL: Cannot save console in/out modes\n"); + return FALSE; + } + + /* Set the console input mode */ + // FIXME: Activate ENABLE_WINDOW_INPUT when we will want to perform actions + // upon console window events (screen buffer resize, ...). + SetConsoleMode(ConsoleInput, 0 /* | ENABLE_WINDOW_INPUT */); + EnableExtraHardware(ConsoleInput); + + /* Set the console output mode */ + // SetConsoleMode(ConsoleOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + + /* Initialize the UI */ + ConsoleInitUI(); + + return TRUE; +} + +VOID +ConsoleDetach(VOID) +{ + /* Cleanup the UI */ + ConsoleCleanupUI(); + + /* Restore the original input and output console modes */ + SetConsoleMode(ConsoleOutput, OrgConsoleOutputMode); + SetConsoleMode(ConsoleInput , OrgConsoleInputMode ); +} + +static BOOL +ConsoleInit(VOID) +{ + /* Set the handler routine */ + SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); + + /* Enable the CTRL_LAST_CLOSE_EVENT */ + SetLastConsoleEventActive(); + + /* + * NOTE: The CONIN$ and CONOUT$ "virtual" files + * always point to non-redirected console handles. + */ + + /* Get the input handle to the real console, and check for success */ + ConsoleInput = CreateFileW(L"CONIN$", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + if (ConsoleInput == INVALID_HANDLE_VALUE) + { + wprintf(L"FATAL: Cannot retrieve a handle to the console input\n"); + return FALSE; + } + + /* Get the output handle to the real console, and check for success */ + ConsoleOutput = CreateFileW(L"CONOUT$", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + if (ConsoleOutput == INVALID_HANDLE_VALUE) + { + CloseHandle(ConsoleInput); + wprintf(L"FATAL: Cannot retrieve a handle to the console output\n"); + return FALSE; + } + + /* Effectively attach to the console */ + return ConsoleAttach(); +} + +static VOID +ConsoleCleanup(VOID) +{ + /* Detach from the console */ + ConsoleDetach(); + + /* Close the console handles */ + if (ConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleOutput); + if (ConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleInput); +} + +VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent) +{ + switch (MenuEvent->dwCommandId) + { + case ID_SHOWHIDE_MOUSE: + ShowHideMousePointer(ConsoleOutput, ShowPointer); + ShowPointer = !ShowPointer; + break; + + case ID_VDM_DUMPMEM_TXT: + DumpMemory(TRUE); + break; + + case ID_VDM_DUMPMEM_BIN: + DumpMemory(FALSE); + break; + + /* Drive 0 -- Mount */ + /* Drive 1 -- Mount */ + case ID_VDM_DRIVES + 0: + case ID_VDM_DRIVES + 2: + { + ULONG DiskNumber = (MenuEvent->dwCommandId - ID_VDM_DRIVES) / 2; + MountFloppy(DiskNumber); + break; + } + + /* Drive 0 -- Eject */ + /* Drive 1 -- Eject */ + case ID_VDM_DRIVES + 1: + case ID_VDM_DRIVES + 3: + { + ULONG DiskNumber = (MenuEvent->dwCommandId - ID_VDM_DRIVES - 1) / 2; + EjectFloppy(DiskNumber); + break; + } + + case ID_VDM_QUIT: + /* Stop the VDM */ + // EmulatorTerminate(); + + /* Nothing runs, so exit immediately */ + DPRINT1("Killing NTVDM via console menu!\n"); + VdmShutdown(TRUE); + break; + + default: + break; + } +} + +VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent) +{ + DPRINT1("Focus events not handled\n"); +} + INT wmain(INT argc, WCHAR *argv[]) @@ -649,7 +815,7 @@ #endif /* Load global VDM settings */ - LoadGlobalSettings(); + LoadGlobalSettings(&GlobalSettings); DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); @@ -668,7 +834,8 @@ } /* Initialize the system BIOS and option ROMs */ - if (!BiosInitialize(NULL, NULL)) + if (!BiosInitialize(GlobalSettings.BiosFileName.Buffer, + GlobalSettings.RomFiles.Buffer)) { wprintf(L"FATAL: Failed to initialize the VDM BIOS.\n"); goto Cleanup; Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Mon Sep 28 01:36:31 2015 @@ -69,7 +69,17 @@ #define ADVANCED_DEBUGGING_LEVEL 1 #endif -/* FUNCTIONS ******************************************************************/ + +/* VARIABLES ******************************************************************/ + +typedef struct _NTVDM_SETTINGS +{ + ANSI_STRING BiosFileName; + ANSI_STRING RomFiles; + ANSI_STRING HardDisks[4]; +} NTVDM_SETTINGS, *PNTVDM_SETTINGS; + +extern NTVDM_SETTINGS GlobalSettings; // Command line of NTVDM extern INT NtVdmArgc; @@ -77,6 +87,8 @@ extern HWND hConsoleWnd; + +/* FUNCTIONS ******************************************************************/ /* * Interface functions

9 years, 2 months

[pschweitzer] 69389: [RTL] Major bugfixing session for RtlGenerate8dot3Name()... Up to know, AllowExtendedCharacters was totally ignored and any upcased char, as long as it was not in the forbidden...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 27 20:54:20 2015 New Revision: 69389 URL: http://svn.reactos.org/svn/reactos?rev=69389&view=rev Log: [RTL] Major bugfixing session for RtlGenerate8dot3Name()... Up to know, AllowExtendedCharacters was totally ignored and any upcased char, as long as it was not in the forbidden list was accepted. This was bringing numerous problems (cf: apitest :-)). So, now, the following fixes were brought: - AllowExtendedCharacters isn't ignored any longer. If it's given, the unicode char is upcased, if it's not, as previously, the ansi char is upcased - Be more strict in the allowed chars in name: only allow "graph" chars. This avoids generating broken names that aren't allowed in FAT - In case no char could be added in the name, then, for the generation of the name checksum and use it as shortname - When writing the checksum, don't use reversed order, but direct order, to match Windows behavior (as exposed with tests) - When writing the checksum, use when possible bit operations instead of numerical operations for performances reasons (NFC) - Rewrite RtlpGetCheckSum() with an algorithm that produces the exact same checksums than Windows 2003. This whole commit fixes all apitests related (direct visible effect). As a bonus, it also fixes short names generation in FAT: we no longer produce broken volumes with international file names. This also fixes less visible issues: we were producing unicode strings with null char in their middle (as exposed in tests), not sure about how all functions could handle this: likely not that good, this could have lead to various memory issues & corruptions. CORE-10223 #resolve #comment Fixed with r69389 Modified: trunk/reactos/lib/rtl/dos8dot3.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=693… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Sun Sep 27 20:54:20 2015 @@ -30,17 +30,42 @@ static USHORT RtlpGetCheckSum(PUNICODE_STRING Name) { - USHORT Hash = 0; - ULONG Length; - PWCHAR c; - - Length = Name->Length / sizeof(WCHAR); - c = Name->Buffer; - while(Length--) - { - Hash = (Hash + (*c << 4) + (*c >> 4)) * 11; - c++; - } + USHORT Hash, Saved; + WCHAR * CurChar; + USHORT Len; + + if (Name->Length == 0) + { + return 0; + } + + if (Name->Length == sizeof(WCHAR)) + { + return Name->Buffer[0]; + } + + CurChar = Name->Buffer; + Hash = (*CurChar << 8) + *(CurChar + 1); + if (Name->Length == 2 * sizeof(WCHAR)) + { + return Hash; + } + + Saved = Hash; + Len = 2; + do + { + CurChar = CurChar + 2; + Hash = (Hash << 7) + *CurChar; + Hash = (Saved >> 1) + (Hash << 8); + if (Len + 1 < Name->Length / sizeof(WCHAR)) + { + Hash += *(CurChar + 1); + } + Saved = Hash; + Len += 2; + } while (Len < Name->Length / sizeof(WCHAR)); + return Hash; } @@ -78,7 +103,7 @@ ULONG IndexLength; ULONG CurrentIndex; USHORT Checksum; - CHAR c; + WCHAR c; StrLength = Name->Length / sizeof(WCHAR); DPRINT("StrLength: %lu\n", StrLength); @@ -98,15 +123,27 @@ /* Copy name (6 valid characters max) */ for (i = 0, NameLength = 0; NameLength < 6 && i < DotPos; i++) { - c = 0; - RtlUpcaseUnicodeToOemN(&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); - if (Count != 1 || c == 0 || RtlpIsShortIllegal(c)) + c = UNICODE_NULL; + if (AllowExtendedCharacters) + { + c = RtlUpcaseUnicodeChar(Name->Buffer[i]); + Count = 1; + } + else + { + RtlUpcaseUnicodeToOemN((CHAR *)&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); + } + + if (Count != 1 || c == UNICODE_NULL || RtlpIsShortIllegal(c)) { NameBuffer[NameLength++] = L'_'; } - else if (c != '.' && c != ' ') - { - NameBuffer[NameLength++] = (WCHAR)c; + else if (c != L'.' && c != L' ') + { + if (isgraph(c) || (AllowExtendedCharacters && iswgraph(c))) + { + NameBuffer[NameLength++] = c; + } } } @@ -118,15 +155,27 @@ { for (i = DotPos, ExtLength = 0; ExtLength < 4 && i < StrLength; i++) { - c = 0; - RtlUpcaseUnicodeToOemN(&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); - if (Count != 1 || c == 0 || RtlpIsShortIllegal(c)) + c = UNICODE_NULL; + if (AllowExtendedCharacters) + { + c = RtlUpcaseUnicodeChar(Name->Buffer[i]); + Count = 1; + } + else + { + RtlUpcaseUnicodeToOemN((CHAR *)&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); + } + + if (Count != 1 || c == UNICODE_NULL || RtlpIsShortIllegal(c)) { ExtBuffer[ExtLength++] = L'_'; } - else if (c != ' ') + else if (c != L' ') { - ExtBuffer[ExtLength++] = c; + if (isgraph(c) || c == L'.' || (AllowExtendedCharacters && iswgraph(c))) + { + ExtBuffer[ExtLength++] = c; + } } } } @@ -171,7 +220,15 @@ else { Context->LastIndexValue = 1; - Context->CheckSumInserted = FALSE; + if (NameLength == 0) + { + Context->CheckSumInserted = TRUE; + Context->Checksum = RtlpGetCheckSum(Name); + } + else + { + Context->CheckSumInserted = FALSE; + } } IndexLength = RtlpGetIndexLength(Context->LastIndexValue); @@ -192,12 +249,11 @@ j = CopyLength; if (Context->CheckSumInserted) { - j += 3; Checksum = Context->Checksum; for (i = 0; i < 4; i++) { - Name8dot3->Buffer[j--] = (Checksum % 16) > 9 ? (Checksum % 16) + L'A' - 10 : (Checksum % 16) + L'0'; - Checksum /= 16; + Name8dot3->Buffer[j++] = (Checksum & 0xF) > 9 ? (Checksum & 0xF) + L'A' - 10 : (Checksum & 0xF) + L'0'; + Checksum >>= 4; } j = CopyLength + 4; }

9 years, 2 months

[pschweitzer] 69388: [NTDLL_APITEST] Add more tests for RtlGenerate8dot3Name(). Not sure how many more are failing in ReactOS: they all pass in my WC (teasing :-)) CORE-10223

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Sep 27 20:41:14 2015 New Revision: 69388 URL: http://svn.reactos.org/svn/reactos?rev=69388&view=rev Log: [NTDLL_APITEST] Add more tests for RtlGenerate8dot3Name(). Not sure how many more are failing in ReactOS: they all pass in my WC (teasing :-)) CORE-10223 Modified: trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c Modified: trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlGenerat… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlGenerate8dot3Name.c [iso-8859-1] Sun Sep 27 20:41:14 2015 @@ -19,17 +19,17 @@ _Inout_ PGENERATE_NAME_CONTEXT Context, _Inout_ PUNICODE_STRING Name8dot3); -PWSTR Names[] = { L"Menu DÃ©marrer", L"SÃ©lecteur de configuration clavier.lnk", L"Ã©Ã¨Ã Ã¹Ã§.txt", L"Ã©Ã¨Ã Ã¹Ã§eeauc.txt", L"Long file name.txt", L"Long file name", L"Longfilename.txt", L"Longfilename" }; -PWSTR ShortNames1[] = { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT", L"EEAUC~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; -PWSTR ShortNames2[] = { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"EEAUC~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; -PWSTR ExShortNames1[] = { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃÃE~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; -PWSTR ExShortNames2[] = { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃÃE~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; +PWSTR Names[] = { L"Menu DÃ©marrer", L"SÃ©lecteur de configuration clavier.lnk", L"Ã©Ã¨Ã Ã¹Ã§.txt", L"Ã§Ã¹Ã Ã¨Ã©.txt", L"Ã©Ã¨Ã Ã¹.txt", L"Ã§Ã¹Ã Ã¨.txt", L"Ã©Ã¨Ã Ã¹Ã§eeauc.txt", L"Ã©eÃ¨Ã©Ã§cÃ¹u.txt", L"test.Ã©xÃ¨", L"tÂ£$tÂ¤.txt", L"Long file name.txt", L"Long file name", L"Longfilename.txt", L"Longfilename" }; +PWSTR ShortNames1[] = { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT", L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT", L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X", L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; +PWSTR ShortNames2[] = { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT", L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT", L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X", L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; +PWSTR ExShortNames1[] = { L"MENUDÃ~1", L"SÃLECT~1.LNK", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃ~1.TXT", L"ÃÃÃÃÃE~1.TXT", L"ÃEÃÃÃC~1.TXT", L"TEST~1.ÃXÃ", L"TÂ£$TÂ¤~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1", L"LONGFI~1.TXT", L"LONGFI~1" }; +PWSTR ExShortNames2[] = { L"MENUDÃ~2", L"SÃLECT~2.LNK", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃ~2.TXT", L"ÃÃÃÃÃE~2.TXT", L"ÃEÃÃÃC~2.TXT", L"TEST~2.ÃXÃ", L"TÂ£$TÂ¤~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2", L"LONGFI~2.TXT", L"LONGFI~2" }; START_TEST(RtlGenerate8dot3Name) { USHORT i; - for (i = 0; i < 8; ++i) + for (i = 0; i < 14; ++i) { WCHAR Buffer[12]; GENERATE_NAME_CONTEXT Context;

9 years, 2 months

[akhaldi] 69387: [SHELLEXTS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 27 18:40:24 2015 New Revision: 69387 URL: http://svn.reactos.org/svn/reactos?rev=69387&view=rev Log: [SHELLEXTS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc trunk/reactos/dll/shellext/devcpux/processor.c trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h trunk/reactos/dll/shellext/slayer/lang/sk-SK.rc trunk/reactos/dll/shellext/slayer/lang/uk-UA.rc trunk/reactos/dll/shellext/slayer/slayer.c trunk/reactos/dll/shellext/stobject/csystray.cpp trunk/reactos/dll/shellext/stobject/csystray.h trunk/reactos/dll/shellext/stobject/stobject.cpp trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/sk-SK.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,5 +1,5 @@ /* - * FILE: dll/win32/shellext/deskadp/lang/sk-SK.rc + * FILE: dll/shellext/deskadp/lang/sk-SK.rc * PURPOSE: Slovak Language File for deskadp * TRANSLATOR: Kario <kario(a)szm.sk> * DATE OF TR.: 30-09-2007 Modified: trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/lang/uk-UA.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Advanced display adapter properties * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shellext/deskadp/lang/uk-UA.rc + * FILE: dll/shellext/deskadp/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for deskadp.dll * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ Modified: trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/lang/uk-UA.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Advanced display monitor properties * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shellext/deskmon/lang/uk-UA.rc + * FILE: dll/shellext/deskmon/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for deskmon.dll * TRANSLATOR: Artem Reznikov */ Modified: trunk/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/proce… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Shell Extensions * LICENSE: LGPL - See COPYING in the top level directory - * FILE: dll\win32\shellext\devcpux\processor.c + * FILE: dll/shellext/devcpux/processor.c * PURPOSE: * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)ReactOS.org> * Modified: trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/uk-UA.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: Network Connections Shell Folder * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/netshell/lang/uk-UA.rc + * FILE: dll/shellext/netshell/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for netshell * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ Modified: trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Netshell * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/netshell/lang/zh-CN.rc + * FILE: dll/shellext/netshell/lang/zh-CN.rc * PURPOSE: Chinese (Simplified) Language File * TRANSLATOR: 2011 Elton Chung aka MfldElton <elton328(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/zh-TW.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Netshell * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/netshell/lang/zh-TW.rc + * FILE: dll/shellext/netshell/lang/zh-TW.rc * PURPOSE: Chinese (Traditional) Language File * TRANSLATOR: 2011 Elton Chung aka MfldElton <elton328(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjfolder.cpp + * FILE: dll/shellext/ntobjshex/ntobjfolder.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjfolder.h + * FILE: dll/shellext/ntobjshex/ntobjfolder.h * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjshex.cpp + * FILE: dll/shellext/ntobjshex/ntobjshex.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\regfolder.cpp + * FILE: dll/shellext/ntobjshex/regfolder.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\regfolder.h + * FILE: dll/shellext/ntobjshex/regfolder.h * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/slayer/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/s… ============================================================================== --- trunk/reactos/dll/shellext/slayer/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/lang/sk-SK.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,5 +1,5 @@ /* - * FILE: dll/win32/shellext/slayer/lang/sk-SK.rc + * FILE: dll/shellext/slayer/lang/sk-SK.rc * PURPOSE: Slovak Language File for slayer * TRANSLATOR: Kario <kario(a)szm.sk> * DATE OF TR.: 30-09-2007 Modified: trunk/reactos/dll/shellext/slayer/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/u… ============================================================================== --- trunk/reactos/dll/shellext/slayer/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/lang/uk-UA.rc [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: Application Compatibility Layer Shell Extension * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/shellext/slayer/Uk.rc + * FILE: dll/shellext/slayer/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for slayer * TRANSLATOR: Artem Reznikov */ Modified: trunk/reactos/dll/shellext/slayer/slayer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.c [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS Compatibility Layer Shell Extension - * FILE: lib/shellext/cplsample/cplsample.c + * FILE: dll/shellext/slayer/slayer.c * PURPOSE: ReactOS Compatibility Layer Shell Extension * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * UPDATE HISTORY: Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll\win32\stobject\csystray.cpp +* FILE: dll/shellext/stobject/csystray.cpp * PURPOSE: Systray shell service object implementation * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/stobject/csystray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\stobject.cpp + * FILE: dll/shellext/stobject/csystray.h * PURPOSE: Systray shell service object * PROGRAMMERS: Robert Naumann David Quintana <gigaherz(a)gmail.com> Modified: trunk/reactos/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/stob… ============================================================================== --- trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/stobject.cpp [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\stobject.cpp + * FILE: dll/shellext/stobject/stobject.cpp * PURPOSE: COM registration services for STobject.dll * PROGRAMMERS: Robert Naumann David Quintana <gigaherz(a)gmail.com> Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Sun Sep 27 18:40:24 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\volume.cpp + * FILE: dll/shellext/stobject/volume.cpp * PURPOSE: Volume notification icon handler * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */

9 years, 2 months

[akhaldi] 69386: [SHELLEXTS] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 27 18:37:23 2015 New Revision: 69386 URL: http://svn.reactos.org/svn/reactos?rev=69386&view=rev Log: [SHELLEXTS] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt trunk/reactos/dll/shellext/deskmon/CMakeLists.txt trunk/reactos/dll/shellext/netshell/CMakeLists.txt trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt trunk/reactos/dll/shellext/stobject/CMakeLists.txt Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/CMake… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:37:23 2015 @@ -5,6 +5,8 @@ deskadp.c shxiface.c precomp.h) + +add_rc_deps(deskadp.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/adapter.ico) add_library(deskadp SHARED ${SOURCE} Modified: trunk/reactos/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/CMake… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:37:23 2015 @@ -5,6 +5,8 @@ deskmon.c shxiface.c precomp.h) + +add_rc_deps(deskmon.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/monitor.ico) add_library(deskmon SHARED ${SOURCE} Modified: trunk/reactos/dll/shellext/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/CMak… ============================================================================== --- trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:37:23 2015 @@ -24,6 +24,9 @@ lanstatusui.cpp precomp.h) +file(GLOB netshell_rc_deps res/*.*) +add_rc_deps(netshell.rc ${netshell_rc_deps}) + add_library(netshell SHARED ${SOURCE} netshell.rc Modified: trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/CMa… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:37:23 2015 @@ -14,6 +14,9 @@ spec2def(ntobjshex.dll ntobjshex.spec) +file(GLOB_RECURSE ntobjshex_rc_deps resources/*.*) +add_rc_deps(ntobjshex.rc ${ntobjshex_rc_deps}) + add_library(ntobjshex SHARED ntobjenum.cpp ntobjfolder.cpp @@ -21,9 +24,6 @@ ntobjshex.rc regfolder.cpp ${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def) - -list(APPEND atl_rc_deps - ${CMAKE_CURRENT_SOURCE_DIR}/resources/rgs/ntobjectfolder.rgs) set_module_type(ntobjshex win32dll UNICODE) target_link_libraries(ntobjshex uuid wine atlnew) Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/CMak… ============================================================================== --- trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:37:23 2015 @@ -13,6 +13,9 @@ ${REACTOS_SOURCE_DIR}) spec2def(stobject.dll stobject.spec) + +file(GLOB_RECURSE stobject_rc_deps resources/*.*) +add_rc_deps(stobject.rc ${stobject_rc_deps}) add_library(stobject SHARED csystray.cpp

9 years, 2 months

[akhaldi] 69385: [CPLS] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 27 18:30:39 2015 New Revision: 69385 URL: http://svn.reactos.org/svn/reactos?rev=69385&view=rev Log: [CPLS] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/dll/cpl/access/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt trunk/reactos/dll/cpl/input/CMakeLists.txt trunk/reactos/dll/cpl/intl/CMakeLists.txt trunk/reactos/dll/cpl/joy/CMakeLists.txt trunk/reactos/dll/cpl/main/CMakeLists.txt trunk/reactos/dll/cpl/mmsys/CMakeLists.txt trunk/reactos/dll/cpl/powercfg/CMakeLists.txt trunk/reactos/dll/cpl/sysdm/CMakeLists.txt trunk/reactos/dll/cpl/telephon/CMakeLists.txt trunk/reactos/dll/cpl/timedate/CMakeLists.txt trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt Modified: trunk/reactos/dll/cpl/access/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/access/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -10,6 +10,8 @@ sound.c access.h) +add_rc_deps(access.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico) + add_library(access SHARED ${SOURCE} access.rc Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -12,6 +12,9 @@ createlink.c appwiz.h) +file(GLOB appwiz_rc_deps resources/*.*) +add_rc_deps(appwiz.rc ${appwiz_rc_deps}) + add_library(appwiz SHARED ${SOURCE} appwiz.rc Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -12,6 +12,8 @@ colors.c console.h) +add_rc_deps(console.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/terminal.ico) + add_library(console SHARED ${SOURCE} console.rc Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -23,6 +23,9 @@ muireg.c desk.h) +file(GLOB desk_rc_deps resources/*.*) +add_rc_deps(desk.rc ${desk_rc_deps}) + add_library(desk SHARED ${SOURCE} guid.c Modified: trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -1,5 +1,7 @@ spec2def(hdwwiz.cpl hdwwiz.spec) +file(GLOB hdwwiz_rc_deps resources/*.*) +add_rc_deps(hdwwiz.rc ${hdwwiz_rc_deps}) add_library(hdwwiz SHARED hdwwiz.c Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -8,6 +8,9 @@ general.c security.c inetcpl.h) + +file(GLOB inetcpl_rc_deps resources/*.*) +add_rc_deps(inetcpl.rc ${inetcpl_rc_deps}) add_library(inetcpl SHARED ${SOURCE} Modified: trunk/reactos/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/cpl/input/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -10,6 +10,8 @@ changekeyseq.c input.h) +add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico) + add_library(input SHARED ${SOURCE} input.rc Modified: trunk/reactos/dll/cpl/intl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/intl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -16,6 +16,8 @@ sort.c intl.h) +add_rc_deps(intl.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico) + add_library(intl SHARED ${SOURCE} intl.rc Modified: trunk/reactos/dll/cpl/joy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/cpl/joy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -1,5 +1,6 @@ spec2def(joy.cpl joy.spec) +add_rc_deps(joy.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico) add_library(joy SHARED joy.c Modified: trunk/reactos/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/cpl/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -6,6 +6,9 @@ main.c mouse.c main.h) + +file(GLOB main_rc_deps resources/*.*) +add_rc_deps(main.rc ${main_rc_deps}) add_library(main SHARED ${SOURCE} Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -9,6 +9,9 @@ voice.c mmsys.h) +file(GLOB mmsys_rc_deps resources/*.*) +add_rc_deps(mmsys.rc ${mmsys_rc_deps}) + add_library(mmsys SHARED ${SOURCE} mmsys.rc Modified: trunk/reactos/dll/cpl/powercfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/CMakeList… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -9,6 +9,9 @@ hibernate.c powercfg.h) +file(GLOB powercfg_rc_deps resources/*.*) +add_rc_deps(powercfg.rc ${powercfg_rc_deps}) + add_library(powercfg SHARED ${SOURCE} powercfg.rc Modified: trunk/reactos/dll/cpl/sysdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -14,6 +14,9 @@ virtmem.c precomp.h) +file(GLOB sysdm_rc_deps resources/*.*) +add_rc_deps(sysdm.rc ${sysdm_rc_deps}) + add_library(sysdm SHARED ${SOURCE} sysdm.rc Modified: trunk/reactos/dll/cpl/telephon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/CMakeList… ============================================================================== --- trunk/reactos/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -1,5 +1,6 @@ spec2def(telephon.cpl telephon.spec) +add_rc_deps(telephon.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/applet.ico) add_library(telephon SHARED telephon.c Modified: trunk/reactos/dll/cpl/timedate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/CMakeList… ============================================================================== --- trunk/reactos/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -11,6 +11,9 @@ timezone.c timedate.h) +file(GLOB timedate_rc_deps resources/*.*) +add_rc_deps(timedate.rc ${timedate_rc_deps}) + add_library(timedate SHARED ${SOURCE} timedate.rc Modified: trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/CMakeLists.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -12,6 +12,9 @@ usrmgr.c usrmgr.h) +file(GLOB usrmgr_rc_deps resources/*.*) +add_rc_deps(usrmgr.rc ${usrmgr_rc_deps}) + add_library(usrmgr SHARED ${SOURCE} usrmgr.rc Modified: trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/CMakeLi… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:30:39 2015 @@ -5,6 +5,8 @@ wined3dcfg.c general.c wined3dcfg.h) + +add_rc_deps(wined3dcfg.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/wined3dcfg.ico) add_library(wined3dcfg SHARED ${SOURCE}

9 years, 2 months

[akhaldi] 69384: [MMDEVAPI_WINETEST] Add missing dxsdk dependency.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 27 18:25:34 2015 New Revision: 69384 URL: http://svn.reactos.org/svn/reactos?rev=69384&view=rev Log: [MMDEVAPI_WINETEST] Add missing dxsdk dependency. Modified: trunk/rostests/winetests/mmdevapi/CMakeLists.txt Modified: trunk/rostests/winetests/mmdevapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/mmdevapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mmdevapi/CMakeLists.txt [iso-8859-1] Sun Sep 27 18:25:34 2015 @@ -13,4 +13,5 @@ set_module_type(mmdevapi_winetest win32cui) target_link_libraries(mmdevapi_winetest uuid) add_importlibs(mmdevapi_winetest ole32 user32 advapi32 msvcrt kernel32 ntdll) +add_dependencies(mmdevapi_winetest dxsdk) add_cd_file(TARGET mmdevapi_winetest DESTINATION reactos/bin FOR all)

9 years, 2 months

[tfaber] 69383: [NTOS:EX] - Remove push lock asserts that are prone to race conditions CORE-10267 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Sep 27 17:40:23 2015 New Revision: 69383 URL: http://svn.reactos.org/svn/reactos?rev=69383&view=rev Log: [NTOS:EX] - Remove push lock asserts that are prone to race conditions CORE-10267 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sun Sep 27 17:40:23 2015 @@ -1032,7 +1032,6 @@ /* Sanity checks */ ASSERT(PushLock->Locked); - ASSERT(PushLock->Waiting || PushLock->Shared > 0); } /*++ @@ -1133,7 +1132,6 @@ /* Sanity checks */ ASSERT(PushLock->Locked); - ASSERT(PushLock->Waiting || PushLock->Shared > 0); /* Try to clear the pushlock */ OldValue.Value = EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_SHARE_INC; @@ -1173,7 +1171,6 @@ /* Sanity checks */ ASSERT(PushLock->Locked); - ASSERT(PushLock->Waiting || PushLock->Shared == 0); /* Unlock the pushlock */ OldValue.Value = InterlockedExchangeAddSizeT((PSIZE_T)PushLock,

9 years, 2 months

[hbelusca] 69382: [NTVDM]: Update the read/write flag of the mounted image: fixes errors when trying to write to the read-only image. Now we correctly return a "write-protected" disk error.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Sep 27 17:39:29 2015 New Revision: 69382 URL: http://svn.reactos.org/svn/reactos?rev=69382&view=rev Log: [NTVDM]: Update the read/write flag of the mounted image: fixes errors when trying to write to the read-only image. Now we correctly return a "write-protected" disk error. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sun Sep 27 17:39:29 2015 @@ -581,6 +581,10 @@ DisplayMessage(L"MountDisk: Failed to mount disk file '%S' in 0x%p.", FileName, DiskImage); goto Quit; } + + /* Update its read/write state */ + DiskImage->ReadOnly = ReadOnly; + Success = TRUE; Quit:

9 years, 2 months

[rnaumann] 69381: [WINMINE] Improve the mine bitmap. By Jared Smudde. CORE-10251

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Sun Sep 27 17:35:54 2015 New Revision: 69381 URL: http://svn.reactos.org/svn/reactos?rev=69381&view=rev Log: [WINMINE] Improve the mine bitmap. By Jared Smudde. CORE-10251 Modified: trunk/reactos/base/applications/games/winmine/rc/mines.bmp Modified: trunk/reactos/base/applications/games/winmine/rc/mines.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== Binary files - no diff available.

9 years, 2 months

← Newer
1
2
3
4
5
6
7
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015