Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 64403: [MSGINA] [SHELL32] * Implement shell shutdown using a proper shutdown dialog. Patch by Lee Schroeder with a small change to fix MSVC build. CORE-7559 #comment Commited into shell...
by dquintana＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: dquintana Date: Mon Sep 29 20:14:21 2014 New Revision: 64403 URL: http://svn.reactos.org/svn/reactos?rev=64403&view=rev Log: [MSGINA] [SHELL32] * Implement shell shutdown using a proper shutdown dialog. Patch by Lee Schroeder with a small change to fix MSVC build. CORE-7559 #comment Commited into shell-experiments branch r64403. Modified: branches/shell-experiments/dll/win32/msgina/CMakeLists.txt branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc branches/shell-experiments/dll/win32/msgina/lang/en-US.rc branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc branches/shell-experiments/dll/win32/msgina/resource.h branches/shell-experiments/dll/win32/msgina/stubs.c branches/shell-experiments/dll/win32/shell32/CMakeLists.txt branches/shell-experiments/dll/win32/shell32/dialogs.cpp branches/shell-experiments/dll/win32/shell32/precomp.h Modified: branches/shell-experiments/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -9,6 +9,7 @@ gui.c lsa.c msgina.c + shutdown.c stubs.c tui.c msgina.h) @@ -21,7 +22,7 @@ set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) add_delay_importlibs(msgina secur32) add_pch(msgina msgina.h SOURCE) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) Modified: branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ´ÑÐ°Ð²ÐµÐ¹ÑÐµ!" Modified: branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -142,6 +142,21 @@ 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 "Vypnout ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" Modified: branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "ReactOS herunterfahren" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "Willkommen!" Modified: branches/shell-experiments/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "Welcome!" Modified: branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -139,6 +139,21 @@ 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 "Apagar ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "Â¿&Que quieres que haga el equipo?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + 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 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Â¡Bienvenido!" Modified: branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "Fermer ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" Modified: branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "××¨×××× ×××××!" Modified: branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" Modified: branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -144,6 +144,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP 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 "Spegnimento di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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: branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "ReactOSã®ã·ã£ãããã¦ã³" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "ãããã!" Modified: branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -137,6 +137,21 @@ 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 "SlÃ¥ av ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "Velkommen!" Modified: branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -145,6 +145,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP 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" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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: branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -144,6 +144,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "Ã&nchide", 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 "Ãnchidere ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 END STRINGTABLE Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -139,6 +139,21 @@ 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 "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" Modified: branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -142,6 +142,21 @@ 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 "Vypnutie systÃ©mu ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 BEGIN IDS_LOGGEDOUTSAS "Vitajte!" Modified: branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -128,7 +128,7 @@ COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 + PUSHBUTTON "Anulo", IDCANCEL, 204, 122, 55, 14 END IDD_LEGALNOTICE_DLG DIALOGEX 0, 0, 280, 200 @@ -138,6 +138,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP 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 "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -139,6 +139,21 @@ DEFPUSHBUTTON "Tamam", 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 "Oturumu Kapat" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "HoÅgeldiniz!" Modified: branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -143,6 +143,21 @@ BEGIN EDITTEXT IDC_LEGALNOTICE_TEXT, 7, 7, 266, 165, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP 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 "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_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 + 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: branches/shell-experiments/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/resource.h [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -8,6 +8,7 @@ #define IDD_LOCKED_DLG 104 #define IDD_UNLOCK_DLG 105 #define IDD_SHUTDOWN_DLG 108 +#define IDD_SHUTDOWN_SHELL 109 #define IDC_LOGOFF 1001 #define IDC_USERNAME 1002 Modified: branches/shell-experiments/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… ============================================================================== --- branches/shell-experiments/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/msgina/stubs.c [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -10,32 +10,6 @@ */ #include "msgina.h" - -/* - * @unimplemented - */ -DWORD WINAPI -ShellShutdownDialog( - HWND hParent, - LPWSTR lpUsername, - BOOL bHideLogoff) -{ - UNREFERENCED_PARAMETER(hParent); - UNREFERENCED_PARAMETER(lpUsername); - UNREFERENCED_PARAMETER(bHideLogoff); - - /* Return values: - * 0x00: Cancelled/Help - * 0x01: Log off user - * 0x02: Shutdown - * 0x04: Reboot - * 0x10: Standby - * 0x40: Hibernate - */ - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -98,6 +98,7 @@ browseui gdi32 user32 + powrprof comctl32 comdlg32 shdocvw Modified: branches/shell-experiments/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -116,6 +116,7 @@ pIconContext = (PPICK_ICON_CONTEXT)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); + SendMessageW(pIconContext->hDlgCtrl, LB_SETCOLUMNWIDTH, 32, 0); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH)) SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, szText); @@ -695,6 +696,44 @@ return RestartDialogEx(hWndOwner, lpstrReason, uFlags, 0); } + /************************************************************************* + * Used to get the shutdown privilege + */ +VOID ExitWindows_GetShutdownPrivilege(VOID) +{ + HANDLE hToken; + TOKEN_PRIVILEGES npr; + + /* enable shut down privilege for current process */ + if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); + + npr.PrivilegeCount = 1; + npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); + + CloseHandle(hToken); + } +} + +/************************************************************************* + * ExitWindowsDialog_backup + * + * NOTES + * used as a backup solution to shutdown the OS in case msgina.dll somehow + * cannot be found. + */ +VOID ExitWindowsDialog_backup(HWND hWndOwner) +{ + TRACE("(%p)\n", hWndOwner); + + if (ConfirmDialog(hWndOwner, IDS_SHUTDOWN_PROMPT, IDS_SHUTDOWN_TITLE)) + { + ExitWindows_GetShutdownPrivilege(); + ExitWindowsEx(EWX_SHUTDOWN, 0); + } +} /************************************************************************* * ExitWindowsDialog [SHELL32.60] @@ -702,24 +741,85 @@ * NOTES * exported by ordinal */ +/* + * TODO: + * - Implement the ability to show either the Welcome Screen or the classic dialog boxes based upon the + * registry value: SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\LogonType. + */ void WINAPI ExitWindowsDialog(HWND hWndOwner) { + typedef DWORD (WINAPI *ShellShFunc)(HWND hParent, WCHAR *Username, BOOL bHideLogoff); + HINSTANCE msginaDll = LoadLibraryA("msgina.dll"); + TRACE("(%p)\n", hWndOwner); - if (ConfirmDialog(hWndOwner, IDS_SHUTDOWN_PROMPT, IDS_SHUTDOWN_TITLE)) - { - HANDLE hToken; - TOKEN_PRIVILEGES npr; - - /* enable shutdown privilege for current process */ - if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) - { - LookupPrivilegeValueA(0, "SeShutdownPrivilege", &npr.Privileges[0].Luid); - npr.PrivilegeCount = 1; - npr.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0); - CloseHandle(hToken); - } - ExitWindowsEx(EWX_SHUTDOWN, 0); - } -} + /* If the DLL cannot be found for any reason, then it simply uses a + dialog box to ask if the user wants to shut down the computer. */ + if(!msginaDll) + { + TRACE("Unable to load msgina.dll.\n"); + ExitWindowsDialog_backup(hWndOwner); + return; + } + + ShellShFunc pShellShutdownDialog = (ShellShFunc) GetProcAddress(msginaDll, "ShellShutdownDialog"); + + if(pShellShutdownDialog) + { + /* Actually call the function */ + DWORD returnValue = pShellShutdownDialog(hWndOwner, NULL, FALSE); + + switch(returnValue) + { + case 0x01: /* Log off user */ + { + ExitWindowsEx(EWX_LOGOFF, 0); + break; + } + case 0x02: /* Shut down */ + { + ExitWindows_GetShutdownPrivilege(); + ExitWindowsEx(EWX_SHUTDOWN, 0); + break; + } + case 0x03: /* Install Updates/Shutdown (?) */ + { + break; + } + case 0x04: /* Reboot */ + { + ExitWindows_GetShutdownPrivilege(); + ExitWindowsEx(EWX_REBOOT, 0); + break; + } + case 0x10: /* Sleep */ + { + if(IsPwrSuspendAllowed()) + { + ExitWindows_GetShutdownPrivilege(); + SetSuspendState(FALSE, FALSE, FALSE); + } + break; + } + case 0x40: /* Hibernate */ + { + if(IsPwrHibernateAllowed()) + { + ExitWindows_GetShutdownPrivilege(); + SetSuspendState(TRUE, FALSE, TRUE); + } + break; + } + /* If the option is any other value */ + default: + break; + } + } + else + { + /* If the function cannot be found, then revert to using the backup solution */ + TRACE("Unable to find the 'ShellShutdownDialog' function"); + FreeLibrary(msginaDll); + ExitWindowsDialog_backup(hWndOwner); + } +} Modified: branches/shell-experiments/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/precomp.h [iso-8859-1] Mon Sep 29 20:14:21 2014 @@ -29,6 +29,7 @@ #include <strsafe.h> #include <atlbase.h> #include <atlcom.h> +#include <powrprof.h> //#include "base/shell/explorer-new/todo.h" //#include "dlgs.h"

1 0

[jgardou] 64402: [ADVAPI32_APITEST] - Add tests testing behaviour of RegOpen/Create for HKEY_CLASSES_ROOT subkeys - Clean up a bit the other tests CORE-8582
by jgardou＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: jgardou Date: Mon Sep 29 19:13:37 2014 New Revision: 64402 URL: http://svn.reactos.org/svn/reactos?rev=64402&view=rev Log: [ADVAPI32_APITEST] - Add tests testing behaviour of RegOpen/Create for HKEY_CLASSES_ROOT subkeys - Clean up a bit the other tests CORE-8582 Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Mon Sep 29 19:13:37 2014 @@ -13,31 +13,322 @@ #include <ndk/cmfuncs.h> #include <ndk/cmtypes.h> -#define IS_HKCR(hk) ((UINT_PTR)hk > 0 && ((UINT_PTR)hk & 3) == 2) +#define IS_HKCR(hk) (((UINT_PTR)hk & 3) == 2) + +/* HKCU and HKLM system paths */ +static UNICODE_STRING HKLM_ClassesPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes"); +static UNICODE_STRING HKCU_ClassesPath; + +static +LONG +DeleteSubKey(HKEY hKey, LPWSTR Root, LPWSTR SubKey) +{ + HKEY RootKey; + LONG ErrorCode; + + ErrorCode = RegOpenKeyExW( + hKey, + Root, + 0, + MAXIMUM_ALLOWED, + &RootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ErrorCode = RegDeleteKeyW(RootKey, SubKey); + RegCloseKey(RootKey); + + return ErrorCode; +} static void -Test_KeyInformation(void) +GetKeyName(HKEY hKey, PUNICODE_STRING KeyName) +{ + UNICODE_STRING InfoName; + PKEY_NAME_INFORMATION NameInformation; + ULONG InfoLength; + NTSTATUS Status; + + /* Get info length */ + InfoLength = 0; + Status = NtQueryKey(hKey, KeyNameInformation, NULL, 0, &InfoLength); + ok_ntstatus(Status, STATUS_BUFFER_TOO_SMALL); + + /* Get it for real */ + NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); + ok(NameInformation != NULL, "\n"); + + Status = NtQueryKey(hKey, KeyNameInformation, NameInformation, InfoLength, &InfoLength); + ok_ntstatus(Status, STATUS_SUCCESS); + + RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Length = NameInformation->NameLength; + + RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &InfoName, KeyName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); +} + +static void _test_key_deleted(HKEY hKey, BOOL Deleted, ULONG LineNumber) +{ + DWORD ErrorCode = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (Deleted) + ok_(__FILE__, LineNumber)(ErrorCode == ERROR_KEY_DELETED, "\n"); + else + ok_(__FILE__, LineNumber)(ErrorCode == ERROR_SUCCESS, "\n"); +} +#define ok_key_deleted(hKey) _test_key_deleted(hKey, TRUE, __LINE__) +#define ok_key_not_deleted(hKey) _test_key_deleted(hKey, FALSE, __LINE__) + +static void _test_key_name(HKEY hKey, PUNICODE_STRING Prefix, LPCWSTR Name, ULONG LineNumber) +{ + UNICODE_STRING ExpectedName, KeyName; + WCHAR Buffer[1024]; + + ExpectedName.Length = 0; + ExpectedName.MaximumLength = sizeof(Buffer); + ExpectedName.Buffer = Buffer; + + RtlAppendUnicodeStringToString(&ExpectedName, Prefix); + RtlAppendUnicodeToString(&ExpectedName, L"\\"); + RtlAppendUnicodeToString(&ExpectedName, Name); + + GetKeyName(hKey, &KeyName); + + ok_(__FILE__, LineNumber)(RtlCompareUnicodeString(&KeyName, &ExpectedName, TRUE) == 0, + "Key name is %.*S, expected %.*S\n", + KeyName.Length, KeyName.Buffer, + ExpectedName.Length, ExpectedName.Buffer); + + RtlFreeUnicodeString(&KeyName); +} + +#define ok_key_name(hKey, Prefix, Name) _test_key_name(hKey, Prefix, Name, __LINE__) + +static +void +Test_CreateOpenKey(void) +{ + HKEY MachineKey, UserKey, ClassesRootKey; + DWORD ErrorCode; + + /* First create a subkey in HKLM */ + ErrorCode = RegCreateKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKLM_Only", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &MachineKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(MachineKey), "\n"); + + /* Open it in HKCR */ + ErrorCode = RegOpenKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKLM_Only", + 0, + MAXIMUM_ALLOWED, + &ClassesRootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + ok_key_name(ClassesRootKey, &HKLM_ClassesPath, L"Apitest_HKLM_Only"); + + /* Try opening it in HKCU */ + UserKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKLM_Only", + 0, + MAXIMUM_ALLOWED, + &UserKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(UserKey, NULL); + + /* Cleanup */ + RegCloseKey(ClassesRootKey); + RegCloseKey(MachineKey); + ErrorCode = DeleteSubKey(HKEY_LOCAL_MACHINE, L"Software\\Classes", L"Apitest_HKLM_Only"); + ok_dec(ErrorCode, ERROR_SUCCESS); + + /* Try creating in HKCR */ + ErrorCode = RegCreateKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKCR", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + ok_key_name(ClassesRootKey, &HKLM_ClassesPath, L"Apitest_HKCR"); + + /* It should be present in HKLM */ + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKCR", + 0, + MAXIMUM_ALLOWED, + &MachineKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(MachineKey), "\n"); + + /* But not in HKCU */ + UserKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCR", + 0, + MAXIMUM_ALLOWED, + &UserKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(UserKey, NULL); + + /* This must delete the one in HKLM */ + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKCR"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(ClassesRootKey); + ok_key_deleted(MachineKey); + RegCloseKey(ClassesRootKey); + RegCloseKey(MachineKey); + + /* Test that it is really not present anymore */ + MachineKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKCR", + 0, + MAXIMUM_ALLOWED, + &MachineKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(MachineKey, NULL); + + /* Try creating in HKCU */ + ErrorCode = RegCreateKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &UserKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(UserKey), "\n"); + + /* Try opening it in HKCR */ + ErrorCode = RegOpenKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKCU", + 0, + MAXIMUM_ALLOWED, + &ClassesRootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); + + /* And in HKLM */ + ErrorCode = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKCU", + 0, + MAXIMUM_ALLOWED, + &MachineKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(MachineKey, NULL); + + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKCU"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(ClassesRootKey); + ok_key_deleted(UserKey); + RegCloseKey(ClassesRootKey); + RegCloseKey(UserKey); + + /* Test that it is really not present anymore */ + UserKey = (HKEY)0xCAFEF00D; + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCU", + 0, + MAXIMUM_ALLOWED, + &UserKey); + ok_dec(ErrorCode, ERROR_FILE_NOT_FOUND); + ok_hdl(UserKey, NULL); + + /* Try creating in both HKLM and HKCU */ + ErrorCode = RegCreateKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKLM_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &UserKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(UserKey), "\n"); + + ErrorCode = RegCreateKeyExW( + HKEY_LOCAL_MACHINE, + L"Software\\Classes\\Apitest_HKLM_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &MachineKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(MachineKey), "\n"); + + /* Open it in HKCR */ + ErrorCode = RegOpenKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKLM_HKCU", + 0, + MAXIMUM_ALLOWED, + &ClassesRootKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + /* Verify it has opened the HKCU one */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKLM_HKCU"); + + /* Deleting it from HKCR first deletes the one in HKCU */ + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKLM_HKCU"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(UserKey); + ok_key_deleted(ClassesRootKey); + ok_key_not_deleted(MachineKey); + + RegCloseKey(UserKey); + RegCloseKey(ClassesRootKey); + + /* This deletes it from HKLM this time */ + ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKLM_HKCU"); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok_key_deleted(MachineKey); + RegCloseKey(MachineKey); +} + +static +void +Test_KeyName(void) { HKEY KeyHandle; DWORD ErrorCode; - NTSTATUS Status; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes\\CLSID"); - UNICODE_STRING InfoName; - CHAR Buffer[FIELD_OFFSET(KEY_NAME_INFORMATION, Name[512])]; - PKEY_NAME_INFORMATION NameInfo = (PKEY_NAME_INFORMATION)Buffer; - ULONG ResultLength; ErrorCode = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &KeyHandle); ok_dec(ErrorCode, ERROR_SUCCESS); ok(IS_HKCR(KeyHandle), "\n"); - - Status = NtQueryKey(KeyHandle, KeyNameInformation, NameInfo, sizeof(Buffer), &ResultLength); - ok_ntstatus(Status, STATUS_SUCCESS); - RtlInitUnicodeString(&InfoName, NameInfo->Name); - InfoName.Length = NameInfo->NameLength; - ok(RtlCompareUnicodeString(&KeyName, &InfoName, TRUE) == 0, "%.*S\n", InfoName.Length, InfoName.Buffer); + ok_key_name(KeyHandle, &HKLM_ClassesPath, L"CLSID"); RegCloseKey(KeyHandle); } @@ -49,13 +340,6 @@ HKEY KeyHandle, DupHandle; DWORD ErrorCode; BOOL Duplicated; - NTSTATUS Status; - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\Classes\\CLSID"); - UNICODE_STRING InfoName; - CHAR Buffer[FIELD_OFFSET(KEY_NAME_INFORMATION, Name[512])]; - PKEY_NAME_INFORMATION NameInfo = (PKEY_NAME_INFORMATION)Buffer; - ULONG ResultLength; - ErrorCode = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID", 0, KEY_READ, &KeyHandle); ok_dec(ErrorCode, ERROR_SUCCESS); @@ -66,11 +350,7 @@ ok(DupHandle != NULL, "\n"); ok(!IS_HKCR(DupHandle), "\n"); - Status = NtQueryKey(DupHandle, KeyNameInformation, NameInfo, sizeof(Buffer), &ResultLength); - ok_ntstatus(Status, STATUS_SUCCESS); - RtlInitUnicodeString(&InfoName, NameInfo->Name); - InfoName.Length = NameInfo->NameLength; - ok(RtlCompareUnicodeString(&KeyName, &InfoName, TRUE) == 0, "%S\n", NameInfo->Name); + ok_key_name(DupHandle, &HKLM_ClassesPath, L"CLSID"); RegCloseKey(KeyHandle); RegCloseKey(DupHandle); @@ -78,6 +358,21 @@ START_TEST(HKEY_CLASSES_ROOT) { - Test_KeyInformation(); + HKEY UserKey; + LONG ErrorCode; + + /* Get HKCU real key name */ + ErrorCode = RegOpenKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes", + 0, + KEY_READ, + &UserKey); + ok_dec(ErrorCode, ERROR_SUCCESS); + GetKeyName(UserKey, &HKCU_ClassesPath); + RegCloseKey(UserKey); + + Test_CreateOpenKey(); Test_DuplicateHandle(); -} + Test_KeyName(); +}

1 0

[akhaldi] 64401: [MPR] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: akhaldi Date: Mon Sep 29 18:56:31 2014 New Revision: 64401 URL: http://svn.reactos.org/svn/reactos?rev=64401&view=rev Log: [MPR] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc trunk/reactos/dll/win32/mpr/lang/mpr_De.rc trunk/reactos/dll/win32/mpr/lang/mpr_En.rc trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc trunk/reactos/dll/win32/mpr/lang/mpr_He.rc trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc trunk/reactos/dll/win32/mpr/lang/mpr_It.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc trunk/reactos/dll/win32/mpr/lang/mpr_No.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Bg.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Bg.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Öÿëàòà ìðåæà" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Âúâåäåòå ìðåæîâà ïàðîëà" FONT 8, "MS Shell Dlg" { - LTEXT "Âúâåäåòå âàøåòî ïîòðåáèòåëñêî èìå è ïàðîëà:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñè", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëà", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Îòìåíè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Âúâåäåòå âàøåòî ïîòðåáèòåëñêî èìå è ïàðîëà:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Ïðîêñè", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Ïîòðåáèòåë", -1, 6, 66, 60, 10 + LTEXT "Ïàðîëà", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Îòìåíè", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Cs.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Cs.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "Celá sí" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Zadání síového hesla" FONT 8, "MS Shell Dlg" { - LTEXT "Prosím zadejte své uivatelské jméno a heslo:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Uivatel", -1, 40, 66, 50, 10 - LTEXT "Heslo", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Prosím zadejte své uivatelské jméno a heslo:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Uivatel", -1, 6, 66, 60, 10 + LTEXT "Heslo", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Uloit toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Zruit", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Zruit", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Da.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Da.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Hele netværket" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Skriv netværkskodeord" FONT 8, "MS Shell Dlg" { - LTEXT "Skriv dit brugernavn og kodeord:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Brugernavn", -1, 40, 66, 50, 10 - LTEXT "Kodeord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Skriv dit brugernavn og kodeord:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Brugernavn", -1, 6, 66, 60, 10 + LTEXT "Kodeord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Gem dette ko&deord (usikkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuller", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_De.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_De.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,22 +27,22 @@ IDS_ENTIRENETWORK "Gesamtes Netzwerk" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Netzwerkkennung eingeben" FONT 8, "MS Shell Dlg" { - LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Bereich", -1, 40, 46, 50, 10 */ - LTEXT "Benutzername", -1, 40, 66, 50, 10 - LTEXT "Kennwort", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Bitte geben Sie Benutzernamen und Kennwort ein:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Bereich", -1, 6, 46, 60, 10 */ + LTEXT "Benutzername", -1, 6, 66, 60, 10 + LTEXT "Kennwort", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Abbrechen", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_En.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_En.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Entire Network" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Enter Network Password" FONT 8, "MS Shell Dlg" { - LTEXT "Please enter your username and password:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "User", -1, 40, 66, 50, 10 - LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Please enter your username and password:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "User", -1, 6, 66, 60, 10 + LTEXT "Password", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Save this password (insecure)", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Es.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Es.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Toda la red" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Introduzca contraseña de red" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, introduzca su nombre de usuario y contraseña:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Usuario", -1, 40, 66, 50, 10 - LTEXT "Contraseña", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Por favor, introduzca su nombre de usuario y contraseña:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Usuario", -1, 6, 66, 60, 10 + LTEXT "Contraseña", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta contraseña (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Aceptar", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Fr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Fr.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -29,22 +29,22 @@ IDS_ENTIRENETWORK "Le rÃ©seau entier" } -IDD_PROXYDLG DIALOG 36, 24, 210, 146 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entrez le mot de passe rÃ©seau" FONT 8, "MS Shell Dlg" { - LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :", IDC_EXPLAIN, 10, 6, 150, 17 - LTEXT "Proxy", -1, 10, 31, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilisateur", -1, 10, 68, 45, 10 - LTEXT "Mot de passe", -1, 10, 88, 45, 10 - LTEXT "", IDC_PROXY, 56, 32, 144, 14, 0 - LTEXT "", IDC_REALM, 56, 46, 144, 14, 0 - EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utilisateur", -1, 6, 66, 60, 10 + LTEXT "Mot de passe", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, - 56, 106, 144, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 68, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 128, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_He.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_He.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,22 +27,22 @@ IDS_ENTIRENETWORK "××¨×©×ª ××××" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "××× ×¡××¡××ª ×¨×©×ª" FONT 8, "MS Shell Dlg" { - LTEXT "× × ××× ×¡ ××ª ×©× ×××ª×©××© ×××¡××¡×× ×©××:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "×©×¨×ª ××ª××× (Proxy)", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "×©× ××©×ª××©", -1, 40, 66, 50, 10 - LTEXT "×¡××¡××", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "× × ××× ×¡ ××ª ×©× ×××ª×©××© ×××¡××¡×× ×©××:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "×©×¨×ª ××ª××× (Proxy)", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "×©× ××©×ª××©", -1, 6, 66, 60, 10 + LTEXT "×¡××¡××", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "××××¨ ××ª ××¡××¡×× (×× ××××)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "×××©××¨", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "×××××", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "×××©××¨", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "×××××", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Hu.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Hu.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Teljes hálózat" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hálózati jelszó megadása" FONT 8, "MS Shell Dlg" { - LTEXT "Kérem adja meg a felhasználónevét és jelszavát:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Felhasználónév", -1, 40, 66, 50, 10 - LTEXT "Jelszó", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Kérem adja meg a felhasználónevét és jelszavát:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Felhasználónév", -1, 6, 66, 60, 10 + LTEXT "Jelszó", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Mégse", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Mégse", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_It.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_It.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "Tutta la rete" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Inserisci la Password di Rete" FONT 8, "MS Shell Dlg" { -LTEXT "Inserire nome utente e password:", IDC_EXPLAIN, 40, 6, 150, 15 -LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ -LTEXT "Utente", -1, 40, 66, 50, 10 -LTEXT "Password", -1, 40, 86, 50, 10 -LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 -LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 -EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP -EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD -CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD, -80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON -PUSHBUTTON "Annulla", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Inserire nome utente e password:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utente", -1, 6, 66, 60, 10 + LTEXT "Password", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ja.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ja.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "ãããã¯ã¼ã¯å¨ä½" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ãããã¯ã¼ã¯ç¨ãã¹ã¯ã¼ããå¥å" FONT 8, "MS Shell Dlg" { - LTEXT "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ããå¥åãã¦ãã ãã:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ãããã·", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ã¦ã¼ã¶ã¼å", -1, 40, 66, 50, 10 - LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "ã¦ã¼ã¶ã¼åã¨ãã¹ã¯ã¼ããå¥åãã¦ãã ãã:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ãããã·", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ã¦ã¼ã¶ã¼å", -1, 6, 66, 60, 10 + LTEXT "ãã¹ã¯ã¼ã", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ko.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ko.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "ÀüÃ¼ ³×Æ®¿öÅ©" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³×Æ®¿öÅ© ¾ÏÈ£ ÀÔ·Â" FONT 9, "MS Shell Dlg" { - LTEXT "´ç½ÅÀÇ »ç¿ëÀÚÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ÇÁ·Ï½Ã", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "»ç¿ëÀÚ", -1, 40, 66, 50, 10 - LTEXT "¾ÏÈ£", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "´ç½ÅÀÇ »ç¿ëÀÚÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ÇÁ·Ï½Ã", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "»ç¿ëÀÚ", -1, 6, 66, 60, 10 + LTEXT "¾ÏÈ£", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "¾ÏÈ£ ÀúÀå(&S) (º¸¾È¿¡ ÁÖÀÇ)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "È®ÀÎ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ãë¼Ò", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "È®ÀÎ", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Lt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Lt.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "Visas tinklas" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ä®veskite tinklo slaptaÅ¾odÄ¯" FONT 8, "MS Shell Dlg" { - LTEXT "Ä®veskite savo naudotojo vardÄ ir slaptaÅ¾odÄ¯:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ä®galiot. serv.", -1, 40, 26, 50, 10 -/* LTEXT "Sritis", -1, 40, 46, 50, 10 */ - LTEXT "Naudotojas", -1, 40, 66, 50, 10 - LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Ä®veskite savo naudotojo vardÄ ir slaptaÅ¾odÄ¯:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Ä®galiot. serv.", -1, 6, 26, 60, 10 +/* LTEXT "Sritis", -1, 6, 46, 60, 10 */ + LTEXT "Naudotojas", -1, 6, 66, 60, 10 + LTEXT "SlaptaÅ¾odis", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Gerai", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Atsisakyti", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Gerai", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Atsisakyti", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Nl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Nl.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "Gehele netwerk" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Voer het Netwerk Wachtwoord in" FONT 8, "MS Shell Dlg" { - LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Gebruiker", -1, 40, 66, 50, 10 - LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Voer a.u.b uw gebruikersnaam en wachtwoord in:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Gebruiker", -1, 6, 66, 60, 10 + LTEXT "Wachtwoord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Sla dit wachtwoord op (Onveilig)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuleren", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_No.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_No.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Hele nettverket" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Skriv inn nettverkspassord" FONT 8, "MS Shell Dlg" { - LTEXT "Skriv inn brukernavnet og passordet ditt:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Mellomtjener", -1, 40, 26, 50, 10 -/* LTEXT "Område", -1, 40, 46, 50, 10 */ - LTEXT "Bruker", -1, 40, 66, 50, 10 - LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Skriv inn brukernavnet og passordet ditt:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Mellomtjener", -1, 6, 26, 60, 10 +/* LTEXT "Område", -1, 6, 46, 60, 10 */ + LTEXT "Bruker", -1, 6, 66, 60, 10 + LTEXT "Passord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre dette pa&ssordet (usikkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pl.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pl.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -26,22 +26,22 @@ IDS_ENTIRENETWORK "Ca³a sieæ" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wpisz has³o sieci" FONT 8, "MS Shell Dlg" { - LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Obszar", -1, 40, 46, 50, 10 */ - LTEXT "U¿ytkownik", -1, 40, 66, 50, 10 - LTEXT "Has³o", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Obszar", -1, 6, 46, 60, 10 */ + LTEXT "U¿ytkownik", -1, 6, 66, 60, 10 + LTEXT "Has³o", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Zapisz to has³o (niebezpieczne)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Pt.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Pt.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -31,44 +31,44 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Entre a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre como o nome de usuÃ¡rio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 - LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Por favor, entre como o nome de usuÃ¡rio e a senha:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "UsuÃ¡rio", -1, 6, 66, 60, 10 + LTEXT "Senha", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Indique a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilizador", -1, 40, 66, 50, 10 - LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utilizador", -1, 6, 66, 60, 10 + LTEXT "Senha", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ro.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ro.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,21 +27,22 @@ IDS_ENTIRENETWORK "ToatÄ reÈeaua" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Introducere parolÄ de reÈea" FONT 8, "MS Shell Dlg" { - LTEXT "IntroduceÈi numele de utilizator Èi parola:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Mandatar", -1, 40, 26, 50, 10 - LTEXT "Utilizator", -1, 40, 66, 50, 10 - LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&PÄstreazÄ aceastÄ parolÄ (nerecomandat)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Con&firmÄ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "IntroduceÈi numele de utilizator Èi parola:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Mandatar", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Utilizator", -1, 6, 66, 60, 10 + LTEXT "ParolÄ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&PÄstreazÄ aceastÄ parolÄ (nerecomandat)", IDC_SAVEPASSWORD, + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Con&firmÄ", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Ru.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Ru.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,22 +28,22 @@ IDS_ENTIRENETWORK "ÐÑÑ ÑÐµÑÑ" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg" { - LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð²Ð°ÑÐ¸ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ÐÑÐ¾ÐºÑÐ¸", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ÐÐ¼Ñ", -1, 40, 66, 50, 10 - LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð²Ð°ÑÐ¸ Ð¸Ð¼Ñ Ð¸ Ð¿Ð°ÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ÐÑÐ¾ÐºÑÐ¸", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ÐÐ¼Ñ", -1, 6, 66, 60, 10 + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾!)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Si.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Si.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -27,22 +27,22 @@ IDS_ENTIRENETWORK "Celotno omreÅ¾je" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vnesite omreÅ¾no geslo" FONT 8, "MS Shell Dlg" { - LTEXT "Vnesite uporabniÅ¡ko ime in geslo:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proksi", -1, 40, 26, 50, 10 -/* LTEXT "Kraljestvo", -1, 40, 46, 50, 10 */ - LTEXT "UporabniÅ¡ko ime", -1, 40, 66, 50, 10 - LTEXT "Geslo", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Vnesite uporabniÅ¡ko ime in geslo:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proksi", -1, 6, 26, 60, 10 +/* LTEXT "Kraljestvo", -1, 6, 46, 60, 10 */ + LTEXT "UporabniÅ¡ko ime", -1, 6, 66, 60, 10 + LTEXT "Geslo", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "PrekliÄi", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "PrekliÄi", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Sq.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Sq.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "GjithÃ« Rrjeti" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FjalÃ«kalimi i GjithÃ« Rrjetit" FONT 8, "MS Shell Dlg" { - LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxi", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "PÃ«rdoruesi", -1, 40, 66, 50, 10 - LTEXT "FjalÃ«kalimi", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Ju lutem shkruani emrin e pÃ«rdoruesit dhe fjalÃ«kalimin:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxi", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "PÃ«rdoruesi", -1, 6, 66, 60, 10 + LTEXT "FjalÃ«kalimi", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ruaj kÃ«tÃ« fjalÃ«kalim (i pasigurt)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Anulo", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anulo", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Sv.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Sv.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "Hela nätverket" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ange nätverkslösenord" FONT 8, "MS Shell Dlg" { - LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Användare", -1, 40, 66, 50, 10 - LTEXT "Lösenord", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "Ange ditt användarnamn och lösenord:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Proxy", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "Användare", -1, 6, 66, 60, 10 + LTEXT "Lösenord", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Avbryt", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Tr.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -25,22 +25,22 @@ IDS_ENTIRENETWORK "TÃ¼m AÄ" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "AÄ Åifresini Gir" FONT 8, "MS Shell Dlg" { - LTEXT "LÃ¼tfen kullanÄ±cÄ± adÄ±nÄ±zÄ± ve Åifrenizi giriniz:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Vekil", -1, 40, 26, 50, 10 -/* LTEXT "EriÅim AlanÄ±", -1, 40, 46, 50, 10 */ - LTEXT "KullanÄ±cÄ±", -1, 40, 66, 50, 10 - LTEXT "Åifre", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "LÃ¼tfen kullanÄ±cÄ± adÄ±nÄ±zÄ± ve Åifrenizi giriniz:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Vekil", -1, 6, 26, 60, 10 +/* LTEXT "EriÅim AlanÄ±", -1, 6, 46, 60, 10 */ + LTEXT "KullanÄ±cÄ±", -1, 6, 66, 60, 10 + LTEXT "Åifre", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Bu Åifreyi Sakla (GÃ¼vensiz)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Tamam", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ä°ptal", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Tamam", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ä°ptal", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Uk.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Uk.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -29,22 +29,22 @@ IDS_ENTIRENETWORK "ÐÑÑ ÐÐµÑÐµÐ¶Ð°" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ²ÐµÐ´ÑÑÑ ÐÐµÑÐµÐ¶Ð½Ð¸Ð¹ ÐÐ°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg" { - LTEXT "ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÐÐ°ÑÑ ÑÐ¼'Ñ ÑÐ° Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ÐÑÐ¾ÐºÑÑ", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ", -1, 40, 66, 50, 10 - LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÐÐ°ÑÑ ÑÐ¼'Ñ ÑÐ° Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ÐÑÐ¾ÐºÑÑ", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ", -1, 6, 66, 60, 10 + LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐµÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑÐ½Ð¾)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Zh.… ============================================================================== --- trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/lang/mpr_Zh.rc [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -28,24 +28,24 @@ IDS_ENTIRENETWORK "æ´ä¸ªç½ç»" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¾å¥ç½ç»å¯ç " FONT 9, "MS Shell Dlg" { - LTEXT "è¯·è¾å¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ä»£ç", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ç¨æ·å", -1, 40, 66, 50, 10 - LTEXT "å¯ç ", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "è¯·è¾å¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ä»£ç", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ç¨æ·å", -1, 6, 66, 60, 10 + LTEXT "å¯ç ", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "ç¡®å®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "ç¡®å®", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "åæ¶", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -55,22 +55,22 @@ IDS_ENTIRENETWORK "æ´åç¶²è·¯" } -IDD_PROXYDLG DIALOG 36, 24, 250, 154 +IDD_PROXYDLG DIALOG 36, 24, 228, 145 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¼¸å¥ç¶²è·¯å¯ç¢¼" FONT 9, "MS Shell Dlg" { - LTEXT "è«è¼¸å¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "ä»£ç", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "ç¨æ¶å", -1, 40, 66, 50, 10 - LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 - LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + LTEXT "è«è¼¸å¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "ä»£ç", -1, 6, 26, 60, 10 +/* LTEXT "Realm", -1, 6, 46, 60, 10 */ + LTEXT "ç¨æ¶å", -1, 6, 66, 60, 10 + LTEXT "å¯ç¢¼", -1, 6, 86, 60, 10 + LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "ç¢ºå®", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ç¢ºå®", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "åæ¶", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -1753,6 +1753,7 @@ struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; HANDLE mgr; DWORD ret = WN_NOT_CONNECTED; + DWORD bytes_returned; if ((mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, @@ -1764,7 +1765,7 @@ memset( data, 0, sizeof(*data) ); data->letter = letter; if (DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, data, sizeof(*data), - data, sizeof(buffer), NULL, NULL )) + data, sizeof(buffer), &bytes_returned, NULL )) { char *p, *mount_point = buffer + data->mount_point_offset; DWORD len; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 29 18:56:31 2014 @@ -109,7 +109,7 @@ reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 reactos/dll/win32/mlang # Synced to Wine-1.7.17 reactos/dll/win32/mmdevapi # Synced to Wine-1.7.27 -reactos/dll/win32/mpr # Synced to Wine-1.7.17 +reactos/dll/win32/mpr # Synced to Wine-1.7.27 reactos/dll/win32/mprapi # Synced to Wine-1.7.17 reactos/dll/win32/msacm32 # Synced to Wine-1.7.17 reactos/dll/win32/msacm32/msacm32.drv # Synced to Wine-1.7.17

1 0

[tkreuzer] 64400: [SPEC2DEF] Fix asm stubs for thiscall functions. CORE-8576 #resolve
by tkreuzer＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: tkreuzer Date: Mon Sep 29 17:43:32 2014 New Revision: 64400 URL: http://svn.reactos.org/svn/reactos?rev=64400&view=rev Log: [SPEC2DEF] Fix asm stubs for thiscall functions. CORE-8576 #resolve Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Mon Sep 29 17:43:32 2014 @@ -385,7 +385,7 @@ } void -Output_symbol(FILE *fileDest, char* pszSymbolName) +Output_stublabel(FILE *fileDest, char* pszSymbolName) { if (giArch == ARCH_ARM) { @@ -429,19 +429,21 @@ sprintf(szNameBuffer, "@_stub_%.*s@%d", pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } - else if (pexp->nCallingConvention == CC_CDECL || - pexp->nCallingConvention == CC_STUB) + else if ((pexp->nCallingConvention == CC_CDECL) || + (pexp->nCallingConvention == CC_THISCALL) || + (pexp->nCallingConvention == CC_EXTERN) || + (pexp->nCallingConvention == CC_STUB)) { sprintf(szNameBuffer, "__stub_%.*s", pexp->strName.len, pexp->strName.buf); } - else if (pexp->nCallingConvention == CC_EXTERN) - { - sprintf(szNameBuffer, "__stub_%.*s", - pexp->strName.len, pexp->strName.buf); - } - - Output_symbol(fileDest, szNameBuffer); + else + { + fprintf(stderr, "Invalid calling convention"); + return 0; + } + + Output_stublabel(fileDest, szNameBuffer); return 1; }

1 0

[akhaldi] 64399: [D3DRM_WINETEST] * Import from Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: akhaldi Date: Mon Sep 29 17:34:31 2014 New Revision: 64399 URL: http://svn.reactos.org/svn/reactos?rev=64399&view=rev Log: [D3DRM_WINETEST] * Import from Wine 1.7.27. CORE-8540 Added: trunk/rostests/winetests/d3drm/ (with props) trunk/rostests/winetests/d3drm/CMakeLists.txt (with props) trunk/rostests/winetests/d3drm/d3drm.c (with props) trunk/rostests/winetests/d3drm/testlist.c (with props) trunk/rostests/winetests/d3drm/vector.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Mon Sep 29 17:34:31 2014 @@ -19,6 +19,7 @@ add_subdirectory(crypt32) add_subdirectory(cryptnet) add_subdirectory(cryptui) +add_subdirectory(d3drm) add_subdirectory(devenum) add_subdirectory(dinput) add_subdirectory(dnsapi) Propchange: trunk/rostests/winetests/d3drm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 29 17:34:31 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/d3drm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/d3drm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/d3drm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/CMakeList… ============================================================================== --- trunk/rostests/winetests/d3drm/CMakeLists.txt (added) +++ trunk/rostests/winetests/d3drm/CMakeLists.txt [iso-8859-1] Mon Sep 29 17:34:31 2014 @@ -0,0 +1,7 @@ + +add_definitions(-DUSE_WINE_TODOS) +add_executable(d3drm_winetest d3drm.c vector.c testlist.c) +target_link_libraries(d3drm_winetest dxguid) +set_module_type(d3drm_winetest win32cui) +add_importlibs(d3drm_winetest ddraw user32 msvcrt kernel32) +add_cd_file(TARGET d3drm_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/d3drm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/d3drm.c?r… ============================================================================== --- trunk/rostests/winetests/d3drm/d3drm.c (added) +++ trunk/rostests/winetests/d3drm/d3drm.c [iso-8859-1] Mon Sep 29 17:34:31 2014 @@ -0,0 +1,1749 @@ +/* + * Copyright 2010, 2012 Christian Costa + * Copyright 2012 AndrÃ© Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <d3d.h> +#include <initguid.h> +#include <d3drm.h> +#include <d3drmwin.h> + +#include "wine/test.h" + +static HMODULE d3drm_handle = 0; + +static HRESULT (WINAPI * pDirect3DRMCreate)(IDirect3DRM **d3drm); + +#define CHECK_REFCOUNT(obj,rc) \ + { \ + int rc_new = rc; \ + int count = get_refcount( (IUnknown *)obj ); \ + ok(count == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, count); \ + } + +#define D3DRM_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + FreeLibrary(d3drm_handle); \ + return FALSE; \ + } + +static BOOL InitFunctionPtrs(void) +{ + d3drm_handle = LoadLibraryA("d3drm.dll"); + + if(!d3drm_handle) + { + skip("Could not load d3drm.dll\n"); + return FALSE; + } + + D3DRM_GET_PROC(Direct3DRMCreate) + + return TRUE; +} + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef( object ); + return IUnknown_Release( object ); +} + +static BOOL match_float(float a, float b) +{ + return (a - b) < 0.000001f; +} + +static D3DRMMATRIX4D identity = { + { 1.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 1.0f, 0.0f, 0.0f }, + { 0.0f, 0.0f, 1.0f, 0.0f }, + { 0.0f, 0.0f, 0.0f, 1.0f } +}; + +static char data_bad_version[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + +static char data_no_mesh[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 0; 1;\n" +"}\n"; + +static char data_ok[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 0; 1;\n" +"}\n" +"Mesh Object\n" +"{\n" +"4;\n" +"1.0; 0.0; 0.0;,\n" +"0.0; 1.0; 0.0;,\n" +"0.0; 0.0; 1.0;,\n" +"1.0; 1.0; 1.0;;\n" +"3;\n" +"3; 0, 1, 2;,\n" +"3; 1, 2, 3;,\n" +"3; 3, 1, 2;;\n" +"}\n"; + +static char data_full[] = +"xof 0302txt 0064\n" +"Header { 1; 0; 1; }\n" +"Mesh {\n" +" 3;\n" +" 0.1; 0.2; 0.3;,\n" +" 0.4; 0.5; 0.6;,\n" +" 0.7; 0.8; 0.9;;\n" +" 1;\n" +" 3; 0, 1, 2;;\n" +" MeshMaterialList {\n" +" 1; 1; 0;\n" +" Material {\n" +" 0.0; 1.0; 0.0; 1.0;;\n" +" 30.0;\n" +" 1.0; 0.0; 0.0;;\n" +" 0.5; 0.5; 0.5;;\n" +" TextureFileName {\n" +" \"Texture.bmp\";\n" +" }\n" +" }\n" +" }\n" +" MeshNormals {\n" +" 3;\n" +" 1.1; 1.2; 1.3;,\n" +" 1.4; 1.5; 1.6;,\n" +" 1.7; 1.8; 1.9;;\n" +" 1;" +" 3; 0, 1, 2;;\n" +" }\n" +" MeshTextureCoords {\n" +" 3;\n" +" 0.13; 0.17;,\n" +" 0.23; 0.27;,\n" +" 0.33; 0.37;;\n" +" }\n" +"}\n"; + +static char data_d3drm_load[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 0; 1;\n" +"}\n" +"Mesh Object1\n" +"{\n" +" 1;\n" +" 0.1; 0.2; 0.3;,\n" +" 1;\n" +" 3; 0, 1, 2;;\n" +"}\n" +"Mesh Object2\n" +"{\n" +" 1;\n" +" 0.1; 0.2; 0.3;,\n" +" 1;\n" +" 3; 0, 1, 2;;\n" +"}\n" +"Frame Scene\n" +"{\n" +" {Object1}\n" +" {Object2}\n" +"}\n" +"Material\n" +"{\n" +" 0.1, 0.2, 0.3, 0.4;;\n" +" 0.5;\n" +" 0.6, 0.7, 0.8;;\n" +" 0.9, 1.0, 1.1;;\n" +"}\n"; + +static char data_frame_mesh_materials[] = +"xof 0302txt 0064\n" +"Header { 1; 0; 1; }\n" +"Frame {\n" +" Mesh mesh1 {\n" +" 5;\n" +" 0.1; 0.2; 0.3;,\n" +" 0.4; 0.5; 0.6;,\n" +" 0.7; 0.8; 0.9;,\n" +" 1.1; 1.2; 1.3;,\n" +" 1.4; 1.5; 1.6;;\n" +" 6;\n" +" 3; 0, 1, 2;,\n" +" 3; 0, 2, 1;,\n" +" 3; 1, 2, 3;,\n" +" 3; 1, 3, 2;,\n" +" 3; 2, 3, 4;,\n" +" 3; 2, 4, 3;;\n" +" MeshMaterialList {\n" +" 3; 6; 0, 1, 1, 2, 2, 2;\n" +" Material mat1 {\n" +" 1.0; 0.0; 0.0; 0.1;;\n" +" 10.0;\n" +" 0.11; 0.12; 0.13;;\n" +" 0.14; 0.15; 0.16;;\n" +" }\n" +" Material mat2 {\n" +" 0.0; 1.0; 0.0; 0.2;;\n" +" 20.0;\n" +" 0.21; 0.22; 0.23;;\n" +" 0.24; 0.25; 0.26;;\n" +" }\n" +" Material mat3 {\n" +" 0.0; 0.0; 1.0; 0.3;;\n" +" 30.0;\n" +" 0.31; 0.32; 0.33;;\n" +" 0.34; 0.35; 0.36;;\n" +" }\n" +" }\n" +" }\n" +"}\n"; + +static void test_MeshBuilder(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMMeshBuilder *pMeshBuilder; + IDirect3DRMMesh *mesh; + D3DRMLOADMEMORY info; + int val; + DWORD val1, val2, val3; + D3DVALUE valu, valv; + D3DVECTOR v[3]; + D3DVECTOR n[4]; + DWORD f[8]; + char name[10]; + DWORD size; + D3DCOLOR color; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Builder"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); + + info.lpMemory = data_bad_version; + info.dSize = strlen(data_bad_version); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + + info.lpMemory = data_no_mesh; + info.dSize = strlen(data_no_mesh); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); + + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, "Object"), "Retrieved name '%s' instead of 'Object'\n", name); + size = strlen("Object"); /* No space for null character */ + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == E_INVALIDARG, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, NULL); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(size == 0, "Size should be 0 instead of %u\n", size); + hr = IDirect3DRMMeshBuilder_SetName(pMeshBuilder, ""); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_SetName returned hr = %x\n", hr); + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(pMeshBuilder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned hr = %x\n", hr); + ok(!strcmp(name, ""), "Retrieved name '%s' instead of ''\n", name); + + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); + ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); + + val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder); + ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); + + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, NULL, &val2, NULL, &val3, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + ok(val2 == 4, "Wrong number of normals %d (must be 4)\n", val2); + ok(val3 == 22, "Wrong number of face data bytes %d (must be 22)\n", val3); + + /* Check that Load method generated default normals */ + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, NULL, &val2, n, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(match_float(U1(n[0]).x, 0.577350f), "Wrong component n[0].x = %f (expected %f)\n", U1(n[0]).x, 0.577350f); + ok(match_float(U2(n[0]).y, 0.577350f), "Wrong component n[0].y = %f (expected %f)\n", U2(n[0]).y, 0.577350f); + ok(match_float(U3(n[0]).z, 0.577350f), "Wrong component n[0].z = %f (expected %f)\n", U3(n[0]).z, 0.577350f); + ok(match_float(U1(n[1]).x, -0.229416f), "Wrong component n[1].x = %f (expected %f)\n", U1(n[1]).x, -0.229416f); + ok(match_float(U2(n[1]).y, 0.688247f), "Wrong component n[1].y = %f (expected %f)\n", U2(n[1]).y, 0.688247f); + ok(match_float(U3(n[1]).z, 0.688247f), "Wrong component n[1].z = %f (expected %f)\n", U3(n[1]).z, 0.688247f); + ok(match_float(U1(n[2]).x, -0.229416f), "Wrong component n[2].x = %f (expected %f)\n", U1(n[2]).x, -0.229416f); + ok(match_float(U2(n[2]).y, 0.688247f), "Wrong component n[2].y = %f (expected %f)\n", U2(n[2]).y, 0.688247f); + ok(match_float(U3(n[2]).z, 0.688247f), "Wrong component n[2].z = %f (expected %f)\n", U3(n[2]).z, 0.688247f); + ok(match_float(U1(n[3]).x, -0.577350f), "Wrong component n[3].x = %f (expected %f)\n", U1(n[3]).x, -0.577350f); + ok(match_float(U2(n[3]).y, 0.577350f), "Wrong component n[3].y = %f (expected %f)\n", U2(n[3]).y, 0.577350f); + ok(match_float(U3(n[3]).z, 0.577350f), "Wrong component n[3].z = %f (expected %f)\n", U3(n[3]).z, 0.577350f); + + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 1, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 2, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 3, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 4, &valu, &valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 0, valu, valv); + ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_SetTextureCoordinates(pMeshBuilder, 4, valu, valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); + + valu = 0.0f; + valv = 0.0f; + hr = IDirect3DRMMeshBuilder_GetTextureCoordinates(pMeshBuilder, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + + IDirect3DRMMeshBuilder_Release(pMeshBuilder); + + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + + /* No group in mesh when mesh builder is not loaded */ + hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh); + ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr); + if (hr == D3DRM_OK) + { + DWORD nb_groups; + + nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); + ok(nb_groups == 0, "GetCroupCount returned %u\n", nb_groups); + + IDirect3DRMMesh_Release(mesh); + } + + info.lpMemory = data_full; + info.dSize = strlen(data_full); + hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + val = IDirect3DRMMeshBuilder_GetVertexCount(pMeshBuilder); + ok(val == 3, "Wrong number of vertices %d (must be 3)\n", val); + + val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder); + ok(val == 1, "Wrong number of faces %d (must be 1)\n", val); + + /* Check no buffer size and too small buffer size errors */ + val1 = 1; val2 = 3; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 1; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 3; val3 = 1; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + + val1 = 3; val2 = 3; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); + ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); + ok(val3 == 8, "Wrong number of face data bytes %d (must be 8)\n", val3); + ok(U1(v[0]).x == 0.1f, "Wrong component v[0].x = %f (expected 0.1)\n", U1(v[0]).x); + ok(U2(v[0]).y == 0.2f, "Wrong component v[0].y = %f (expected 0.2)\n", U2(v[0]).y); + ok(U3(v[0]).z == 0.3f, "Wrong component v[0].z = %f (expected 0.3)\n", U3(v[0]).z); + ok(U1(v[1]).x == 0.4f, "Wrong component v[1].x = %f (expected 0.4)\n", U1(v[1]).x); + ok(U2(v[1]).y == 0.5f, "Wrong component v[1].y = %f (expected 0.5)\n", U2(v[1]).y); + ok(U3(v[1]).z == 0.6f, "Wrong component v[1].z = %f (expected 0.6)\n", U3(v[1]).z); + ok(U1(v[2]).x == 0.7f, "Wrong component v[2].x = %f (expected 0.7)\n", U1(v[2]).x); + ok(U2(v[2]).y == 0.8f, "Wrong component v[2].y = %f (expected 0.8)\n", U2(v[2]).y); + ok(U3(v[2]).z == 0.9f, "Wrong component v[2].z = %f (expected 0.9)\n", U3(v[2]).z); + ok(U1(n[0]).x == 1.1f, "Wrong component n[0].x = %f (expected 1.1)\n", U1(n[0]).x); + ok(U2(n[0]).y == 1.2f, "Wrong component n[0].y = %f (expected 1.2)\n", U2(n[0]).y); + ok(U3(n[0]).z == 1.3f, "Wrong component n[0].z = %f (expected 1.3)\n", U3(n[0]).z); + ok(U1(n[1]).x == 1.4f, "Wrong component n[1].x = %f (expected 1.4)\n", U1(n[1]).x); + ok(U2(n[1]).y == 1.5f, "Wrong component n[1].y = %f (expected 1.5)\n", U2(n[1]).y); + ok(U3(n[1]).z == 1.6f, "Wrong component n[1].z = %f (expected 1.6)\n", U3(n[1]).z); + ok(U1(n[2]).x == 1.7f, "Wrong component n[2].x = %f (expected 1.7)\n", U1(n[2]).x); + ok(U2(n[2]).y == 1.8f, "Wrong component n[2].y = %f (expected 1.8)\n", U2(n[2]).y); + ok(U3(n[2]).z == 1.9f, "Wrong component n[2].z = %f (expected 1.9)\n", U3(n[2]).z); + ok(f[0] == 3 , "Wrong component f[0] = %d (expected 3)\n", f[0]); + ok(f[1] == 0 , "Wrong component f[1] = %d (expected 0)\n", f[1]); + ok(f[2] == 0 , "Wrong component f[2] = %d (expected 0)\n", f[2]); + ok(f[3] == 1 , "Wrong component f[3] = %d (expected 1)\n", f[3]); + ok(f[4] == 1 , "Wrong component f[4] = %d (expected 1)\n", f[4]); + ok(f[5] == 2 , "Wrong component f[5] = %d (expected 2)\n", f[5]); + ok(f[6] == 2 , "Wrong component f[6] = %d (expected 2)\n", f[6]); + ok(f[7] == 0 , "Wrong component f[7] = %d (expected 0)\n", f[7]); + + hr = IDirect3DRMMeshBuilder_CreateMesh(pMeshBuilder, &mesh); + ok(hr == D3DRM_OK, "CreateMesh failed returning hr = %x\n", hr); + if (hr == D3DRM_OK) + { + DWORD nb_groups; + unsigned nb_vertices, nb_faces, nb_face_vertices; + DWORD data_size; + IDirect3DRMMaterial *material = (IDirect3DRMMaterial *)0xdeadbeef; + IDirect3DRMTexture *texture = (IDirect3DRMTexture *)0xdeadbeef; + D3DVALUE values[3]; + + nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); + ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups); + hr = IDirect3DRMMesh_GetGroup(mesh, 1, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL); + ok(hr == D3DRMERR_BADVALUE, "GetCroup returned hr = %x\n", hr); + hr = IDirect3DRMMesh_GetGroup(mesh, 0, &nb_vertices, &nb_faces, &nb_face_vertices, &data_size, NULL); + ok(hr == D3DRM_OK, "GetCroup failed returning hr = %x\n", hr); + ok(nb_vertices == 3, "Wrong number of vertices %u (must be 3)\n", nb_vertices); + ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); + ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); + ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + color = IDirect3DRMMesh_GetGroupColor(mesh, 0); + ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); + hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); + ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); + ok(texture == NULL, "No texture should be present\n"); + hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); + ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); + ok(material != NULL, "No material present\n"); + if ((hr == D3DRM_OK) && material) + { + hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); + ok(values[0] == 0.5f, "Emissive red component should be %f instead of %f\n", 0.5f, values[0]); + ok(values[1] == 0.5f, "Emissive green component should be %f instead of %f\n", 0.5f, values[1]); + ok(values[2] == 0.5f, "Emissive blue component should be %f instead of %f\n", 0.5f, values[2]); + hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); + ok(values[0] == 1.0f, "Specular red component should be %f instead of %f\n", 1.0f, values[0]); + ok(values[1] == 0.0f, "Specular green component should be %f instead of %f\n", 0.0f, values[1]); + ok(values[2] == 0.0f, "Specular blue component should be %f instead of %f\n", 0.0f, values[2]); + values[0] = IDirect3DRMMaterial_GetPower(material); + ok(values[0] == 30.0f, "Power value should be %f instead of %f\n", 30.0f, values[0]); + } + + IDirect3DRMMesh_Release(mesh); + } + + hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4); + ok(hr == D3DRM_OK, "Scale failed returning hr = %x\n", hr); + + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val2 == 3, "Wrong number of normals %d (must be 3)\n", val2); + ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1); + ok(U1(v[0]).x == 0.1f*2, "Wrong component v[0].x = %f (expected %f)\n", U1(v[0]).x, 0.1f*2); + ok(U2(v[0]).y == 0.2f*3, "Wrong component v[0].y = %f (expected %f)\n", U2(v[0]).y, 0.2f*3); + ok(U3(v[0]).z == 0.3f*4, "Wrong component v[0].z = %f (expected %f)\n", U3(v[0]).z, 0.3f*4); + ok(U1(v[1]).x == 0.4f*2, "Wrong component v[1].x = %f (expected %f)\n", U1(v[1]).x, 0.4f*2); + ok(U2(v[1]).y == 0.5f*3, "Wrong component v[1].y = %f (expected %f)\n", U2(v[1]).y, 0.5f*3); + ok(U3(v[1]).z == 0.6f*4, "Wrong component v[1].z = %f (expected %f)\n", U3(v[1]).z, 0.6f*4); + ok(U1(v[2]).x == 0.7f*2, "Wrong component v[2].x = %f (expected %f)\n", U1(v[2]).x, 0.7f*2); + ok(U2(v[2]).y == 0.8f*3, "Wrong component v[2].y = %f (expected %f)\n", U2(v[2]).y, 0.8f*3); + ok(U3(v[2]).z == 0.9f*4, "Wrong component v[2].z = %f (expected %f)\n", U3(v[2]).z, 0.9f*4); + /* Normals are not affected by Scale */ + ok(U1(n[0]).x == 1.1f, "Wrong component n[0].x = %f (expected %f)\n", U1(n[0]).x, 1.1f); + ok(U2(n[0]).y == 1.2f, "Wrong component n[0].y = %f (expected %f)\n", U2(n[0]).y, 1.2f); + ok(U3(n[0]).z == 1.3f, "Wrong component n[0].z = %f (expected %f)\n", U3(n[0]).z, 1.3f); + ok(U1(n[1]).x == 1.4f, "Wrong component n[1].x = %f (expected %f)\n", U1(n[1]).x, 1.4f); + ok(U2(n[1]).y == 1.5f, "Wrong component n[1].y = %f (expected %f)\n", U2(n[1]).y, 1.5f); + ok(U3(n[1]).z == 1.6f, "Wrong component n[1].z = %f (expected %f)\n", U3(n[1]).z, 1.6f); + ok(U1(n[2]).x == 1.7f, "Wrong component n[2].x = %f (expected %f)\n", U1(n[2]).x, 1.7f); + ok(U2(n[2]).y == 1.8f, "Wrong component n[2].y = %f (expected %f)\n", U2(n[2]).y, 1.8f); + ok(U3(n[2]).z == 1.9f, "Wrong component n[2].z = %f (expected %f)\n", U3(n[2]).z, 1.9f); + + IDirect3DRMMeshBuilder_Release(pMeshBuilder); + + IDirect3DRM_Release(d3drm); +} + +static void test_MeshBuilder3(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRM3 *d3drm3; + IDirect3DRMMeshBuilder3 *pMeshBuilder3; + D3DRMLOADMEMORY info; + int val; + DWORD val1; + D3DVALUE valu, valv; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Builder"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); + + info.lpMemory = data_bad_version; + info.dSize = strlen(data_bad_version); + hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRMERR_BADFILE, "Should have returned D3DRMERR_BADFILE (hr = %x)\n", hr); + + info.lpMemory = data_no_mesh; + info.dSize = strlen(data_no_mesh); + hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRMERR_NOTFOUND, "Should have returned D3DRMERR_NOTFOUND (hr = %x)\n", hr); + + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + val = IDirect3DRMMeshBuilder3_GetVertexCount(pMeshBuilder3); + ok(val == 4, "Wrong number of vertices %d (must be 4)\n", val); + + val = IDirect3DRMMeshBuilder3_GetFaceCount(pMeshBuilder3); + ok(val == 3, "Wrong number of faces %d (must be 3)\n", val); + + hr = IDirect3DRMMeshBuilder3_GetVertices(pMeshBuilder3, 0, &val1, NULL); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(val1 == 4, "Wrong number of vertices %d (must be 4)\n", val1); + + /* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */ + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 1, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 2, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 3, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valu); + ok(valv == 0.0f, "Wrong coordinate %f (must be 0.0)\n", valv); + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 4, &valu, &valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); + + valu = 1.23f; + valv = 3.21f; + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 0, valu, valv); + ok(hr == D3DRM_OK, "Cannot set texture coordinates (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_SetTextureCoordinates(pMeshBuilder3, 4, valu, valv); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); + + valu = 0.0f; + valv = 0.0f; + hr = IDirect3DRMMeshBuilder3_GetTextureCoordinates(pMeshBuilder3, 0, &valu, &valv); + ok(hr == D3DRM_OK, "Cannot get texture coordinates (hr = %x)\n", hr); + ok(valu == 1.23f, "Wrong coordinate %f (must be 1.23)\n", valu); + ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); + + IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm); +} + +static void test_Mesh(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMMesh *mesh; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateMesh(d3drm, &mesh); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMesh interface (hr = %x)\n", hr); + + hr = IDirect3DRMMesh_GetClassName(mesh, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMesh_GetClassName(mesh, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMesh_GetClassName(mesh, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMesh_GetClassName(mesh, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Mesh"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname); + + IDirect3DRMMesh_Release(mesh); + + IDirect3DRM_Release(d3drm); +} + +static void test_Face(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMMeshBuilder2 *MeshBuilder2; + IDirect3DRMMeshBuilder3 *MeshBuilder3; + IDirect3DRMFace *face1; + IDirect3DRMFace2 *face2; + IDirect3DRMFaceArray *array1; + D3DRMLOADMEMORY info; + D3DVECTOR v1[4], n1[4], v2[4], n2[4]; + DWORD count; + CHAR cname[64] = {0}; + int icount; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFace(d3drm, &face1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr); + if (FAILED(hr)) + { + skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRMFace_GetClassName(face1, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFace_GetClassName(face1, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFace_GetClassName(face1, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFace_GetClassName(face1, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Face"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Face"), "Expected cname to be \"Face\", but got \"%s\"\n", cname); + + icount = IDirect3DRMFace_GetVertexCount(face1); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace_Release(face1); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2))) + { + win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2); + ok(!icount, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + + hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2); + todo_wine + ok(icount == 1, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + icount = IDirect3DRMFace_GetVertexCount(face1); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace_Release(face1); + IDirect3DRMMeshBuilder2_Release(MeshBuilder2); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + ok(!icount, "wrong FaceCount: %i\n", icount); + + hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr); + + hr = IDirect3DRMFace2_GetClassName(face2, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFace2_GetClassName(face2, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFace2_GetClassName(face2, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFace2_GetClassName(face2, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Face"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Face"), "Expected cname to be \"Face\", but got \"%s\"\n", cname); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 1, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + icount = IDirect3DRMFace2_GetVertexCount(face2); + ok(!icount, "wrong VertexCount: %i\n", icount); + + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3); + ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetNormalCount(MeshBuilder3); + ok(icount == 4, "Wrong number of normals %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 4, "Wrong number of faces %d (must be 4)\n", icount); + + count = 4; + hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count); + + hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1); + ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of normals %d (must be 4)\n", count); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 4, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_GetVertices(face, &count, v2, n2); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); + ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n", + U1(v2[0]).x, U1(v1[0]).x); + ok(U2(v2[0]).y == U2(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n", + U2(v2[0]).y, U2(v1[0]).y); + ok(U3(v2[0]).z == U3(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n", + U3(v2[0]).z, U3(v1[0]).z); + ok(U1(v2[1]).x == U1(v1[1]).x, "Wrong component v2[1].x = %f (expected %f)\n", + U1(v2[1]).x, U1(v1[1]).x); + ok(U2(v2[1]).y == U2(v1[1]).y, "Wrong component v2[1].y = %f (expected %f)\n", + U2(v2[1]).y, U2(v1[1]).y); + ok(U3(v2[1]).z == U3(v1[1]).z, "Wrong component v2[1].z = %f (expected %f)\n", + U3(v2[1]).z, U3(v1[1]).z); + ok(U1(v2[2]).x == U1(v1[2]).x, "Wrong component v2[2].x = %f (expected %f)\n", + U1(v2[2]).x, U1(v1[2]).x); + ok(U2(v2[2]).y == U2(v1[2]).y, "Wrong component v2[2].y = %f (expected %f)\n", + U2(v2[2]).y, U2(v1[2]).y); + ok(U3(v2[2]).z == U3(v1[2]).z, "Wrong component v2[2].z = %f (expected %f)\n", + U3(v2[2]).z, U3(v1[2]).z); + + ok(U1(n2[0]).x == U1(n1[0]).x, "Wrong component n2[0].x = %f (expected %f)\n", + U1(n2[0]).x, U1(n1[0]).x); + ok(U2(n2[0]).y == U2(n1[0]).y, "Wrong component n2[0].y = %f (expected %f)\n", + U2(n2[0]).y, U2(n1[0]).y); + ok(U3(n2[0]).z == U3(n1[0]).z, "Wrong component n2[0].z = %f (expected %f)\n", + U3(n2[0]).z, U3(n1[0]).z); + ok(U1(n2[1]).x == U1(n1[1]).x, "Wrong component n2[1].x = %f (expected %f)\n", + U1(n2[1]).x, U1(n1[1]).x); + ok(U2(n2[1]).y == U2(n1[1]).y, "Wrong component n2[1].y = %f (expected %f)\n", + U2(n2[1]).y, U2(n1[1]).y); + ok(U3(n2[1]).z == U3(n1[1]).z, "Wrong component n2[1].z = %f (expected %f)\n", + U3(n2[1]).z, U3(n1[1]).z); + ok(U1(n2[2]).x == U1(n1[2]).x, "Wrong component n2[2].x = %f (expected %f)\n", + U1(n2[2]).x, U1(n1[2]).x); + ok(U2(n2[2]).y == U2(n1[2]).y, "Wrong component n2[2].y = %f (expected %f)\n", + U2(n2[2]).y, U2(n1[2]).y); + ok(U3(n2[2]).z == U3(n1[2]).z, "Wrong component n2[2].z = %f (expected %f)\n", + U3(n2[2]).z, U3(n1[2]).z); + + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + IDirect3DRMFace2_Release(face2); + IDirect3DRMMeshBuilder3_Release(MeshBuilder3); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm); +} + +static void test_Frame(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMFrame *pFrameC; + IDirect3DRMFrame *pFrameP1; + IDirect3DRMFrame *pFrameP2; + IDirect3DRMFrame *pFrameTmp; + IDirect3DRMFrameArray *frame_array; + IDirect3DRMMeshBuilder *mesh_builder; + IDirect3DRMVisual *visual1; + IDirect3DRMVisual *visual_tmp; + IDirect3DRMVisualArray *visual_array; + IDirect3DRMLight *light1; + IDirect3DRMLight *light_tmp; + IDirect3DRMLightArray *light_array; + D3DCOLOR color; + DWORD count; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameC); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 1); + + hr = IDirect3DRMFrame_GetClassName(pFrameC, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFrame_GetClassName(pFrameC, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Frame"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Frame"), "Expected cname to be \"Frame\", but got \"%s\"\n", cname); + + hr = IDirect3DRMFrame_GetParent(pFrameC, NULL); + ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + CHECK_REFCOUNT(pFrameC, 1); + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameC, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + ok(!!frame_array, "frame_array = %p\n", frame_array); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 0, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrameArray_Release(frame_array); + } + + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + /* GetParent with NULL pointer */ + hr = IDirect3DRMFrame_GetParent(pFrameP1, NULL); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + + /* [Add/Delete]Child with NULL pointer */ + hr = IDirect3DRMFrame_AddChild(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + + hr = IDirect3DRMFrame_DeleteChild(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + + /* Add child to first parent */ + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameP1, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + hr = IDirect3DRMFrame_AddChild(pFrameP1, pFrameC); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 1); + CHECK_REFCOUNT(pFrameC, 2); + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + /* In some older version of d3drm, creating IDirect3DRMFrameArray object with GetChildren does not increment refcount of children frames */ + ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2), + "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC)); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + ok((get_refcount((IUnknown*)pFrameC) == 4) || broken(get_refcount((IUnknown*)pFrameC) == 3), + "Invalid refcount. Expected 4 (or 3) got %d\n", get_refcount((IUnknown*)pFrameC)); + IDirect3DRMFrame_Release(pFrameTmp); + ok((get_refcount((IUnknown*)pFrameC) == 3) || broken(get_refcount((IUnknown*)pFrameC) == 2), + "Invalid refcount. Expected 3 (or 2) got %d\n", get_refcount((IUnknown*)pFrameC)); + IDirect3DRMFrameArray_Release(frame_array); + CHECK_REFCOUNT(pFrameC, 2); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + CHECK_REFCOUNT(pFrameP1, 2); + + /* Add child to second parent */ + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 2); + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); + IDirect3DRMFrameArray_Release(frame_array); + } + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP1, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 0, "count = %u\n", count); + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrameArray_Release(frame_array); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp); + CHECK_REFCOUNT(pFrameP2, 2); + CHECK_REFCOUNT(pFrameC, 2); + + /* Add child again */ + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 2); + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); + IDirect3DRMFrameArray_Release(frame_array); + } + + /* Delete child */ + hr = IDirect3DRMFrame_DeleteChild(pFrameP2, pFrameC); + ok(hr == D3DRM_OK, "Cannot delete child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 1); + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 0, "count = %u\n", count); + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRMERR_BADVALUE, "Should have returned D3DRMERR_BADVALUE (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrameArray_Release(frame_array); + } + + pFrameTmp = (void*)0xdeadbeef; + hr = IDirect3DRMFrame_GetParent(pFrameC, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); + ok(pFrameTmp == NULL, "pFrameTmp = %p\n", pFrameTmp); + + /* Add two children */ + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameC, 2); + + hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1); + ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + + frame_array = NULL; + hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array); + ok(hr == D3DRM_OK, "Cannot get children (hr = %x)\n", hr); + if (frame_array) + { + count = IDirect3DRMFrameArray_GetSize(frame_array); + ok(count == 2, "count = %u\n", count); + hr = IDirect3DRMFrameArray_GetElement(frame_array, 0, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameC, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); + hr = IDirect3DRMFrameArray_GetElement(frame_array, 1, &pFrameTmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); + IDirect3DRMFrame_Release(pFrameTmp); + IDirect3DRMFrameArray_Release(frame_array); + } + + /* [Add/Delete]Visual with NULL pointer */ + hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + + hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + + /* Create Visual */ + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + visual1 = (IDirect3DRMVisual *)mesh_builder; + + /* Add Visual to first parent */ + hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); + ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(visual1, 2); + + visual_array = NULL; + hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array); + ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); + if (visual_array) + { + count = IDirect3DRMVisualArray_GetSize(visual_array); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp); + IDirect3DRMVisual_Release(visual_tmp); + IDirect3DRMVisualArray_Release(visual_array); + } + + /* Delete Visual */ + hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); + ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + IDirect3DRMMeshBuilder_Release(mesh_builder); + + /* [Add/Delete]Light with NULL pointer */ + hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + + hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + + /* Create Light */ + hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + + /* Add Light to first parent */ + hr = IDirect3DRMFrame_AddLight(pFrameP1, light1); + ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(light1, 2); + + light_array = NULL; + hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array); + ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); + if (light_array) + { + count = IDirect3DRMLightArray_GetSize(light_array); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp); + ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); + ok(light_tmp == light1, "light_tmp = %p\n", light_tmp); + IDirect3DRMLight_Release(light_tmp); + IDirect3DRMLightArray_Release(light_array); + } + + /* Delete Light */ + hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1); + ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr); + CHECK_REFCOUNT(pFrameP1, 3); + IDirect3DRMLight_Release(light1); + + /* Test SceneBackground on first parent */ + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff000000, "wrong color (%x)\n", color); + + hr = IDirect3DRMFrame_SetSceneBackground(pFrameP1, 0xff180587); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff180587, "wrong color (%x)\n", color); + + hr = IDirect3DRMFrame_SetSceneBackgroundRGB(pFrameP1, 0.5, 0.5, 0.5); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + + /* Cleanup */ + IDirect3DRMFrame_Release(pFrameP2); + CHECK_REFCOUNT(pFrameC, 2); + CHECK_REFCOUNT(pFrameP1, 3); + + IDirect3DRMFrame_Release(pFrameC); + IDirect3DRMFrame_Release(pFrameP1); + + IDirect3DRM_Release(d3drm); +} + +static void test_Viewport(void) +{ + IDirectDrawClipper *pClipper; + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMDevice *device; + IDirect3DRMFrame *frame; + IDirect3DRMViewport *viewport; + GUID driver; + HWND window; + RECT rc; + DWORD size; + CHAR cname[64] = {0}; + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = DirectDrawCreateClipper(0, &pClipper, NULL); + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); + + hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window); + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); + + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateViewport(d3drm, device, frame, rc.left, rc.top, rc.right, rc.bottom, &viewport); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMViewport interface (hr = %x)\n", hr); + + hr = IDirect3DRMViewport_GetClassName(viewport, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMViewport_GetClassName(viewport, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMViewport_GetClassName(viewport, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMViewport_GetClassName(viewport, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Viewport"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Viewport"), "Expected cname to be \"Viewport\", but got \"%s\"\n", cname); + + IDirect3DRMViewport_Release(viewport); + IDirect3DRMFrame_Release(frame); + IDirect3DRMDevice_Release(device); + IDirectDrawClipper_Release(pClipper); + + IDirect3DRM_Release(d3drm); + DestroyWindow(window); +} + +static void test_Light(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMLight *light; + D3DRMLIGHTTYPE type; + D3DCOLOR color; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &light); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + + hr = IDirect3DRMLight_GetClassName(light, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMLight_GetClassName(light, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMLight_GetClassName(light, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMLight_GetClassName(light, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Light"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Light"), "Expected cname to be \"Light\", but got \"%s\"\n", cname); + + type = IDirect3DRMLight_GetType(light); + ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); + + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + + hr = IDirect3DRMLight_SetType(light, D3DRMLIGHT_POINT); + ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); + type = IDirect3DRMLight_GetType(light); + ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); + + hr = IDirect3DRMLight_SetColor(light, 0xff180587); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xff180587, "wrong color (%x)\n", color); + + hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + + IDirect3DRMLight_Release(light); + + IDirect3DRM_Release(d3drm); +} + +static void test_Material2(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRM3 *d3drm3; + IDirect3DRMMaterial2 *material2; + D3DVALUE r, g, b; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &material2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr); + + hr = IDirect3DRMMaterial2_GetClassName(material2, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMaterial2_GetClassName(material2, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMaterial2_GetClassName(material2, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMaterial2_GetClassName(material2, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Material"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Material"), "Expected cname to be \"Material\", but got \"%s\"\n", cname); + + r = IDirect3DRMMaterial2_GetPower(material2); + ok(r == 18.5f, "wrong power (%f)\n", r); + + hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong emissive r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b); + + hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 1.0f && g == 1.0f && b == 1.0f, "wrong specular r=%f g=%f b=%f, expected r=1.0 g=1.0 b=1.0\n", r, g, b); + + hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 0.0f && g == 0.0f && b == 0.0f, "wrong ambient r=%f g=%f b=%f, expected r=0.0 g=0.0 b=0.0\n", r, g, b); + + hr = IDirect3DRMMaterial2_SetPower(material2, 5.87f); + ok(hr == D3DRM_OK, "Cannot set power (hr = %x)\n", hr); + r = IDirect3DRMMaterial2_GetPower(material2); + ok(r == 5.87f, "wrong power (%f)\n", r); + + hr = IDirect3DRMMaterial2_SetEmissive(material2, 0.5f, 0.5f, 0.5f); + ok(hr == D3DRM_OK, "Cannot set emissive (hr = %x)\n", hr); + hr = IDirect3DRMMaterial2_GetEmissive(material2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get emissive (hr = %x)\n", hr); + ok(r == 0.5f && g == 0.5f && b == 0.5f, "wrong emissive r=%f g=%f b=%f, expected r=0.5 g=0.5 b=0.5\n", r, g, b); + + hr = IDirect3DRMMaterial2_SetSpecular(material2, 0.6f, 0.6f, 0.6f); + ok(hr == D3DRM_OK, "Cannot set specular (hr = %x)\n", hr); + hr = IDirect3DRMMaterial2_GetSpecular(material2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get specular (hr = %x)\n", hr); + ok(r == 0.6f && g == 0.6f && b == 0.6f, "wrong specular r=%f g=%f b=%f, expected r=0.6 g=0.6 b=0.6\n", r, g, b); + + hr = IDirect3DRMMaterial2_SetAmbient(material2, 0.7f, 0.7f, 0.7f); + ok(hr == D3DRM_OK, "Cannot set ambient (hr = %x)\n", hr); + hr = IDirect3DRMMaterial2_GetAmbient(material2, &r, &g, &b); + ok(hr == D3DRM_OK, "Cannot get ambient (hr = %x)\n", hr); + ok(r == 0.7f && g == 0.7f && b == 0.7f, "wrong ambient r=%f g=%f b=%f, expected r=0.7 g=0.7 b=0.7\n", r, g, b); + + IDirect3DRMMaterial2_Release(material2); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM_Release(d3drm); +} + +static void test_Texture(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMTexture *texture; + D3DRMIMAGE initimg = { + 2, 2, 1, 1, 32, + TRUE, 2 * sizeof(DWORD), NULL, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL + }; + DWORD pixel[4] = { 20000, 30000, 10000, 0 }; + DWORD size; + CHAR cname[64] = {0}; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + initimg.buffer1 = &pixel; + hr = IDirect3DRM_CreateTexture(d3drm, &initimg, &texture); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMTexture interface (hr = %x)\n", hr); + + hr = IDirect3DRMTexture_GetClassName(texture, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMTexture_GetClassName(texture, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMTexture_GetClassName(texture, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMTexture_GetClassName(texture, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Texture"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Texture"), "Expected cname to be \"Texture\", but got \"%s\"\n", cname); + + IDirect3DRMTexture_Release(texture); + + IDirect3DRM_Release(d3drm); +} + +static void test_Device(void) +{ + IDirectDrawClipper *pClipper; + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMDevice *device; + IDirect3DRMWinDevice *win_device; + GUID driver; + HWND window; + RECT rc; + DWORD size; + CHAR cname[64] = {0}; + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = DirectDrawCreateClipper(0, &pClipper, NULL); + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); + + hr = IDirectDrawClipper_SetHWnd(pClipper, 0, window); + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); + + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm, pClipper, &driver, rc.right, rc.bottom, &device); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); + + hr = IDirect3DRMDevice_GetClassName(device, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMDevice_GetClassName(device, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMDevice_GetClassName(device, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMDevice_GetClassName(device, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Device"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + + /* WinDevice */ + if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device))) + { + win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr); + goto cleanup; + } + + hr = IDirect3DRMWinDevice_GetClassName(win_device, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMWinDevice_GetClassName(win_device, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMWinDevice_GetClassName(win_device, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = sizeof(cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, &size, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size == sizeof("Device"), "wrong size: %u\n", size); + ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); + + IDirect3DRMWinDevice_Release(win_device); + +cleanup: + IDirect3DRMDevice_Release(device); + IDirectDrawClipper_Release(pClipper); + + IDirect3DRM_Release(d3drm); + DestroyWindow(window); +} + +static void test_frame_transform(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRMFrame *frame; + D3DRMMATRIX4D matrix; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFrame(d3drm, NULL, &frame); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); + + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); + ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + + IDirect3DRMFrame_Release(frame); + IDirect3DRM_Release(d3drm); +} + +static int nb_objects = 0; +static const GUID* refiids[] = +{ + &IID_IDirect3DRMMeshBuilder, + &IID_IDirect3DRMMeshBuilder, + &IID_IDirect3DRMFrame, + &IID_IDirect3DRMMaterial /* Not taken into account and not notified */ +}; + +static void __cdecl object_load_callback(IDirect3DRMObject *object, REFIID objectguid, void *arg) +{ + ok(object != NULL, "Arg 1 should not be null\n"); + ok(IsEqualGUID(objectguid, refiids[nb_objects]), "Arg 2 is incorrect\n"); + ok(arg == (void *)0xdeadbeef, "Arg 3 should be 0xdeadbeef (got %p)\n", arg); + nb_objects++; +} + +static void test_d3drm_load(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + D3DRMLOADMEMORY info; + const GUID* req_refiids[] = { &IID_IDirect3DRMMeshBuilder, &IID_IDirect3DRMFrame, &IID_IDirect3DRMMaterial }; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + info.lpMemory = data_d3drm_load; + info.dSize = strlen(data_d3drm_load); + hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID **)req_refiids, 3, D3DRMLOAD_FROMMEMORY, + object_load_callback, (void *)0xdeadbeef, NULL, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); + ok(nb_objects == 3, "Should have loaded 3 objects (got %d)\n", nb_objects); + + IDirect3DRM_Release(d3drm); +} + +IDirect3DRMMeshBuilder *mesh_builder = NULL; + +static void __cdecl object_load_callback_frame(IDirect3DRMObject *object, REFIID object_guid, void *arg) +{ + HRESULT hr; + IDirect3DRMFrame *frame; + IDirect3DRMVisualArray *array; + IDirect3DRMVisual *visual; + ULONG size; + char name[128]; + + hr = IDirect3DRMObject_QueryInterface(object, &IID_IDirect3DRMFrame, (void**)&frame); + ok(hr == D3DRM_OK, "IDirect3DRMObject_QueryInterface returned %x\n", hr); + + hr = IDirect3DRMFrame_GetVisuals(frame, &array); + ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetVisuals returned %x\n", hr); + + size = IDirect3DRMVisualArray_GetSize(array); + ok(size == 1, "Wrong size %u returned, expected 1\n", size); + + hr = IDirect3DRMVisualArray_GetElement(array, 0, &visual); + ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetElement returned %x\n", hr); + + hr = IDirect3DRMVisual_QueryInterface(visual, &IID_IDirect3DRMMeshBuilder, (void**)&mesh_builder); + ok(hr == D3DRM_OK, "IDirect3DRMVisualArray_GetSize returned %x\n", hr); + + size = sizeof(name); + hr = IDirect3DRMMeshBuilder_GetName(mesh_builder, &size, name); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_GetName returned %x\n", hr); + ok(!strcmp(name, "mesh1"), "Wrong name %s, expected mesh1\n", name); + + IDirect3DRMVisual_Release(visual); + IDirect3DRMVisualArray_Release(array); + IDirect3DRMFrame_Release(frame); +} + +struct { + int vertex_count; + int face_count; + int vertex_per_face; + int face_data_size; + DWORD color; + float power; + float specular[3]; + float emissive[3]; +} groups[3] = { + { 4, 3, 3, 9, 0x4c0000ff, 30.0f, { 0.31f, 0.32f, 0.33f }, { 0.34f, 0.35f, 0.36f } }, + { 4, 2, 3, 6, 0x3300ff00, 20.0f, { 0.21f, 0.22f, 0.23f }, { 0.24f, 0.25f, 0.26f } }, + { 3, 1, 3, 3, 0x19ff0000, 10.0f, { 0.11f, 0.12f, 0.13f }, { 0.14f, 0.15f, 0.16f } } +}; + +static void test_frame_mesh_materials(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + D3DRMLOADMEMORY info; + const GUID *req_refiids[] = { &IID_IDirect3DRMFrame }; + IDirect3DRMMesh *mesh; + ULONG size; + IDirect3DRMMaterial *material; + IDirect3DRMTexture *texture; + int i; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Direct3DRMCreate returned %x\n", hr); + + info.lpMemory = data_frame_mesh_materials; + info.dSize = strlen(data_frame_mesh_materials); + hr = IDirect3DRM_Load(d3drm, &info, NULL, (GUID**)req_refiids, 1, D3DRMLOAD_FROMMEMORY, object_load_callback_frame, (void*)0xdeadbeef, NULL, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load data (hr = %x)\n", hr); + + hr = IDirect3DRMMeshBuilder_CreateMesh(mesh_builder, &mesh); + ok(hr == D3DRM_OK, "IDirect3DRMMeshBuilder_CreateMesh returned %x\n", hr); + + size = IDirect3DRMMesh_GetGroupCount(mesh); + ok(size == 3, "Wrong size %u returned, expected 3\n", size); + + for (i = 0; i < size; i++) + { + D3DVALUE red, green, blue, power; + D3DCOLOR color; + unsigned vertex_count, face_count, vertex_per_face; + DWORD face_data_size; + + hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL); + ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroup returned %x\n", i, hr); + ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count); + ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count); + ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face); + ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %d, expected %d\n", i, face_data_size, groups[i].face_data_size); + + color = IDirect3DRMMesh_GetGroupColor(mesh, i); + ok(color == groups[i].color, "Group %d: Wrong color %x, expected %x\n", i, color, groups[i].color); + + hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material); + ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupMaterial returned %x\n", i, hr); + ok(material != NULL, "Group %d: No material\n", i); + power = IDirect3DRMMaterial_GetPower(material); + ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power); + hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue); + ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetSpecular returned %x\n", i, hr); + ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]); + ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]); + ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]); + hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue); + ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMaterial_GetEmissive returned %x\n", i, hr); + ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]); + ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]); + ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]); + + hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture); + ok(hr == D3DRM_OK, "Group %d: IDirect3DRMMesh_GetGroupTexture returned %x\n", i, hr); + ok(!texture, "Group %d: Unexpected texture\n", i); + + if (material) + IDirect3DRMMaterial_Release(material); + if (texture) + IDirect3DRMTexture_Release(texture); + } + + IDirect3DRMMesh_Release(mesh); + IDirect3DRMMeshBuilder_Release(mesh_builder); + IDirect3DRM_Release(d3drm); +} + +START_TEST(d3drm) +{ + if (!InitFunctionPtrs()) + return; + + test_MeshBuilder(); + test_MeshBuilder3(); + test_Mesh(); + test_Face(); + test_Frame(); + test_Device(); + test_Viewport(); + test_Light(); + test_Material2(); + test_Texture(); + test_frame_transform(); + test_d3drm_load(); + test_frame_mesh_materials(); + + FreeLibrary(d3drm_handle); +} Propchange: trunk/rostests/winetests/d3drm/d3drm.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/d3drm/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/testlist.… ============================================================================== --- trunk/rostests/winetests/d3drm/testlist.c (added) +++ trunk/rostests/winetests/d3drm/testlist.c [iso-8859-1] Mon Sep 29 17:34:31 2014 @@ -0,0 +1,14 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_d3drm(void); +extern void func_vector(void); + +const struct test winetest_testlist[] = +{ + { "d3drm", func_d3drm }, + { "vector", func_vector }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/d3drm/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/d3drm/vector.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/vector.c?… ============================================================================== --- trunk/rostests/winetests/d3drm/vector.c (added) +++ trunk/rostests/winetests/d3drm/vector.c [iso-8859-1] Mon Sep 29 17:34:31 2014 @@ -0,0 +1,367 @@ +/* + * Copyright 2007 Vijay Kiran Kamuju + * Copyright 2007 David Adam + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <math.h> + +#include "d3drmdef.h" + +#include "wine/test.h" + +#define PI (4.0f*atanf(1.0f)) +#define admit_error 0.000001f + +#define expect_mat( expectedmat, gotmat)\ +{ \ + int i,j; \ + BOOL equal = TRUE; \ + for (i=0; i<4; i++)\ + {\ + for (j=0; j<4; j++)\ + {\ + if (fabs(expectedmat[i][j]-gotmat[i][j])>admit_error)\ + {\ + equal = FALSE;\ + }\ + }\ + }\ + ok(equal, "Expected matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n)\n\n" \ + "Got matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f)\n", \ + expectedmat[0][0],expectedmat[0][1],expectedmat[0][2],expectedmat[0][3], \ + expectedmat[1][0],expectedmat[1][1],expectedmat[1][2],expectedmat[1][3], \ + expectedmat[2][0],expectedmat[2][1],expectedmat[2][2],expectedmat[2][3], \ + expectedmat[3][0],expectedmat[3][1],expectedmat[3][2],expectedmat[3][3], \ + gotmat[0][0],gotmat[0][1],gotmat[0][2],gotmat[0][3], \ + gotmat[1][0],gotmat[1][1],gotmat[1][2],gotmat[1][3], \ + gotmat[2][0],gotmat[2][1],gotmat[2][2],gotmat[2][3], \ + gotmat[3][0],gotmat[3][1],gotmat[3][2],gotmat[3][3] ); \ +} + +#define expect_quat(expectedquat,gotquat) \ + ok( (fabs(U1(expectedquat.v).x-U1(gotquat.v).x)<admit_error) && \ + (fabs(U2(expectedquat.v).y-U2(gotquat.v).y)<admit_error) && \ + (fabs(U3(expectedquat.v).z-U3(gotquat.v).z)<admit_error) && \ + (fabs(expectedquat.s-gotquat.s)<admit_error), \ + "Expected Quaternion %f %f %f %f , Got Quaternion %f %f %f %f\n", \ + expectedquat.s,U1(expectedquat.v).x,U2(expectedquat.v).y,U3(expectedquat.v).z, \ + gotquat.s,U1(gotquat.v).x,U2(gotquat.v).y,U3(gotquat.v).z); + +#define expect_vec(expectedvec,gotvec) \ + ok( ((fabs(U1(expectedvec).x-U1(gotvec).x)<admit_error)&&(fabs(U2(expectedvec).y-U2(gotvec).y)<admit_error)&&(fabs(U3(expectedvec).z-U3(gotvec).z)<admit_error)), \ + "Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", \ + U1(expectedvec).x,U2(expectedvec).y,U3(expectedvec).z, U1(gotvec).x, U2(gotvec).y, U3(gotvec).z); + +static HMODULE d3drm_handle = 0; + +static void (WINAPI * pD3DRMMatrixFromQuaternion)(D3DRMMATRIX4D, D3DRMQUATERNION *); +static D3DVECTOR *(WINAPI *pD3DRMVectorAdd)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); +static D3DVECTOR *(WINAPI *pD3DRMVectorCrossProduct)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); +static D3DVALUE (WINAPI *pD3DRMVectorDotProduct)(D3DVECTOR *, D3DVECTOR *); +static D3DVALUE (WINAPI *pD3DRMVectorModulus)(D3DVECTOR *); +static D3DVECTOR *(WINAPI *pD3DRMVectorNormalize)(D3DVECTOR *); +static D3DVECTOR *(WINAPI *pD3DRMVectorReflect)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); +static D3DVECTOR *(WINAPI *pD3DRMVectorRotate)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *, D3DVALUE); +static D3DVECTOR *(WINAPI *pD3DRMVectorScale)(D3DVECTOR *, D3DVECTOR *, D3DVALUE); +static D3DVECTOR *(WINAPI *pD3DRMVectorSubtract)(D3DVECTOR *, D3DVECTOR *, D3DVECTOR *); +static D3DRMQUATERNION *(WINAPI *pD3DRMQuaternionFromRotation)(D3DRMQUATERNION*, D3DVECTOR *, D3DVALUE); +static D3DRMQUATERNION *(WINAPI * pD3DRMQuaternionSlerp)(D3DRMQUATERNION *, + D3DRMQUATERNION *, D3DRMQUATERNION *, D3DVALUE); +static D3DCOLOR (WINAPI * pD3DRMCreateColorRGB)(D3DVALUE, D3DVALUE, D3DVALUE); +static D3DCOLOR (WINAPI * pD3DRMCreateColorRGBA)(D3DVALUE, D3DVALUE, D3DVALUE, D3DVALUE); +static D3DVALUE (WINAPI * pD3DRMColorGetAlpha)(D3DCOLOR); +static D3DVALUE (WINAPI * pD3DRMColorGetBlue)(D3DCOLOR); +static D3DVALUE (WINAPI * pD3DRMColorGetGreen)(D3DCOLOR); +static D3DVALUE (WINAPI * pD3DRMColorGetRed)(D3DCOLOR); + +#define D3DRM_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + FreeLibrary(d3drm_handle); \ + return FALSE; \ + } + +static BOOL InitFunctionPtrs(void) +{ + d3drm_handle = LoadLibraryA("d3drm.dll"); + + if(!d3drm_handle) + { + skip("Could not load d3drm.dll\n"); + return FALSE; + } + + D3DRM_GET_PROC(D3DRMMatrixFromQuaternion) + D3DRM_GET_PROC(D3DRMVectorAdd) + D3DRM_GET_PROC(D3DRMVectorCrossProduct) + D3DRM_GET_PROC(D3DRMVectorDotProduct) + D3DRM_GET_PROC(D3DRMVectorModulus) + D3DRM_GET_PROC(D3DRMVectorNormalize) + D3DRM_GET_PROC(D3DRMVectorReflect) + D3DRM_GET_PROC(D3DRMVectorRotate) + D3DRM_GET_PROC(D3DRMVectorScale) + D3DRM_GET_PROC(D3DRMVectorSubtract) + D3DRM_GET_PROC(D3DRMQuaternionFromRotation) + D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMCreateColorRGB) + D3DRM_GET_PROC(D3DRMCreateColorRGBA) + D3DRM_GET_PROC(D3DRMColorGetAlpha) + D3DRM_GET_PROC(D3DRMColorGetBlue) + D3DRM_GET_PROC(D3DRMColorGetGreen) + D3DRM_GET_PROC(D3DRMColorGetRed) + + return TRUE; +} + + +static void VectorTest(void) +{ + D3DVALUE mod,par,theta; + D3DVECTOR e,r,u,v,w,axis,casnul,norm,ray,self; + + U1(u).x=2.0f; U2(u).y=2.0f; U3(u).z=1.0f; + U1(v).x=4.0f; U2(v).y=4.0f; U3(v).z=0.0f; + + +/*______________________VectorAdd_________________________________*/ + pD3DRMVectorAdd(&r,&u,&v); + U1(e).x=6.0f; U2(e).y=6.0f; U3(e).z=1.0f; + expect_vec(e,r); + + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; + pD3DRMVectorAdd(&self,&self,&u); + U1(e).x=11.0f; U2(e).y=20.0f; U3(e).z=28.0f; + expect_vec(e,self); + +/*_______________________VectorSubtract__________________________*/ + pD3DRMVectorSubtract(&r,&u,&v); + U1(e).x=-2.0f; U2(e).y=-2.0f; U3(e).z=1.0f; + expect_vec(e,r); + + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; + pD3DRMVectorSubtract(&self,&self,&u); + U1(e).x=7.0f; U2(e).y=16.0f; U3(e).z=26.0f; + expect_vec(e,self); + +/*_______________________VectorCrossProduct_______________________*/ + pD3DRMVectorCrossProduct(&r,&u,&v); + U1(e).x=-4.0f; U2(e).y=4.0f; U3(e).z=0.0f; + expect_vec(e,r); + + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; + pD3DRMVectorCrossProduct(&self,&self,&u); + U1(e).x=-36.0f; U2(e).y=45.0f; U3(e).z=-18.0f; + expect_vec(e,self); + +/*_______________________VectorDotProduct__________________________*/ + mod=pD3DRMVectorDotProduct(&u,&v); + ok((mod == 16.0f), "Expected 16.0f, Got %f\n", mod); + +/*_______________________VectorModulus_____________________________*/ + mod=pD3DRMVectorModulus(&u); + ok((mod == 3.0f), "Expected 3.0f, Got %f\n", mod); + +/*_______________________VectorNormalize___________________________*/ + pD3DRMVectorNormalize(&u); + U1(e).x=2.0f/3.0f; U2(e).y=2.0f/3.0f; U3(e).z=1.0f/3.0f; + expect_vec(e,u); + +/* If u is the NULL vector, MSDN says that the return vector is NULL. In fact, the returned vector is (1,0,0). The following test case prove it. */ + + U1(casnul).x=0.0f; U2(casnul).y=0.0f; U3(casnul).z=0.0f; + pD3DRMVectorNormalize(&casnul); + U1(e).x=1.0f; U2(e).y=0.0f; U3(e).z=0.0f; + expect_vec(e,casnul); + +/*____________________VectorReflect_________________________________*/ + U1(ray).x=3.0f; U2(ray).y=-4.0f; U3(ray).z=5.0f; + U1(norm).x=1.0f; U2(norm).y=-2.0f; U3(norm).z=6.0f; + U1(e).x=79.0f; U2(e).y=-160.0f; U3(e).z=487.0f; + pD3DRMVectorReflect(&r,&ray,&norm); + expect_vec(e,r); + +/*_______________________VectorRotate_______________________________*/ + U1(w).x=3.0f; U2(w).y=4.0f; U3(w).z=0.0f; + U1(axis).x=0.0f; U2(axis).y=0.0f; U3(axis).z=1.0f; + theta=2.0f*PI/3.0f; + pD3DRMVectorRotate(&r,&w,&axis,theta); + U1(e).x=-0.3f-0.4f*sqrtf(3.0f); U2(e).y=0.3f*sqrtf(3.0f)-0.4f; U3(e).z=0.0f; + expect_vec(e,r); + +/* The same formula gives D3DRMVectorRotate, for theta in [-PI/2;+PI/2] or not. The following test proves this fact.*/ + theta=-PI/4.0f; + pD3DRMVectorRotate(&r,&w,&axis,theta); + U1(e).x=1.4f/sqrtf(2.0f); U2(e).y=0.2f/sqrtf(2.0f); U3(e).z=0.0f; + expect_vec(e,r); + + theta=PI/8.0f; + pD3DRMVectorRotate(&self,&self,&axis,theta); + U1(e).x=0.989950; U2(e).y=0.141421f; U3(e).z=0.0f; + expect_vec(e,r); + +/*_______________________VectorScale__________________________*/ + par=2.5f; + pD3DRMVectorScale(&r,&v,par); + U1(e).x=10.0f; U2(e).y=10.0f; U3(e).z=0.0f; + expect_vec(e,r); + + U1(self).x=9.0f; U2(self).y=18.0f; U3(self).z=27.0f; + pD3DRMVectorScale(&self,&self,2); + U1(e).x=18.0f; U2(e).y=36.0f; U3(e).z=54.0f; + expect_vec(e,self); +} + +static void MatrixTest(void) +{ + D3DRMQUATERNION q; + D3DRMMATRIX4D exp,mat; + + exp[0][0]=-49.0f; exp[0][1]=4.0f; exp[0][2]=22.0f; exp[0][3]=0.0f; + exp[1][0]=20.0f; exp[1][1]=-39.0f; exp[1][2]=20.0f; exp[1][3]=0.0f; + exp[2][0]=10.0f; exp[2][1]=28.0f; exp[2][2]=-25.0f; exp[2][3]=0.0f; + exp[3][0]=0.0f; exp[3][1]=0.0f; exp[3][2]=0.0f; exp[3][3]=1.0f; + q.s=1.0f; U1(q.v).x=2.0f; U2(q.v).y=3.0f; U3(q.v).z=4.0f; + + pD3DRMMatrixFromQuaternion(mat,&q); + expect_mat(exp,mat); +} + +static void QuaternionTest(void) +{ + D3DVECTOR axis; + D3DVALUE par,theta; + D3DRMQUATERNION q,q1,q1final,q2,q2final,r; + +/*_________________QuaternionFromRotation___________________*/ + U1(axis).x=1.0f; U2(axis).y=1.0f; U3(axis).z=1.0f; + theta=2.0f*PI/3.0f; + pD3DRMQuaternionFromRotation(&r,&axis,theta); + q.s=0.5f; U1(q.v).x=0.5f; U2(q.v).y=0.5f; U3(q.v).z=0.5f; + expect_quat(q,r); + +/*_________________QuaternionSlerp_________________________*/ +/* If the angle of the two quaternions is in ]PI/2;3PI/2[, QuaternionSlerp + * interpolates between the first quaternion and the opposite of the second one. + * The test proves this fact. */ + par=0.31f; + q1.s=1.0f; U1(q1.v).x=2.0f; U2(q1.v).y=3.0f; U3(q1.v).z=50.0f; + q2.s=-4.0f; U1(q2.v).x=6.0f; U2(q2.v).y=7.0f; U3(q2.v).z=8.0f; +/* The angle between q1 and q2 is in [-PI/2,PI/2]. So, one interpolates between q1 and q2. */ + q.s = -0.55f; U1(q.v).x=3.24f; U2(q.v).y=4.24f; U3(q.v).z=36.98f; + pD3DRMQuaternionSlerp(&r,&q1,&q2,par); + expect_quat(q,r); + + q1.s=1.0f; U1(q1.v).x=2.0f; U2(q1.v).y=3.0f; U3(q1.v).z=50.0f; + q2.s=-94.0f; U1(q2.v).x=6.0f; U2(q2.v).y=7.0f; U3(q2.v).z=-8.0f; +/* The angle between q1 and q2 is not in [-PI/2,PI/2]. So, one interpolates between q1 and -q2. */ + q.s=29.83f; U1(q.v).x=-0.48f; U2(q.v).y=-0.10f; U3(q.v).z=36.98f; + pD3DRMQuaternionSlerp(&r,&q1,&q2,par); + expect_quat(q,r); + +/* Test the spherical interpolation part */ + q1.s=0.1f; U1(q1.v).x=0.2f; U2(q1.v).y=0.3f; U3(q1.v).z=0.4f; + q2.s=0.5f; U1(q2.v).x=0.6f; U2(q2.v).y=0.7f; U3(q2.v).z=0.8f; + q.s = 0.243943f; U1(q.v).x = 0.351172f; U2(q.v).y = 0.458401f; U3(q.v).z = 0.565629f; + + q1final=q1; + q2final=q2; + pD3DRMQuaternionSlerp(&r,&q1,&q2,par); + expect_quat(q,r); + +/* Test to show that the input quaternions are not changed */ + expect_quat(q1,q1final); + expect_quat(q2,q2final); +} + +static void ColorTest(void) +{ + D3DCOLOR color, expected_color, got_color; + D3DVALUE expected, got, red, green, blue, alpha; + +/*___________D3DRMCreateColorRGB_________________________*/ + red=0.8f; + green=0.3f; + blue=0.55f; + expected_color=0xffcc4c8c; + got_color=pD3DRMCreateColorRGB(red,green,blue); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + +/*___________D3DRMCreateColorRGBA________________________*/ + red=0.1f; + green=0.4f; + blue=0.7f; + alpha=0.58f; + expected_color=0x931966b2; + got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + +/* if a component is <0 then, then one considers this component as 0. The following test proves this fact (test only with the red component). */ + red=-0.88f; + green=0.4f; + blue=0.6f; + alpha=0.41f; + expected_color=0x68006699; + got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + +/* if a component is >1 then, then one considers this component as 1. The following test proves this fact (test only with the red component). */ + red=2.37f; + green=0.4f; + blue=0.6f; + alpha=0.41f; + expected_color=0x68ff6699; + got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); + ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); + +/*___________D3DRMColorGetAlpha_________________________*/ + color=0x0e4921bf; + expected=14.0f/255.0f; + got=pD3DRMColorGetAlpha(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); + +/*___________D3DRMColorGetBlue__________________________*/ + color=0xc82a1455; + expected=1.0f/3.0f; + got=pD3DRMColorGetBlue(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); + +/*___________D3DRMColorGetGreen_________________________*/ + color=0xad971203; + expected=6.0f/85.0f; + got=pD3DRMColorGetGreen(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); + +/*___________D3DRMColorGetRed__________________________*/ + color=0xb62d7a1c; + expected=3.0f/17.0f; + got=pD3DRMColorGetRed(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); +} + +START_TEST(vector) +{ + if(!InitFunctionPtrs()) + return; + + VectorTest(); + MatrixTest(); + QuaternionTest(); + ColorTest(); + + FreeLibrary(d3drm_handle); +} Propchange: trunk/rostests/winetests/d3drm/vector.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 64398: [D3DRM] * Import from Wine 1.7.27. CORE-8082 #resolve #comment Imported in r64396. Thanks! CORE-8540
by akhaldi＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: akhaldi Date: Mon Sep 29 17:24:32 2014 New Revision: 64398 URL: http://svn.reactos.org/svn/reactos?rev=64398&view=rev Log: [D3DRM] * Import from Wine 1.7.27. CORE-8082 #resolve #comment Imported in r64396. Thanks! CORE-8540 Added: trunk/reactos/dll/directx/wine/d3drm/ (with props) trunk/reactos/dll/directx/wine/d3drm/CMakeLists.txt (with props) trunk/reactos/dll/directx/wine/d3drm/d3drm.c (with props) trunk/reactos/dll/directx/wine/d3drm/d3drm.spec (with props) trunk/reactos/dll/directx/wine/d3drm/d3drm_main.c (with props) trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h (with props) trunk/reactos/dll/directx/wine/d3drm/device.c (with props) trunk/reactos/dll/directx/wine/d3drm/face.c (with props) trunk/reactos/dll/directx/wine/d3drm/frame.c (with props) trunk/reactos/dll/directx/wine/d3drm/light.c (with props) trunk/reactos/dll/directx/wine/d3drm/material.c (with props) trunk/reactos/dll/directx/wine/d3drm/math.c (with props) trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c (with props) trunk/reactos/dll/directx/wine/d3drm/texture.c (with props) trunk/reactos/dll/directx/wine/d3drm/version.rc (with props) trunk/reactos/dll/directx/wine/d3drm/viewport.c (with props) Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… Added: trunk/reactos/dll/directx/wine/d3drm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/CMa… Added: trunk/reactos/dll/directx/wine/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… Added: trunk/reactos/dll/directx/wine/d3drm/d3drm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… Added: trunk/reactos/dll/directx/wine/d3drm/d3drm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… Added: trunk/reactos/dll/directx/wine/d3drm/d3drm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/d3d… Added: trunk/reactos/dll/directx/wine/d3drm/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/dev… Added: trunk/reactos/dll/directx/wine/d3drm/face.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/fac… Added: trunk/reactos/dll/directx/wine/d3drm/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/fra… Added: trunk/reactos/dll/directx/wine/d3drm/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/lig… Added: trunk/reactos/dll/directx/wine/d3drm/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mat… Added: trunk/reactos/dll/directx/wine/d3drm/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mat… Added: trunk/reactos/dll/directx/wine/d3drm/meshbuilder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/mes… Added: trunk/reactos/dll/directx/wine/d3drm/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/tex… Added: trunk/reactos/dll/directx/wine/d3drm/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/ver… Added: trunk/reactos/dll/directx/wine/d3drm/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/vie… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64397: [PSDK] * Update d3drm.h and d3drmdef.h. * Import d3drmobj.h and d3drmwin.h. * Guard against redefinition of MAKE_DDHRESULT. [DXSDK] * Get rid of this d3drmwin.h. * Guard against re...
by akhaldi＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: akhaldi Date: Mon Sep 29 17:03:05 2014 New Revision: 64397 URL: http://svn.reactos.org/svn/reactos?rev=64397&view=rev Log: [PSDK] * Update d3drm.h and d3drmdef.h. * Import d3drmobj.h and d3drmwin.h. * Guard against redefinition of MAKE_DDHRESULT. [DXSDK] * Get rid of this d3drmwin.h. * Guard against redefinition of MAKE_DDHRESULT. CORE-8540 CORE-8082 Added: trunk/reactos/include/psdk/d3drmobj.h (with props) trunk/reactos/include/psdk/d3drmwin.h (with props) Removed: trunk/reactos/include/dxsdk/d3drmwin.h Modified: trunk/reactos/include/dxsdk/dxfile.h trunk/reactos/include/psdk/d3drm.h trunk/reactos/include/psdk/d3drmdef.h trunk/reactos/include/psdk/ddraw.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/dxsdk/d3drmwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3drmwin.h?r… Modified: trunk/reactos/include/dxsdk/dxfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxfile.h?rev… Modified: trunk/reactos/include/psdk/d3drm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drm.h?rev=6… Modified: trunk/reactos/include/psdk/d3drmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmdef.h?re… Added: trunk/reactos/include/psdk/d3drmobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmobj.h?re… Added: trunk/reactos/include/psdk/d3drmwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3drmwin.h?re… Modified: trunk/reactos/include/psdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?rev=6…

1 0

[jgardou] 64396: [NTOS/CM] - Add NtQueryKey(KeyNameInformation) implementation. CORE-8581 #resolve
by jgardou＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: jgardou Date: Mon Sep 29 16:27:16 2014 New Revision: 64396 URL: http://svn.reactos.org/svn/reactos?rev=64396&view=rev Log: [NTOS/CM] - Add NtQueryKey(KeyNameInformation) implementation. CORE-8581 #resolve Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Mon Sep 29 16:27:16 2014 @@ -1514,13 +1514,103 @@ return STATUS_SUCCESS; } +static +NTSTATUS +CmpQueryNameInformation( + _In_ PCM_KEY_CONTROL_BLOCK Kcb, + _Out_opt_ PKEY_NAME_INFORMATION KeyNameInfo, + _In_ ULONG Length, + _Out_ PULONG ResultLength) +{ + ULONG NeededLength; + PCM_KEY_CONTROL_BLOCK CurrentKcb; + + NeededLength = 0; + CurrentKcb = Kcb; + + /* Count the needed buffer size */ + while (CurrentKcb) + { + if (CurrentKcb->NameBlock->Compressed) + NeededLength += CmpCompressedNameSize(CurrentKcb->NameBlock->Name, CurrentKcb->NameBlock->NameLength); + else + NeededLength += CurrentKcb->NameBlock->NameLength; + + NeededLength += sizeof(OBJ_NAME_PATH_SEPARATOR); + + CurrentKcb = CurrentKcb->ParentKcb; + } + + _SEH2_TRY + { + *ResultLength = NeededLength + FIELD_OFFSET(KEY_NAME_INFORMATION, Name[0]); + if (Length < *ResultLength) + return STATUS_BUFFER_TOO_SMALL; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Do the real copy */ + KeyNameInfo->NameLength = 0; + CurrentKcb = Kcb; + while (CurrentKcb) + { + ULONG NameLength; + + _SEH2_TRY + { + if (CurrentKcb->NameBlock->Compressed) + { + NameLength = CmpCompressedNameSize(CurrentKcb->NameBlock->Name, CurrentKcb->NameBlock->NameLength); + /* Copy the compressed name */ + CmpCopyCompressedName(&KeyNameInfo->Name[(NeededLength - NameLength)/sizeof(WCHAR)], + NameLength, + CurrentKcb->NameBlock->Name, + CurrentKcb->NameBlock->NameLength); + } + else + { + NameLength = CurrentKcb->NameBlock->NameLength; + /* Otherwise, copy the raw name */ + RtlCopyMemory(&KeyNameInfo->Name[(NeededLength - NameLength)/sizeof(WCHAR)], + CurrentKcb->NameBlock->Name, + NameLength); + } + + NeededLength -= NameLength; + NeededLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + /* Add path separator */ + KeyNameInfo->Name[NeededLength/sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; + KeyNameInfo->NameLength += NameLength + sizeof(OBJ_NAME_PATH_SEPARATOR); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + CurrentKcb = CurrentKcb->ParentKcb; + } + + /* Make sure we copied everything */ + ASSERT(NeededLength == 0); + ASSERT(KeyNameInfo->Name[0] == OBJ_NAME_PATH_SEPARATOR); + + /* We're done */ + return STATUS_SUCCESS; +} + + NTSTATUS NTAPI -CmQueryKey(IN PCM_KEY_CONTROL_BLOCK Kcb, - IN KEY_INFORMATION_CLASS KeyInformationClass, - IN PVOID KeyInformation, - IN ULONG Length, - IN PULONG ResultLength) +CmQueryKey(_In_ PCM_KEY_CONTROL_BLOCK Kcb, + _In_ KEY_INFORMATION_CLASS KeyInformationClass, + _Out_opt_ PVOID KeyInformation, + _In_ ULONG Length, + _Out_ PULONG ResultLength) { NTSTATUS Status; PHHIVE Hive; @@ -1588,12 +1678,12 @@ ResultLength); break; - /* Unsupported class for now */ case KeyNameInformation: - - /* Print message and fail */ - DPRINT1("Unsupported class: %d!\n", KeyInformationClass); - Status = STATUS_NOT_IMPLEMENTED; + /* Call the internal API */ + Status = CmpQueryNameInformation(Kcb, + KeyInformation, + Length, + ResultLength); break; /* Illegal classes */

1 0

[dquintana] 64395: [RSHELL] * Implement skeleton shell dde parser. [SHELL32] * Copy over the skeleton from rshell, and fill in the handlers for ViewFolder and ExploreFolder, with rudimentary implem...
by dquintana＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: dquintana Date: Mon Sep 29 16:22:21 2014 New Revision: 64395 URL: http://svn.reactos.org/svn/reactos?rev=64395&view=rev Log: [RSHELL] * Implement skeleton shell dde parser. [SHELL32] * Copy over the skeleton from rshell, and fill in the handlers for ViewFolder and ExploreFolder, with rudimentary implementations. CORE-7552 Modified: branches/shell-experiments/base/shell/rshell/ShellDDE.cpp branches/shell-experiments/dll/win32/shell32/dde.cpp Modified: branches/shell-experiments/base/shell/rshell/ShellDDE.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/ShellDDE.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/ShellDDE.cpp [iso-8859-1] Mon Sep 29 16:22:21 2014 @@ -21,8 +21,20 @@ #include "precomp.h" #include <ddeml.h> #include <strsafe.h> +#include <shlwapi_undoc.h> WINE_DEFAULT_DEBUG_CHANNEL(shelldde); + +typedef DWORD(CALLBACK * pfnCommandHandler)(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS); + +struct DDECommandHandler +{ + WCHAR Command[32]; + pfnCommandHandler Handler; +}; + +extern DDECommandHandler HandlerList []; +extern const int HandlerListLength; /* DDE Instance ID */ static DWORD dwDDEInst; @@ -34,6 +46,8 @@ static HSZ hszAppProperties; static HSZ hszFolders; +static BOOL bInitialized; + static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) { WCHAR szTopic[MAX_PATH]; @@ -54,7 +68,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - + DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); } @@ -82,6 +96,32 @@ DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); return NULL; +} + +static LPITEMIDLIST _ILReadFromSharedMemory(PCWSTR strField) +{ + LPITEMIDLIST ret = NULL; + + // Ensure it really is an IDLIST-formatted parameter + // Format for IDLIST params: ":pid:shared" + if (*strField != L':') + return NULL; + + HANDLE hData = (HANDLE) StrToIntW(strField + 1); + PWSTR strSecond = StrChrW(strField + 1, L':'); + + if (strSecond) + { + int pid = StrToIntW(strSecond + 1); + void* pvShared = SHLockShared(hData, pid); + if (pvShared) + { + ret = ILClone((LPCITEMIDLIST) pvShared); + SHUnlockShared(pvShared); + SHFreeShared(hData, pid); + } + } + return ret; } static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) @@ -92,7 +132,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); - pszCommand = (WCHAR*)DdeAccessData(hdata, NULL); + pszCommand = (WCHAR*) DdeAccessData(hdata, NULL); if (!pszCommand) return DDE_FNOTPROCESSED; @@ -103,15 +143,139 @@ DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); /* - [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode [ExploreFolder("%l", %I, %S)] -- Open a folder in "explore" mode (file tree is shown to the left by default) [FindFolder("%l", %I)] -- Open a folder in "find" mode (search panel is shown to the left by default) [ShellFile("%1","%1",%S)] -- Execute the contents of the specified .SCF file - + + Approximate grammar (Upper names define rules, <lower> names define terminals, single-quotes are literals): + + Rules + Command = ('[' Function ']') | Function + Function = <identifier> '(' Parameters ')' + Parameters = (<quoted-string> (',' <idlist> (',' <number>)?)?)? + + Terminals + <identifier> = [a-zA-Z]+ + <quoted-string> = \"([^\"]|\\.)\" + <idlist> = \:[0-9]+\:[0-9]+ + <number> = [0-9]+ */ - return DDE_FACK; + WCHAR Command[MAX_PATH] = L""; + WCHAR Path[MAX_PATH] = L""; + LPITEMIDLIST IdList = NULL; + INT UnknownParameter = 0; + + // Simplified parsing (assumes the command will not be TOO broken): + + PWSTR cmd = szCommand; + // 1. if starts with [, skip first char + if (*cmd == L'[') + cmd++; + + if (*cmd == L']') + { + ERR("Empty command. Nothing to run.\n"); + return DDE_FNOTPROCESSED; + } + + // Read until first (, and take text before ( as command name + { + PWSTR cmdEnd = StrChrW(cmd, L'('); + + if (!cmdEnd) + { + ERR("Could not find '('. Invalid command.\n"); + return DDE_FNOTPROCESSED; + } + + *cmdEnd = 0; + + StringCchCopy(Command, _countof(Command), cmd); + + cmd = cmdEnd + 1; + } + + // Read first param after (, expecting quoted string + if (*cmd != L')') + { + // Copy unescaped string + PWSTR dst = Path; + BOOL isQuote = FALSE; + + PWSTR arg = cmd; + + while (*arg && (isQuote || *arg != L',')) + { + if (*arg == L'"') + { + isQuote = !isQuote; + if (isQuote && arg != cmd) // do not copy the " at the beginning of the string + { + *(dst++) = L'"'; + } + } + else + { + *(dst++) = *arg; + } + + arg++; + } + + cmd = arg + 1; + + while (*cmd == L' ') + cmd++; + } + + // Read second param, expecting an idlist in shared memory + if (*cmd != L')') + { + if (*cmd != ':') + { + ERR("Expected ':'. Invalid command.\n"); + return DDE_FNOTPROCESSED; + } + + PWSTR idlistEnd = StrChrW(cmd, L','); + + if (!idlistEnd) + idlistEnd = StrChrW(cmd, L')'); + + if (!idlistEnd) + { + ERR("Expected ',' or ')'. Invalid command.\n"); + return DDE_FNOTPROCESSED; + } + + IdList = _ILReadFromSharedMemory(cmd); + + cmd = idlistEnd + 1; + } + + // Read third param, expecting an integer + if (*cmd != L')') + { + UnknownParameter = StrToIntW(cmd); + } + + DbgPrint("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); + + // Find handler in list + for (int i = 0; i < HandlerListLength; i++) + { + DDECommandHandler & handler = HandlerList[i]; + if (StrCmpW(handler.Command, Command) == 0) + { + return handler.Handler(Command, Path, IdList, UnknownParameter); + } + } + + // No handler found + ERR("Unknown command %S\n", Command); + return DDE_FNOTPROCESSED; } static void Dde_OnDisconnect(HCONV hconv) @@ -132,26 +296,26 @@ switch (uType) { case XTYP_CONNECT: - return (HDDEDATA)(DWORD_PTR)Dde_OnConnect(hsz1, hsz2); + return (HDDEDATA) (DWORD_PTR) Dde_OnConnect(hsz1, hsz2); case XTYP_CONNECT_CONFIRM: Dde_OnConnectConfirm(hconv, hsz1, hsz2); return NULL; case XTYP_WILDCONNECT: - return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); + return (HDDEDATA) (DWORD_PTR) Dde_OnWildConnect(hsz1, hsz2); case XTYP_REQUEST: return Dde_OnRequest(uFmt, hconv, hsz1, hsz2); case XTYP_EXECUTE: - return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); + return (HDDEDATA) (DWORD_PTR) Dde_OnExecute(hconv, hsz1, hdata); case XTYP_DISCONNECT: Dde_OnDisconnect(hconv); return NULL; + case XTYP_REGISTER: + return NULL; default: DbgPrint("DdeCallback: unknown uType=%d\n", uType); - case XTYP_REGISTER: return NULL; } } - /************************************************************************* * ShellDDEInit (SHELL32.@) * @@ -168,7 +332,7 @@ { DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); - if (bInit) + if (bInit && !bInitialized) { DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); @@ -178,19 +342,67 @@ hszAppProperties = DdeCreateStringHandleW(dwDDEInst, L"AppProperties", CP_WINUNICODE); hszFolders = DdeCreateStringHandleW(dwDDEInst, L"Folders", CP_WINUNICODE); - DdeNameService(dwDDEInst, hszFolders, 0, DNS_FILTEROFF); - } - else + if (hszProgmanTopic && hszProgmanService && + hszShell && hszAppProperties && hszFolders && + DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER) && + DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER) && + DdeNameService(dwDDEInst, hszShell, 0, DNS_REGISTER)) + { + bInitialized = TRUE; + } + } + else if (!bInit && bInitialized) { /* unregister all services */ DdeNameService(dwDDEInst, 0, 0, DNS_UNREGISTER); - DdeFreeStringHandle(dwDDEInst, hszFolders); - DdeFreeStringHandle(dwDDEInst, hszAppProperties); - DdeFreeStringHandle(dwDDEInst, hszShell); - DdeFreeStringHandle(dwDDEInst, hszProgmanService); - DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); + if (hszFolders) + DdeFreeStringHandle(dwDDEInst, hszFolders); + if (hszAppProperties) + DdeFreeStringHandle(dwDDEInst, hszAppProperties); + if (hszShell) + DdeFreeStringHandle(dwDDEInst, hszShell); + if (hszProgmanService) + DdeFreeStringHandle(dwDDEInst, hszProgmanService); + if (hszProgmanTopic) + DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); DdeUninitialize(dwDDEInst); - } -} + + bInitialized = FALSE; + } +} + +static DWORD CALLBACK DDE_OnViewFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + UNIMPLEMENTED; + return DDE_FACK; +} + +static DWORD CALLBACK DDW_OnExploreFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + UNIMPLEMENTED; + return DDE_FACK; +} + +static DWORD CALLBACK DDE_OnFindFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + UNIMPLEMENTED; + return DDE_FNOTPROCESSED; +} + +static DWORD CALLBACK DDE_OnShellFile(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + UNIMPLEMENTED; + return DDE_FNOTPROCESSED; +} + +DDECommandHandler HandlerList [] = { + + { L"ViewFolder", DDE_OnViewFolder }, + { L"ExploreFolder", DDW_OnExploreFolder }, + { L"FindFolder", DDE_OnFindFolder }, + { L"ShellFile", DDE_OnShellFile } +}; + +const int HandlerListLength = _countof(HandlerList); Modified: branches/shell-experiments/dll/win32/shell32/dde.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/dde.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/dde.cpp [iso-8859-1] Mon Sep 29 16:22:21 2014 @@ -19,69 +19,268 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); +#include <ddeml.h> +#include <strsafe.h> +#include <shlwapi_undoc.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shelldde); + +typedef DWORD(CALLBACK * pfnCommandHandler)(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS); + +struct DDECommandHandler +{ + WCHAR Command[32]; + pfnCommandHandler Handler; +}; + +extern DDECommandHandler HandlerList []; +extern const int HandlerListLength; + +/* DDE Instance ID */ +static DWORD dwDDEInst; /* String handles */ static HSZ hszProgmanTopic; static HSZ hszProgmanService; -static HSZ hszAsterisk; static HSZ hszShell; static HSZ hszAppProperties; static HSZ hszFolders; -/* DDE Instance ID */ -static DWORD dwDDEInst; - - -static BOOL __inline Dde_OnConnect(HSZ hszTopic, HSZ hszService) -{ - if ((hszTopic == hszProgmanTopic) && (hszService == hszProgmanService)) - return TRUE; - if ((hszTopic == hszProgmanTopic) && (hszService == hszAppProperties)) - return TRUE; - if ((hszTopic == hszShell) && (hszService == hszFolders)) - return TRUE; - if ((hszTopic == hszShell) && (hszService == hszAppProperties)) - return TRUE; + +static BOOL bInitialized; + +static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szService[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); + + DbgPrint("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); + + return TRUE; +} + +static void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szService[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); + + DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); +} + +static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szService[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); + + DbgPrint("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); + return FALSE; } -static void __inline Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService) -{ - FIXME("stub\n"); -} - -static BOOL __inline Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) -{ - FIXME("stub\n"); - return FALSE; -} - -static HDDEDATA __inline Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, - HSZ hszItem) -{ - FIXME("stub\n"); +static HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szItem[MAX_PATH]; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); + + DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); + return NULL; } -static DWORD __inline Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) -{ - BYTE * pszCommand; - - pszCommand = DdeAccessData(hdata, NULL); +static LPITEMIDLIST _ILReadFromSharedMemory(PCWSTR strField) +{ + LPITEMIDLIST ret = NULL; + + // Ensure it really is an IDLIST-formatted parameter + // Format for IDLIST params: ":pid:shared" + if (*strField != L':') + return NULL; + + HANDLE hData = (HANDLE) StrToIntW(strField + 1); + PWSTR strSecond = StrChrW(strField + 1, L':'); + + if (strSecond) + { + int pid = StrToIntW(strSecond + 1); + void* pvShared = SHLockShared(hData, pid); + if (pvShared) + { + ret = ILClone((LPCITEMIDLIST) pvShared); + SHUnlockShared(pvShared); + SHFreeShared(hData, pid); + } + } + return ret; +} + +static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) +{ + WCHAR szTopic[MAX_PATH]; + WCHAR szCommand[MAX_PATH]; + WCHAR *pszCommand; + + DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); + + pszCommand = (WCHAR*) DdeAccessData(hdata, NULL); if (!pszCommand) return DDE_FNOTPROCESSED; - FIXME("stub: %s\n", pszCommand); + StringCchCopyW(szCommand, _countof(szCommand), pszCommand); DdeUnaccessData(hdata); + DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); + + /* + [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode + [ExploreFolder("%l", %I, %S)] -- Open a folder in "explore" mode (file tree is shown to the left by default) + [FindFolder("%l", %I)] -- Open a folder in "find" mode (search panel is shown to the left by default) + [ShellFile("%1","%1",%S)] -- Execute the contents of the specified .SCF file + + Approximate grammar (Upper names define rules, <lower> names define terminals, single-quotes are literals): + + Rules + Command = ('[' Function ']') | Function + Function = <identifier> '(' Parameters ')' + Parameters = (<quoted-string> (',' <idlist> (',' <number>)?)?)? + + Terminals + <identifier> = [a-zA-Z]+ + <quoted-string> = \"([^\"]|\\.)\" + <idlist> = \:[0-9]+\:[0-9]+ + <number> = [0-9]+ + */ + + WCHAR Command[MAX_PATH] = L""; + WCHAR Path[MAX_PATH] = L""; + LPITEMIDLIST IdList = NULL; + INT UnknownParameter = 0; + + // Simplified parsing (assumes the command will not be TOO broken): + + PWSTR cmd = szCommand; + // 1. if starts with [, skip first char + if (*cmd == L'[') + cmd++; + + if (*cmd == L']') + { + ERR("Empty command. Nothing to run.\n"); + return DDE_FNOTPROCESSED; + } + + // Read until first (, and take text before ( as command name + { + PWSTR cmdEnd = StrChrW(cmd, L'('); + + if (!cmdEnd) + { + ERR("Could not find '('. Invalid command.\n"); + return DDE_FNOTPROCESSED; + } + + *cmdEnd = 0; + + StringCchCopy(Command, _countof(Command), cmd); + + cmd = cmdEnd + 1; + } + + // Read first param after (, expecting quoted string + if (*cmd != L')') + { + // Copy unescaped string + PWSTR dst = Path; + BOOL isQuote = FALSE; + + PWSTR arg = cmd; + + while (*arg && (isQuote || *arg != L',')) + { + if (*arg == L'"') + { + isQuote = !isQuote; + if (isQuote && arg != cmd) // do not copy the " at the beginning of the string + { + *(dst++) = L'"'; + } + } + else + { + *(dst++) = *arg; + } + + arg++; + } + + cmd = arg + 1; + + while (*cmd == L' ') + cmd++; + } + + // Read second param, expecting an idlist in shared memory + if (*cmd != L')') + { + if (*cmd != ':') + { + ERR("Expected ':'. Invalid command.\n"); + return DDE_FNOTPROCESSED; + } + + PWSTR idlistEnd = StrChrW(cmd, L','); + + if (!idlistEnd) + idlistEnd = StrChrW(cmd, L')'); + + if (!idlistEnd) + { + ERR("Expected ',' or ')'. Invalid command.\n"); + return DDE_FNOTPROCESSED; + } + + IdList = _ILReadFromSharedMemory(cmd); + + cmd = idlistEnd + 1; + } + + // Read third param, expecting an integer + if (*cmd != L')') + { + UnknownParameter = StrToIntW(cmd); + } + + DbgPrint("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); + + // Find handler in list + for (int i = 0; i < HandlerListLength; i++) + { + DDECommandHandler & handler = HandlerList[i]; + if (StrCmpW(handler.Command, Command) == 0) + { + return handler.Handler(Command, Path, IdList, UnknownParameter); + } + } + + // No handler found + ERR("Unknown command %S\n", Command); return DDE_FNOTPROCESSED; } -static void __inline Dde_OnDisconnect(HCONV hconv) -{ - FIXME("stub\n"); +static void Dde_OnDisconnect(HCONV hconv) +{ + DbgPrint("Dde_OnDisconnect: hconv=%p\n", hconv); } static HDDEDATA CALLBACK DdeCallback( @@ -97,24 +296,26 @@ switch (uType) { case XTYP_CONNECT: - return (HDDEDATA)(DWORD_PTR)Dde_OnConnect(hsz1, hsz2); + return (HDDEDATA) (DWORD_PTR) Dde_OnConnect(hsz1, hsz2); case XTYP_CONNECT_CONFIRM: Dde_OnConnectConfirm(hconv, hsz1, hsz2); return NULL; case XTYP_WILDCONNECT: - return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2); + return (HDDEDATA) (DWORD_PTR) Dde_OnWildConnect(hsz1, hsz2); case XTYP_REQUEST: return Dde_OnRequest(uFmt, hconv, hsz1, hsz2); case XTYP_EXECUTE: - return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata); + return (HDDEDATA) (DWORD_PTR) Dde_OnExecute(hconv, hsz1, hdata); case XTYP_DISCONNECT: Dde_OnDisconnect(hconv); return NULL; + case XTYP_REGISTER: + return NULL; default: + DbgPrint("DdeCallback: unknown uType=%d\n", uType); return NULL; } } - /************************************************************************* * ShellDDEInit (SHELL32.@) * @@ -129,42 +330,95 @@ */ EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) { - TRACE("bInit = %s\n", bInit ? "TRUE" : "FALSE"); - - if (bInit) - { - static const WCHAR wszProgman[] = {'P','r','o','g','m','a','n',0}; - static const WCHAR wszAsterisk[] = {'*',0}; - static const WCHAR wszShell[] = {'S','h','e','l','l',0}; - static const WCHAR wszAppProperties[] = - {'A','p','p','P','r','o','p','e','r','t','i','e','s',0}; - static const WCHAR wszFolders[] = {'F','o','l','d','e','r','s',0}; - + DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); + + if (bInit && !bInitialized) + { DdeInitializeW(&dwDDEInst, DdeCallback, CBF_FAIL_ADVISES | CBF_FAIL_POKES, 0); - hszProgmanTopic = DdeCreateStringHandleW(dwDDEInst, wszProgman, CP_WINUNICODE); - hszProgmanService = DdeCreateStringHandleW(dwDDEInst, wszProgman, CP_WINUNICODE); - hszAsterisk = DdeCreateStringHandleW(dwDDEInst, wszAsterisk, CP_WINUNICODE); - hszShell = DdeCreateStringHandleW(dwDDEInst, wszShell, CP_WINUNICODE); - hszAppProperties = DdeCreateStringHandleW(dwDDEInst, wszAppProperties, CP_WINUNICODE); - hszFolders = DdeCreateStringHandleW(dwDDEInst, wszFolders, CP_WINUNICODE); - - DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER); - DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER); - DdeNameService(dwDDEInst, hszShell, 0, DNS_REGISTER); - } - else + hszProgmanTopic = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); + hszProgmanService = DdeCreateStringHandleW(dwDDEInst, L"Progman", CP_WINUNICODE); + hszShell = DdeCreateStringHandleW(dwDDEInst, L"Shell", CP_WINUNICODE); + hszAppProperties = DdeCreateStringHandleW(dwDDEInst, L"AppProperties", CP_WINUNICODE); + hszFolders = DdeCreateStringHandleW(dwDDEInst, L"Folders", CP_WINUNICODE); + + if (hszProgmanTopic && hszProgmanService && + hszShell && hszAppProperties && hszFolders && + DdeNameService(dwDDEInst, hszFolders, 0, DNS_REGISTER) && + DdeNameService(dwDDEInst, hszProgmanService, 0, DNS_REGISTER) && + DdeNameService(dwDDEInst, hszShell, 0, DNS_REGISTER)) + { + bInitialized = TRUE; + } + } + else if (!bInit && bInitialized) { /* unregister all services */ DdeNameService(dwDDEInst, 0, 0, DNS_UNREGISTER); - DdeFreeStringHandle(dwDDEInst, hszFolders); - DdeFreeStringHandle(dwDDEInst, hszAppProperties); - DdeFreeStringHandle(dwDDEInst, hszShell); - DdeFreeStringHandle(dwDDEInst, hszAsterisk); - DdeFreeStringHandle(dwDDEInst, hszProgmanService); - DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); + if (hszFolders) + DdeFreeStringHandle(dwDDEInst, hszFolders); + if (hszAppProperties) + DdeFreeStringHandle(dwDDEInst, hszAppProperties); + if (hszShell) + DdeFreeStringHandle(dwDDEInst, hszShell); + if (hszProgmanService) + DdeFreeStringHandle(dwDDEInst, hszProgmanService); + if (hszProgmanTopic) + DdeFreeStringHandle(dwDDEInst, hszProgmanTopic); DdeUninitialize(dwDDEInst); - } -} + + bInitialized = FALSE; + } +} + +static DWORD CALLBACK DDE_OnViewFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + if (!pidl) + pidl = ILCreateFromPathW(strPath); + + if (!pidl) + return DDE_FNOTPROCESSED; + + if (FAILED(SHOpenNewFrame(pidl, NULL, 0, 0))) + return DDE_FNOTPROCESSED; + + return DDE_FACK; +} + +static DWORD CALLBACK DDW_OnExploreFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + if (!pidl) + pidl = ILCreateFromPathW(strPath); + + if (!pidl) + return DDE_FNOTPROCESSED; + + if (FAILED(SHOpenNewFrame(pidl, NULL, 0, SH_EXPLORER_CMDLINE_FLAG_E))) + return DDE_FNOTPROCESSED; + + return DDE_FACK; +} + +static DWORD CALLBACK DDE_OnFindFolder(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + UNIMPLEMENTED; + return DDE_FNOTPROCESSED; +} + +static DWORD CALLBACK DDE_OnShellFile(PWSTR strCommand, PWSTR strPath, LPITEMIDLIST pidl, INT unkS) +{ + UNIMPLEMENTED; + return DDE_FNOTPROCESSED; +} + +DDECommandHandler HandlerList [] = { + + { L"ViewFolder", DDE_OnViewFolder }, + { L"ExploreFolder", DDW_OnExploreFolder }, + { L"FindFolder", DDE_OnFindFolder }, + { L"ShellFile", DDE_OnShellFile } +}; + +const int HandlerListLength = _countof(HandlerList);

1 0

[jgardou] 64394: [NTDLL_APITEST] - Add tests for NtQueryKey(KeyNameInformation) [ADVAPI32_APITEST] - Don't be so generous and claim back my code. @Thomas: If you ever find out how buggy it is, feel...
by jgardou＠svn.reactos.org 29 Sep '14

29 Sep '14

Author: jgardou Date: Mon Sep 29 16:21:53 2014 New Revision: 64394 URL: http://svn.reactos.org/svn/reactos?rev=64394&view=rev Log: [NTDLL_APITEST] - Add tests for NtQueryKey(KeyNameInformation) [ADVAPI32_APITEST] - Don't be so generous and claim back my code. @Thomas: If you ever find out how buggy it is, feel free to claim it back. ;-) Added: trunk/rostests/apitests/ntdll/NtQueryKey.c (with props) Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Mon Sep 29 16:21:53 2014 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test for CreateService - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PURPOSE: Test for the HKEY_CLASSES_ROOT key + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> */ #include <apitest.h> Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Sep 29 16:21:53 2014 @@ -10,6 +10,7 @@ NtMapViewOfSection.c NtMutant.c NtProtectVirtualMemory.c + NtQueryKey.c NtQuerySystemEnvironmentValue.c NtQueryVolumeInformationFile.c NtSaveKey.c Added: trunk/rostests/apitests/ntdll/NtQueryKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryKey… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryKey.c (added) +++ trunk/rostests/apitests/ntdll/NtQueryKey.c [iso-8859-1] Mon Sep 29 16:21:53 2014 @@ -0,0 +1,99 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Tests for the NtQueryKey API + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> +#include <ndk/cmfuncs.h> +#include <ndk/cmtypes.h> +#include <ndk/obfuncs.h> + +static +void +Test_KeyNameInformation(void) +{ + UNICODE_STRING HKLM_Name = RTL_CONSTANT_STRING(L"\\Registry\\Machine"); + UNICODE_STRING HKLM_Software_Name = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software"); + UNICODE_STRING Software_Name = RTL_CONSTANT_STRING(L"Software"); + UNICODE_STRING InfoName; + HANDLE HKLM_Key, HKLM_Software_Key; + PKEY_NAME_INFORMATION NameInformation; + ULONG InfoLength; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + /* Open the HKCU key */ + InitializeObjectAttributes(&ObjectAttributes, + &HKLM_Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&HKLM_Key, KEY_READ, &ObjectAttributes); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Get the name info length */ + InfoLength = 0; + Status = NtQueryKey(HKLM_Key, KeyNameInformation, NULL, 0, &InfoLength); + ok_ntstatus(Status, STATUS_BUFFER_TOO_SMALL); + ok_size_t(InfoLength, FIELD_OFFSET(KEY_NAME_INFORMATION, Name[HKLM_Name.Length/sizeof(WCHAR)])); + + /* Get it for real */ + NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); + ok(NameInformation != NULL, "\n"); + + Status = NtQueryKey(HKLM_Key, KeyNameInformation, NameInformation, InfoLength, &InfoLength); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_size_t(InfoLength, FIELD_OFFSET(KEY_NAME_INFORMATION, Name[HKLM_Name.Length/sizeof(WCHAR)])); + ok_size_t(NameInformation->NameLength, HKLM_Name.Length); + + RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Length = NameInformation->NameLength; + ok(RtlCompareUnicodeString(&InfoName, &HKLM_Name, TRUE) == 0, "%.*S\n", + InfoName.Length, InfoName.Buffer); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); + + /* Open one subkey */ + InitializeObjectAttributes(&ObjectAttributes, + &Software_Name, + OBJ_CASE_INSENSITIVE, + HKLM_Key, + NULL); + Status = NtOpenKey(&HKLM_Software_Key, KEY_READ, &ObjectAttributes); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Get the name info length */ + InfoLength = 0; + Status = NtQueryKey(HKLM_Software_Key, KeyNameInformation, NULL, 0, &InfoLength); + ok_ntstatus(Status, STATUS_BUFFER_TOO_SMALL); + ok_size_t(InfoLength, FIELD_OFFSET(KEY_NAME_INFORMATION, Name[HKLM_Software_Name.Length/sizeof(WCHAR)])); + + /* Get it for real */ + NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength); + ok(NameInformation != NULL, "\n"); + + Status = NtQueryKey(HKLM_Software_Key, KeyNameInformation, NameInformation, InfoLength, &InfoLength); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_size_t(InfoLength, FIELD_OFFSET(KEY_NAME_INFORMATION, Name[HKLM_Software_Name.Length/sizeof(WCHAR)])); + ok_size_t(NameInformation->NameLength, HKLM_Software_Name.Length); + + RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Length = NameInformation->NameLength; + ok(RtlCompareUnicodeString(&InfoName, &HKLM_Software_Name, TRUE) == 0, "%.*S\n", + InfoName.Length, InfoName.Buffer); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NameInformation); + + NtClose(HKLM_Software_Key); + NtClose(HKLM_Key); +} + +START_TEST(NtQueryKey) +{ + Test_KeyNameInformation(); +} Propchange: trunk/rostests/apitests/ntdll/NtQueryKey.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/apitests/ntdll/NtQueryKey.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/ntdll/NtQueryKey.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Mon Sep 29 16:21:53 2014 @@ -13,6 +13,7 @@ extern void func_NtMapViewOfSection(void); extern void func_NtMutant(void); extern void func_NtProtectVirtualMemory(void); +extern void func_NtQueryKey(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQueryVolumeInformationFile(void); extern void func_NtSaveKey(void); @@ -44,6 +45,7 @@ { "NtMapViewOfSection", func_NtMapViewOfSection }, { "NtMutant", func_NtMutant }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, + { "NtQueryKey", func_NtQueryKey }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, { "NtSaveKey", func_NtSaveKey},

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