Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[hbelusca] 72720: [MSGINA][SHELL32]: Now that CORE-11979 is fixed, automatically close the logoff/shutdown dialog as soon as the user deactivates the window (focus lost) by e.g. pressing Alt-Tab.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 17 22:44:50 2016 New Revision: 72720 URL: http://svn.reactos.org/svn/reactos?rev=72720&view=rev Log: [MSGINA][SHELL32]: Now that CORE-11979 is fixed, automatically close the logoff/shutdown dialog as soon as the user deactivates the window (focus lost) by e.g. pressing Alt-Tab. Modified: trunk/reactos/dll/win32/msgina/shutdown.c trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.… ============================================================================== --- trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] Sat Sep 17 22:44:50 2016 @@ -297,6 +297,13 @@ if (pgContext) DeleteObject(pgContext->hBitmap); return TRUE; + } + + case WM_ACTIVATE: + { + if (LOWORD(wParam) == WA_INACTIVE) + EndDialog(hWnd, 0); + return FALSE; } case WM_PAINT: Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Sep 17 22:44:50 2016 @@ -900,6 +900,13 @@ EndDialog(hwnd, IDCANCEL); break; + case WM_ACTIVATE: + { + if (LOWORD(wParam) == WA_INACTIVE) + EndDialog(hwnd, 0); + return FALSE; + } + case WM_COMMAND: switch (LOWORD(wParam)) {

8 years, 3 months

[hbelusca] 72719: [XDK][MSGINA]: Consistency codestyle fixes. [SHELL32] - Use explicit unicode functions; - Use _countof instead of sizeof(foo)/sizeof(foo[0]); - Enable the shutdown privilege when ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 17 22:39:54 2016 New Revision: 72719 URL: http://svn.reactos.org/svn/reactos?rev=72719&view=rev Log: [XDK][MSGINA]: Consistency codestyle fixes. [SHELL32] - Use explicit unicode functions; - Use _countof instead of sizeof(foo)/sizeof(foo[0]); - Enable the shutdown privilege when we need it, and disable as soon as possible (code taken from taskmgr). Modified: trunk/reactos/dll/win32/msgina/msgina.spec trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp trunk/reactos/sdk/include/xdk/setypes.h Modified: trunk/reactos/dll/win32/msgina/msgina.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.sp… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.spec [iso-8859-1] Sat Sep 17 22:39:54 2016 @@ -13,7 +13,7 @@ 13 stub -noname ShellStatusHostShuttingDown ; () 14 stub -noname ShellNotifyThemeUserChange ; (long long) 15 stub -noname ShellSwitchWhenInteractiveReady ; (long long) -16 stdcall -noname ShellDimScreen (ptr ptr) +16 stdcall -noname ShellDimScreen(ptr ptr) 17 stub -noname ShellInstallAccountFilterData ; () 18 stub -noname ShellStatusHostBegin ; (long) 19 stub -noname ShellIsUserInteractiveLogonAllowed ; (long) Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Sep 17 22:39:54 2016 @@ -802,15 +802,15 @@ */ static BOOL ConfirmDialog(HWND hWndOwner, UINT PromptId, UINT TitleId) { - WCHAR Prompt[256]; - WCHAR Title[256]; - - LoadStringW(shell32_hInstance, PromptId, Prompt, sizeof(Prompt) / sizeof(WCHAR)); - LoadStringW(shell32_hInstance, TitleId, Title, sizeof(Title) / sizeof(WCHAR)); - return MessageBoxW(hWndOwner, Prompt, Title, MB_YESNO|MB_ICONQUESTION) == IDYES; -} - -typedef HRESULT (__stdcall *tShellDimScreen) (IUnknown** Unknown, HWND* hWindow); + WCHAR Prompt[256]; + WCHAR Title[256]; + + LoadStringW(shell32_hInstance, PromptId, Prompt, _countof(Prompt)); + LoadStringW(shell32_hInstance, TitleId, Title, _countof(Title)); + return MessageBoxW(hWndOwner, Prompt, Title, MB_YESNO | MB_ICONQUESTION) == IDYES; +} + +typedef HRESULT (WINAPI *tShellDimScreen)(IUnknown** Unknown, HWND* hWindow); BOOL CallShellDimScreen(IUnknown** pUnknown, HWND* hWindow) @@ -819,8 +819,8 @@ static BOOL Initialized = FALSE; if (!Initialized) { - HMODULE mod = LoadLibrary(TEXT("msgina.dll")); - ShellDimScreen = (tShellDimScreen)GetProcAddress(mod, MAKEINTRESOURCEA(16)); + HMODULE mod = LoadLibraryW(L"msgina.dll"); + ShellDimScreen = (tShellDimScreen)GetProcAddress(mod, (LPCSTR)16); Initialized = TRUE; } @@ -831,6 +831,33 @@ } +/* Used to get the shutdown privilege */ +static BOOL +EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege) +{ + BOOL Success; + HANDLE hToken; + TOKEN_PRIVILEGES tp; + + Success = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken); + if (!Success) return Success; + + Success = LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid); + if (!Success) goto Quit; + + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + + Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); + +Quit: + CloseHandle(hToken); + return Success; +} /************************************************************************* * RestartDialogEx [SHELL32.730] @@ -842,25 +869,16 @@ CComPtr<IUnknown> fadeHandler; HWND parent; + if (!CallShellDimScreen(&fadeHandler, &parent)) parent = hWndOwner; /* FIXME: use lpwstrReason */ if (ConfirmDialog(parent, IDS_RESTART_PROMPT, IDS_RESTART_TITLE)) { - HANDLE hToken; - TOKEN_PRIVILEGES npr; - - /* enable the shutdown privilege for the current process */ - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); - npr.PrivilegeCount = 1; - npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); - CloseHandle(hToken); - } + EnablePrivilege(L"SeShutdownPrivilege", TRUE); ExitWindowsEx(EWX_REBOOT, uReason); + EnablePrivilege(L"SeShutdownPrivilege", FALSE); } return 0; @@ -870,21 +888,20 @@ * LogOffDialogProc * * NOTES: Used to make the Log Off dialog work - * - */ -INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) -{ - switch(Message) + */ +INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) { case WM_INITDIALOG: - { return TRUE; - } + case WM_CLOSE: EndDialog(hwnd, IDCANCEL); break; + case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: ExitWindowsEx(EWX_LOGOFF, 0); @@ -894,12 +911,12 @@ break; } break; + default: break; } return FALSE; } - /************************************************************************* * LogoffWindowsDialog [SHELL32.54] @@ -909,13 +926,13 @@ { CComPtr<IUnknown> fadeHandler; HWND parent; + if (!CallShellDimScreen(&fadeHandler, &parent)) parent = hWndOwner; - DialogBox(shell32_hInstance, MAKEINTRESOURCE(IDD_LOG_OFF), parent, LogOffDialogProc); + DialogBoxW(shell32_hInstance, MAKEINTRESOURCEW(IDD_LOG_OFF), parent, LogOffDialogProc); return 0; } - /************************************************************************* * RestartDialog [SHELL32.59] @@ -924,27 +941,6 @@ int WINAPI RestartDialog(HWND hWndOwner, LPCWSTR lpstrReason, DWORD uFlags) { return RestartDialogEx(hWndOwner, lpstrReason, uFlags, 0); -} - - /************************************************************************* - * Used to get the shutdown privilege - */ -VOID ExitWindows_GetShutdownPrivilege(VOID) -{ - HANDLE hToken; - TOKEN_PRIVILEGES npr; - - /* enable shut down privilege for current process */ - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); - - npr.PrivilegeCount = 1; - npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); - - CloseHandle(hToken); - } } /************************************************************************* @@ -960,8 +956,9 @@ if (ConfirmDialog(hWndOwner, IDS_SHUTDOWN_PROMPT, IDS_SHUTDOWN_TITLE)) { - ExitWindows_GetShutdownPrivilege(); + EnablePrivilege(L"SeShutdownPrivilege", TRUE); ExitWindowsEx(EWX_SHUTDOWN, 0); + EnablePrivilege(L"SeShutdownPrivilege", FALSE); } } @@ -979,7 +976,7 @@ void WINAPI ExitWindowsDialog(HWND hWndOwner) { typedef DWORD (WINAPI *ShellShFunc)(HWND hParent, WCHAR *Username, BOOL bHideLogoff); - HINSTANCE msginaDll = LoadLibraryA("msgina.dll"); + HINSTANCE msginaDll = LoadLibraryW(L"msgina.dll"); TRACE("(%p)\n", hWndOwner); @@ -990,21 +987,21 @@ /* If the DLL cannot be found for any reason, then it simply uses a dialog box to ask if the user wants to shut down the computer. */ - if(!msginaDll) + if (!msginaDll) { TRACE("Unable to load msgina.dll.\n"); ExitWindowsDialog_backup(parent); return; } - ShellShFunc pShellShutdownDialog = (ShellShFunc) GetProcAddress(msginaDll, "ShellShutdownDialog"); - - if(pShellShutdownDialog) + ShellShFunc pShellShutdownDialog = (ShellShFunc)GetProcAddress(msginaDll, "ShellShutdownDialog"); + + if (pShellShutdownDialog) { /* Actually call the function */ DWORD returnValue = pShellShutdownDialog(parent, NULL, FALSE); - switch(returnValue) + switch (returnValue) { case 0x01: /* Log off user */ { @@ -1013,8 +1010,9 @@ } case 0x02: /* Shut down */ { - ExitWindows_GetShutdownPrivilege(); + EnablePrivilege(L"SeShutdownPrivilege", TRUE); ExitWindowsEx(EWX_SHUTDOWN, 0); + EnablePrivilege(L"SeShutdownPrivilege", FALSE); break; } case 0x03: /* Install Updates/Shutdown (?) */ @@ -1023,25 +1021,28 @@ } case 0x04: /* Reboot */ { - ExitWindows_GetShutdownPrivilege(); + EnablePrivilege(L"SeShutdownPrivilege", TRUE); ExitWindowsEx(EWX_REBOOT, 0); + EnablePrivilege(L"SeShutdownPrivilege", FALSE); break; } case 0x10: /* Sleep */ { - if(IsPwrSuspendAllowed()) - { - ExitWindows_GetShutdownPrivilege(); + if (IsPwrSuspendAllowed()) + { + EnablePrivilege(L"SeShutdownPrivilege", TRUE); SetSuspendState(FALSE, FALSE, FALSE); + EnablePrivilege(L"SeShutdownPrivilege", FALSE); } break; } case 0x40: /* Hibernate */ { - if(IsPwrHibernateAllowed()) - { - ExitWindows_GetShutdownPrivilege(); + if (IsPwrHibernateAllowed()) + { + EnablePrivilege(L"SeShutdownPrivilege", TRUE); SetSuspendState(TRUE, FALSE, TRUE); + EnablePrivilege(L"SeShutdownPrivilege", FALSE); } break; } @@ -1054,7 +1055,8 @@ { /* If the function cannot be found, then revert to using the backup solution */ TRACE("Unable to find the 'ShellShutdownDialog' function"); - FreeLibrary(msginaDll); ExitWindowsDialog_backup(parent); } -} + + FreeLibrary(msginaDll); +} Modified: trunk/reactos/sdk/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/setypes.h?… ============================================================================== --- trunk/reactos/sdk/include/xdk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/setypes.h [iso-8859-1] Sat Sep 17 22:39:54 2016 @@ -61,7 +61,7 @@ /* Privilege attributes */ #define SE_PRIVILEGE_ENABLED_BY_DEFAULT (0x00000001L) #define SE_PRIVILEGE_ENABLED (0x00000002L) -#define SE_PRIVILEGE_REMOVED (0X00000004L) +#define SE_PRIVILEGE_REMOVED (0x00000004L) #define SE_PRIVILEGE_USED_FOR_ACCESS (0x80000000L) #define SE_PRIVILEGE_VALID_ATTRIBUTES (SE_PRIVILEGE_ENABLED_BY_DEFAULT | \

8 years, 3 months

[hbelusca] 72718: [MSGINA]: Code style fixes: - Use explicit unicode functions; - Just use the hdc field of the PAINTSTRUCT initialized by BeginPaint instead of introducing yet another hdc variable...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 17 22:04:54 2016 New Revision: 72718 URL: http://svn.reactos.org/svn/reactos?rev=72718&view=rev Log: [MSGINA]: Code style fixes: - Use explicit unicode functions; - Just use the hdc field of the PAINTSTRUCT initialized by BeginPaint instead of introducing yet another hdc variable; - Use SetDlgItemTextW instead of GetDlgItem + SetWindowTextW; - Don't hardcode buffer sizes in functions calls; - Use _countof instead of sizeof(foo)/sizeof(foo[0]); - Avoid using raw 'int' variables where possible; - Remove trailing whitespace. ... Modified: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp trunk/reactos/dll/win32/msgina/shutdown.c Modified: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/dimmedwin… ============================================================================== --- trunk/reactos/dll/win32/msgina/dimmedwindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/dimmedwindow.cpp [iso-8859-1] Sat Sep 17 22:04:54 2016 @@ -35,7 +35,7 @@ UCHAR* m_bytes; int m_step; - static LRESULT WINAPI Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); public: CDimmedWindow() @@ -49,7 +49,7 @@ , m_step(0) { WNDCLASSEXW wndclass = {sizeof(wndclass)}; - wndclass.lpfnWndProc = Proc; + wndclass.lpfnWndProc = WndProc; wndclass.hInstance = hDllInstance; wndclass.hCursor = LoadCursor(0, IDC_ARROW); wndclass.lpszClassName = L"DimmedWindowClass"; @@ -73,9 +73,15 @@ LONG x = GetSystemMetrics(SM_XVIRTUALSCREEN); LONG y = GetSystemMetrics(SM_YVIRTUALSCREEN); - m_hwnd = CreateWindowExW(WS_EX_TOPMOST, L"DimmedWindowClass", NULL, WS_POPUP, - x, y, m_width, m_height, - NULL, NULL, hDllInstance, (LPVOID)this); + m_hwnd = CreateWindowExW(WS_EX_TOPMOST, + L"DimmedWindowClass", + NULL, + WS_POPUP, + x, y, + m_width, m_height, + NULL, NULL, + hDllInstance, + (LPVOID)this); } ~CDimmedWindow() @@ -115,7 +121,8 @@ { Capture(); - ShowWindow(m_hwnd, SW_SHOWNA); + ShowWindow(m_hwnd, SW_SHOW); + SetForegroundWindow(m_hwnd); EnableWindow(m_hwnd, FALSE); SetTimer(m_hwnd, FADE_TIMER_ID, 200, NULL); @@ -191,58 +198,62 @@ }; -LRESULT WINAPI CDimmedWindow::Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +LRESULT WINAPI CDimmedWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - switch(uMsg) + switch (uMsg) { case WM_NCCREATE: { LPCREATESTRUCT lpcs = reinterpret_cast<LPCREATESTRUCT>(lParam); CDimmedWindow* info = static_cast<CDimmedWindow*>(lpcs->lpCreateParams); - SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG)info); + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)info); SetTimer(hWnd, INIT_TIMER_ID, 50, NULL); break; } + case WM_PAINT: { - CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtrW(hWnd, GWLP_USERDATA)); if (info) { - PAINTSTRUCT paint; - HDC hdc = BeginPaint(hWnd, &paint); - info->Blt(hdc); - EndPaint(hWnd, &paint); + PAINTSTRUCT ps; + BeginPaint(hWnd, &ps); + info->Blt(ps.hdc); + EndPaint(hWnd, &ps); } return 0; } + case WM_TIMER: + { if (wParam == INIT_TIMER_ID) { - CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtrW(hWnd, GWLP_USERDATA)); KillTimer(hWnd, INIT_TIMER_ID); info->Init(); - return 0; - } - if (wParam == FADE_TIMER_ID) - { - CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + } + else if (wParam == FADE_TIMER_ID) + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtrW(hWnd, GWLP_USERDATA)); if (info && info->Step()) InvalidateRect(hWnd, NULL, TRUE); else KillTimer(hWnd, FADE_TIMER_ID); - return 0; - } - break; + } + return 0; + } + default: break; } + return DefWindowProc(hWnd, uMsg, wParam, lParam); } extern "C" HRESULT WINAPI -ShellDimScreen (void** pUnknown, HWND* hWindow) +ShellDimScreen(void** pUnknown, HWND* hWindow) { CComObject<CDimmedWindow> *pWindow; HRESULT hr = CComObject<CDimmedWindow>::CreateInstance(&pWindow); Modified: trunk/reactos/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.… ============================================================================== --- trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] Sat Sep 17 22:04:54 2016 @@ -13,27 +13,35 @@ #include <winreg.h> #include <stdlib.h> -int g_shutdownCode = 0; +DWORD g_shutdownCode = 0; BOOL g_logoffHideState = FALSE; -int LoadShutdownSelState(void) +static DWORD +LoadShutdownSelState(VOID) { HKEY hKey; + LONG lRet; DWORD dwValue, dwTemp, dwSize; - - /* default to shutdown */ + /* Default to shutdown */ dwValue = 1; - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - { + lRet = RegOpenKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", + 0, KEY_QUERY_VALUE, &hKey); + if (lRet != ERROR_SUCCESS) return dwValue; - } dwSize = sizeof(dwTemp); - if (RegQueryValueExW(hKey, L"Shutdown Setting", NULL, NULL, (LPBYTE)&dwTemp, &dwSize) == ERROR_SUCCESS) - { - switch(dwTemp) + lRet = RegQueryValueExW(hKey, + L"Shutdown Setting", + NULL, NULL, + (LPBYTE)&dwTemp, &dwSize); + RegCloseKey(hKey); + + if (lRet == ERROR_SUCCESS) + { + switch (dwTemp) { case 0x01: /* Log off */ dwValue = 0; @@ -57,23 +65,26 @@ } } - RegCloseKey(hKey); - return dwValue; } -VOID SaveShutdownSelState(int ShutdownCode) +static VOID +SaveShutdownSelState(DWORD ShutdownCode) { HKEY hKey; DWORD dwValue = 0; - - if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", + 0, NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, &hKey, NULL) != ERROR_SUCCESS) { return; } - switch(ShutdownCode) + switch (ShutdownCode) { case 0: /* Log off */ dwValue = 0x01; @@ -96,64 +107,67 @@ break; } - RegSetValueExW(hKey, L"Shutdown Setting", 0, REG_DWORD, (const BYTE*)&dwValue, sizeof(dwValue)); + RegSetValueExW(hKey, + L"Shutdown Setting", + 0, REG_DWORD, + (LPBYTE)&dwValue, sizeof(dwValue)); RegCloseKey(hKey); } -VOID UpdateShutdownShellDesc(HWND hwnd) +static VOID +UpdateShutdownShellDesc(HWND hWnd) { + UINT DescId = 0; + DWORD ShutdownCode = 0; WCHAR tmpBuffer[256]; - UINT shutdownDescId = 0; - HWND shutdownHwnd = GetDlgItem(hwnd, IDC_SHUTDOWN_DESCRIPTION); - int shutdownCode = 0; - - shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); - - if(!g_logoffHideState) - { - switch (shutdownCode) + + ShutdownCode = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); + + if (!g_logoffHideState) + { + switch (ShutdownCode) { case 0: /* Log off */ - shutdownDescId = IDS_SHUTDOWN_LOGOFF_DESC; + DescId = IDS_SHUTDOWN_LOGOFF_DESC; break; case 1: /* Shut down */ - shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + DescId = IDS_SHUTDOWN_SHUTDOWN_DESC; break; case 2: /* Restart */ - shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; + DescId = IDS_SHUTDOWN_RESTART_DESC; break; default: break; } - + if (IsPwrSuspendAllowed()) { - if (shutdownCode == 3) /* Sleep */ - { - shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; - } - else if (shutdownCode == 4) /* Hibernate */ - { - shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; + if (ShutdownCode == 3) /* Sleep */ + { + DescId = IDS_SHUTDOWN_SLEEP_DESC; + } + else if (ShutdownCode == 4) /* Hibernate */ + { + DescId = IDS_SHUTDOWN_HIBERNATE_DESC; } } else { - if (shutdownCode == 3) /* Hibernate */ - { - shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + if (ShutdownCode == 3) /* Hibernate */ + { + DescId = IDS_SHUTDOWN_SLEEP_DESC; } } } else { - switch (shutdownCode) + switch (ShutdownCode) { case 0: /* Shut down */ - shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + DescId = IDS_SHUTDOWN_SHUTDOWN_DESC; break; case 1: /* Restart */ - shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; + DescId = IDS_SHUTDOWN_RESTART_DESC; break; default: break; @@ -161,35 +175,36 @@ if (IsPwrSuspendAllowed()) { - if (shutdownCode == 2) /* Sleep */ - { - shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; - } - else if (shutdownCode == 3) /* Hibernate */ - { - shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; + if (ShutdownCode == 2) /* Sleep */ + { + DescId = IDS_SHUTDOWN_SLEEP_DESC; + } + else if (ShutdownCode == 3) /* Hibernate */ + { + DescId = IDS_SHUTDOWN_HIBERNATE_DESC; } } else { - if (shutdownCode == 2) /* Hibernate */ - { - shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; - } - } - } - - LoadStringW(hDllInstance, shutdownDescId, tmpBuffer, sizeof(tmpBuffer)); - SetWindowTextW(shutdownHwnd, tmpBuffer); + if (ShutdownCode == 2) /* Hibernate */ + { + DescId = IDS_SHUTDOWN_SLEEP_DESC; + } + } + } + + LoadStringW(hDllInstance, DescId, tmpBuffer, _countof(tmpBuffer)); + SetDlgItemTextW(hWnd, IDC_SHUTDOWN_DESCRIPTION, tmpBuffer); } - -BOOL CALLBACK ExitWindowsDialogShellProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) + +BOOL CALLBACK +ExitWindowsDialogShellProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PGINA_CONTEXT pgContext; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwnd, GWL_USERDATA); - - switch (Message) + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + + switch (uMsg) { case WM_INITDIALOG: { @@ -205,21 +220,21 @@ { WARN("pgContext is NULL, branding bitmaps will not be displayed.\n"); } - - SetWindowLongPtr(hwnd, GWL_USERDATA, (DWORD_PTR)pgContext); - - /* Clears the content before it's used */ - SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_RESETCONTENT, 0, 0); + + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)pgContext); + + /* Clear the content before it's used */ + SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_RESETCONTENT, 0, 0); lastState = LoadShutdownSelState(); - if(!g_logoffHideState) + if (!g_logoffHideState) { /* Log off */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); + LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, tmpBuffer, _countof(tmpBuffer)); GetUserNameW(userBuffer, &userBufferSize); - StringCchPrintfW(tmpBuffer2, 512, tmpBuffer, userBuffer); - tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer2); + StringCchPrintfW(tmpBuffer2, _countof(tmpBuffer2), tmpBuffer, userBuffer); + tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer2); if (lastState == 0) { defSelect = tmpSelect; @@ -227,16 +242,16 @@ } /* Shut down - DEFAULT */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, tmpBuffer, _countof(tmpBuffer)); + tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); if (lastState == 1) { defSelect = tmpSelect; } /* Restart */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, tmpBuffer, _countof(tmpBuffer)); + tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); if (lastState == 2) { defSelect = tmpSelect; @@ -245,8 +260,8 @@ /* Sleep */ if (IsPwrSuspendAllowed()) { - LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, tmpBuffer, _countof(tmpBuffer)); + tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); if (lastState == 3) { defSelect = tmpSelect; @@ -256,8 +271,8 @@ /* Hibernate */ if (IsPwrHibernateAllowed()) { - LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, tmpBuffer, _countof(tmpBuffer)); + tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); if (lastState == 4) { defSelect = tmpSelect; @@ -265,55 +280,61 @@ } /* Sets the default shut down selection */ - SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_SETCURSEL, defSelect, 0); - + SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_SETCURSEL, defSelect, 0); + /* Updates the choice description based on the current selection */ - UpdateShutdownShellDesc(hwnd); - - /* Draw the logo graphic */ + UpdateShutdownShellDesc(hWnd); + + /* Draw the logo bitmap */ if (pgContext) - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + pgContext->hBitmap = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); return TRUE; } - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc; - if (pgContext && pgContext->hBitmap) - { - hdc = BeginPaint(hwnd, &ps); - DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); - EndPaint(hwnd, &ps); - return TRUE; - } - return FALSE; - } + case WM_DESTROY: { if (pgContext) DeleteObject(pgContext->hBitmap); return TRUE; } + + case WM_PAINT: + { + PAINTSTRUCT ps; + if (pgContext && pgContext->hBitmap) + { + BeginPaint(hWnd, &ps); + DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, 0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hWnd, &ps); + return TRUE; + } + return FALSE; + } + case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: - g_shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + g_shutdownCode = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); SaveShutdownSelState(g_shutdownCode); - EndDialog(hwnd, IDOK); + EndDialog(hWnd, IDOK); break; + case IDCANCEL: - EndDialog(hwnd, IDCANCEL); + EndDialog(hWnd, IDCANCEL); break; + case IDHELP: - EndDialog(hwnd, IDHELP); + EndDialog(hWnd, IDHELP); break; + case IDC_SHUTDOWN_LIST: - UpdateShutdownShellDesc(hwnd); + UpdateShutdownShellDesc(hWnd); break; } break; + default: return FALSE; } @@ -331,10 +352,10 @@ * - When the Help button is pushed, it sends the same return value as IDCANCEL (0x00), but * at the same time, it calls the help file directly from the dialog box. * - When the dialog is created, it doesn't disable all other input from the other windows. - * This is done elsewhere. When running the function ShellShutdownDialog() from XP/2K3, if the user clicks + * This is done elsewhere. When running the function ShellShutdownDialog() from XP/2K3, if the user clicks * out of the window, it automatically closes itself. * - The parameter, lpUsername never seems to be used when calling the function from Windows XP. Either - * it was a parameter that was never used in the final version before release, or it has a use that + * it was a parameter that was never used in the final version before release, or it has a use that * is currently not known. */ DWORD WINAPI @@ -344,20 +365,20 @@ BOOL bHideLogoff) { GINA_CONTEXT pgContext = { 0 }; - int dlgValue = 0; - + INT_PTR dlgValue = 0; + + UNREFERENCED_PARAMETER(lpUsername); + g_logoffHideState = bHideLogoff; - UNREFERENCED_PARAMETER(lpUsername); - - // Loads the shut down dialog box - dlgValue = DialogBoxParam(hDllInstance, - MAKEINTRESOURCE(IDD_SHUTDOWN_SHELL), - hParent, - ExitWindowsDialogShellProc, - (LPARAM)&pgContext); - - // Determines what to do based on user selection + /* Load the shut down dialog box */ + dlgValue = DialogBoxParamW(hDllInstance, + MAKEINTRESOURCEW(IDD_SHUTDOWN_SHELL), + hParent, + ExitWindowsDialogShellProc, + (LPARAM)&pgContext); + + /* Determine what to do based on user selection */ if (dlgValue == IDOK) { switch (g_shutdownCode) @@ -384,6 +405,6 @@ { ERR("Failed to create dialog\n"); } - + return 0x00; }

8 years, 3 months

[dchapyshev] 72717: [NLS] Update NLS files. Part 5/x

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 17 21:45:39 2016 New Revision: 72717 URL: http://svn.reactos.org/svn/reactos?rev=72717&view=rev Log: [NLS] Update NLS files. Part 5/x Modified: trunk/reactos/media/nls/c_20127.nls trunk/reactos/media/nls/c_20866.nls trunk/reactos/media/nls/c_21866.nls trunk/reactos/media/nls/c_28591.nls trunk/reactos/media/nls/c_28592.nls trunk/reactos/media/nls/c_28593.nls trunk/reactos/media/nls/c_28594.nls trunk/reactos/media/nls/c_28595.nls trunk/reactos/media/nls/c_28596.nls trunk/reactos/media/nls/c_28597.nls trunk/reactos/media/nls/c_28598.nls trunk/reactos/media/nls/c_28599.nls trunk/reactos/media/nls/c_28603.nls trunk/reactos/media/nls/c_28605.nls trunk/reactos/media/nls/src/c_20127.txt trunk/reactos/media/nls/src/c_20866.txt trunk/reactos/media/nls/src/c_21866.txt trunk/reactos/media/nls/src/c_28591.txt trunk/reactos/media/nls/src/c_28592.txt trunk/reactos/media/nls/src/c_28593.txt trunk/reactos/media/nls/src/c_28594.txt trunk/reactos/media/nls/src/c_28595.txt trunk/reactos/media/nls/src/c_28596.txt trunk/reactos/media/nls/src/c_28597.txt trunk/reactos/media/nls/src/c_28598.txt trunk/reactos/media/nls/src/c_28599.txt trunk/reactos/media/nls/src/c_28603.txt trunk/reactos/media/nls/src/c_28605.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/nls/c_20127.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_20127.nls?rev=… Modified: trunk/reactos/media/nls/c_20866.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_20866.nls?rev=… Modified: trunk/reactos/media/nls/c_21866.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_21866.nls?rev=… Modified: trunk/reactos/media/nls/c_28591.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28591.nls?rev=… Modified: trunk/reactos/media/nls/c_28592.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28592.nls?rev=… Modified: trunk/reactos/media/nls/c_28593.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28593.nls?rev=… Modified: trunk/reactos/media/nls/c_28594.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28594.nls?rev=… Modified: trunk/reactos/media/nls/c_28595.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28595.nls?rev=… Modified: trunk/reactos/media/nls/c_28596.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28596.nls?rev=… Modified: trunk/reactos/media/nls/c_28597.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28597.nls?rev=… Modified: trunk/reactos/media/nls/c_28598.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28598.nls?rev=… Modified: trunk/reactos/media/nls/c_28599.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28599.nls?rev=… Modified: trunk/reactos/media/nls/c_28603.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28603.nls?rev=… Modified: trunk/reactos/media/nls/c_28605.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_28605.nls?rev=… Modified: trunk/reactos/media/nls/src/c_20127.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_20127.txt?… Modified: trunk/reactos/media/nls/src/c_20866.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_20866.txt?… Modified: trunk/reactos/media/nls/src/c_21866.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_21866.txt?… Modified: trunk/reactos/media/nls/src/c_28591.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28591.txt?… Modified: trunk/reactos/media/nls/src/c_28592.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28592.txt?… Modified: trunk/reactos/media/nls/src/c_28593.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28593.txt?… Modified: trunk/reactos/media/nls/src/c_28594.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28594.txt?… Modified: trunk/reactos/media/nls/src/c_28595.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28595.txt?… Modified: trunk/reactos/media/nls/src/c_28596.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28596.txt?… Modified: trunk/reactos/media/nls/src/c_28597.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28597.txt?… Modified: trunk/reactos/media/nls/src/c_28598.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28598.txt?… Modified: trunk/reactos/media/nls/src/c_28599.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28599.txt?… Modified: trunk/reactos/media/nls/src/c_28603.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28603.txt?… Modified: trunk/reactos/media/nls/src/c_28605.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28605.txt?…

8 years, 3 months

[dchapyshev] 72716: [NLS] Add source data for NLS-files

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 17 21:18:13 2016 New Revision: 72716 URL: http://svn.reactos.org/svn/reactos?rev=72716&view=rev Log: [NLS] Add source data for NLS-files Added: trunk/reactos/media/nls/src/c_20127.txt (with props) trunk/reactos/media/nls/src/c_20866.txt (with props) trunk/reactos/media/nls/src/c_21866.txt (with props) trunk/reactos/media/nls/src/c_28591.txt (with props) trunk/reactos/media/nls/src/c_28592.txt (with props) trunk/reactos/media/nls/src/c_28593.txt (with props) trunk/reactos/media/nls/src/c_28594.txt (with props) trunk/reactos/media/nls/src/c_28595.txt (with props) trunk/reactos/media/nls/src/c_28596.txt (with props) trunk/reactos/media/nls/src/c_28597.txt (with props) trunk/reactos/media/nls/src/c_28598.txt (with props) trunk/reactos/media/nls/src/c_28599.txt (with props) trunk/reactos/media/nls/src/c_28600.txt (with props) trunk/reactos/media/nls/src/c_28603.txt (with props) trunk/reactos/media/nls/src/c_28604.txt (with props) trunk/reactos/media/nls/src/c_28605.txt (with props) trunk/reactos/media/nls/src/c_28606.txt (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/media/nls/src/c_20127.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_20127.txt?… Added: trunk/reactos/media/nls/src/c_20866.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_20866.txt?… Added: trunk/reactos/media/nls/src/c_21866.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_21866.txt?… Added: trunk/reactos/media/nls/src/c_28591.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28591.txt?… Added: trunk/reactos/media/nls/src/c_28592.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28592.txt?… Added: trunk/reactos/media/nls/src/c_28593.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28593.txt?… Added: trunk/reactos/media/nls/src/c_28594.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28594.txt?… Added: trunk/reactos/media/nls/src/c_28595.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28595.txt?… Added: trunk/reactos/media/nls/src/c_28596.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28596.txt?… Added: trunk/reactos/media/nls/src/c_28597.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28597.txt?… Added: trunk/reactos/media/nls/src/c_28598.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28598.txt?… Added: trunk/reactos/media/nls/src/c_28599.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28599.txt?… Added: trunk/reactos/media/nls/src/c_28600.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28600.txt?… Added: trunk/reactos/media/nls/src/c_28603.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28603.txt?… Added: trunk/reactos/media/nls/src/c_28604.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28604.txt?… Added: trunk/reactos/media/nls/src/c_28605.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28605.txt?… Added: trunk/reactos/media/nls/src/c_28606.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_28606.txt?…

8 years, 3 months

[hbelusca] 72715: [NTVDM]: Update README.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 17 21:12:03 2016 New Revision: 72715 URL: http://svn.reactos.org/svn/reactos?rev=72715&view=rev Log: [NTVDM]: Update README. Modified: trunk/reactos/subsystems/mvdm/README.txt Modified: trunk/reactos/subsystems/mvdm/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/README.txt… ============================================================================== --- trunk/reactos/subsystems/mvdm/README.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/README.txt [iso-8859-1] Sat Sep 17 21:12:03 2016 @@ -2,8 +2,10 @@ ===================================================== - config : Miscellaneous configuration files. -- dos : All 16-bit DOS files (kernel, drivers, apps...) are placed here. +- dos : 16-bit DOS components (kernel, drivers, apps...). - ntvdm : NT Virtual DOS Machine. +- pifedit: ReactOS Program Information File Editor. +- pifmgr : PIF Manager Icon Resource Library. - samples: Sample programs for NTVDM. - vdmdbg : Virtual DOS Machine debug helper DLL (from Wine). -- wow16 : All Win16 thunk files are placed here. +- wow16 : Win16 thunk files and components.

8 years, 3 months

[dchapyshev] 72714: [NLS] Update NLS files. Part 4/x

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 17 21:08:09 2016 New Revision: 72714 URL: http://svn.reactos.org/svn/reactos?rev=72714&view=rev Log: [NLS] Update NLS files. Part 4/x Modified: trunk/reactos/media/nls/c_10000.nls trunk/reactos/media/nls/c_10006.nls trunk/reactos/media/nls/c_10007.nls trunk/reactos/media/nls/c_10029.nls trunk/reactos/media/nls/c_10079.nls trunk/reactos/media/nls/c_10081.nls trunk/reactos/media/nls/src/c_10000.txt trunk/reactos/media/nls/src/c_10006.txt trunk/reactos/media/nls/src/c_10007.txt trunk/reactos/media/nls/src/c_10029.txt trunk/reactos/media/nls/src/c_10079.txt trunk/reactos/media/nls/src/c_10081.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/nls/c_10000.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_10000.nls?rev=… Modified: trunk/reactos/media/nls/c_10006.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_10006.nls?rev=… Modified: trunk/reactos/media/nls/c_10007.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_10007.nls?rev=… Modified: trunk/reactos/media/nls/c_10029.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_10029.nls?rev=… Modified: trunk/reactos/media/nls/c_10079.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_10079.nls?rev=… Modified: trunk/reactos/media/nls/c_10081.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_10081.nls?rev=… Modified: trunk/reactos/media/nls/src/c_10000.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10000.txt?… Modified: trunk/reactos/media/nls/src/c_10006.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10006.txt?… Modified: trunk/reactos/media/nls/src/c_10007.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10007.txt?… Modified: trunk/reactos/media/nls/src/c_10029.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10029.txt?… Modified: trunk/reactos/media/nls/src/c_10079.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10079.txt?… Modified: trunk/reactos/media/nls/src/c_10081.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10081.txt?…

8 years, 3 months

[dchapyshev] 72713: [NLS] Add source data for 10000, 10006, 10007, 10029, 10079, 10081 codepages

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 17 20:54:14 2016 New Revision: 72713 URL: http://svn.reactos.org/svn/reactos?rev=72713&view=rev Log: [NLS] Add source data for 10000, 10006, 10007, 10029, 10079, 10081 codepages Added: trunk/reactos/media/nls/src/c_10000.txt (with props) trunk/reactos/media/nls/src/c_10006.txt (with props) trunk/reactos/media/nls/src/c_10007.txt (with props) trunk/reactos/media/nls/src/c_10029.txt (with props) trunk/reactos/media/nls/src/c_10079.txt (with props) trunk/reactos/media/nls/src/c_10081.txt (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/media/nls/src/c_10000.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10000.txt?… Added: trunk/reactos/media/nls/src/c_10006.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10006.txt?… Added: trunk/reactos/media/nls/src/c_10007.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10007.txt?… Added: trunk/reactos/media/nls/src/c_10029.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10029.txt?… Added: trunk/reactos/media/nls/src/c_10079.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10079.txt?… Added: trunk/reactos/media/nls/src/c_10081.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_10081.txt?…

8 years, 3 months

[hbelusca] 72712: [NTVDM]: Add new icons: - Tango-style icons by Henry Tang Ih and Jared Smudde, arranged by myself for PC-XT and AT style; - ROS-DOS & VDM-DOS (copied from pifmgr.dll) by DSP2015 C...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 17 20:50:08 2016 New Revision: 72712 URL: http://svn.reactos.org/svn/reactos?rev=72712&view=rev Log: [NTVDM]: Add new icons: - Tango-style icons by Henry Tang Ih and Jared Smudde, arranged by myself for PC-XT and AT style; - ROS-DOS & VDM-DOS (copied from pifmgr.dll) by DSP2015 CORE-10340 Added: trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt (with props) trunk/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico (with props) trunk/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico (with props) trunk/reactos/subsystems/mvdm/ntvdm/res/ros_dos.ico - copied unchanged from r72710, trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico trunk/reactos/subsystems/mvdm/ntvdm/res/vdm_dos.ico - copied unchanged from r72710, trunk/reactos/subsystems/mvdm/pifmgr/res/01vdm.ico Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc trunk/reactos/subsystems/mvdm/ntvdm/resource.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.rc [iso-8859-1] Sat Sep 17 20:50:08 2016 @@ -11,7 +11,13 @@ #define REACTOS_STR_ORIGINAL_FILENAME "ntvdm.exe" #include <reactos/version.rc> -IDI_APPICON ICON "res/ntvdm.ico" +/* Icons */ +1 ICON "res/ntvdm.ico" +// 2 ICON "res/ntvdm_2.ico" // TODO: Swyter's icon, see CORE-10340 +3 ICON "res/pc_xt.ico" +4 ICON "res/pc_at.ico" +5 ICON "res/ros_dos.ico" +6 ICON "res/vdm_dos.ico" /* UTF-8 */ #pragma code_page(65001) Added: trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt [iso-8859-1] Sat Sep 17 20:50:08 2016 @@ -0,0 +1,18 @@ + +ntvdm.ico +--------- +(C) 2013 HermÃ¨s BÃ©lusca-MaÃ¯to. +Distributed under CC-BY-SA 4.0 International License Terms. + +pc_at.ico and pc_xt.ico +----------------------- +Tango-style PC icons +(C) 2015 Henry Tang Ih and Jared Smudde. +Adapted for PC-AT and XT style by HermÃ¨s BÃ©lusca-MaÃ¯to. +16-colour conversion by HermÃ¨s BÃ©lusca-MaÃ¯to. + +ros_dos.ico and vdm_dos.ico (from pifmgr.dll icon-set) +------------------------------------------------------ +(C) 2016 DSP2003. +http://dsp2003.deviantart.com | http://wks.arai-kibou.ru +Distributed under CC-BY-SA 4.0 International License Terms. Propchange: trunk/reactos/subsystems/mvdm/ntvdm/res/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/res/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/subsystems/mvdm/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/reso… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/resource.h [iso-8859-1] Sat Sep 17 20:50:08 2016 @@ -22,7 +22,4 @@ #define IDS_NO_MEDIA 300 -/* Icon */ -#define IDI_APPICON 1 - /* EOF */

8 years, 3 months

[dchapyshev] 72711: [NLS] Update NLS files. Part 3/x

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 17 20:48:40 2016 New Revision: 72711 URL: http://svn.reactos.org/svn/reactos?rev=72711&view=rev Log: [NLS] Update NLS files. Part 3/x Modified: trunk/reactos/media/nls/c_1026.nls trunk/reactos/media/nls/c_1250.nls trunk/reactos/media/nls/c_1251.nls trunk/reactos/media/nls/c_1252.nls trunk/reactos/media/nls/c_1253.nls trunk/reactos/media/nls/c_1254.nls trunk/reactos/media/nls/c_1255.nls trunk/reactos/media/nls/c_1256.nls trunk/reactos/media/nls/c_1257.nls trunk/reactos/media/nls/c_1258.nls trunk/reactos/media/nls/src/c_1026.txt trunk/reactos/media/nls/src/c_1250.txt trunk/reactos/media/nls/src/c_1251.txt trunk/reactos/media/nls/src/c_1252.txt trunk/reactos/media/nls/src/c_1253.txt trunk/reactos/media/nls/src/c_1254.txt trunk/reactos/media/nls/src/c_1255.txt trunk/reactos/media/nls/src/c_1256.txt trunk/reactos/media/nls/src/c_1257.txt trunk/reactos/media/nls/src/c_1258.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/nls/c_1026.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1026.nls?rev=7… Modified: trunk/reactos/media/nls/c_1250.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1250.nls?rev=7… Modified: trunk/reactos/media/nls/c_1251.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1251.nls?rev=7… Modified: trunk/reactos/media/nls/c_1252.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1252.nls?rev=7… Modified: trunk/reactos/media/nls/c_1253.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1253.nls?rev=7… Modified: trunk/reactos/media/nls/c_1254.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1254.nls?rev=7… Modified: trunk/reactos/media/nls/c_1255.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1255.nls?rev=7… Modified: trunk/reactos/media/nls/c_1256.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1256.nls?rev=7… Modified: trunk/reactos/media/nls/c_1257.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1257.nls?rev=7… Modified: trunk/reactos/media/nls/c_1258.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_1258.nls?rev=7… Modified: trunk/reactos/media/nls/src/c_1026.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1026.txt?r… Modified: trunk/reactos/media/nls/src/c_1250.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1250.txt?r… Modified: trunk/reactos/media/nls/src/c_1251.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1251.txt?r… Modified: trunk/reactos/media/nls/src/c_1252.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1252.txt?r… Modified: trunk/reactos/media/nls/src/c_1253.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1253.txt?r… Modified: trunk/reactos/media/nls/src/c_1254.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1254.txt?r… Modified: trunk/reactos/media/nls/src/c_1255.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1255.txt?r… Modified: trunk/reactos/media/nls/src/c_1256.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1256.txt?r… Modified: trunk/reactos/media/nls/src/c_1257.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1257.txt?r… Modified: trunk/reactos/media/nls/src/c_1258.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/src/c_1258.txt?r…

8 years, 3 months

← Newer
1
...
13
14
15
16
17
18
19
...
35
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 2016