Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 72732: [MSGINA] - Do not hardcode buffer sizes in function calls, and use _countof when needed. - Use explicit unicode functions where possible. - No need to have 342687 versions of the ...
by hbelusca＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: hbelusca Date: Sun Sep 18 19:37:25 2016 New Revision: 72732 URL: http://svn.reactos.org/svn/reactos?rev=72732&view=rev Log: [MSGINA] - Do not hardcode buffer sizes in function calls, and use _countof when needed. - Use explicit unicode functions where possible. - No need to have 342687 versions of the shutdown dialog in msgina, only one is sufficient. The help button should be either shown or hidden, depending on whom is calling the dialog (shell or winlogon) (this is TODO!) - Therefore, no need to have twice the (almost) same code for the shutdown dialog. - Fix & rework said code. - The old duplicated shutdown dialog now becomes the "template" for the "Luna-XP-style Shut Down dialog" (implementation TODO!) - Reenable the WM_ACTIVATE code that was added in r72720 and temporarily disabled in r72721. CORE-7559 #comment Numerous fixes committed in r72732. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/lang/zh-CN.rc trunk/reactos/dll/win32/msgina/lang/zh-TW.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/resource.h trunk/reactos/dll/win32/msgina/shutdown.c trunk/reactos/dll/win32/msgina/tui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -93,9 +93,9 @@ return FALSE; } - DialogBoxParam( + DialogBoxParamW( hDllInstance, - MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), + MAKEINTRESOURCEW(IDD_STATUSWINDOW_DLG), GetDesktopWindow(), StatusMessageWindowProc, (LPARAM)lpParam); @@ -126,7 +126,7 @@ */ msg = (PDISPLAYSTATUSMSG)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DISPLAYSTATUSMSG)); + sizeof(*msg)); if(!msg) return FALSE; @@ -136,10 +136,7 @@ msg->pMessage = pMessage; msg->hDesktop = hDesktop; - msg->StartupEvent = CreateEventW(NULL, - TRUE, - FALSE, - NULL); + msg->StartupEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!msg->StartupEvent) { @@ -204,25 +201,26 @@ { PGINA_CONTEXT pgContext; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: { pgContext = (PGINA_CONTEXT)lParam; - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (LONG_PTR)pgContext); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); + + /* Draw the logo bitmap */ + pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); return TRUE; } case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc; if (pgContext->hBitmap) { - hdc = BeginPaint(hwndDlg, &ps); - DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + BeginPaint(hwndDlg, &ps); + DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } return TRUE; @@ -288,8 +286,8 @@ WCHAR szCaption[256]; WCHAR szText[256]; - LoadStringW(pgContext->hDllInstance, uCaption, szCaption, 256); - LoadStringW(pgContext->hDllInstance, uText, szText, 256); + LoadStringW(pgContext->hDllInstance, uCaption, szCaption, _countof(szCaption)); + LoadStringW(pgContext->hDllInstance, uText, szText, _countof(szText)); return pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx, hwnd, @@ -319,11 +317,11 @@ NTSTATUS ProtocolStatus; NTSTATUS Status; - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, 256); - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, Domain, 256); - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, 256); - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, 256); - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, _countof(UserName)); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, Domain, _countof(Domain)); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, _countof(OldPassword)); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, _countof(NewPassword1)); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, _countof(NewPassword2)); /* Compare the two passwords and fail if they do not match */ if (wcscmp(NewPassword1, NewPassword2) != 0) @@ -440,7 +438,7 @@ (wcscmp(Domain, pgContext->Domain) == 0) && (wcscmp(OldPassword, pgContext->Password) == 0)) { - ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); wcscpy(pgContext->Password, NewPassword1); } @@ -464,19 +462,21 @@ { PGINA_CONTEXT pgContext; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: + { pgContext = (PGINA_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); SetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, pgContext->UserName); SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_ADDSTRING, 0, (LPARAM)pgContext->Domain); SendDlgItemMessageW(hwndDlg, IDC_CHANGEPWD_DOMAIN, CB_SETCURSEL, 0, 0); SetFocus(GetDlgItem(hwndDlg, IDC_CHANGEPWD_OLDPWD)); return TRUE; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -518,26 +518,26 @@ WCHAR Buffer3[256]; WCHAR Buffer4[512]; - LoadStringW(pgContext->hDllInstance, IDS_LOGONMSG, Buffer1, 256); + LoadStringW(pgContext->hDllInstance, IDS_LOGONMSG, Buffer1, _countof(Buffer1)); wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); wsprintfW(Buffer4, Buffer1, Buffer2); SetDlgItemTextW(hwnd, IDC_LOGONMSG, Buffer4); - LoadStringW(pgContext->hDllInstance, IDS_LOGONDATE, Buffer1, 256); + LoadStringW(pgContext->hDllInstance, IDS_LOGONDATE, Buffer1, _countof(Buffer1)); GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, - (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer2, 256); + (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer2, _countof(Buffer2)); GetTimeFormatW(LOCALE_USER_DEFAULT, 0, - (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer3, 256); + (SYSTEMTIME*)&pgContext->LogonTime, NULL, Buffer3, _countof(Buffer3)); wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3); SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); - if (pgContext->bAutoAdminLogon == TRUE) + if (pgContext->bAutoAdminLogon) EnableWindow(GetDlgItem(hwnd, IDC_LOGOFF), FALSE); } @@ -616,217 +616,25 @@ static -VOID -UpdateShutdownDesc( - IN HWND hwnd) -{ - WCHAR szBuffer[256]; - UINT shutdownDescId = 0; - int shutdownCode = 0; - - shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); - - switch (shutdownCode) - { - case 0: /* Log off */ - shutdownDescId = IDS_SHUTDOWN_LOGOFF_DESC; - break; - - case 1: /* Shut down */ - shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; - break; - - case 2: /* Restart */ - shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; - break; - - case 3: /* Sleep */ - shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; - break; - - case 4: /* Hibernate */ - shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; - break; - - default: - break; - } - - LoadStringW(hDllInstance, shutdownDescId, szBuffer, sizeof(szBuffer)); - SetDlgItemTextW(hwnd, IDC_SHUTDOWN_DESCRIPTION, szBuffer); -} - - -static -VOID -ShutDownOnInit( - IN HWND hwndDlg, - IN PGINA_CONTEXT pgContext) -{ - WCHAR szBuffer[256]; - WCHAR szBuffer2[256]; - HWND hwndList; - INT idx, count, i; - - hwndList = GetDlgItem(hwndDlg, IDC_SHUTDOWN_LIST); - - /* Clears the content before it's used */ - SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); - - /* Log off */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - wsprintfW(szBuffer2, szBuffer, pgContext->UserName); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer2); - if (idx != CB_ERR) - SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF); - - /* Shut down */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); - if (idx != CB_ERR) - SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); - - /* Restart */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); - if (idx != CB_ERR) - SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_REBOOT); - - /* Sleep */ -#if 0 - LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); - if (idx != CB_ERR) - SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_SLEEP); -#endif - - /* Hibernate */ -#if 0 - LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); - idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); - if (idx != CB_ERR) - SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE); -#endif - - /* Sets the default shut down selection */ - count = SendMessageW(hwndList, CB_GETCOUNT, 0, 0); - for (i = 0; i < count; i++) - { - if (pgContext->nShutdownAction == SendMessageW(hwndList, CB_GETITEMDATA, i, 0)) - { - SendMessageW(hwndList, CB_SETCURSEL, i, 0); - break; - } - } - - /* Updates the choice description based on the current selection */ - UpdateShutdownDesc(hwndDlg); -} - - -static -VOID -ShutDownOnOk( - IN HWND hwndDlg, - IN PGINA_CONTEXT pgContext) -{ - INT idx; - - idx = SendDlgItemMessageW(hwndDlg, - IDC_SHUTDOWN_LIST, - CB_GETCURSEL, - 0, - 0); - if (idx != CB_ERR) - { - pgContext->nShutdownAction = SendDlgItemMessageW(hwndDlg, - IDC_SHUTDOWN_LIST, - CB_GETITEMDATA, - idx, - 0); - } -} - - -BOOL -CALLBACK -ShutDownDialogProc( - HWND hwnd, - UINT Message, - WPARAM wParam, - LPARAM lParam) -{ - PGINA_CONTEXT pgContext; - - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwnd, GWL_USERDATA); - - switch (Message) - { - case WM_INITDIALOG: - pgContext = (PGINA_CONTEXT)lParam; - SetWindowLongPtr(hwnd, GWL_USERDATA, (INT_PTR)pgContext); - - ShutDownOnInit(hwnd, pgContext); - - /* Draw the logo graphic */ - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - return TRUE; - - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc; - if (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; - } - - case WM_DESTROY: - DeleteObject(pgContext->hBitmap); - return TRUE; - - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDOK: - ShutDownOnOk(hwnd, pgContext); - EndDialog(hwnd, IDOK); - break; - - case IDCANCEL: - EndDialog(hwnd, IDCANCEL); - break; - - case IDC_SHUTDOWN_LIST: - UpdateShutdownDesc(hwnd); - break; - } - break; - - default: - return FALSE; - } - return TRUE; -} - - -static INT OnShutDown( IN HWND hwndDlg, IN PGINA_CONTEXT pgContext) { - return pgContext->pWlxFuncs->WlxDialogBoxParam( - pgContext->hWlx, - pgContext->hDllInstance, - MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), - hwndDlg, - ShutDownDialogProc, - (LPARAM)pgContext); + INT ret; + DWORD ShutdownOptions; + + // FIXME: User impersonation!! + pgContext->nShutdownAction = LoadShutdownSelState(); + ShutdownOptions = GetAllowedShutdownOptions(); + + ret = ShutdownDialog(hwndDlg, ShutdownOptions, pgContext); + + // FIXME: User impersonation!! + if (ret == IDOK) + SaveShutdownSelState(pgContext->nShutdownAction); + + return ret; } @@ -839,14 +647,14 @@ { PGINA_CONTEXT pgContext; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: { pgContext = (PGINA_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); OnInitSecurityDlg(hwndDlg, (PGINA_CONTEXT)lParam); SetFocus(GetDlgItem(hwndDlg, IDNO)); @@ -980,7 +788,7 @@ } else if (SubStatus == STATUS_ACCOUNT_LOCKED_OUT) { -TRACE("Account locked!\n"); + TRACE("Account locked!\n"); pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx, hwndDlg, L"Account locked!", @@ -1022,7 +830,7 @@ } else { -TRACE("Other error!\n"); + TRACE("Other error!\n"); pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx, hwndDlg, L"Other error!", @@ -1033,8 +841,7 @@ } else if (!NT_SUCCESS(Status)) { -TRACE("DoLoginTasks failed! Status 0x%08lx\n", Status); - + TRACE("DoLoginTasks failed! Status 0x%08lx\n", Status); goto done; } @@ -1045,7 +852,7 @@ goto done; } - ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); wcscpy(pgContext->Password, Password); result = TRUE; @@ -1077,7 +884,7 @@ SendMessageW(hwndDomainComboBox, CB_RESETCONTENT, 0, 0); - dwComputerNameLength = sizeof(szComputerName) / sizeof(WCHAR); + dwComputerNameLength = _countof(szComputerName); if (GetComputerNameW(szComputerName, &dwComputerNameLength)) { lIndex = SendMessageW(hwndDomainComboBox, CB_ADDSTRING, 0, (LPARAM)szComputerName); @@ -1109,39 +916,41 @@ { PGINA_CONTEXT pgContext; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: + { /* FIXME: take care of NoDomainUI */ pgContext = (PGINA_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); - - if (pgContext->bDontDisplayLastUserName == FALSE) + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); + + if (!pgContext->bDontDisplayLastUserName) SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); - if (pgContext->bDisableCAD == TRUE) + if (pgContext->bDisableCAD) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); - if (pgContext->bShutdownWithoutLogon == FALSE) + if (!pgContext->bShutdownWithoutLogon) EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); SetDomainComboBox(GetDlgItem(hwndDlg, IDC_LOGON_TO), pgContext); SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - return TRUE; + /* Draw the logo bitmap */ + pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + } case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc; if (pgContext->hBitmap) { - hdc = BeginPaint(hwndDlg, &ps); - DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + BeginPaint(hwndDlg, &ps); + DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } return TRUE; @@ -1286,7 +1095,7 @@ WCHAR Buffer2[256]; WCHAR Buffer3[512]; - LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, 256); + LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, _countof(Buffer1)); wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); wsprintfW(Buffer3, Buffer1, Buffer2); @@ -1327,8 +1136,8 @@ wcscmp(Password, pgContext->Password) != 0) { /* Wrong Password */ - LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGPASSWORD, Buffer2, 256); - LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); + LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGPASSWORD, Buffer2, _countof(Buffer2)); + LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, _countof(Buffer1)); MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); } else @@ -1341,9 +1150,9 @@ } else { - LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, 256); + LoadStringW(pgContext->hDllInstance, IDS_LOCKEDWRONGUSER, Buffer1, _countof(Buffer1)); wsprintfW(Buffer2, Buffer1, pgContext->Domain, pgContext->UserName); - LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, 256); + LoadStringW(pgContext->hDllInstance, IDS_COMPUTERLOCKED, Buffer1, _countof(Buffer1)); MessageBoxW(hwndDlg, Buffer2, Buffer1, MB_OK | MB_ICONERROR); } } @@ -1371,33 +1180,35 @@ PGINA_CONTEXT pgContext; INT result = WLX_SAS_ACTION_NONE; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: + { pgContext = (PGINA_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); SetLockMessage(hwndDlg, IDC_LOCKMSG, pgContext); SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); - if (pgContext->bDisableCAD == TRUE) + if (pgContext->bDisableCAD) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - return TRUE; + /* Draw the logo bitmap */ + pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + } case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc; if (pgContext->hBitmap) { - hdc = BeginPaint(hwndDlg, &ps); - DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + BeginPaint(hwndDlg, &ps); + DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } return TRUE; @@ -1461,27 +1272,27 @@ { PGINA_CONTEXT pgContext; - pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: { pgContext = (PGINA_CONTEXT)lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); - - pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)pgContext); + + /* Draw the logo bitmap */ + pgContext->hBitmap = LoadImageW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); SetLockMessage(hwndDlg, IDC_LOCKMSG, pgContext); return TRUE; } case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc; if (pgContext->hBitmap) { - hdc = BeginPaint(hwndDlg, &ps); - DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + BeginPaint(hwndDlg, &ps); + DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } return TRUE; Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "ÐÐ¾Ð¼Ð¾&Ñ", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "ÐÐ¾Ð¼Ð¾&Ñ", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -131,6 +131,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Storno", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&NÃ¡povÄda", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -142,19 +146,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Vypnout ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Storno", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&NÃ¡povÄda", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Abbrechen", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Hilfe", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ReactOS herunterfahren" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Abbrechen", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Hilfe", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -116,6 +116,7 @@ IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 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 @@ -126,6 +127,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +142,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -127,6 +127,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Aceptar", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "Aceptar", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Cancelar", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Ayuda", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -138,19 +142,12 @@ DEFPUSHBUTTON "Aceptar", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Apagar ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "Aceptar", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Cancelar", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Ayuda", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Annuler", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Aide", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Fermer ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Annuler", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Aide", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Help", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -135,6 +135,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Annulla", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Aiuto", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -146,19 +150,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Spegnimento di ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Annulla", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Aiuto", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "ãã«ã(&H)", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 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" +CAPTION "Luna-XP-style Shut Down dialog" +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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "ãã«ã(&H)", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -126,6 +126,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Avbryt", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Hjelp", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -137,19 +141,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "SlÃ¥ av ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Avbryt", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Hjelp", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -136,6 +136,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Anuluj", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Pomoc", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -147,19 +151,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Zamknij ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Anuluj", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Pomoc", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -135,6 +135,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Con&firmÄ", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "A&nuleazÄ", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "Con&firmÄ", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "A&nuleazÄ", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Manualâ¦", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -146,19 +150,12 @@ DEFPUSHBUTTON "Ã&nchide", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Ãnchidere ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "Con&firmÄ", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Manualâ¦", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -128,6 +128,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -139,19 +143,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -131,6 +131,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&PomocnÃk", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -142,19 +146,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Vypnutie systÃ©mu ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&PomocnÃk", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -129,6 +129,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Anulo", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Anulo", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&NdihmÃ«", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -140,19 +144,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Anulo", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&NdihmÃ«", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -128,6 +128,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "Tamam", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Ä°ptal", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "Tamam", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Ä°ptal", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&YardÄ±m", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -139,19 +143,12 @@ DEFPUSHBUTTON "Tamam", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Oturumu Kapat" +CAPTION "Luna-XP-style Shut Down dialog" 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Ä±zÄ±n ne yapmasÄ±nÄ± istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "Tamam", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Ä°ptal", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&YardÄ±m", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -134,6 +134,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "&ÐÐ¾Ð²ÑÐ´ÐºÐ°", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -145,19 +149,12 @@ DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "&ÐÐ¾Ð²ÑÐ´ÐºÐ°", IDHELP, 204, 122, 55, 14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/zh-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/zh-CN.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -128,6 +128,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "ç¡®å®", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "åæ¶", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "ç¡®å®", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "åæ¶", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "å¸®å©(&H)", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -139,19 +143,12 @@ DEFPUSHBUTTON "ç¡®å®", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "å³é ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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 "ä½ æ³è®©è®¡ç®æºåä»ä¹?(&W)", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "ç¡®å®", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "åæ¶", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "å¸®å©(&H)", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/zh-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/zh-TW.rc [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -128,6 +128,10 @@ LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "ç¢ºå®", IDOK, 143, 122, 55, 14, WS_GROUP PUSHBUTTON "åæ¶", IDCANCEL, 204, 122, 55, 14 + + // DEFPUSHBUTTON "ç¢ºå®", IDOK, 80, 122, 55, 14, WS_GROUP + // PUSHBUTTON "åæ¶", IDCANCEL, 143, 122, 55, 14 + // PUSHBUTTON "å¹«å©(&H)", IDHELP, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -139,19 +143,12 @@ DEFPUSHBUTTON "ç¢ºå®", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_SHELL DIALOGEX 0, 0, 275, 146 +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 146 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "éé ReactOS" +CAPTION "Luna-XP-style Shut Down dialog" 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 "ä½ æ³è®è¨ç®æ©åä»éº¼?(&W)", IDC_STATIC, 39, 57, 167, 10 - COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 - DEFPUSHBUTTON "ç¢ºå®", IDOK, 80, 122, 55, 14, WS_GROUP - PUSHBUTTON "åæ¶", IDCANCEL, 143, 122, 55, 14 - PUSHBUTTON "å¹«å©(&H)", IDHELP, 204, 122, 55, 14 + DEFPUSHBUTTON "OK", IDOK, 80, 122, 55, 14, WS_GROUP END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -26,11 +26,9 @@ #include "msgina.h" -#include <winreg.h> #include <winsvc.h> #include <userenv.h> #include <ndk/sefuncs.h> -#include <strsafe.h> HINSTANCE hDllInstance; @@ -228,7 +226,7 @@ pgContext->bDontDisplayLastUserName = TRUE; } - dwSize = 256 * sizeof(WCHAR); + dwSize = sizeof(pgContext->UserName); rc = RegQueryValueExW(hKey, L"DefaultUserName", NULL, @@ -236,7 +234,7 @@ (LPBYTE)&pgContext->UserName, &dwSize); - dwSize = 256 * sizeof(WCHAR); + dwSize = sizeof(pgContext->Domain); rc = RegQueryValueExW(hKey, L"DefaultDomain", NULL, @@ -327,7 +325,7 @@ pgContext->station = lpWinsta; /* Clear status window handle */ - pgContext->hStatusWindow = 0; + pgContext->hStatusWindow = NULL; /* Notify winlogon that we will use the default SAS */ pgContext->pWlxFuncs->WlxUseCtrlAltDel(hWlx); @@ -370,6 +368,8 @@ * User setting: * HKCU\Control Panel\Desktop : ScreenSaverIsSecure */ + + // FIXME: User impersonation!! rc = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", @@ -766,7 +766,7 @@ wcscpy(pgContext->UserName, UserName); if (Domain == NULL || wcslen(Domain) == 0) { - dwLength = 256; + dwLength = _countof(pgContext->Domain); GetComputerNameW(pgContext->Domain, &dwLength); } else @@ -935,9 +935,9 @@ } result = CreateProfile(pgContext, UserName, Domain, Password); - if (result == TRUE) + if (result) { - ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + ZeroMemory(pgContext->Password, sizeof(pgContext->Password)); wcscpy(pgContext->Password, Password); NotifyBootConfigStatus(TRUE); @@ -976,7 +976,7 @@ return; } - if (pgContext->bAutoAdminLogon == TRUE) + if (pgContext->bAutoAdminLogon) { /* Don't display the window, we want to do an automatic logon */ pgContext->AutoLogonState = AUTOLOGON_ONCE; @@ -986,7 +986,7 @@ else pgContext->AutoLogonState = AUTOLOGON_DISABLED; - if (pgContext->bDisableCAD == TRUE) + if (pgContext->bDisableCAD) { pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); return; @@ -1067,7 +1067,7 @@ TRACE("WlxDisplayLockedNotice()\n"); - if (pgContext->bDisableCAD == TRUE) + if (pgContext->bDisableCAD) { pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); return; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -6,6 +6,8 @@ #endif #include <stdarg.h> +#include <stdlib.h> +#include <tchar.h> #define WIN32_NO_STATUS #define _INC_WINDOWS @@ -13,10 +15,13 @@ #include <windef.h> #include <winbase.h> +#include <winreg.h> #include <winuser.h> #include <winwlx.h> #include <ndk/rtlfuncs.h> #include <ntsecapi.h> + +#include <strsafe.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msgina); @@ -43,7 +48,7 @@ BOOL bDontDisplayLastUserName; BOOL bShutdownWithoutLogon; - INT nShutdownAction; + ULONG nShutdownAction; /* Information to be filled during logon */ WCHAR UserName[256]; @@ -129,6 +134,24 @@ IN PWSTR Domain, IN PWSTR Password); +/* shutdown.c */ + +DWORD +LoadShutdownSelState(VOID); + +VOID +SaveShutdownSelState(DWORD ShutdownCode); + +DWORD +GetAllowedShutdownOptions(VOID); + +INT_PTR +ShutdownDialog( + IN HWND hwndDlg, + IN DWORD ShutdownOptions, + IN PGINA_CONTEXT pgContext); + + #ifdef __cplusplus } // extern "C" #endif Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -8,7 +8,7 @@ #define IDD_LOCKED_DLG 104 #define IDD_UNLOCK_DLG 105 #define IDD_SHUTDOWN_DLG 108 -#define IDD_SHUTDOWN_SHELL 109 +#define IDD_SHUTDOWN_FANCY 109 #define IDC_LOGOFF 1001 #define IDC_USERNAME 1002 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] Sun Sep 18 19:37:25 2016 @@ -2,29 +2,41 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS msgina.dll * FILE: lib/msgina/shutdown.c - * PURPOSE: Shutdown Dialog Box - * PROGRAMMER: Lee Schroeder (spaceseel at gmail dot com) + * PURPOSE: Shutdown Dialog Box (GUI only) + * PROGRAMMERS: Lee Schroeder (spaceseel at gmail dot com) + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ #include "msgina.h" #include <powrprof.h> -#include <strsafe.h> #include <wingdi.h> -#include <winreg.h> -#include <stdlib.h> - -DWORD g_shutdownCode = 0; -BOOL g_logoffHideState = FALSE; - -static DWORD + +/* Shutdown state flags */ +#define WLX_SHUTDOWN_STATE_LOGOFF 0x01 +#define WLX_SHUTDOWN_STATE_POWER_OFF 0x02 +#define WLX_SHUTDOWN_STATE_REBOOT 0x04 +// 0x08 +#define WLX_SHUTDOWN_STATE_SLEEP 0x10 +// 0x20 +#define WLX_SHUTDOWN_STATE_HIBERNATE 0x40 +// 0x80 + +typedef struct _SHUTDOWN_DLG_CONTEXT +{ + PGINA_CONTEXT pgContext; + DWORD ShutdownOptions; + BOOL bCloseDlg; +} SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT; + +DWORD LoadShutdownSelState(VOID) { + LONG lRet; HKEY hKey; - LONG lRet; DWORD dwValue, dwTemp, dwSize; /* Default to shutdown */ - dwValue = 1; + dwValue = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; lRet = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", @@ -43,33 +55,40 @@ { switch (dwTemp) { - case 0x01: /* Log off */ - dwValue = 0; + case WLX_SHUTDOWN_STATE_LOGOFF: + dwValue = WLX_SAS_ACTION_LOGOFF; break; - case 0x02: /* Shut down */ - dwValue = 1; + case WLX_SHUTDOWN_STATE_POWER_OFF: + dwValue = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF; break; - case 0x04: /* Reboot */ - dwValue = 2; + case WLX_SHUTDOWN_STATE_REBOOT: + dwValue = WLX_SAS_ACTION_SHUTDOWN_REBOOT; break; - case 0x10: /* Sleep */ - dwValue = 3; + // 0x08 + + case WLX_SHUTDOWN_STATE_SLEEP: + dwValue = WLX_SAS_ACTION_SHUTDOWN_SLEEP; break; - case 0x40: /* Hibernate */ - dwValue = 4; + // 0x20 + + case WLX_SHUTDOWN_STATE_HIBERNATE: + dwValue = WLX_SAS_ACTION_SHUTDOWN_HIBERNATE; break; + + // 0x80 } } return dwValue; } -static VOID -SaveShutdownSelState(DWORD ShutdownCode) +VOID +SaveShutdownSelState( + IN DWORD ShutdownCode) { HKEY hKey; DWORD dwValue = 0; @@ -86,24 +105,24 @@ switch (ShutdownCode) { - case 0: /* Log off */ - dwValue = 0x01; - break; - - case 1: /* Shut down */ - dwValue = 0x02; - break; - - case 2: /* Reboot */ - dwValue = 0x04; - break; - - case 3: /* Sleep */ - dwValue = 0x10; - break; - - case 4: /* Hibernate */ - dwValue = 0x40; + case WLX_SAS_ACTION_LOGOFF: + dwValue = WLX_SHUTDOWN_STATE_LOGOFF; + break; + + case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: + dwValue = WLX_SHUTDOWN_STATE_POWER_OFF; + break; + + case WLX_SAS_ACTION_SHUTDOWN_REBOOT: + dwValue = WLX_SHUTDOWN_STATE_REBOOT; + break; + + case WLX_SAS_ACTION_SHUTDOWN_SLEEP: + dwValue = WLX_SHUTDOWN_STATE_SLEEP; + break; + + case WLX_SAS_ACTION_SHUTDOWN_HIBERNATE: + dwValue = WLX_SHUTDOWN_STATE_HIBERNATE; break; } @@ -114,232 +133,255 @@ RegCloseKey(hKey); } +DWORD +GetAllowedShutdownOptions(VOID) +{ + DWORD Options = 0; + + // FIXME: Compute those options accordings to current user's rights! + Options |= WLX_SHUTDOWN_STATE_LOGOFF | WLX_SHUTDOWN_STATE_POWER_OFF | WLX_SHUTDOWN_STATE_REBOOT; + + if (IsPwrSuspendAllowed()) + Options |= WLX_SHUTDOWN_STATE_SLEEP; + + if (IsPwrHibernateAllowed()) + Options |= WLX_SHUTDOWN_STATE_HIBERNATE; + + return Options; +} + static VOID -UpdateShutdownShellDesc(HWND hWnd) +UpdateShutdownDesc( + IN HWND hDlg, + IN PSHUTDOWN_DLG_CONTEXT pContext) // HINSTANCE hInstance { UINT DescId = 0; - DWORD ShutdownCode = 0; - WCHAR tmpBuffer[256]; - - ShutdownCode = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); - - if (!g_logoffHideState) - { - switch (ShutdownCode) + DWORD ShutdownCode; + WCHAR szBuffer[256]; + + ShutdownCode = SendDlgItemMessageW(hDlg, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); + if (ShutdownCode == CB_ERR) // Invalid selection + return; + + ShutdownCode = SendDlgItemMessageW(hDlg, IDC_SHUTDOWN_LIST, CB_GETITEMDATA, ShutdownCode, 0); + + switch (ShutdownCode) + { + case WLX_SAS_ACTION_LOGOFF: + DescId = IDS_SHUTDOWN_LOGOFF_DESC; + break; + + case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: + DescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + break; + + case WLX_SAS_ACTION_SHUTDOWN_REBOOT: + DescId = IDS_SHUTDOWN_RESTART_DESC; + break; + + case WLX_SAS_ACTION_SHUTDOWN_SLEEP: + DescId = IDS_SHUTDOWN_SLEEP_DESC; + break; + + case WLX_SAS_ACTION_SHUTDOWN_HIBERNATE: + DescId = IDS_SHUTDOWN_HIBERNATE_DESC; + break; + + default: + break; + } + + LoadStringW(pContext->pgContext->hDllInstance, DescId, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SHUTDOWN_DESCRIPTION, szBuffer); +} + +static VOID +ShutdownOnInit( + IN HWND hDlg, + IN PSHUTDOWN_DLG_CONTEXT pContext) +{ + PGINA_CONTEXT pgContext = pContext->pgContext; + HWND hwndList; + INT idx, count, i; + WCHAR szBuffer[256]; + WCHAR szBuffer2[256]; + + hwndList = GetDlgItem(hDlg, IDC_SHUTDOWN_LIST); + + /* Clear the content before it's used */ + SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); + + /* Log off */ + if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_LOGOFF) + { + LoadStringW(pgContext->hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, _countof(szBuffer)); + StringCchPrintfW(szBuffer2, _countof(szBuffer2), szBuffer, pgContext->UserName); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer2); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF); + } + + /* Shut down - DEFAULT */ + if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_POWER_OFF) + { + LoadStringW(pgContext->hDllInstance, IDS_SHUTDOWN_SHUTDOWN, szBuffer, _countof(szBuffer)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + } + + /* Restart */ + if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_REBOOT) + { + LoadStringW(pgContext->hDllInstance, IDS_SHUTDOWN_RESTART, szBuffer, _countof(szBuffer)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + } + + // if (pContext->ShutdownOptions & 0x08) {} + + /* Sleep */ + if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_SLEEP) + { + LoadStringW(pgContext->hDllInstance, IDS_SHUTDOWN_SLEEP, szBuffer, _countof(szBuffer)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_SLEEP); + } + + // if (pContext->ShutdownOptions & 0x20) {} + + /* Hibernate */ + if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_HIBERNATE) + { + LoadStringW(pgContext->hDllInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, _countof(szBuffer)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE); + } + + // if (pContext->ShutdownOptions & 0x80) {} + + /* Set the default shut down selection */ + count = SendMessageW(hwndList, CB_GETCOUNT, 0, 0); + for (i = 0; i < count; i++) + { + if (SendMessageW(hwndList, CB_GETITEMDATA, i, 0) == pgContext->nShutdownAction) { - case 0: /* Log off */ - DescId = IDS_SHUTDOWN_LOGOFF_DESC; - break; - case 1: /* Shut down */ - DescId = IDS_SHUTDOWN_SHUTDOWN_DESC; - break; - case 2: /* Restart */ - DescId = IDS_SHUTDOWN_RESTART_DESC; - break; - default: + SendMessageW(hwndList, CB_SETCURSEL, i, 0); break; } - - if (IsPwrSuspendAllowed()) - { - if (ShutdownCode == 3) /* Sleep */ - { - DescId = IDS_SHUTDOWN_SLEEP_DESC; - } - else if (ShutdownCode == 4) /* Hibernate */ - { - DescId = IDS_SHUTDOWN_HIBERNATE_DESC; - } - } - else - { - if (ShutdownCode == 3) /* Hibernate */ - { - DescId = IDS_SHUTDOWN_SLEEP_DESC; - } - } - } - else - { - switch (ShutdownCode) - { - case 0: /* Shut down */ - DescId = IDS_SHUTDOWN_SHUTDOWN_DESC; - break; - case 1: /* Restart */ - DescId = IDS_SHUTDOWN_RESTART_DESC; - break; - default: - break; - } - - if (IsPwrSuspendAllowed()) - { - if (ShutdownCode == 2) /* Sleep */ - { - DescId = IDS_SHUTDOWN_SLEEP_DESC; - } - else if (ShutdownCode == 3) /* Hibernate */ - { - DescId = IDS_SHUTDOWN_HIBERNATE_DESC; - } - } - else - { - 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 uMsg, WPARAM wParam, LPARAM lParam) -{ - PGINA_CONTEXT pgContext; - - pgContext = (PGINA_CONTEXT)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + } + + /* Update the choice description based on the current selection */ + UpdateShutdownDesc(hDlg, pContext); +} + +static VOID +ShutdownOnOk( + IN HWND hDlg, + IN PGINA_CONTEXT pgContext) +{ + INT idx; + + idx = SendDlgItemMessageW(hDlg, + IDC_SHUTDOWN_LIST, + CB_GETCURSEL, + 0, + 0); + if (idx != CB_ERR) + { + pgContext->nShutdownAction = + SendDlgItemMessageW(hDlg, + IDC_SHUTDOWN_LIST, + CB_GETITEMDATA, + idx, + 0); + } +} + +static BOOL +CALLBACK +ShutdownDialogProc( + HWND hDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PSHUTDOWN_DLG_CONTEXT pContext; + + pContext = (PSHUTDOWN_DLG_CONTEXT)GetWindowLongPtrW(hDlg, GWLP_USERDATA); switch (uMsg) { case WM_INITDIALOG: { - int defSelect = 0; - int tmpSelect, lastState; - WCHAR userBuffer[256]; - DWORD userBufferSize = _countof(userBuffer); - WCHAR tmpBuffer[256]; - WCHAR tmpBuffer2[512]; - - pgContext = (PGINA_CONTEXT)lParam; - if (!pgContext) + pContext = (PSHUTDOWN_DLG_CONTEXT)lParam; + SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)pContext); + + ShutdownOnInit(hDlg, pContext); + + /* Draw the logo bitmap */ + pContext->pgContext->hBitmap = + LoadImageW(pContext->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + } + + case WM_DESTROY: + DeleteObject(pContext->pgContext->hBitmap); + return TRUE; + + case WM_ACTIVATE: + { + /* + * If the user deactivates the shutdown dialog (it loses its focus + * while the dialog is not being closed), then destroy the dialog + * and cancel shutdown. + */ + if (LOWORD(wParam) == WA_INACTIVE) { - WARN("pgContext is NULL, branding bitmaps will not be displayed.\n"); - } - - 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) - { - /* Log off */ - LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, tmpBuffer, _countof(tmpBuffer)); - GetUserNameW(userBuffer, &userBufferSize); - StringCchPrintfW(tmpBuffer2, _countof(tmpBuffer2), tmpBuffer, userBuffer); - tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer2); - if (lastState == 0) + if (!pContext->bCloseDlg) { - defSelect = tmpSelect; + pContext->bCloseDlg = TRUE; + EndDialog(hDlg, 0); } } - - /* Shut down - DEFAULT */ - 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, _countof(tmpBuffer)); - tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); - if (lastState == 2) - { - defSelect = tmpSelect; - } - - /* Sleep */ - if (IsPwrSuspendAllowed()) - { - LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, tmpBuffer, _countof(tmpBuffer)); - tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); - if (lastState == 3) - { - defSelect = tmpSelect; - } - } - - /* Hibernate */ - if (IsPwrHibernateAllowed()) - { - LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, tmpBuffer, _countof(tmpBuffer)); - tmpSelect = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); - if (lastState == 4) - { - defSelect = tmpSelect; - } - } - - /* Sets the default shut down selection */ - SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_SETCURSEL, defSelect, 0); - - /* Updates the choice description based on the current selection */ - UpdateShutdownShellDesc(hWnd); - - /* Draw the logo bitmap */ - if (pgContext) - pgContext->hBitmap = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - - return TRUE; - } - - case WM_DESTROY: - { - if (pgContext) - DeleteObject(pgContext->hBitmap); - return TRUE; - } - -#if 0 - case WM_ACTIVATE: - { - if (LOWORD(wParam) == WA_INACTIVE) - EndDialog(hWnd, 0); return FALSE; } -#endif case WM_PAINT: { PAINTSTRUCT ps; - if (pgContext && pgContext->hBitmap) + if (pContext->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; + BeginPaint(hDlg, &ps); + DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pContext->pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hDlg, &ps); } - return FALSE; + return TRUE; } + + case WM_CLOSE: + pContext->bCloseDlg = TRUE; + EndDialog(hDlg, IDCANCEL); + break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - g_shutdownCode = SendDlgItemMessageW(hWnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); - SaveShutdownSelState(g_shutdownCode); - EndDialog(hWnd, IDOK); + ShutdownOnOk(hDlg, pContext->pgContext); + + /* Fall back */ + case IDCANCEL: + case IDHELP: + pContext->bCloseDlg = TRUE; + EndDialog(hDlg, LOWORD(wParam)); break; - case IDCANCEL: - EndDialog(hWnd, IDCANCEL); - break; - - case IDHELP: - EndDialog(hWnd, IDHELP); - break; - case IDC_SHUTDOWN_LIST: - UpdateShutdownShellDesc(hWnd); + UpdateShutdownDesc(hDlg, pContext); break; } break; @@ -349,6 +391,55 @@ } return TRUE; } + +INT_PTR +ShutdownDialog( + IN HWND hwndDlg, + IN DWORD ShutdownOptions, + IN PGINA_CONTEXT pgContext) +{ + INT_PTR ret; + SHUTDOWN_DLG_CONTEXT Context; + +#if 0 + DWORD ShutdownOptions; + + // FIXME: User impersonation!! + pgContext->nShutdownAction = LoadShutdownSelState(); + ShutdownOptions = GetAllowedShutdownOptions(); +#endif + + Context.pgContext = pgContext; + Context.ShutdownOptions = ShutdownOptions; + Context.bCloseDlg = FALSE; + + if (pgContext->hWlx && pgContext->pWlxFuncs) + { + ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), + hwndDlg, + ShutdownDialogProc, + (LPARAM)&Context); + } + else + { + ret = DialogBoxParamW(pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), + hwndDlg, + ShutdownDialogProc, + (LPARAM)&Context); + } + +#if 0 + // FIXME: User impersonation!! + if (ret == IDOK) + SaveShutdownSelState(pgContext->nShutdownAction); +#endif + + return ret; +} + /* * NOTES: @@ -373,35 +464,62 @@ LPWSTR lpUsername, BOOL bHideLogoff) { - GINA_CONTEXT pgContext = { 0 }; - INT_PTR dlgValue = 0; + INT_PTR dlgValue; + DWORD ShutdownOptions; + + /* + * As we are called by the shell itself, don't use + * the cached GINA context but use a local copy here. + */ + GINA_CONTEXT gContext = { 0 }; + DWORD BufferSize; UNREFERENCED_PARAMETER(lpUsername); - g_logoffHideState = bHideLogoff; - - /* Load the shut down dialog box */ - dlgValue = DialogBoxParamW(hDllInstance, - MAKEINTRESOURCEW(IDD_SHUTDOWN_SHELL), - hParent, - ExitWindowsDialogShellProc, - (LPARAM)&pgContext); + ShutdownOptions = GetAllowedShutdownOptions(); + if (bHideLogoff) + ShutdownOptions &= ~WLX_SHUTDOWN_STATE_LOGOFF; + + /* Initialize our local GINA context */ + gContext.hDllInstance = hDllInstance; + BufferSize = _countof(gContext.UserName); + // NOTE: Only when this function is called, Win checks inside + // HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", + // value "Logon User Name", and determines whether it will display + // the user name. + GetUserNameW(gContext.UserName, &BufferSize); + gContext.nShutdownAction = LoadShutdownSelState(); + + /* Load the shutdown dialog box */ + dlgValue = ShutdownDialog(hParent, ShutdownOptions, &gContext); /* Determine what to do based on user selection */ if (dlgValue == IDOK) { - switch (g_shutdownCode) + SaveShutdownSelState(gContext.nShutdownAction); + + switch (gContext.nShutdownAction) { - case 0: /* Log off */ - return 0x01; - case 1: /* Shut down */ - return 0x02; - case 2: /* Reboot */ - return 0x04; - case 3: /* Sleep */ - return 0x10; - case 4: /* Hibernate */ - return 0x40; + case WLX_SAS_ACTION_LOGOFF: + return WLX_SHUTDOWN_STATE_LOGOFF; + + case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: + return WLX_SHUTDOWN_STATE_POWER_OFF; + + case WLX_SAS_ACTION_SHUTDOWN_REBOOT: + return WLX_SHUTDOWN_STATE_REBOOT; + + // 0x08 + + case WLX_SAS_ACTION_SHUTDOWN_SLEEP: + return WLX_SHUTDOWN_STATE_SLEEP; + + // 0x20 + + case WLX_SAS_ACTION_SHUTDOWN_HIBERNATE: + return WLX_SHUTDOWN_STATE_HIBERNATE; + + // 0x80 } } /* Help file is called directly here */ @@ -415,5 +533,5 @@ ERR("Failed to create dialog\n"); } - return 0x00; -} + return 0; +} Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/tui.c [iso-8859-1] Sun Sep 18 19:37:25 2016 @@ -70,7 +70,7 @@ static LPCWSTR newLine = L"\n"; DWORD count; - if (0 == LoadStringW(hDllInstance, uIdResourceText, Prompt, 256)) + if (0 == LoadStringW(hDllInstance, uIdResourceText, Prompt, _countof(Prompt))) return FALSE; if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), @@ -205,9 +205,9 @@ TRACE("TUILoggedOutSAS()\n"); /* Ask the user for credentials */ - if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE)) - return WLX_SAS_ACTION_NONE; - if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) + if (!ReadString(IDS_ASKFORUSER, UserName, _countof(UserName), TRUE)) + return WLX_SAS_ACTION_NONE; + if (!ReadString(IDS_ASKFORPASSWORD, Password, _countof(Password), FALSE)) return WLX_SAS_ACTION_NONE; Status = DoLoginTasks(pgContext, UserName, NULL, Password, &SubStatus); @@ -238,9 +238,9 @@ return WLX_SAS_ACTION_UNLOCK_WKSTA; /* Ask the user for credentials */ - if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE)) - return WLX_SAS_ACTION_NONE; - if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) + if (!ReadString(IDS_ASKFORUSER, UserName, _countof(UserName), TRUE)) + return WLX_SAS_ACTION_NONE; + if (!ReadString(IDS_ASKFORPASSWORD, Password, _countof(Password), FALSE)) return WLX_SAS_ACTION_NONE; Status = ConnectToLsa(pgContext);

1 0

[hbelusca] 72731: [SHELL32]: Code formatting only.
by hbelusca＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: hbelusca Date: Sun Sep 18 19:36:05 2016 New Revision: 72731 URL: http://svn.reactos.org/svn/reactos?rev=72731&view=rev Log: [SHELL32]: Code formatting only. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp 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] Sun Sep 18 19:36:05 2016 @@ -914,10 +914,11 @@ { case IDOK: ExitWindowsEx(EWX_LOGOFF, 0); - break; + break; + case IDCANCEL: EndDialog(hwnd, IDCANCEL); - break; + break; } break; @@ -956,8 +957,8 @@ * ExitWindowsDialog_backup * * NOTES - * used as a backup solution to shutdown the OS in case msgina.dll somehow - * cannot be found. + * Used as a backup solution to shutdown the OS in case msgina.dll + * somehow cannot be found. */ VOID ExitWindowsDialog_backup(HWND hWndOwner) {

1 0

[dchapyshev] 72730: [KERNEL32] Implement MB_ERR_INVALID_CHARS flag for DBCS codepages * Fixes 3 tests for kernel32:codepage
by dchapyshev＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: dchapyshev Date: Sun Sep 18 18:21:30 2016 New Revision: 72730 URL: http://svn.reactos.org/svn/reactos?rev=72730&view=rev Log: [KERNEL32] Implement MB_ERR_INVALID_CHARS flag for DBCS codepages * Fixes 3 tests for kernel32:codepage Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Sep 18 18:21:30 2016 @@ -439,6 +439,7 @@ PUSHORT MultiByteTable; LPCSTR TempString; INT TempLength; + USHORT WideChar; /* Get code page table. */ CodePageEntry = IntGetCodePageEntry(CodePage); @@ -471,8 +472,48 @@ if (Flags & MB_ERR_INVALID_CHARS) { - /* FIXME */ - DPRINT1("IntMultiByteToWideCharCP: MB_ERR_INVALID_CHARS case not implemented!\n"); + TempString = MultiByteString; + + while (TempString < MbsEnd) + { + DBCSOffset = CodePageTable->DBCSOffsets[*TempString]; + + if (DBCSOffset) + { + /* If lead byte is presented, but behind it there is no symbol */ + if (((TempString + 1) == MbsEnd) || (*(TempString + 1) == 0)) + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + + WideChar = CodePageTable->DBCSOffsets[*(TempString + 1) + DBCSOffset]; + + if (WideChar == CodePageTable->UniDefaultChar && + MAKEWORD(*(TempString + 1), *TempString) != CodePageTable->TransUniDefaultChar) + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + + TempString++; + } + else + { + USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + + if ((WideChar == CodePageTable->UniDefaultChar && + *TempString != CodePageTable->TransUniDefaultChar) || + /* "Private Use" characters */ + (WideChar >= 0xE000 && WideChar <= 0xF8FF)) + { + SetLastError(ERROR_NO_UNICODE_TRANSLATION); + return 0; + } + } + + TempString++; + } } /* Does caller query for output buffer size? */ @@ -536,10 +577,10 @@ TempLength > 0; TempString++, TempLength--) { - USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + WideChar = MultiByteTable[(UCHAR)*TempString]; if ((WideChar == CodePageTable->UniDefaultChar && - *TempString != CodePageEntry->CodePageTable.TransUniDefaultChar) || + *TempString != CodePageTable->TransUniDefaultChar) || /* "Private Use" characters */ (WideChar >= 0xE000 && WideChar <= 0xF8FF)) {

1 0

[dchapyshev] 72729: [KERNEL32] Implement MB_USEGLYPHCHARS flag for MultiByteToWideChar. Add checks for "Private Use" characters. More correct checks for input parameters. * Fixes 6 tests for kernel...
by dchapyshev＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: dchapyshev Date: Sun Sep 18 17:26:59 2016 New Revision: 72729 URL: http://svn.reactos.org/svn/reactos?rev=72729&view=rev Log: [KERNEL32] Implement MB_USEGLYPHCHARS flag for MultiByteToWideChar. Add checks for "Private Use" characters. More correct checks for input parameters. * Fixes 6 tests for kernel32:codepage Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Sep 18 17:26:59 2016 @@ -436,6 +436,7 @@ { PCODEPAGE_ENTRY CodePageEntry; PCPTABLEINFO CodePageTable; + PUSHORT MultiByteTable; LPCSTR TempString; INT TempLength; @@ -446,10 +447,22 @@ SetLastError(ERROR_INVALID_PARAMETER); return 0; } + CodePageTable = &CodePageEntry->CodePageTable; + /* If MB_USEGLYPHCHARS flag present and glyph table present */ + if ((Flags & MB_USEGLYPHCHARS) && CodePageTable->MultiByteTable[256]) + { + /* Use glyph table */ + MultiByteTable = CodePageTable->MultiByteTable + 256 + 1; + } + else + { + MultiByteTable = CodePageTable->MultiByteTable; + } + /* Different handling for DBCS code pages. */ - if (CodePageTable->MaximumCharacterSize > 1) + if (CodePageTable->DBCSCodePage) { UCHAR Char; USHORT DBCSOffset; @@ -498,7 +511,7 @@ if (!DBCSOffset) { - *WideCharString++ = CodePageTable->MultiByteTable[Char]; + *WideCharString++ = MultiByteTable[Char]; continue; } @@ -523,9 +536,12 @@ TempLength > 0; TempString++, TempLength--) { - if (CodePageTable->MultiByteTable[(UCHAR)*TempString] == - CodePageTable->UniDefaultChar && - *TempString != CodePageEntry->CodePageTable.DefaultChar) + USHORT WideChar = MultiByteTable[(UCHAR)*TempString]; + + if ((WideChar == CodePageTable->UniDefaultChar && + *TempString != CodePageEntry->CodePageTable.TransUniDefaultChar) || + /* "Private Use" characters */ + (WideChar >= 0xE000 && WideChar <= 0xF8FF)) { SetLastError(ERROR_NO_UNICODE_TRANSLATION); return 0; @@ -542,7 +558,7 @@ TempLength > 0; MultiByteString++, TempLength--) { - *WideCharString++ = CodePageTable->MultiByteTable[(UCHAR)*MultiByteString]; + *WideCharString++ = MultiByteTable[(UCHAR)*MultiByteString]; } /* Adjust buffer size. Wine trick ;-) */ @@ -1434,9 +1450,9 @@ { /* Check the parameters. */ if (MultiByteString == NULL || - MultiByteCount == 0 || - (WideCharString == NULL && WideCharCount > 0) || - (PVOID)MultiByteString == (PVOID)WideCharString) + MultiByteCount == 0 || WideCharCount < 0 || + (WideCharCount && (WideCharString == NULL || + (PVOID)MultiByteString == (PVOID)WideCharString))) { SetLastError(ERROR_INVALID_PARAMETER); return 0;

1 0

[akhaldi] 72728: [WS2_32_WINETEST] Disable test_address_list_query() as the ioctl is not supported yet by winsock helper dll (wshtcpip.dll) and the test is assuming there is info returned which is ...
by akhaldi＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: akhaldi Date: Sun Sep 18 16:20:20 2016 New Revision: 72728 URL: http://svn.reactos.org/svn/reactos?rev=72728&view=rev Log: [WS2_32_WINETEST] Disable test_address_list_query() as the ioctl is not supported yet by winsock helper dll (wshtcpip.dll) and the test is assuming there is info returned which is wrong and crashes. By Peter Hater. CORE-10440 CORE-12000 Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Sun Sep 18 16:20:20 2016 @@ -9287,6 +9287,8 @@ CloseHandle(previous_port); } +#if CORE_12000_IS_FIXED /* CORE-12000 */ +/* WSHIoctl is not supported by wshtcpip.dll and crashes. Test should be fixed also! */ static void test_address_list_query(void) { SOCKET_ADDRESS_LIST *address_list; @@ -9349,6 +9351,7 @@ HeapFree(GetProcessHeap(), 0, address_list); closesocket(s); } +#endif /* CORE-12000 */ static DWORD WINAPI inet_ntoa_thread_proc(void *param) { @@ -9807,7 +9810,9 @@ test_WSAAsyncGetServByName(); test_completion_port(); +#if CORE_12000_IS_FIXED /* FIXME: CORE-12000 */ test_address_list_query(); +#endif /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

[akhaldi] 72727: [ADNS] Use dynamic memory for network info and set domain for searches. By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: akhaldi Date: Sun Sep 18 16:07:29 2016 New Revision: 72727 URL: http://svn.reactos.org/svn/reactos?rev=72727&view=rev Log: [ADNS] Use dynamic memory for network info and set domain for searches. By Peter Hater. CORE-10440 Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/adns/src/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] Sun Sep 18 16:07:29 2016 @@ -572,9 +572,14 @@ #define SECURE_PATH_LEN (MAX_PATH - 64) char PathBuf[MAX_PATH]; struct in_addr addr; +#ifdef __REACTOS__ + PFIXED_INFO network_info; + ULONG network_info_blen = 0; +#else #define ADNS_PFIXED_INFO_BLEN (2048) PFIXED_INFO network_info = (PFIXED_INFO)_alloca(ADNS_PFIXED_INFO_BLEN); ULONG network_info_blen = ADNS_PFIXED_INFO_BLEN; +#endif /* __REACTOS__ */ DWORD network_info_result; PIP_ADDR_STRING pip; const char *network_err_str = ""; @@ -601,6 +606,10 @@ GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); readconfig(ads,PathBuf,0); +#ifdef __REACTOS__ + network_info_result = GetNetworkParams(NULL, &network_info_blen); + network_info = (PFIXED_INFO)malloc((size_t)network_info_blen); +#endif network_info_result = GetNetworkParams(network_info, &network_info_blen); if (network_info_result != ERROR_SUCCESS){ switch(network_info_result) { @@ -616,8 +625,17 @@ addr.s_addr = inet_addr(pip->IpAddress.String); if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) addserver(ads, addr); - } - } +#ifdef __REACTOS__ + if (network_info->DomainName) + ccf_search(ads, "LOCALDOMAIN", -1, network_info->DomainName); + else + ccf_search(ads, "LOCALDOMAIN", -1, ""); +#endif + } + } +#ifdef __REACTOS__ + if (network_info) free(network_info); +#endif #else readconfig(ads,"/etc/resolv.conf",1); readconfig(ads,"/etc/resolv-adns.conf",0);

1 0

[akhaldi] 72726: [DNSAPI] Request adns to search servers and domains. By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: akhaldi Date: Sun Sep 18 14:25:39 2016 New Revision: 72726 URL: http://svn.reactos.org/svn/reactos?rev=72726&view=rev Log: [DNSAPI] Request adns to search servers and domains. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sun Sep 18 14:25:39 2016 @@ -53,7 +53,7 @@ PVOID *Reserved) { adns_state astate; - int quflags = 0; + int quflags = adns_qf_search; int adns_error; adns_answer *answer; LPSTR CurrentName;

1 0

[janderwald] 72725: [USBAUDIO] - start implementing init routines - not yet added to build
by janderwald＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: janderwald Date: Sun Sep 18 14:24:21 2016 New Revision: 72725 URL: http://svn.reactos.org/svn/reactos?rev=72725&view=rev Log: [USBAUDIO] - start implementing init routines - not yet added to build Added: trunk/reactos/drivers/usb/usbaudio/ (with props) trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt (with props) trunk/reactos/drivers/usb/usbaudio/filter.c (with props) trunk/reactos/drivers/usb/usbaudio/guid.c (with props) trunk/reactos/drivers/usb/usbaudio/pin.c (with props) trunk/reactos/drivers/usb/usbaudio/pool.c (with props) trunk/reactos/drivers/usb/usbaudio/usbaudio.c (with props) trunk/reactos/drivers/usb/usbaudio/usbaudio.h (with props) trunk/reactos/drivers/usb/usbaudio/usbaudio.rc (with props) Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 18 14:24:21 2016 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/drivers/usb/usbaudio/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/CMake… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt (added) +++ trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,25 @@ + +set_cpp() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +list(APPEND SOURCE + usbaudio.c + pool.c + filter.c + pin.c + guid.c) + +add_library(usbaudio SHARED + ${SOURCE} + usbaudio.rc) + +target_link_libraries(usbaudio + libcntpr + ${PSEH_LIB}) + +set_module_type(usbaudio kernelmodedriver) +add_importlibs(usbaudio ntoskrnl hal usbd ks) + +add_cd_file(TARGET usbaudio DESTINATION reactos/system32/drivers NO_CAB FOR all) Propchange: trunk/reactos/drivers/usb/usbaudio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/filte… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/filter.c (added) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,101 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/filter.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ + +#include "usbaudio.h" + +NTSTATUS +BuildUSBAudioFilterTopology( + PKSDEVICE Device) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +USBAudioPinBuildDescriptors( + PKSDEVICE Device, + PKSPIN_DESCRIPTOR_EX *PinDescriptors, + PULONG PinDescriptorsCount, + PULONG PinDescriptorSize) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +USBAudioInitComponentId( + PKSDEVICE Device, + IN PKSCOMPONENTID ComponentId) +{ + PDEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = Device->Context; + + INIT_USBAUDIO_MID(&ComponentId->Manufacturer, DeviceExtension->DeviceDescriptor->idVendor); + INIT_USBAUDIO_PID(&ComponentId->Product, DeviceExtension->DeviceDescriptor->idProduct); + + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +USBAudioCreateFilterContext( + PKSDEVICE Device) +{ + KSFILTER_DESCRIPTOR FilterDescriptor; + PKSCOMPONENTID ComponentId; + NTSTATUS Status; + + /* clear filter descriptor */ + RtlZeroMemory(&FilterDescriptor, sizeof(KSFILTER_DESCRIPTOR)); + + /* init filter descriptor*/ + FilterDescriptor.Version = KSFILTER_DESCRIPTOR_VERSION; + FilterDescriptor.ReferenceGuid = &KSNAME_Filter; + + /* init component id*/ + ComponentId = AllocFunction(sizeof(KSCOMPONENTID)); + if (!ComponentId) + { + /* no memory */ + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + Status = USBAudioInitComponentId(Device, ComponentId); + if (!NT_SUCCESS(Status)) + { + /* failed*/ + FreeFunction(ComponentId); + return Status; + } + FilterDescriptor.ComponentId = ComponentId; + + /* build pin descriptors */ + Status = USBAudioPinBuildDescriptors(Device, (PKSPIN_DESCRIPTOR_EX *)&FilterDescriptor.PinDescriptors, &FilterDescriptor.PinDescriptorsCount, &FilterDescriptor.PinDescriptorSize); + if (!NT_SUCCESS(Status)) + { + /* failed*/ + FreeFunction(ComponentId); + return Status; + } + + /* build topology */ + Status = BuildUSBAudioFilterTopology(Device); + if (!NT_SUCCESS(Status)) + { + /* failed*/ + FreeFunction(ComponentId); + return Status; + } + + return Status; +} + + Propchange: trunk/reactos/drivers/usb/usbaudio/filter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/guid.… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/guid.c (added) +++ trunk/reactos/drivers/usb/usbaudio/guid.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +//#include <wdm.h> +#include <portcls.h> + +#include <initguid.h> +#include <wdmguid.h> +#include <hubbusif.h> +#include <usbbusif.h> + +/* FIXME */ +DEFINE_GUID(KSNAME_Filter, 0x9b365890L, 0x165f, 0x11d0, 0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/usb/usbaudio/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c (added) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,11 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/pin.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ + +#include "usbaudio.h" + Propchange: trunk/reactos/drivers/usb/usbaudio/pin.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pool.… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pool.c (added) +++ trunk/reactos/drivers/usb/usbaudio/pool.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,35 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/pool.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ +#include "usbaudio.h" + +PVOID +NTAPI +AllocFunction( + IN ULONG ItemSize) +{ + PVOID Item = ExAllocatePoolWithTag(NonPagedPool, ItemSize, USBAUDIO_TAG); + if (Item) + { + // zero item + RtlZeroMemory(Item, ItemSize); + } + + // done + return Item; +} + +VOID +NTAPI +FreeFunction( + IN PVOID Item) +{ + /* free item */ + ExFreePoolWithTag(Item, USBAUDIO_TAG); +} + Propchange: trunk/reactos/drivers/usb/usbaudio/pool.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/usbaudio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.c (added) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.c [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,484 @@ +/* +* PROJECT: ReactOS Universal Audio Class Driver +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/usb/usbaudio/usbaudio.c +* PURPOSE: USB Audio device driver. +* PROGRAMMERS: +* Johannes Anderwald (johannes.anderwald(a)reactos.org) +*/ + +#include "usbaudio.h" + +static KSDEVICE_DISPATCH KsDeviceDispatch = { + USBAudioAddDevice, + USBAudioPnPStart, + NULL, + USBAudioPnPQueryStop, + USBAudioPnPCancelStop, + USBAudioPnPStop, + USBAudioPnPQueryRemove, + USBAudioPnPCancelRemove, + USBAudioPnPRemove, + USBAudioPnPQueryCapabilities, + USBAudioPnPSurpriseRemoval, + USBAudioPnPQueryPower, + USBAudioPnPSetPower +}; + +static KSDEVICE_DESCRIPTOR KsDeviceDescriptor = { + &KsDeviceDispatch, + 0, + NULL, + 0x100, //KSDEVICE_DESCRIPTOR_VERSION, + 0 +}; + +NTSTATUS +NTAPI +USBAudioCancelCompleteSynch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + /* signal event */ + KeSetEvent(Context, 0, FALSE); + + /* done */ + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +SubmitUrbSync( + IN PKSDEVICE Device, + IN PURB Urb) +{ + PIRP Irp; + KEVENT Event; + PDEVICE_EXTENSION DeviceExtension; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // init event + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // get device extension + DeviceExtension = (PDEVICE_EXTENSION)Device->Context; + + // build irp + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, + DeviceExtension->LowerDevice, + NULL, + 0, + NULL, + 0, + TRUE, + &Event, + &IoStatus); + + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // get next stack location + IoStack = IoGetNextIrpStackLocation(Irp); + + // store urb + IoStack->Parameters.Others.Argument1 = Urb; + + // set completion routine + IoSetCompletionRoutine(Irp, USBAudioCancelCompleteSynch, &Event, TRUE, TRUE, TRUE); + + // call driver + Status = IoCallDriver(DeviceExtension->LowerDevice, Irp); + + // wait for the request to finish + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + // complete request + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + if (Status == STATUS_PENDING) + { + // get final status + Status = IoStatus.Status; + } + + // done + return Status; +} + +NTSTATUS +NTAPI +USBAudioSelectConfiguration( + IN PKSDEVICE Device, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PDEVICE_EXTENSION DeviceExtension; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSBD_INTERFACE_LIST_ENTRY InterfaceList; + PURB Urb; + NTSTATUS Status; + ULONG InterfaceDescriptorCount; + + /* alloc item for configuration request */ + InterfaceList = AllocFunction(sizeof(USBD_INTERFACE_LIST_ENTRY) * (ConfigurationDescriptor->bNumInterfaces + 1)); + if (!InterfaceList) + { + /* insufficient resources*/ + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + /* grab interface descriptor */ + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + if (!InterfaceDescriptor) + { + /* no such interface */ + return STATUS_INVALID_PARAMETER; + } + + /* lets enumerate the interfaces */ + InterfaceDescriptorCount = 0; + while (InterfaceDescriptor != NULL) + { + if (InterfaceDescriptor->bInterfaceSubClass == 0x01) /* AUDIO_CONTROL*/ + { + InterfaceList[InterfaceDescriptorCount++].InterfaceDescriptor = InterfaceDescriptor; + } + else if (InterfaceDescriptor->bInterfaceSubClass == 0x03) /* MIDI_STREAMING*/ + { + InterfaceList[InterfaceDescriptorCount++].InterfaceDescriptor = InterfaceDescriptor; + } + + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength), -1, -1, USB_DEVICE_CLASS_AUDIO, -1, -1); + } + + /* build urb */ + Urb = USBD_CreateConfigurationRequestEx(ConfigurationDescriptor, InterfaceList); + if (!Urb) + { + /* no memory */ + FreeFunction(InterfaceList); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* submit configuration urb */ + Status = SubmitUrbSync(Device, Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + ExFreePool(Urb); + FreeFunction(InterfaceList); + return Status; + } + + /* store configuration handle */ + DeviceExtension = Device->Context; + DeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; + + /* alloc interface info */ + DeviceExtension->InterfaceInfo = AllocFunction(Urb->UrbSelectConfiguration.Interface.Length); + if (DeviceExtension->InterfaceInfo) + { + /* copy interface info */ + RtlCopyMemory(DeviceExtension->InterfaceInfo, &Urb->UrbSelectConfiguration.Interface, Urb->UrbSelectConfiguration.Interface.Length); + } + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +USBAudioStartDevice( + IN PKSDEVICE Device) +{ + PURB Urb; + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PDEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + ULONG Length; + + /* allocate urb */ + Urb = AllocFunction(sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST)); + if (!Urb) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* alloc buffer for device descriptor */ + DeviceDescriptor = AllocFunction(sizeof(USB_DEVICE_DESCRIPTOR)); + if (!DeviceDescriptor) + { + /* insufficient resources */ + FreeFunction(Urb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* build descriptor request */ + UsbBuildGetDescriptorRequest(Urb, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, DeviceDescriptor, NULL, sizeof(USB_DEVICE_DESCRIPTOR), NULL); + + /* submit urb */ + Status = SubmitUrbSync(Device, Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + return Status; + } + + /* now allocate some space for partial configuration descriptor */ + ConfigurationDescriptor = AllocFunction(sizeof(USB_CONFIGURATION_DESCRIPTOR)); + if (!ConfigurationDescriptor) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + return Status; + } + + /* build descriptor request */ + UsbBuildGetDescriptorRequest(Urb, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, ConfigurationDescriptor, NULL, sizeof(USB_CONFIGURATION_DESCRIPTOR), NULL); + + /* submit urb */ + Status = SubmitUrbSync(Device, Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + FreeFunction(ConfigurationDescriptor); + return Status; + } + + /* backup length */ + Length = ConfigurationDescriptor->wTotalLength; + + /* free old descriptor */ + FreeFunction(ConfigurationDescriptor); + + /* now allocate some space for full configuration descriptor */ + ConfigurationDescriptor = AllocFunction(Length); + if (!ConfigurationDescriptor) + { + /* free resources */ + FreeFunction(Urb); + FreeFunction(DeviceDescriptor); + return Status; + } + + /* build descriptor request */ + UsbBuildGetDescriptorRequest(Urb, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, ConfigurationDescriptor, NULL, Length, NULL); + + /* submit urb */ + Status = SubmitUrbSync(Device, Urb); + + /* free urb */ + FreeFunction(Urb); + if (!NT_SUCCESS(Status)) + { + /* free resources */ + FreeFunction(DeviceDescriptor); + FreeFunction(ConfigurationDescriptor); + return Status; + } + + /* lets add to object bag */ + KsAddItemToObjectBag(Device->Bag, DeviceDescriptor, ExFreePool); + KsAddItemToObjectBag(Device->Bag, ConfigurationDescriptor, ExFreePool); + + Status = USBAudioSelectConfiguration(Device, ConfigurationDescriptor); + if (NT_SUCCESS(Status)) + { + DeviceExtension = Device->Context; + DeviceExtension->ConfigurationDescriptor = ConfigurationDescriptor; + DeviceExtension->DeviceDescriptor = DeviceDescriptor; + } + return Status; +} + + +NTSTATUS +NTAPI +USBAudioAddDevice( + _In_ PKSDEVICE Device) +{ + /* no op */ + DPRINT1("USBAudioAddDevice\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +USBAudioPnPStart( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_opt_ PCM_RESOURCE_LIST TranslatedResourceList, + _In_opt_ PCM_RESOURCE_LIST UntranslatedResourceList) +{ + NTSTATUS Status = STATUS_SUCCESS; + PDEVICE_EXTENSION DeviceExtension; + + if (!Device->Started) + { + /* alloc context */ + DeviceExtension = AllocFunction(sizeof(DEVICE_EXTENSION)); + if (DeviceExtension == NULL) + { + /* insufficient resources */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init context */ + Device->Context = DeviceExtension; + DeviceExtension->LowerDevice = Device->NextDeviceObject; + + /* add to object bag*/ + KsAddItemToObjectBag(Device->Bag, Device->Context, ExFreePool); + + /* init device*/ + Status = USBAudioStartDevice(Device); + if (NT_SUCCESS(Status)) + { + /* TODO build filter topology and pin descriptors and retrieve interface */ + UNIMPLEMENTED + } + } + + return Status; +} + +NTSTATUS +NTAPI +USBAudioPnPQueryStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +USBAudioPnPCancelStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ +} + +VOID +NTAPI +USBAudioPnPStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* TODO: stop device */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPnPQueryRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ + return STATUS_SUCCESS; +} + + +VOID +NTAPI +USBAudioPnPCancelRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* no op */ +} + +VOID +NTAPI +USBAudioPnPRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* TODO: stop device */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPnPQueryCapabilities( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _Inout_ PDEVICE_CAPABILITIES Capabilities) +{ + /* TODO: set caps */ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + +VOID +NTAPI +USBAudioPnPSurpriseRemoval( + _In_ PKSDEVICE Device, + _In_ PIRP Irp) +{ + /* TODO: stop streams */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +USBAudioPnPQueryPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE DeviceTo, + _In_ DEVICE_POWER_STATE DeviceFrom, + _In_ SYSTEM_POWER_STATE SystemTo, + _In_ SYSTEM_POWER_STATE SystemFrom, + _In_ POWER_ACTION Action) +{ + /* no op */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +USBAudioPnPSetPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE To, + _In_ DEVICE_POWER_STATE From) +{ + /* TODO: stop streams */ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + + // initialize driver + Status = KsInitializeDriver(DriverObject, RegistryPath, &KsDeviceDescriptor); + if (!NT_SUCCESS(Status)) + { + // failed to initialize driver + DPRINT1("Failed to initialize driver with %x\n", Status); + return Status; + } + return Status; +} Propchange: trunk/reactos/drivers/usb/usbaudio/usbaudio.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h (added) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,129 @@ +#pragma once + +#include <ntddk.h> +#include <portcls.h> +#include <ksmedia.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> +#include <usbdlib.h> +#include <debug.h> + +#define USBAUDIO_TAG 'AbsU' + +typedef struct __DEVICE_EXTENSION__ +{ + PDEVICE_OBJECT LowerDevice; /* lower device*/ + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; /* usb configuration descriptor */ + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; /* usb device descriptor */ + PUSBD_INTERFACE_INFORMATION InterfaceInfo; /* interface information */ + USBD_CONFIGURATION_HANDLE ConfigurationHandle; /* configuration handle */ + +}DEVICE_EXTENSION, *PDEVICE_EXTENSION; + +/* pool.c */ +PVOID +NTAPI +AllocFunction( + IN ULONG ItemSize); + +VOID +NTAPI +FreeFunction( + IN PVOID Item); + +/* usbaudio.c */ + +NTSTATUS +NTAPI +USBAudioAddDevice( + _In_ PKSDEVICE Device +); + +NTSTATUS +NTAPI +USBAudioPnPStart( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_opt_ PCM_RESOURCE_LIST TranslatedResourceList, + _In_opt_ PCM_RESOURCE_LIST UntranslatedResourceList +); + +NTSTATUS +NTAPI +USBAudioPnPQueryStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPCancelStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPStop( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +NTSTATUS +NTAPI +USBAudioPnPQueryRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPCancelRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +VOID +NTAPI +USBAudioPnPRemove( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +NTSTATUS +NTAPI +USBAudioPnPQueryCapabilities( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _Inout_ PDEVICE_CAPABILITIES Capabilities +); + +VOID +NTAPI +USBAudioPnPSurpriseRemoval( + _In_ PKSDEVICE Device, + _In_ PIRP Irp +); + +NTSTATUS +NTAPI +USBAudioPnPQueryPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE DeviceTo, + _In_ DEVICE_POWER_STATE DeviceFrom, + _In_ SYSTEM_POWER_STATE SystemTo, + _In_ SYSTEM_POWER_STATE SystemFrom, + _In_ POWER_ACTION Action +); + +VOID +NTAPI +USBAudioPnPSetPower( + _In_ PKSDEVICE Device, + _In_ PIRP Irp, + _In_ DEVICE_POWER_STATE To, + _In_ DEVICE_POWER_STATE From +); Propchange: trunk/reactos/drivers/usb/usbaudio/usbaudio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbaudio/usbaudio.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.rc (added) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.rc [iso-8859-1] Sun Sep 18 14:24:21 2016 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBAUDIO Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "usbaudio\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbaudio.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/usb/usbaudio/usbaudio.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 72724: try fix build
by janderwald＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: janderwald Date: Sun Sep 18 14:11:47 2016 New Revision: 72724 URL: http://svn.reactos.org/svn/reactos?rev=72724&view=rev Log: try fix build Modified: trunk/reactos/sdk/include/psdk/ksmedia.h Modified: trunk/reactos/sdk/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Sun Sep 18 14:11:47 2016 @@ -116,7 +116,7 @@ // USB Component ID #define STATIC_KSCOMPONENTID_USBAUDIO \ - 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA + 0x8F1275F0, 0x26E9, 0x4264, {0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA} DEFINE_GUIDSTRUCT("8F1275F0-26E9-4264-BA4D-39FFF01D94AA", KSCOMPONENTID_USBAUDIO); #define KSCOMPONENTID_USBAUDIO DEFINE_GUIDNAMED(KSCOMPONENTID_USBAUDIO)

1 0

[janderwald] 72723: [PSDK] - add missing definitions
by janderwald＠svn.reactos.org 18 Sep '16

18 Sep '16

Author: janderwald Date: Sun Sep 18 14:02:22 2016 New Revision: 72723 URL: http://svn.reactos.org/svn/reactos?rev=72723&view=rev Log: [PSDK] - add missing definitions Modified: trunk/reactos/sdk/include/psdk/ksmedia.h Modified: trunk/reactos/sdk/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Sun Sep 18 14:02:22 2016 @@ -15,6 +15,112 @@ */ typedef LONGLONG REFERENCE_TIME; + + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +#if !defined(INIT_USBAUDIO_MID) +#define INIT_USBAUDIO_MID(guid, id)\ +{\ + (guid)->Data1 = 0x4e1cecd2 + (USHORT)(id);\ + (guid)->Data2 = 0x1679;\ + (guid)->Data3 = 0x463b;\ + (guid)->Data4[0] = 0xa7;\ + (guid)->Data4[1] = 0x2f;\ + (guid)->Data4[2] = 0xa5;\ + (guid)->Data4[3] = 0xbf;\ + (guid)->Data4[4] = 0x64;\ + (guid)->Data4[5] = 0xc8;\ + (guid)->Data4[6] = 0x6e;\ + (guid)->Data4[7] = 0xba;\ +} +#define EXTRACT_USBAUDIO_MID(guid)\ + (USHORT)((guid)->Data1 - 0x4e1cecd2) +#define DEFINE_USBAUDIO_MID_GUID(id)\ + 0x4e1cecd2+(USHORT)(id), 0x1679, 0x463b, 0xa7, 0x2f, 0xa5, 0xbf, 0x64, 0xc8, 0x6e, 0xba + +#define INIT_EXBUS_MANUFACTURER_ID INIT_USBAUDIO_MID + +#define IS_COMPATIBLE_USBAUDIO_MID(guid)\ + (((guid)->Data1 >= 0x4e1cecd2) &&\ + ((guid)->Data1 < 0x4e1cecd2 + 0xffff) &&\ + ((guid)->Data2 == 0x1679) &&\ + ((guid)->Data3 == 0x463b) &&\ + ((guid)->Data4[0] == 0xa7) &&\ + ((guid)->Data4[1] == 0x2f) &&\ + ((guid)->Data4[2] == 0xa5) &&\ + ((guid)->Data4[3] == 0xbf) &&\ + ((guid)->Data4[4] == 0x64) &&\ + ((guid)->Data4[5] == 0xc8) &&\ + ((guid)->Data4[6] == 0x6e) &&\ + ((guid)->Data4[7] == 0xba)) +#endif // !defined(INIT_USBAUDIO_MID) + +#if !defined(INIT_USBAUDIO_PID) +#define INIT_USBAUDIO_PID(guid, id)\ +{\ + (guid)->Data1 = 0xabcc5a5e + (USHORT)(id);\ + (guid)->Data2 = 0xc263;\ + (guid)->Data3 = 0x463b;\ + (guid)->Data4[0] = 0xa7;\ + (guid)->Data4[1] = 0x2f;\ + (guid)->Data4[2] = 0xa5;\ + (guid)->Data4[3] = 0xbf;\ + (guid)->Data4[4] = 0x64;\ + (guid)->Data4[5] = 0xc8;\ + (guid)->Data4[6] = 0x6e;\ + (guid)->Data4[7] = 0xba;\ +} +#define EXTRACT_USBAUDIO_PID(guid)\ + (USHORT)((guid)->Data1 - 0xabcc5a5e) +#define DEFINE_USBAUDIO_PID_GUID(id)\ + 0xabcc5a5e+(USHORT)(id), 0xc263, 0x463b, 0xa7, 0x2f, 0xa5, 0xbf, 0x64, 0xc8, 0x6e, 0xba + +#define INIT_EXBUS_PRODUCT_ID INIT_USBAUDIO_PID + +#define IS_COMPATIBLE_USBAUDIO_PID(guid)\ + (((guid)->Data1 >= 0xabcc5a5e) &&\ + ((guid)->Data1 < 0xabcc5a5e + 0xffff) &&\ + ((guid)->Data2 == 0xc263) &&\ + ((guid)->Data3 == 0x463b) &&\ + ((guid)->Data4[0] == 0xa7) &&\ + ((guid)->Data4[1] == 0x2f) &&\ + ((guid)->Data4[2] == 0xa5) &&\ + ((guid)->Data4[3] == 0xbf) &&\ + ((guid)->Data4[4] == 0x64) &&\ + ((guid)->Data4[5] == 0xc8) &&\ + ((guid)->Data4[6] == 0x6e) &&\ + ((guid)->Data4[7] == 0xba)) +#endif // !defined(INIT_USBAUDIO_PID) + +#if !defined(INIT_USBAUDIO_PRODUCT_NAME) +#define INIT_USBAUDIO_PRODUCT_NAME(guid, vid, pid, strIndex)\ +{\ + (guid)->Data1 = 0XFC575048 + (USHORT)(vid);\ + (guid)->Data2 = 0x2E08 + (USHORT)(pid);\ + (guid)->Data3 = 0x463B + (USHORT)(strIndex);\ + (guid)->Data4[0] = 0xA7;\ + (guid)->Data4[1] = 0x2F;\ + (guid)->Data4[2] = 0xA5;\ + (guid)->Data4[3] = 0xBF;\ + (guid)->Data4[4] = 0x64;\ + (guid)->Data4[5] = 0xC8;\ + (guid)->Data4[6] = 0x6E;\ + (guid)->Data4[7] = 0xBA;\ +} +#define DEFINE_USBAUDIO_PRODUCT_NAME(vid, pid, strIndex)\ + 0xFC575048+(USHORT)(vid), 0x2E08+(USHORT)(pid), 0x463B+(USHORT)(strIndex), 0xA7, 0x2F, 0xA5, 0xBF, 0x64, 0xC8, 0x6E, 0xBA +#endif + +#define INIT_EXBUS_PRODUCT_NAME INIT_USBAUDIO_PRODUCT_NAME + +// USB Component ID +#define STATIC_KSCOMPONENTID_USBAUDIO \ + 0x8F1275F0, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA +DEFINE_GUIDSTRUCT("8F1275F0-26E9-4264-BA4D-39FFF01D94AA", KSCOMPONENTID_USBAUDIO); +#define KSCOMPONENTID_USBAUDIO DEFINE_GUIDNAMED(KSCOMPONENTID_USBAUDIO) + +#endif // (NTDDI_VERSION >= NTDDI_WINXP) #define EXTRACT_WAVEFORMATEX_ID(Guid)\ (USHORT)((Guid)->Data1)

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