Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/02: [APISETS] Update the script to take the current newline setting into account.
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15affd19ee8ce8cb2c875… commit 15affd19ee8ce8cb2c875a43822788d465acd6cb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 11:10:11 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:30:44 2018 +0200 [APISETS] Update the script to take the current newline setting into account. --- dll/apisets/update.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dll/apisets/update.py b/dll/apisets/update.py index 2d7ce387a7..dc14a162aa 100644 --- a/dll/apisets/update.py +++ b/dll/apisets/update.py @@ -14,6 +14,8 @@ import subprocess SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) +NL_CHAR = '\n' + IGNORE_OPTIONS = ('-norelay', '-ret16', '-ret64', '-register', '-private', '-noname', '-ordinal', '-i386', '-arch=', '-stub') @@ -234,7 +236,7 @@ class SpecEntry(object): assert self._ord != '@' name = 'Ordinal' + self._ord if not self._forwarder: - spec_file.write('{} stub{} {}\n'.format(self._ord, opts, name)) + spec_file.write('{} stub{} {}{}'.format(self._ord, opts, name, NL_CHAR)) estimate_size += 0x1000 else: assert self.arch != Arch(), self.name @@ -256,12 +258,13 @@ class SpecEntry(object): fwd = '{}._imp__{}'.format(*self._forwarder) if arch != Arch(Arch.Any): opts = '{} -arch={}'.format(opts, arch.to_str()) - spec_file.write('{ord} {cc}{opts} {name}{args} {fwd}\n'.format(ord=self._ord, - cc=callconv, - opts=opts, - name=name, - args=args, - fwd=fwd)) + spec_file.write('{ord} {cc}{opts} {name}{args} {fwd}{nl}'.format(ord=self._ord, + cc=callconv, + opts=opts, + name=name, + args=args, + fwd=fwd, + nl=NL_CHAR)) estimate_size += 0x100 return estimate_size @@ -353,7 +356,7 @@ class SpecFile(object): fwd_strings = ' '.join(fwd_strings) name = self.name baseaddress = '0x{:8x}'.format(baseaddress) - cmakelists.write('add_apiset({} {} {})\n'.format(name, baseaddress, fwd_strings)) + cmakelists.write('add_apiset({} {} {}){}'.format(name, baseaddress, fwd_strings, NL_CHAR)) return self._estimate_size @@ -377,6 +380,7 @@ def generate_specnames(dll_dir): yield (os.path.join(dll_dir, '..', 'win32ss', 'gdi', 'gdi32', 'gdi32.spec'), 'gdi32') def run(wineroot): + global NL_CHAR wine_apisets = [] ros_modules = [] @@ -426,16 +430,21 @@ def run(wineroot): total = tuple(map(sum, zip(apiset.extra_forwarders(function_lookup, module_lookup), total))) print 'found', total[0], '/', total[1], 'forwarders' + with open(os.path.join(SCRIPT_DIR, 'CMakeLists.txt.in'), 'rb') as template: + data = template.read() + data = data.replace('%WINE_GIT_VERSION%', version) + # Detect the checkout newline settings + if '\r\n' in data: + NL_CHAR = '\r\n' + print 'Writing apisets' + spec_header = [line.replace('\n', NL_CHAR) for line in SPEC_HEADER] for apiset in wine_apisets: with open(os.path.join(SCRIPT_DIR, apiset.name + '.spec'), 'wb') as out_spec: - out_spec.writelines(SPEC_HEADER) + out_spec.writelines(spec_header) apiset.write(out_spec) print 'Writing CMakeLists.txt' - with open(os.path.join(SCRIPT_DIR, 'CMakeLists.txt.in'), 'rb') as template: - data = template.read() - data = data.replace('%WINE_GIT_VERSION%', version) baseaddress = 0x60000000 with open(os.path.join(SCRIPT_DIR, 'CMakeLists.txt'), 'wb') as cmakelists: cmakelists.write(data)

1 0

01/02: [KERNEL32_VISTA] Export InitializeCriticalSectionEx.
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aefc6f49a048c2d8b6ab… commit 5aefc6f49a048c2d8b6ab91fbcda792dee63191b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 8 11:09:54 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:30:44 2018 +0200 [KERNEL32_VISTA] Export InitializeCriticalSectionEx. --- dll/apisets/api-ms-win-core-synch-l1-1-0.spec | 2 +- dll/apisets/api-ms-win-core-synch-l1-2-0.spec | 2 +- dll/apisets/api-ms-win-core-synch-l1-2-1.spec | 2 +- dll/win32/kernel32_vista/k32_vista.h | 1 + dll/win32/kernel32_vista/kernel32_vista.spec | 2 ++ dll/win32/kernel32_vista/sync.c | 28 +++++++++++++++++++++++++++ 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dll/apisets/api-ms-win-core-synch-l1-1-0.spec b/dll/apisets/api-ms-win-core-synch-l1-1-0.spec index ab22da2ec4..de4c2f4f3e 100644 --- a/dll/apisets/api-ms-win-core-synch-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-synch-l1-1-0.spec @@ -18,7 +18,7 @@ @ stdcall EnterCriticalSection() kernel32.EnterCriticalSection @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount -@ stub InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock @ stdcall LeaveCriticalSection() kernel32.LeaveCriticalSection @ stdcall OpenEventA() kernel32.OpenEventA diff --git a/dll/apisets/api-ms-win-core-synch-l1-2-0.spec b/dll/apisets/api-ms-win-core-synch-l1-2-0.spec index 78f9a6137c..778abd9aad 100644 --- a/dll/apisets/api-ms-win-core-synch-l1-2-0.spec +++ b/dll/apisets/api-ms-win-core-synch-l1-2-0.spec @@ -25,7 +25,7 @@ @ stdcall InitializeConditionVariable() kernel32_vista.InitializeConditionVariable @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount -@ stub InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock @ stub InitializeSynchronizationBarrier @ stdcall LeaveCriticalSection() kernel32.LeaveCriticalSection diff --git a/dll/apisets/api-ms-win-core-synch-l1-2-1.spec b/dll/apisets/api-ms-win-core-synch-l1-2-1.spec index 37270fd434..d147b86c29 100644 --- a/dll/apisets/api-ms-win-core-synch-l1-2-1.spec +++ b/dll/apisets/api-ms-win-core-synch-l1-2-1.spec @@ -23,7 +23,7 @@ @ stdcall InitializeConditionVariable() kernel32_vista.InitializeConditionVariable @ stdcall InitializeCriticalSection() kernel32.InitializeCriticalSection @ stdcall InitializeCriticalSectionAndSpinCount() kernel32.InitializeCriticalSectionAndSpinCount -@ stub InitializeCriticalSectionEx +@ stdcall InitializeCriticalSectionEx() kernel32_vista.InitializeCriticalSectionEx @ stdcall InitializeSRWLock() kernel32_vista.InitializeSRWLock @ stub InitializeSynchronizationBarrier @ stub InitOnceBeginInitialize diff --git a/dll/win32/kernel32_vista/k32_vista.h b/dll/win32/kernel32_vista/k32_vista.h index 45c8bfe4c8..fff9ba8d0b 100644 --- a/dll/win32/kernel32_vista/k32_vista.h +++ b/dll/win32/kernel32_vista/k32_vista.h @@ -8,4 +8,5 @@ #include <ndk/kefuncs.h> #include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> diff --git a/dll/win32/kernel32_vista/kernel32_vista.spec b/dll/win32/kernel32_vista/kernel32_vista.spec index caa7adcf7f..f61e6e6dc3 100644 --- a/dll/win32/kernel32_vista/kernel32_vista.spec +++ b/dll/win32/kernel32_vista/kernel32_vista.spec @@ -14,3 +14,5 @@ @ stdcall SleepConditionVariableSRW(ptr ptr long long) @ stdcall WakeAllConditionVariable(ptr) @ stdcall WakeConditionVariable(ptr) + +@ stdcall InitializeCriticalSectionEx(ptr long long) diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32_vista/sync.c index a13f984f34..17d394955d 100644 --- a/dll/win32/kernel32_vista/sync.c +++ b/dll/win32/kernel32_vista/sync.c @@ -148,3 +148,31 @@ WakeConditionVariable(PCONDITION_VARIABLE ConditionVariable) { RtlWakeConditionVariable((PRTL_CONDITION_VARIABLE)ConditionVariable); } + + +/* +* @implemented +*/ +BOOL WINAPI InitializeCriticalSectionEx(OUT LPCRITICAL_SECTION lpCriticalSection, + IN DWORD dwSpinCount, + IN DWORD flags) +{ + NTSTATUS Status; + + /* FIXME: Flags ignored */ + + /* Initialize the critical section */ + Status = RtlInitializeCriticalSectionAndSpinCount( + (PRTL_CRITICAL_SECTION)lpCriticalSection, + dwSpinCount); + if (!NT_SUCCESS(Status)) + { + /* Set failure code */ + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Success */ + return TRUE; +} +

1 0

01/01: [KERNEL32] Implement FlsAlloc/FlsFree based on Wine's implementation.
by Mark Jansen 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac620c2e8ea7a14e7175c… commit ac620c2e8ea7a14e7175ce32d1bfa74585f9ff36 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 7 23:41:53 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 17:27:24 2018 +0200 [KERNEL32] Implement FlsAlloc/FlsFree based on Wine's implementation. --- dll/apisets/api-ms-win-core-fibers-l1-1-0.spec | 8 +- dll/apisets/api-ms-win-core-fibers-l1-1-1.spec | 8 +- dll/win32/kernel32/client/fiber.c | 148 ++++++++++++++++--------- dll/win32/kernel32/kernel32.spec | 8 +- 4 files changed, 105 insertions(+), 67 deletions(-) diff --git a/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec b/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec index 32edaf83d2..4c4d859ad5 100644 --- a/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-fibers-l1-1-0.spec @@ -1,7 +1,7 @@ # This file is autogenerated by update.py -@ stub FlsAlloc -@ stub FlsFree -@ stub FlsGetValue -@ stub FlsSetValue +@ stdcall FlsAlloc() kernel32.FlsAlloc +@ stdcall FlsFree() kernel32.FlsFree +@ stdcall FlsGetValue() kernel32.FlsGetValue +@ stdcall FlsSetValue() kernel32.FlsSetValue diff --git a/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec b/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec index f29bdf3060..504e62c345 100644 --- a/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec +++ b/dll/apisets/api-ms-win-core-fibers-l1-1-1.spec @@ -1,8 +1,8 @@ # This file is autogenerated by update.py -@ stub FlsAlloc -@ stub FlsFree -@ stub FlsGetValue -@ stub FlsSetValue +@ stdcall FlsAlloc() kernel32.FlsAlloc +@ stdcall FlsFree() kernel32.FlsFree +@ stdcall FlsGetValue() kernel32.FlsGetValue +@ stdcall FlsSetValue() kernel32.FlsSetValue @ stub IsThreadAFiber diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c index 8daa28e1de..ce6cd2d150 100644 --- a/dll/win32/kernel32/client/fiber.c +++ b/dll/win32/kernel32/client/fiber.c @@ -312,32 +312,97 @@ IsThreadAFiber(VOID) } /* - * @unimplemented + * @implemented */ DWORD WINAPI FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) { - (void)lpCallback; + DWORD dwFlsIndex; + PPEB Peb = NtCurrentPeb(); + PVOID *ppFlsSlots; - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FLS_OUT_OF_INDEXES; + RtlAcquirePebLock(); + + ppFlsSlots = NtCurrentTeb()->FlsData; + + if (!Peb->FlsCallback && + !(Peb->FlsCallback = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + FLS_MAXIMUM_AVAILABLE * sizeof(PVOID)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwFlsIndex = FLS_OUT_OF_INDEXES; + } + else + { + dwFlsIndex = RtlFindClearBitsAndSet(Peb->FlsBitmap, 1, 1); + if (dwFlsIndex != FLS_OUT_OF_INDEXES) + { + if (!ppFlsSlots && + !(ppFlsSlots = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + (FLS_MAXIMUM_AVAILABLE + 2) * sizeof(PVOID)))) + { + RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); + dwFlsIndex = FLS_OUT_OF_INDEXES; + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + if (!NtCurrentTeb()->FlsData) + NtCurrentTeb()->FlsData = ppFlsSlots; + + if (lpCallback) + DPRINT1("FlsAlloc: Got lpCallback 0x%p, UNIMPLEMENTED!", lpCallback); + + ppFlsSlots[dwFlsIndex + 2] = NULL; /* clear the value */ + Peb->FlsCallback[dwFlsIndex] = lpCallback; + } + } + else + { + SetLastError(ERROR_NO_MORE_ITEMS); + } + } + RtlReleasePebLock(); + return dwFlsIndex; } /* - * @unimplemented + * @implemented */ BOOL WINAPI FlsFree(DWORD dwFlsIndex) { - (void)dwFlsIndex; + BOOL ret; + PPEB Peb = NtCurrentPeb(); + PVOID *ppFlsSlots; + + if (dwFlsIndex >= FLS_MAXIMUM_AVAILABLE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + RtlAcquirePebLock(); + + ppFlsSlots = NtCurrentTeb()->FlsData; + ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1); + if (ret) + { + RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1); + /* FIXME: call Fls callback */ + /* FIXME: add equivalent of ThreadZeroTlsCell here */ + if (ppFlsSlots) + ppFlsSlots[dwFlsIndex + 2] = NULL; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + RtlReleasePebLock(); + return ret; } @@ -349,22 +414,16 @@ WINAPI FlsGetValue(DWORD dwFlsIndex) { PVOID *ppFlsSlots; - PVOID pRetVal; - - if(dwFlsIndex >= 128) goto l_InvalidParam; ppFlsSlots = NtCurrentTeb()->FlsData; + if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE || !ppFlsSlots) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } - if(ppFlsSlots == NULL) goto l_InvalidParam; - - SetLastError(0); - pRetVal = ppFlsSlots[dwFlsIndex + 2]; - - return pRetVal; - -l_InvalidParam: - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; + SetLastError(ERROR_SUCCESS); + return ppFlsSlots[dwFlsIndex + 2]; } @@ -377,43 +436,22 @@ FlsSetValue(DWORD dwFlsIndex, PVOID lpFlsData) { PVOID *ppFlsSlots; - TEB *pTeb = NtCurrentTeb(); - - if(dwFlsIndex >= 128) goto l_InvalidParam; - ppFlsSlots = pTeb->FlsData; - - if (ppFlsSlots == NULL) + if (!dwFlsIndex || dwFlsIndex >= FLS_MAXIMUM_AVAILABLE) { - PEB *pPeb = pTeb->ProcessEnvironmentBlock; - - ppFlsSlots = RtlAllocateHeap(pPeb->ProcessHeap, - HEAP_ZERO_MEMORY, - (128 + 2) * sizeof(PVOID)); - if(ppFlsSlots == NULL) goto l_OutOfMemory; - - pTeb->FlsData = ppFlsSlots; - - RtlAcquirePebLock(); - - /* TODO: initialization */ - - RtlReleasePebLock(); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - + if (!NtCurrentTeb()->FlsData && + !(NtCurrentTeb()->FlsData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, + (FLS_MAXIMUM_AVAILABLE + 2) * sizeof(PVOID)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + ppFlsSlots = NtCurrentTeb()->FlsData; ppFlsSlots[dwFlsIndex + 2] = lpFlsData; - return TRUE; - -l_OutOfMemory: - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto l_Fail; - -l_InvalidParam: - SetLastError(ERROR_INVALID_PARAMETER); - -l_Fail: - return FALSE; } /* EOF */ diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 923545416f..25b47afc8e 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -235,10 +235,10 @@ 231 stdcall FindResourceW(long wstr wstr) 232 stdcall FindVolumeClose(ptr) 233 stdcall FindVolumeMountPointClose(ptr) -;234 stdcall FlsAlloc(ptr) -;235 stdcall FlsFree(long) -;236 stdcall FlsGetValue(long) -;237 stdcall FlsSetValue(long ptr) +234 stdcall FlsAlloc(ptr) +235 stdcall FlsFree(long) +236 stdcall FlsGetValue(long) +237 stdcall FlsSetValue(long ptr) 238 stdcall FlushConsoleInputBuffer(long) 239 stdcall FlushFileBuffers(long) 240 stdcall FlushInstructionCache(long long long)

1 0

01/01: [USERSRV] HardError: Fix compilation warning; fix few comments; fix the default empty window title string.
by Hermès Bélusca-Maïto 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75e80632d1c1352eafee6… commit 75e80632d1c1352eafee6226ab759fe72c992d78 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 8 16:15:56 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 8 16:15:56 2018 +0200 [USERSRV] HardError: Fix compilation warning; fix few comments; fix the default empty window title string. --- win32ss/user/winsrv/usersrv/harderror.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/win32ss/user/winsrv/usersrv/harderror.c b/win32ss/user/winsrv/usersrv/harderror.c index 62864ca695..7cc3a67ca4 100644 --- a/win32ss/user/winsrv/usersrv/harderror.c +++ b/win32ss/user/winsrv/usersrv/harderror.c @@ -175,8 +175,8 @@ UserpCaptureStringParameters( } else { - /* Allocate a buffer for converted to ANSI string */ - TempStringA.MaximumLength = RtlUnicodeStringToAnsiSize(&TempStringU); + /* Allocate a buffer for conversion to ANSI string */ + TempStringA.MaximumLength = (USHORT)RtlUnicodeStringToAnsiSize(&TempStringU); TempStringA.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TempStringA.MaximumLength); @@ -542,7 +542,7 @@ UserpFormatMessages( * Fall back to unknown hard error format string. * NOTE: The value used here is ReactOS-specific: it allows specifying * the exact hard error status value and the parameters, contrary to - * the one on Windows which only says: "Unknown Hard Error". + * the one on Windows that only says: "Unknown Hard Error". */ RtlInitEmptyUnicodeString(&FormatU, NULL, 0); FormatA.Buffer = NULL; @@ -585,7 +585,7 @@ UserpFormatMessages( } /* Retrieve the window title of the client, if it has one */ - RtlInitEmptyUnicodeString(&WindowTitleU, NULL, 0); + RtlInitEmptyUnicodeString(&WindowTitleU, L"", 0); hwndOwner = NULL; EnumThreadWindows(HandleToUlong(Message->h.ClientId.UniqueThread), FindTopLevelWnd, (LPARAM)&hwndOwner); @@ -595,22 +595,19 @@ UserpFormatMessages( if (cszBuffer != 0) { cszBuffer += 3; // 2 characters for ": " and a NULL terminator. - WindowTitleU.MaximumLength = (USHORT)(cszBuffer * sizeof(WCHAR)); - WindowTitleU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - WindowTitleU.MaximumLength); - if (WindowTitleU.Buffer) + cszBuffer *= sizeof(WCHAR); + pszBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + cszBuffer); + if (pszBuffer) { + RtlInitEmptyUnicodeString(&WindowTitleU, pszBuffer, (USHORT)cszBuffer); cszBuffer = GetWindowTextW(hwndOwner, WindowTitleU.Buffer, WindowTitleU.MaximumLength / sizeof(WCHAR)); WindowTitleU.Length = (USHORT)(cszBuffer * sizeof(WCHAR)); RtlAppendUnicodeToString(&WindowTitleU, L": "); } - else - { - RtlInitEmptyUnicodeString(&WindowTitleU, NULL, 0); - } } } @@ -636,7 +633,7 @@ UserpFormatMessages( CaptionStringU->Length = 0; CaptionStringU->Buffer[0] = UNICODE_NULL; - /* Append the file name, the separator and the caption text */ + /* Build the caption */ RtlStringCbPrintfW(CaptionStringU->Buffer, CaptionStringU->MaximumLength, L"%wZ%wZ - %wZ",

1 0

01/01: [ZIPFLDR] Typo fix
by Bișoc George 08 Apr '18

08 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10e4517ff87d9bc596b37… commit 10e4517ff87d9bc596b37cdce996783a97c50dee Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 8 11:34:13 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 8 12:08:06 2018 +0200 [ZIPFLDR] Typo fix --- dll/shellext/zipfldr/zipfldr.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 0b577b5f3e..b9f93eecf7 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -24,7 +24,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Select a Destination" FONT 8, "MS Shell Dlg", 400, 0, 0x0 BEGIN - LTEXT "Select the destionation directory",IDC_STATIC,6,12,174,8 + LTEXT "Select the destination directory",IDC_STATIC,6,12,174,8 EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Browse...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14

1 0

02/02: [EXPLORER] Implement the feature of cleanly shutting down the explorer shell when cancelling the shutdown-dialog while pressing the CTRL-ALT-SHIFT keys.
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c62bccdda030ad8845429… commit c62bccdda030ad88454297af2f4611232435f609 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 8 00:33:23 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 8 00:36:56 2018 +0200 [EXPLORER] Implement the feature of cleanly shutting down the explorer shell when cancelling the shutdown-dialog while pressing the CTRL-ALT-SHIFT keys. See the feature description in https://msdn.microsoft.com/en-us/library/windows/desktop/cc144064(v=vs.85).… and the additional observations reported in CORE-14358 . --- base/shell/explorer/traywnd.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 2bbe3c5d61..4095bc1046 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -327,7 +327,19 @@ public: LRESULT DoExitWindows() { + /* Display the ReactOS Shutdown Dialog */ ExitWindowsDialog(m_hWnd); + + /* + * If the user presses CTRL+ALT+SHIFT while exiting + * the shutdown dialog, exit the shell cleanly. + */ + if ((GetKeyState(VK_CONTROL) & 0x8000) && + (GetKeyState(VK_SHIFT) & 0x8000) && + (GetKeyState(VK_MENU) & 0x8000)) + { + PostMessage(WM_QUIT, 0, 0); + } return 0; }

1 0

01/02: [EXPLORER] Remove trailing whitespace.
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6093abdebb6bf4c1abf46… commit 6093abdebb6bf4c1abf46acad4d3b01087fb4189 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 8 00:32:11 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 8 00:36:51 2018 +0200 [EXPLORER] Remove trailing whitespace. --- base/shell/explorer/explorer.cpp | 4 ++-- base/shell/explorer/taskswnd.cpp | 2 +- base/shell/explorer/traywnd.cpp | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp index f6e7402423..a596da1db7 100644 --- a/base/shell/explorer/explorer.cpp +++ b/base/shell/explorer/explorer.cpp @@ -87,7 +87,7 @@ HideMinimizedWindows(IN BOOL bHide) #endif #if !WIN7_COMPAT_MODE -static INT +static INT StartWithCommandLine(IN HINSTANCE hInstance) { BOOL b = FALSE; @@ -109,7 +109,7 @@ StartWithCommandLine(IN HINSTANCE hInstance) } #endif -static INT +static INT StartWithDesktop(IN HINSTANCE hInstance) { InitializeAtlModule(hInstance, TRUE); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 60b047a7dc..fe8ec05ac6 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -125,7 +125,7 @@ public: if (m_bThreadRunning) { /* Try to unstuck Show */ - PostThreadMessage(m_ThreadId, WM_QUIT, 0, 0); + PostThreadMessage(m_ThreadId, WM_QUIT, 0, 0); DWORD ret = WaitForSingleObject(m_hThread, 3*1000); if (ret == WAIT_TIMEOUT) TerminateThread(m_hThread, 0); diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 47da09b558..2bbe3c5d61 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -544,7 +544,7 @@ public: case IDHK_EXPLORE: //FIXME: We don't support this yet: //ShellExecuteW(0, L"explore", NULL, NULL, NULL, 1); - ShellExecuteW(0, NULL, L"explorer.exe", L"/e ,", NULL, 1); + ShellExecuteW(0, NULL, L"explorer.exe", L"/e ,", NULL, 1); break; case IDHK_FIND: SHFindFiles(NULL, NULL); @@ -1311,8 +1311,8 @@ ChangePos: FitToRebar(&m_TrayRects[m_Position]); /* Move the tray window */ - /* The handler of WM_WINDOWPOSCHANGING will override whatever size - *and position we use here with m_TrayRects */ + /* The handler of WM_WINDOWPOSCHANGING will override whatever size + * and position we use here with m_TrayRects */ SetWindowPos(NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE); ResizeWorkArea(); ApplyClipping(TRUE); @@ -2012,7 +2012,7 @@ ChangePos: if (!m_ContextMenu) return E_INVALIDARG; - return m_ContextMenu->GetCommandString(idCmd, uType, pwReserved, pszName, cchMax); + return m_ContextMenu->GetCommandString(idCmd, uType, pwReserved, pszName, cchMax); } @@ -2396,7 +2396,7 @@ ChangePos: LRESULT OnNcLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - /* This handler implements the trick that makes the start button to + /* This handler implements the trick that makes the start button to get pressed when the user clicked left or below the button */ POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; @@ -2705,14 +2705,14 @@ HandleTrayContextMenu: RECT rc; ::GetWindowRect(m_hWnd, &rc); - SIZE szWindow = { - rc.right - rc.left, + SIZE szWindow = { + rc.right - rc.left, rc.bottom - rc.top }; - SIZE szTarget = { - as->rcTarget.right - as->rcTarget.left, + SIZE szTarget = { + as->rcTarget.right - as->rcTarget.left, as->rcTarget.bottom - as->rcTarget.top }; - SIZE szActual = { - as->rcActual.right - as->rcActual.left, + SIZE szActual = { + as->rcActual.right - as->rcActual.left, as->rcActual.bottom - as->rcActual.top }; SIZE borders = { @@ -2976,7 +2976,7 @@ public: return S_OK; } - virtual HRESULT STDMETHODCALLTYPE + virtual HRESULT STDMETHODCALLTYPE QueryContextMenu(HMENU hPopup, UINT indexMenu, UINT idCmdFirst,

1 0

01/01: [MSGINA] Add the shutdown reason dialog but keep it disabled by default
by Eric Kohl 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4453f72ef80d86f0c6e83… commit 4453f72ef80d86f0c6e83d80210ab4911b268510 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 7 20:47:10 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 7 22:26:46 2018 +0200 [MSGINA] Add the shutdown reason dialog but keep it disabled by default --- dll/win32/msgina/lang/bg-BG.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/cs-CZ.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/de-DE.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/en-US.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/es-ES.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/fr-FR.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/he-IL.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/id-ID.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/it-IT.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/ja-JP.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/no-NO.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/pl-PL.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/ro-RO.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/ru-RU.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/sk-SK.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/sq-AL.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/tr-TR.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/uk-UA.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/zh-CN.rc | 27 +++++++++++++++++ dll/win32/msgina/lang/zh-TW.rc | 27 +++++++++++++++++ dll/win32/msgina/resource.h | 5 ++++ dll/win32/msgina/shutdown.c | 68 ++++++++++++++++++++++++++++++++++++++++-- 22 files changed, 611 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 3bac3b26f5..c01b2d09d2 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "Помо&щ", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Изключване на РеактОС" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Какво искате да направи компютъра?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Добре", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Отказ", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "Добре", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Отказ", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "Помо&щ", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index 2eee9560ee..4890687273 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -137,6 +137,33 @@ BEGIN // PUSHBUTTON "&Nápověda", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vypnout ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co má počítač provést?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Storno", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Storno", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Nápověda", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index 03b369d6bf..0e547ef8c5 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "&Hilfe", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ReactOS herunterfahren" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Ereignisprotokollierung", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Wählen Sie die Option, die am besten beschreibt, warum der Computer heruntergefahren werden soll.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Geplant", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Kommentar:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Abbrechen", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Abbrechen", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Hilfe", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index 519612a5b9..249ecf2ba1 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -133,6 +133,33 @@ BEGIN // PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Cancel", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Help", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index a52079424a..aad7d12372 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -133,6 +133,33 @@ BEGIN // PUSHBUTTON "&Ayuda", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Apagar ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "¿&Qué desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "Aceptar", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Cancelar", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Ayuda", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 8dd4fe6eef..4001427e03 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "&Aide", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Fermer ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Annuler", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Aide", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index 0b9fda10c9..fabb061d1f 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Cancel", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Help", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 1736489b33..994e5ac515 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Cancel", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Help", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 6068cdd450..d669ff5d20 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -141,6 +141,33 @@ BEGIN // PUSHBUTTON "&Aiuto", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Spegnimento di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Annulla", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Aiuto", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 279f56c68d..ec343314a8 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "ヘルプ(&H)", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "ReactOSのシャットダウン" +FONT 9,"MS UI Gothic", 400, 0, 1 +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&コンピュータの動作を選択してください", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "キャンセル", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "キャンセル", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "ヘルプ(&H)", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index aa5abc3565..387400b678 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -132,6 +132,33 @@ BEGIN // PUSHBUTTON "&Hjelp", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Slå av ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Avbryt", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Avbryt", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Hjelp", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index a969f74c39..519ee034b7 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -142,6 +142,33 @@ BEGIN // PUSHBUTTON "&Pomoc", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Zamknij ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co chcesz, aby zrobił komputer?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Anuluj", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Pomoc", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index 9306d54aa1..19b6e4bd2a 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -141,6 +141,33 @@ BEGIN // PUSHBUTTON "&Manual…", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Închidere ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Ce doriți să se întâmple?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Con&firmă", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "A&nulează", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "Con&firmă", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "A&nulează", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Manual…", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 74e4353cf5..672091e845 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -134,6 +134,33 @@ BEGIN // PUSHBUTTON "&Справка", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Завершение работы ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Выберите желаемое действие:", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Отмена", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Отмена", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Справка", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index f5b8c59954..2bcde2642e 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -137,6 +137,33 @@ BEGIN // PUSHBUTTON "&Pomocník", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Vypnutie systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Čo chcete aby počítač urobil?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Zrušiť", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Zrušiť", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Pomocník", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index 246f946e4c..246f31a847 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -136,6 +136,33 @@ BEGIN // PUSHBUTTON "&Ndihmë", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Anulo", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Anulo", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Ndihmë", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index 8e64071fd0..d8b18636d6 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -134,6 +134,33 @@ BEGIN // PUSHBUTTON "&Yardım", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Bilgisayarı Kapat" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Bilgisayarın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Tamam", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "İptal", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "Tamam", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "İptal", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Yardım", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index f4ba2ff702..5fbfc51a13 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -140,6 +140,33 @@ BEGIN // PUSHBUTTON "&Довідка", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Завершення роботи ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Виберіть одну з таких можливостей?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "Скасувати", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "Скасувати", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "&Довідка", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index c7c5f19402..06ff044c0d 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -135,6 +135,33 @@ BEGIN // PUSHBUTTON "帮助(&H)", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "关闭 ReactOS" +FONT 9, "宋体" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "你想让计算机做什么?(&W)", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "确定", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "取消", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "确定", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "取消", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "帮助(&H)", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index fd9aeab68b..737345ec51 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -134,6 +134,33 @@ BEGIN // PUSHBUTTON "幫助(&H)", IDHELP, 204, 122, 55, 14 END +IDD_SHUTDOWN_REASON DIALOGEX 0, 0, 275, 297 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +// STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "關閉 ReactOS" +FONT 9, "新細明體" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "你想讓計算機做什麼?(&W)", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 190, 27 + GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 9, 122, 257, 146 + LTEXT "Select the option that best describes why you want to shut down your computer.", IDC_STATIC, 39, 134, 190, 17 + LTEXT "&Option:", IDC_STATIC, 39, 154, 80, 8 + AUTOCHECKBOX "&Planned", IDC_REASON_PLANNED, 182, 154, 47, 10 + COMBOBOX IDC_REASON_LIST, 39, 165, 190, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_REASON_DESCRIPTION, 39, 184, 190, 27 + LTEXT "&Comment:", IDC_STATIC, 39, 214, 80, 8 + EDITTEXT IDC_REASON_COMMENT, 39, 224, 190, 35, ES_MULTILINE | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "確定", IDOK, 150, 276, 55, 14, WS_GROUP + PUSHBUTTON "取消", IDCANCEL, 211, 276, 55, 14 + + // DEFPUSHBUTTON "確定", IDOK, 87, 276, 55, 14, WS_GROUP + // PUSHBUTTON "取消", IDCANCEL, 150, 276, 55, 14 + // PUSHBUTTON "幫助(&H)", IDHELP, 211, 276, 55, 14 +END + IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index 61de45d2a9..ffee4c59d1 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -9,6 +9,7 @@ #define IDD_UNLOCK_DLG 105 #define IDD_SHUTDOWN_DLG 108 #define IDD_SHUTDOWN_FANCY 109 +#define IDD_SHUTDOWN_REASON 110 #define IDC_LOGOFF 1001 #define IDC_USERNAME 1002 @@ -25,6 +26,10 @@ #define IDC_LOGON_TO 1013 #define IDC_SHUTDOWN_LIST 1014 #define IDC_SHUTDOWN_DESCRIPTION 1015 +#define IDC_REASON_PLANNED 1016 +#define IDC_REASON_LIST 1017 +#define IDC_REASON_DESCRIPTION 1018 +#define IDC_REASON_COMMENT 1019 #define IDD_CHANGE_PASSWORD 106 #define IDC_CHANGEPWD_USERNAME 1013 diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index 11390e5f88..ca2528a7bb 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -26,8 +26,71 @@ typedef struct _SHUTDOWN_DLG_CONTEXT PGINA_CONTEXT pgContext; DWORD ShutdownOptions; BOOL bCloseDlg; + BOOL bReasonUI; } SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT; + +static +BOOL +GetShutdownReasonUI(VOID) +{ + OSVERSIONINFOEX VersionInfo; + DWORD dwValue, dwSize; + HKEY hKey; + LONG lRet; + + /* Query the policy value */ + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Policies\\Microsoft\\Windows NT\\Reliability", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet == ERROR_SUCCESS) + { + dwValue = 0; + dwSize = sizeof(dwValue); + RegQueryValueExW(hKey, + L"ShutdownReasonUI", + NULL, + NULL, + (LPBYTE)&dwValue, + &dwSize); + RegCloseKey(hKey); + + return (dwValue != 0) ? TRUE : FALSE; + } + + /* Query the machine value */ + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Reliability", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet == ERROR_SUCCESS) + { + dwValue = 0; + dwSize = sizeof(dwValue); + RegQueryValueExW(hKey, + L"ShutdownReasonUI", + NULL, + NULL, + (LPBYTE)&dwValue, + &dwSize); + RegCloseKey(hKey); + + return (dwValue != 0) ? TRUE : FALSE; + } + + /* Return the default value */ + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + if (!GetVersionEx((POSVERSIONINFO)&VersionInfo)) + return FALSE; + + return FALSE; +// return (VersionInfo.wProductType == VER_NT_WORKSTATION) ? FALSE : TRUE; +} + + DWORD LoadShutdownSelState(VOID) { @@ -427,12 +490,13 @@ ShutdownDialog( Context.pgContext = pgContext; Context.ShutdownOptions = ShutdownOptions; Context.bCloseDlg = FALSE; + Context.bReasonUI = GetShutdownReasonUI(); if (pgContext->hWlx && pgContext->pWlxFuncs) { ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), + MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN_DLG), hwndDlg, ShutdownDialogProc, (LPARAM)&Context); @@ -440,7 +504,7 @@ ShutdownDialog( else { ret = DialogBoxParamW(pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), + MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN_DLG), hwndDlg, ShutdownDialogProc, (LPARAM)&Context);

1 0

01/01: [BOOTDATA] Remove 'debugout.sys' mention since this driver has been removed in r26032 (ad07a1e5).
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40d7381e283226adb54db… commit 40d7381e283226adb54dbfbcf860a4a4191e0a8e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 7 22:13:20 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 22:13:42 2018 +0200 [BOOTDATA] Remove 'debugout.sys' mention since this driver has been removed in r26032 (ad07a1e5). --- boot/bootdata/hivesys.inf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 72d0fb8739..2bed731cb6 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1510,13 +1510,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ImagePath",0x00020000,"system32\d HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001 -; Debug output driver -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"Debug" -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system32\drivers\debugout.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001 - ; EMS Serial Administration Console Driver HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS"

1 0

01/01: [EXPLORER] Remove double 'return' statement. Determining whether it should be HTBORDER or HTCLIENT is left as an exercise to the reader. Spotted by 'mudhead'. CORE-14528
by Hermès Bélusca-Maïto 07 Apr '18

07 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eff4c2138d2ad47cf802f… commit eff4c2138d2ad47cf802fd0ed4639ced7830fdec Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 7 19:06:04 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Apr 7 19:06:22 2018 +0200 [EXPLORER] Remove double 'return' statement. Determining whether it should be HTBORDER or HTCLIENT is left as an exercise to the reader. Spotted by 'mudhead'. CORE-14528 --- base/shell/explorer/traywnd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index a3c1f3670f..47da09b558 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2205,8 +2205,7 @@ ChangePos: pt.x = (SHORT) LOWORD(lParam); pt.y = (SHORT) HIWORD(lParam); - if (PtInRect(&rcClient, - pt)) + if (PtInRect(&rcClient, pt)) { /* The user is trying to drag the tray window */ return HTCAPTION; @@ -2236,7 +2235,6 @@ ChangePos: } } return HTBORDER; - return TRUE; } LRESULT OnMoving(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs