Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[hbelusca] 71796: [BOOTDATA]: Apply the new russian timezones, by "amber". CORE-10558 #resolve #comment Finally committed!! ^^ Please retest :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 3 14:10:58 2016 New Revision: 71796 URL: http://svn.reactos.org/svn/reactos?rev=71796&view=rev Log: [BOOTDATA]: Apply the new russian timezones, by "amber". CORE-10558 #resolve #comment Finally committed!! ^^ Please retest :) Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Jul 3 14:10:58 2016 @@ -1,4 +1,4 @@ -[Version] +ï»¿[Version] Signature="$ReactOS$" [AddReg] @@ -735,21 +735,21 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Display",0x00000000,"(GMT+03:00) Kaliningrad" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Display",0x00000000,"(GMT+02:00) Kaliningrad" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Dlt",0x00000000,"Kaliningrad Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Std",0x00000000,"Kaliningrad Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","Index",0x00010001,143 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Kaliningrad Standard Time","TZI",0x00000001,\ -0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 - -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Display",0x00000000,"(GMT+04:00) Moscow, St. Petersburg, Volgograd" +0x88,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Display",0x00000000,"(GMT+03:00) Moscow, St. Petersburg, Volgograd" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Dlt",0x00000000,"Russian Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Std",0x00000000,"Russian Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","Index",0x00010001,145 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Russian Standard Time","TZI",0x00000001,\ -0x10,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -798,7 +798,7 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Display",0x00000000,"(GMT+04:00) Caucasus Standard Time" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Display",0x00000000,"(GMT+04:00) Samara" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Dlt",0x00000000,"Caucasus Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Std",0x00000000,"Caucasus Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Caucasus Standard Time","Index",0x00010001,170 @@ -816,12 +816,12 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Display",0x00000000,"(GMT+06:00) Ekaterinburg" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Display",0x00000000,"(GMT+05:00) Ekaterinburg" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Dlt",0x00000000,"Ekaterinburg Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Std",0x00000000,"Ekaterinburg Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","Index",0x00010001,180 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Ekaterinburg Standard Time","TZI",0x00000001,\ -0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0xd4,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -870,12 +870,12 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+07:00) Novosibirsk, Omsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Display",0x00000000,"(GMT+06:00) Novosibirsk, Omsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Dlt",0x00000000,"N. Central Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Std",0x00000000,"N. Central Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","Index",0x00010001,201 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\N. Central Asia Standard Time","TZI",0x00000001,\ -0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x98,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -897,12 +897,12 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+08:00) Krasnoyarsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Display",0x00000000,"(GMT+07:00) Krasnoyarsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Dlt",0x00000000,"North Asia Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Std",0x00000000,"North Asia Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","Index",0x00010001,207 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia Standard Time","TZI",0x00000001,\ -0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x5c,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -951,12 +951,12 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+09:00) Irkutsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Display",0x00000000,"(GMT+08:00) Irkutsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Dlt",0x00000000,"North Asia East Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Std",0x00000000,"North Asia East Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","Index",0x00010001,227 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\North Asia East Standard Time","TZI",0x00000001,\ -0xe4,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x20,0xfe,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -978,12 +978,12 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Display",0x00000000,"(GMT+10:00) Yakutsk" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Display",0x00000000,"(GMT+09:00) Yakutsk" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Dlt",0x00000000,"Yakutsk Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Std",0x00000000,"Yakutsk Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","Index",0x00010001,240 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Yakutsk Standard Time","TZI",0x00000001,\ -0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0xe4,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -1032,12 +1032,12 @@ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+11:00) Vladivostok" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Display",0x00000000,"(GMT+10:00) Vladivostok" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Dlt",0x00000000,"Vladivostok Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Std",0x00000000,"Vladivostok Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","Index",0x00010001,270 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Vladivostok Standard Time","TZI",0x00000001,\ -0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0xa8,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 @@ -1059,12 +1059,12 @@ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Display",0x00000000,"(GMT+12:00) Magadan" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Display",0x00000000,"(GMT+11:00) Magadan" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Dlt",0x00000000,"Magadan Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Std",0x00000000,"Magadan Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","Index",0x00010001,283 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Magadan Standard Time","TZI",0x00000001,\ -0x30,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x6c,0xfd,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00

8 years, 5 months

[ekohl] 71795: [MSGINA] Icon fix ups. Patch by Jared Smudde. CORE-11417 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 3 13:55:15 2016 New Revision: 71795 URL: http://svn.reactos.org/svn/reactos?rev=71795&view=rev Log: [MSGINA] Icon fix ups. Patch by Jared Smudde. CORE-11417 #resolve #comment Thanks a lot! Added: trunk/reactos/dll/win32/msgina/resources/109.ico (with props) trunk/reactos/dll/win32/msgina/resources/110.ico (with props) trunk/reactos/dll/win32/msgina/resources/115.ico (with props) trunk/reactos/dll/win32/msgina/resources/13.ico (with props) trunk/reactos/dll/win32/msgina/resources/22.ico (with props) Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/lang/zh-CN.rc trunk/reactos/dll/win32/msgina/lang/zh-TW.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msgina/resource.h trunk/reactos/dll/win32/msgina/resources/21.ico Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "ÐÐ°ÑÐ¸ÑÐ½ÐµÑÐµ ÐµÐ´Ð½Ð¾Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¾ Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ÐÐ°ÐºÐ²Ð¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ÐÐ°ÐºÐ²Ð¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -20,7 +20,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "StisknÄte klÃ¡vesy Ctrl-Alt-Delete", IDC_STATIC, 38, 60, 144, 14 END @@ -113,7 +113,7 @@ CAPTION "OdhlÃ¡sit se ze systÃ©mu" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "UrÄitÄ se chcete odhlÃ¡sit?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Ano", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Ne", IDNO, 95, 39, 50, 14 @@ -125,7 +125,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Co mÃ¡ poÄÃtaÄ provÃ©st?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -148,7 +148,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Co mÃ¡ poÄÃtaÄ provÃ©st?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "DrÃ¼cken Sie Strg+Alt+Entf",IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Von ReactOS abmelden" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Wollen Sie sich wirklich abmelden?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Ja", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Welcher Vorgang soll durchgefÃ¼hrt werden?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Welcher Vorgang soll durchgefÃ¼hrt werden?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Press Ctrl-Alt-Delete to begin.",IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -16,7 +16,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Para empezar, presione Ctrl-Alt-Supr.",IDC_STATIC, 38, 60, 144, 14 END @@ -109,7 +109,7 @@ CAPTION "Cerrar sesiÃ³n de ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Â¿Seguro que desea cerrar sesiÃ³n?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "SÃ", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -121,7 +121,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "Â¿&QuÃ© desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -144,7 +144,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "Â¿&QuÃ© desea hacer con el equipo?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Appuyer sur les touches Ctrl-Alt-Suppr", IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "DÃ©connexion de ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Ãtes-vous sÃ»r de vouloir vous dÃ©connecter?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Oui", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Non", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "×××¥ ×¢× Ctrl-Alt-Del ×× ××× ××ª", IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Tekan kombinasi tombol Kontrol-Alt-Delete",IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Premere i tasti Ctrl-Alt-Canc ",IDC_STATIC, 38, 60, 144, 14 END @@ -117,7 +117,7 @@ CAPTION "Disconetti da ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Sei sicuro di volerti disconettere?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Si", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -129,7 +129,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -152,7 +152,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Ctrl-Alt-Del ãã¼ã®çµã¿åãããæ¼ãã¦ãã ãã", IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Log Off ReactOS" FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ FONT 9,"MS UI Gothic", 400, 0, 1 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ã³ã³ãã¥ã¼ã¿ã®åä½ãé¸æãã¦ãã ãã", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ FONT 9, "MS UI Gothic" 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ã³ã³ãã¥ã¼ã¿ã®åä½ãé¸æãã¦ãã ãã", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "Trykk Ctrl-Alt-Del knappene", IDC_STATIC, 38, 60, 144, 14 END @@ -108,7 +108,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -120,7 +120,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Hva vil du at datamaskinen skal gjÃ¸re?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -143,7 +143,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Hva vil du at datamaskinen skal gjÃ¸re?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -25,7 +25,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "ProszÄ wcisnÄÄ kombinacjÄ klawiszy Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14 END @@ -118,7 +118,7 @@ CAPTION "ReactOS - Wylogowywanie z systemu" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Czy na pewno chcesz siÄ wylogowaÄ?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Tak", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Nie", IDNO, 95, 39, 50, 14 @@ -130,7 +130,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Co chcesz, aby zrobiÅ komputer?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -153,7 +153,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Co chcesz, aby zrobiÅ komputer?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -24,7 +24,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "ApasaÈi simultan Â«CtrlÂ»+Â«AltÂ»+Â«DelÂ»", IDC_STATIC, 38, 60, 144, 14 END @@ -117,7 +117,7 @@ CAPTION "Deautentificare ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Sigur doriÈi sÄ vÄ deautentificaÈi?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "D&a", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14 @@ -129,7 +129,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Ce doriÈi sÄ se Ã®ntÃ¢mple?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -152,7 +152,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Ce doriÈi sÄ se Ã®ntÃ¢mple?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -17,7 +17,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "ÐÐ°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ»Ð°Ð²Ð¸ÑÐ¸ Ctrl-Alt-Del.", IDC_STATIC, 38, 60, 144, 14 END @@ -110,7 +110,7 @@ CAPTION "ÐÑÑÐ¾Ð´ Ð¸Ð· ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "ÐÐ°", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "ÐÐµÑ", IDNO, 95, 39, 50, 14 @@ -122,7 +122,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -145,7 +145,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¶ÐµÐ»Ð°ÐµÐ¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ.", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -20,7 +20,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "StlaÄte kombinÃ¡ciu klÃ¡ves Ctrl-Alt-Del", IDC_STATIC, 38, 60, 144, 14 END @@ -113,7 +113,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -125,7 +125,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Äo chcete aby poÄÃtaÄ urobil?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -148,7 +148,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&Äo chcete aby poÄÃtaÄ urobil?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-A… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -111,7 +111,7 @@ CAPTION "Dil nga ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Jeni te sigurte qe doni te dilni?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Po", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Jo", IDNO, 95, 39, 50, 14 @@ -123,7 +123,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -146,7 +146,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -17,7 +17,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "BaÅlamak iÃ§in Denetim, SeÃ§enek ve Silme dÃ¼Ämelerine birlikte basÄ±nÄ±z.",IDC_STATIC, 38, 60, 144, 14 END @@ -110,7 +110,7 @@ CAPTION "Oturumu Kapat" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Oturumu kapatmayÄ± istediÄinizden emin misiniz?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Evet", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "HayÄ±r", IDNO, 95, 39, 50, 14 @@ -122,7 +122,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&BilgisayarÄ±n ne yapmasÄ±nÄ± istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -145,7 +145,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&BilgisayarÄ±nÄ±zÄ±n ne yapmasÄ±nÄ± istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -116,7 +116,7 @@ CAPTION "Log Off ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 @@ -128,7 +128,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ÐÐ¸Ð±ÐµÑÑÑÑ Ð¾Ð´Ð½Ñ Ð· ÑÐ°ÐºÐ¸Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÐµÐ¹?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -151,7 +151,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "&ÐÐ¸Ð±ÐµÑÑÑÑ Ð¾Ð´Ð½Ñ Ð· ÑÐ°ÐºÐ¸Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÐµÐ¹?", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/zh-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/zh-CN.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -17,7 +17,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "æ Ctrl-Alt-Delete å¼å§ã",IDC_STATIC, 38, 60, 144, 14 END @@ -110,7 +110,7 @@ CAPTION "ReactOS æ³¨é" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "ä½ ç¡®å®ä½ æ³è¦æ³¨é?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "æ¯", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "å¦", IDNO, 95, 39, 50, 14 @@ -122,7 +122,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "ä½ æ³è®©è®¡ç®æºåä»ä¹?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -145,7 +145,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "ä½ æ³è®©è®¡ç®æºåä»ä¹?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/zh-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/zh-TW.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -17,7 +17,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - ICON IDI_LOCKICON, IDC_STATIC, 7, 55, 32, 32 + ICON IDI_KEYBOARD, IDC_STATIC, 7, 55, 32, 32 LTEXT "æ Ctrl-Alt-Delete éå§ã",IDC_STATIC, 38, 60, 144, 14 END @@ -110,7 +110,7 @@ CAPTION "ReactOS ç»åº" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN - ICON IDI_LOCKICON, -1, 7, 7, 20, 20 + ICON IDI_LOGOFF, -1, 7, 7, 20, 20 LTEXT "ä½ ç¢ºå®ä½ æ³è¦ç»åº?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "æ¯", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "å¦", IDNO, 95, 39, 50, 14 @@ -122,7 +122,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "ä½ æ³è®è¨ç®æ©åä»éº¼?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 @@ -145,7 +145,7 @@ 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 + ICON IDI_SHUTDOWN, IDI_SHUTDOWN, 9, 57, 21, 20, WS_GROUP LTEXT "ä½ æ³è®è¨ç®æ©åä»éº¼?(&W)", IDC_STATIC, 39, 57, 167, 10 COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -9,9 +9,16 @@ #define REACTOS_STR_ORIGINAL_FILENAME "msgina.dll" #include <reactos/version.rc> +/* Icons */ +IDI_NOT_CONNECTED ICON "resources/13.ico" +IDI_LOGOFF ICON "resources/21.ico" +IDI_SHUTDOWN ICON "resources/22.ico" +IDI_KEYBOARD ICON "resources/109.ico" +IDI_HARDWARE ICON "resources/110.ico" +IDI_LOCKICON ICON "resources/115.ico" + +/* Bitmaps */ IDI_ROSLOGO BITMAP "resources/reactos.bmp" -IDI_LOCKICON ICON "resources/21.ico" -IDI_SHELL_SHUTDOWN ICON "resources/shutdown.ico" #include <reactos/manifest_dll.rc> Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sun Jul 3 13:55:15 2016 @@ -40,9 +40,13 @@ #define IDI_ROSLOGO 20000 -#define IDI_SHELL_SHUTDOWN 20001 -#define IDI_LOCKICON 21 +#define IDI_NOT_CONNECTED 13 +#define IDI_LOGOFF 21 +#define IDI_SHUTDOWN 22 +#define IDI_KEYBOARD 109 +#define IDI_HARDWARE 110 +#define IDI_LOCKICON 115 #define IDS_LOGGEDOUTSAS 40000 #define IDS_LOCKEDSAS 40001 Added: trunk/reactos/dll/win32/msgina/resources/109.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/109.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/msgina/resources/110.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/110.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/msgina/resources/115.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/115.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/msgina/resources/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/13.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/msgina/resources/21.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Added: trunk/reactos/dll/win32/msgina/resources/22.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/msgina/resources/22.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

8 years, 5 months

[hbelusca] 71794: [KERNEL32]: Implement support for Auto-Execute (AE) Debugging: starting a user-specified debugger (e.g., DrWatson on Windows, etc...) which attaches to a user-mode application whe...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 3 13:52:28 2016 New Revision: 71794 URL: http://svn.reactos.org/svn/reactos?rev=71794&view=rev Log: [KERNEL32]: Implement support for Auto-Execute (AE) Debugging: starting a user-specified debugger (e.g., DrWatson on Windows, etc...) which attaches to a user-mode application when the latter crashes. CORE-11508 #resolve Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/kernel32/k32.h Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Jul 3 13:52:28 2016 @@ -160,6 +160,11 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","RegisteredOrganization",2,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","RegisteredOwner",2,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","SoftwareType",2,"System" + +; Auto-Execute (AE) Debugger +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",2,"1" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","Debugger",2,"drwtsn32 -p %ld -e %ld -g" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","UserDebuggerHotKey",0x00010001,0x00000000 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Accessibility",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Compatibility",,0x00000012 Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sun Jul 3 13:52:28 2016 @@ -12,6 +12,7 @@ /* INCLUDES *******************************************************************/ #include <k32.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -242,27 +243,66 @@ WINAPI UnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) { + static UNICODE_STRING AeDebugKey = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_AEDEBUG); + + static BOOLEAN IsSecondChance = FALSE; + + /* Exception data */ NTSTATUS Status; + PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; + LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; LONG RetValue; + + /* Debugger and hard error parameters */ HANDLE DebugPort = NULL; ULONG_PTR ErrorParameters[4]; - ULONG ErrorResponse; - PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; - - if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && - ExceptionRecord->NumberParameters >= 2) - { - switch(ExceptionRecord->ExceptionInformation[0]) + ULONG DebugResponse, ErrorResponse; + + /* Post-Mortem "Auto-Execute" (AE) Debugger registry data */ + HANDLE KeyHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ValueString; + ULONG Length; + UCHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PVOID)Buffer; + BOOLEAN AeDebugAuto = FALSE; + PWCHAR AeDebugPath = NULL; + WCHAR AeDebugCmdLine[MAX_PATH]; + + /* Debugger process data */ + BOOL Success; + HRESULT hr; + ULONG PrependLength; + HANDLE hDebugEvent; + HANDLE WaitHandles[2]; + STARTUPINFOW StartupInfo; + PROCESS_INFORMATION ProcessInfo; + + /* In case this is a nested exception, just kill the process */ + if (ExceptionRecord->ExceptionFlags & EXCEPTION_NESTED_CALL) + { + NtTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); + return EXCEPTION_EXECUTE_HANDLER; + } + + if ((ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) && + (ExceptionRecord->NumberParameters >= 2)) + { + switch (ExceptionRecord->ExceptionInformation[0]) { case EXCEPTION_WRITE_FAULT: - /* Change the protection on some write attempts, some InstallShield setups - have this bug */ + { + /* + * Change the protection on some write attempts, + * some InstallShield setups have this bug. + */ RetValue = BasepCheckForReadOnlyResource( (PVOID)ExceptionRecord->ExceptionInformation[1]); if (RetValue == EXCEPTION_CONTINUE_EXECUTION) return EXCEPTION_CONTINUE_EXECUTION; break; + } case EXCEPTION_EXECUTE_FAULT: /* FIXME */ @@ -270,66 +310,353 @@ } } - /* Is there a debugger running? */ + /* If the process is being debugged, pass the exception to the debugger */ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDebugPort, &DebugPort, sizeof(DebugPort), NULL); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return EXCEPTION_EXECUTE_HANDLER; - } - - if (DebugPort) - { - /* Pass the exception to debugger. */ + if (NT_SUCCESS(Status) && DebugPort) + { DPRINT("Passing exception to debugger\n"); return EXCEPTION_CONTINUE_SEARCH; } + /* No debugger present, let's continue... */ + RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); if (RealFilter) { - LONG ret = RealFilter(ExceptionInfo); - if (ret != EXCEPTION_CONTINUE_SEARCH) - return ret; - } - + RetValue = RealFilter(ExceptionInfo); + if (RetValue != EXCEPTION_CONTINUE_SEARCH) + return RetValue; + } + + /* ReactOS-specific: DPRINT a stack trace */ PrintStackTrace(ExceptionInfo); + /* + * Now pop up an error if needed. Check both the process-wide (Win32) + * and per-thread error-mode flags (NT). + */ + if ((GetErrorMode() & SEM_NOGPFAULTERRORBOX) || + (RtlGetThreadErrorMode() & RTL_SEM_NOGPFAULTERRORBOX)) + { + /* Do not display the pop-up error box, just transfer control to the exception handler */ + return EXCEPTION_EXECUTE_HANDLER; + } + /* Save exception code and address */ - ErrorParameters[0] = (ULONG)ExceptionRecord->ExceptionCode; + ErrorParameters[0] = (ULONG_PTR)ExceptionRecord->ExceptionCode; ErrorParameters[1] = (ULONG_PTR)ExceptionRecord->ExceptionAddress; - if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) - { - /* get the type of operation that caused the access violation */ + if (ExceptionRecord->ExceptionCode == STATUS_IN_PAGE_ERROR) + { + /* + * Get the underlying status code that resulted in the exception, + * and just forget about the type of operation (read/write). + */ + ErrorParameters[2] = ExceptionRecord->ExceptionInformation[2]; + } + else // if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) or others... + { + /* Get the type of operation that caused the access violation */ ErrorParameters[2] = ExceptionRecord->ExceptionInformation[0]; - } - else - { - ErrorParameters[2] = ExceptionRecord->ExceptionInformation[2]; } /* Save faulting address */ ErrorParameters[3] = ExceptionRecord->ExceptionInformation[1]; - /* Raise the harderror */ - Status = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION, - 4, - 0, - ErrorParameters, - OptionOkCancel, - &ErrorResponse); - - if (NT_SUCCESS(Status) && (ErrorResponse == ResponseCancel)) - { - /* FIXME: Check the result, if the "Cancel" button was - clicked run a debugger */ - DPRINT1("Debugging is not implemented yet\n"); - } + /* + * Prepare the hard error dialog: default to only OK + * in case we do not have any debugger at our disposal. + */ + DebugResponse = OptionOk; + AeDebugAuto = FALSE; + + /* + * Retrieve Post-Mortem Debugger settings from the registry, under: + * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug + * (REGSTR_PATH_AEDEBUG). + */ + + InitializeObjectAttributes(&ObjectAttributes, + &AeDebugKey, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* + * Read the 'Auto' REG_SZ value: + * "0" (or any other value): Prompt the user for starting the debugger. + * "1": Start the debugger without prompting. + */ + RtlInitUnicodeString(&ValueString, REGSTR_VAL_AEDEBUG_AUTO); + Status = NtQueryValueKey(KeyHandle, + &ValueString, + KeyValuePartialInformation, + PartialInfo, + sizeof(Buffer), + &Length); + if (NT_SUCCESS(Status) && (PartialInfo->Type == REG_SZ)) + { + AeDebugAuto = (*(PWCHAR)PartialInfo->Data == L'1'); + } + else + { + AeDebugAuto = FALSE; + } + + /* + * Read and store the 'Debugger' REG_SZ value. Its usual format is: + * C:\dbgtools\ntsd.exe -p %ld -e %ld -g + * with the first and second parameters being respectively + * the process ID and a notification event handle. + */ + RtlInitUnicodeString(&ValueString, REGSTR_VAL_AEDEBUG_DEBUGGER); + Status = NtQueryValueKey(KeyHandle, + &ValueString, + KeyValuePartialInformation, + PartialInfo, + sizeof(Buffer), + &Length); + if (NT_SUCCESS(Status) && (PartialInfo->Type == REG_SZ)) + { + /* We hope the string is NULL-terminated */ + AeDebugPath = (PWCHAR)PartialInfo->Data; + + /* Skip any prepended whitespace */ + while ( *AeDebugPath && + ((*AeDebugPath == L' ') || + (*AeDebugPath == L'\t')) ) // iswspace(*AeDebugPath) + { + ++AeDebugPath; + } + + if (*AeDebugPath) + { + /* We have a debugger path, we can prompt the user to debug the program */ + DebugResponse = OptionOkCancel; + } + else + { + /* We actually do not have anything, reset the pointer */ + AeDebugPath = NULL; + } + } + else + { + AeDebugPath = NULL; + } + + NtClose(KeyHandle); + } + + // TODO: Start a ReactOS Fault Reporter (unimplemented!) + // + // For now we are doing the "old way" (aka Win2k), that is also the fallback + // case for Windows XP/2003 in case it does not find faultrep.dll to display + // the nice "Application Error" dialog box: We use a hard error to communicate + // the problem and prompt the user to continue debugging the application or + // to terminate it. + // + // Since Windows XP/2003, we have the ReportFault API available. + // See http://www.clausbrod.de/twiki/pub/Blog/DefinePrivatePublic20070616/reportfa… + // and https://msdn.microsoft.com/en-us/library/windows/desktop/bb513616(v=vs.85).… + // and the legacy ReportFault API: https://msdn.microsoft.com/en-us/library/windows/desktop/bb513615(v=vs.85).… + // + // NOTE: Starting Vista+, the fault API is constituted of the WerXXX functions. + // + // Also see Vostokov's book "Memory Dump Analysis Anthology Collector's Edition, Volume 1" + // at: https://books.google.fr/books?id=9w2x6NHljg4C&pg=PA115&lpg=PA115 + + if (!(AeDebugPath && AeDebugAuto)) + { + /* + * Either there is no debugger specified, or the debugger should + * not start automatically: display the hard error no matter what. + * For a first chance exception, allow continuing or debugging; + * for a second chance exception, just debug or kill the process. + */ + Status = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION | HARDERROR_OVERRIDE_ERRORMODE, + 4, + 0, + ErrorParameters, + (!IsSecondChance ? DebugResponse : OptionOk), + &ErrorResponse); + } + else + { + Status = STATUS_SUCCESS; + ErrorResponse = (AeDebugPath ? ResponseCancel : ResponseOk); + } + + /* + * If the user has chosen not to debug the process, or + * if this is a second chance exception, kill the process. + */ + if (!NT_SUCCESS(Status) || (ErrorResponse != ResponseCancel) || IsSecondChance) + goto Quit; + + /* If the exception comes from a CSR Server, kill it (this will lead to ReactOS shutdown) */ + if (BaseRunningInServerProcess) + { + IsSecondChance = TRUE; + goto Quit; + } + + /* + * Attach a debugger to this process. The debugger process is given + * the process ID of the current process to be debugged, as well as + * a notification event handle. After being spawned, the debugger + * initializes and attaches to the process by calling DebugActiveProcess. + * When the debugger is ready, it signals the notification event, + * so that we can give it control over the process being debugged, + * by passing it the exception. + * + * See https://msdn.microsoft.com/en-us/library/ms809754.aspx + * and http://www.debuginfo.com/articles/ntsdwatson.html + * and https://sourceware.org/ml/gdb-patches/2012-08/msg00893.html + * for more details. + */ + + /* Create an inheritable notification debug event for the debugger */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_INHERIT, + NULL, + NULL); + Status = NtCreateEvent(&hDebugEvent, + EVENT_ALL_ACCESS, + &ObjectAttributes, + NotificationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + hDebugEvent = NULL; + + /* Build the debugger command line */ + + Success = FALSE; + + /* + * We will add two longs (process ID and event handle) to the command + * line. The biggest 32-bit unsigned int (0xFFFFFFFF == 4.294.967.295) + * takes 10 decimal digits. We then count the terminating NULL. + */ + Length = wcslen(AeDebugPath) + 2*10 + 1; + + /* Check whether the debugger path may be a relative path */ + if ((*AeDebugPath != L'"') && + (RtlDetermineDosPathNameType_U(AeDebugPath) == RtlPathTypeRelative)) + { + /* Relative path, prepend SystemRoot\System32 */ + PrependLength = wcslen(SharedUserData->NtSystemRoot) + 10 /* == wcslen(L"\\System32\\") */; + if (PrependLength + Length <= ARRAYSIZE(AeDebugCmdLine)) + { + hr = StringCchPrintfW(AeDebugCmdLine, + PrependLength + 1, + L"%s\\System32\\", + SharedUserData->NtSystemRoot); + Success = SUCCEEDED(hr); + } + } + else + { + /* Full path */ + PrependLength = 0; + if (Length <= ARRAYSIZE(AeDebugCmdLine)) + Success = TRUE; + } + + /* Format the command line */ + if (Success) + { + hr = StringCchPrintfW(&AeDebugCmdLine[PrependLength], + Length, + AeDebugPath, + HandleToUlong(NtCurrentTeb()->ClientId.UniqueProcess), // GetCurrentProcessId() + hDebugEvent); + Success = SUCCEEDED(hr); + } + + /* Start the debugger */ + if (Success) + { + DPRINT1("\nStarting debugger: '%S'\n", AeDebugCmdLine); + + RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); + RtlZeroMemory(&ProcessInfo, sizeof(ProcessInfo)); + + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpDesktop = L"WinSta0\\Default"; + + Success = CreateProcessW(NULL, + AeDebugCmdLine, + NULL, NULL, + TRUE, 0, + NULL, NULL, + &StartupInfo, &ProcessInfo); + } + + if (Success) + { + WaitHandles[0] = hDebugEvent; + WaitHandles[1] = ProcessInfo.hProcess; + + /* Loop until the debugger gets ready or terminates unexpectedly */ + do + { + /* Alertable wait */ + Status = NtWaitForMultipleObjects(ARRAYSIZE(WaitHandles), + WaitHandles, + WaitAny, + TRUE, NULL); + } while ((Status == STATUS_ALERTED) || (Status == STATUS_USER_APC)); + + /* + * The debugger terminated unexpectedly and we cannot attach to it. + * Kill the process being debugged. + */ + if (Status == STATUS_WAIT_1) + { + /* Be sure there is no other debugger attached */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDebugPort, + &DebugPort, + sizeof(DebugPort), + NULL); + if (!NT_SUCCESS(Status) || !DebugPort) + { + /* No debugger is attached, kill the process at next round */ + IsSecondChance = TRUE; + } + } + + CloseHandle(ProcessInfo.hThread); + CloseHandle(ProcessInfo.hProcess); + + if (hDebugEvent) + NtClose(hDebugEvent); + + return EXCEPTION_CONTINUE_SEARCH; + } + + /* We failed starting the debugger, close the event handle and kill the process */ + + if (hDebugEvent) + NtClose(hDebugEvent); + + IsSecondChance = TRUE; + + +Quit: + /* If this is a second chance exception, kill the process */ + if (IsSecondChance) + NtTerminateProcess(NtCurrentProcess(), ExceptionRecord->ExceptionCode); + + /* Otherwise allow handling exceptions in first chance */ /* * Returning EXCEPTION_EXECUTE_HANDLER means that the code in Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Sun Jul 3 13:52:28 2016 @@ -21,6 +21,11 @@ #include <winreg.h> #include <wincon.h> #include <winuser.h> + +#undef TEXT +#define TEXT(s) L##s +#include <regstr.h> + #include <tlhelp32.h> /* Redefine NTDDI_VERSION to 2K3 SP1 to get correct NDK definitions */ @@ -40,7 +45,7 @@ #include <ndk/setypes.h> #include <ndk/umfuncs.h> -/* CSRSS Header */ +/* CSRSS Headers */ #include <csr/csr.h> #include <win/base.h> #include <win/basemsg.h>

8 years, 5 months

[hbelusca] 71793: [KERNEL32] - No need to explicitely convert the pointers to PVOID in the NtQueryInformationProcess calls, and do not hardcode the size-of the variable being passed in parameter. -...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 3 13:48:50 2016 New Revision: 71793 URL: http://svn.reactos.org/svn/reactos?rev=71793&view=rev Log: [KERNEL32] - No need to explicitely convert the pointers to PVOID in the NtQueryInformationProcess calls, and do not hardcode the size-of the variable being passed in parameter. - "Fix" FatalAppExitW: it's only in checked builds that one can continue running the application even after a FatalAppExitW call. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Jul 3 13:48:50 2016 @@ -915,8 +915,8 @@ /* Query information on the process from the kernel */ Status = NtQueryInformationProcess(hProcess, ProcessBasicInformation, - (PVOID)&ProcessInfo, - sizeof(PROCESS_BASIC_INFORMATION), + &ProcessInfo, + sizeof(ProcessInfo), NULL); if (!NT_SUCCESS(Status)) { @@ -1032,7 +1032,7 @@ Status = NtQueryInformationProcess(hProcess, ProcessQuotaLimits, &QuotaLimits, - sizeof(QUOTA_LIMITS_EX), + sizeof(QuotaLimits), NULL); if (!NT_SUCCESS(Status)) { @@ -1220,7 +1220,7 @@ Status = NtQueryInformationProcess(hProcess, ProcessBasicInformation, &ProcessBasic, - sizeof(PROCESS_BASIC_INFORMATION), + sizeof(ProcessBasic), NULL); if (!NT_SUCCESS(Status)) { @@ -1251,7 +1251,7 @@ Status = NtQueryInformationProcess(Process, ProcessBasicInformation, &ProcessBasic, - sizeof(PROCESS_BASIC_INFORMATION), + sizeof(ProcessBasic), NULL); if (!NT_SUCCESS(Status)) { @@ -1615,7 +1615,7 @@ MessageTextU = &NtCurrentTeb()->StaticUnicodeString; RtlInitAnsiString(&MessageText, (LPSTR)lpMessageText); - /* Convert to unicode and just exit normally if this failed */ + /* Convert to unicode, or just exit normally if this failed */ Status = RtlAnsiStringToUnicodeString(MessageTextU, &MessageText, FALSE); if (!NT_SUCCESS(Status)) ExitProcess(0); @@ -1643,11 +1643,18 @@ 1, 1, (PULONG_PTR)&UnicodeString, +#if DBG + /* On Checked builds, Windows allows the user to cancel the operation */ OptionOkCancel, +#else + OptionOk, +#endif &Response); +#if DBG /* Give the user a chance to abort */ if ((NT_SUCCESS(Status)) && (Response == ResponseCancel)) return; +#endif /* Otherwise kill the process */ ExitProcess(0); @@ -1661,7 +1668,7 @@ FatalExit(IN int ExitCode) { #if DBG - /* On Checked builds, Windows gives you a nice little debugger UI */ + /* On Checked builds, Windows gives the user a nice little debugger UI */ CHAR ch[2]; DbgPrint("FatalExit...\n"); DbgPrint("\n"); @@ -1701,7 +1708,7 @@ Status = NtQueryInformationProcess(hProcess, ProcessPriorityClass, &PriorityClass, - sizeof(PROCESS_PRIORITY_CLASS), + sizeof(PriorityClass), NULL); if (NT_SUCCESS(Status)) { @@ -1933,7 +1940,7 @@ Status = NtQueryInformationProcess(hProcess, ProcessPriorityBoost, &PriorityBoost, - sizeof(ULONG), + sizeof(PriorityBoost), NULL); if (NT_SUCCESS(Status)) { @@ -1990,7 +1997,7 @@ Status = NtQueryInformationProcess(hProcess, ProcessHandleCount, &phc, - sizeof(ULONG), + sizeof(phc), NULL); if (NT_SUCCESS(Status)) {

8 years, 5 months

[akhaldi] 71792: [COMCTL32_WINETEST] Addendum to r71791. CORE-11383

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 12:30:14 2016 New Revision: 71792 URL: http://svn.reactos.org/svn/reactos?rev=71792&view=rev Log: [COMCTL32_WINETEST] Addendum to r71791. CORE-11383 Modified: trunk/rostests/winetests/comctl32/listview.c Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… ============================================================================== --- trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] Sun Jul 3 12:30:14 2016 @@ -1849,6 +1849,7 @@ { HWND hwnd; WNDPROC oldwndproc; + LVITEMA item; hwnd = create_listview_control(LVS_REPORT); @@ -1867,6 +1868,18 @@ InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE); + + /* check colors when item is selected */ + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT, selection", FALSE); DestroyWindow(hwnd);

8 years, 5 months

[akhaldi] 71791: [COMCTL32] Apply Wine Staging commit 35bf531 by Michael Müller: Preserve custom colors between subitems. (v2). CORE-11383

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 12:29:33 2016 New Revision: 71791 URL: http://svn.reactos.org/svn/reactos?rev=71791&view=rev Log: [COMCTL32] Apply Wine Staging commit 35bf531 by Michael Müller: Preserve custom colors between subitems. (v2). CORE-11383 Modified: trunk/reactos/dll/win32/comctl32/listview.c Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun Jul 3 12:29:33 2016 @@ -1038,7 +1038,7 @@ COLORREF backcolor, textcolor; /* apparently, for selected items, we have to override the returned values */ - if (!SubItem) + if (!SubItem || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) { @@ -4772,6 +4772,7 @@ while (iterator_next(subitems)) { DWORD subitemstage = CDRF_DODEFAULT; + NMLVCUSTOMDRAW temp_nmlvcd; /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */ if (subitems->nItem) @@ -4799,13 +4800,15 @@ if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); + /* + * A selection should neither affect the colors in the post paint notification nor + * affect the colors of the next drawn subitem. Copy the structure to prevent this. + */ + temp_nmlvcd = nmlvcd; + prepaint_setup(infoPtr, hdc, &temp_nmlvcd, subitems->nItem); if (!(subitemstage & CDRF_SKIPDEFAULT)) - LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &temp_nmlvcd, &pos); if (subitemstage & CDRF_NOTIFYPOSTPAINT) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd);

8 years, 5 months

[akhaldi] 71790: [README.WINE] Mark some modules as synced with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 12:11:37 2016 New Revision: 71790 URL: http://svn.reactos.org/svn/reactos?rev=71790&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/media/doc/README.WINE 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] Sun Jul 3 12:11:37 2016 @@ -15,9 +15,9 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to WineStaging-1.9.11 -reactos/tools/widl # Synced to WineStaging-1.9.11 -reactos/tools/wpp # Synced to WineStaging-1.9.4 +reactos/sdk/tools/unicode # Synced to WineStaging-1.9.11 +reactos/sdk/tools/widl # Synced to WineStaging-1.9.11 +reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 The following libraries are shared with Wine. @@ -27,184 +27,184 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.11 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.11 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.11 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 -reactos/dll/win32/activeds # Synced to WineStaging-1.9.4 -reactos/dll/win32/actxprxy # Synced to WineStaging-1.9.4 -reactos/dll/win32/advpack # Synced to WineStaging-1.9.4 -reactos/dll/win32/atl # Synced to WineStaging-1.9.4 -reactos/dll/win32/atl80 # Synced to WineStaging-1.9.4 -reactos/dll/win32/atl100 # Synced to WineStaging-1.9.4 +reactos/dll/win32/activeds # Synced to WineStaging-1.9.11 +reactos/dll/win32/actxprxy # Synced to WineStaging-1.9.11 +reactos/dll/win32/advpack # Synced to WineStaging-1.9.11 +reactos/dll/win32/atl # Synced to WineStaging-1.9.11 +reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 +reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.11 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4 -reactos/dll/win32/clusapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/comcat # Synced to WineStaging-1.9.4 +reactos/dll/win32/cabinet # Synced to WineStaging-1.9.11 +reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.11 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/compstui # Synced to WineStaging-1.9.4 -reactos/dll/win32/credui # Synced to WineStaging-1.9.4 +reactos/dll/win32/compstui # Synced to WineStaging-1.9.11 +reactos/dll/win32/credui # Synced to WineStaging-1.9.11 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.4 -reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.4 -reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.4 -reactos/dll/win32/cryptui # Synced to WineStaging-1.9.4 +reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptui # Synced to WineStaging-1.9.11 reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.11 -reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/faultrep # Synced to WineStaging-1.9.4 -reactos/dll/win32/fltlib # Synced to WineStaging-1.9.4 -reactos/dll/win32/fusion # Synced to WineStaging-1.9.4 +reactos/dll/win32/dciman32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 +reactos/dll/win32/fltlib # Synced to WineStaging-1.9.11 +reactos/dll/win32/fusion # Synced to WineStaging-1.9.11 reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.11 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.4 -reactos/dll/win32/hlink # Synced to WineStaging-1.9.4 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.9.11 +reactos/dll/win32/hlink # Synced to WineStaging-1.9.11 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.11 -reactos/dll/win32/httpapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-1.9.11 reactos/dll/win32/ieframe # Synced to WineStaging-1.9.11 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11 -reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.4 +reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-1.9.11 -reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.4 -reactos/dll/win32/initpki # Synced to WineStaging-1.9.4 -reactos/dll/win32/inseng # Synced to WineStaging-1.9.4 +reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.11 +reactos/dll/win32/initpki # Synced to WineStaging-1.9.11 +reactos/dll/win32/inseng # Synced to WineStaging-1.9.11 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to WineStaging-1.9.4 -reactos/dll/win32/itss # Synced to WineStaging-1.9.4 +reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 +reactos/dll/win32/itss # Synced to WineStaging-1.9.11 reactos/dll/win32/jscript # Synced to WineStaging-1.9.11 reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 -reactos/dll/win32/loadperf # Synced to WineStaging-1.9.4 -reactos/dll/win32/localspl # Synced to WineStaging-1.9.4 -reactos/dll/win32/localui # Synced to WineStaging-1.9.4 -reactos/dll/win32/lz32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 +reactos/dll/win32/localspl # Synced to WineStaging-1.9.11 +reactos/dll/win32/localui # Synced to WineStaging-1.9.11 +reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mcicda # Synced to WineStaging-1.9.4 +reactos/dll/win32/mcicda # Synced to WineStaging-1.9.11 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mciseq # Synced to WineStaging-1.9.4 -reactos/dll/win32/mciwave # Synced to WineStaging-1.9.4 +reactos/dll/win32/mciseq # Synced to WineStaging-1.9.11 +reactos/dll/win32/mciwave # Synced to WineStaging-1.9.11 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/mlang # Synced to WineStaging-1.9.4 +reactos/dll/win32/mlang # Synced to WineStaging-1.9.11 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.11 reactos/dll/win32/mpr # Synced to WineStaging-1.9.11 -reactos/dll/win32/mprapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.4 -reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.4 -reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mscms # Synced to WineStaging-1.9.4 +reactos/dll/win32/mprapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/msacm32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/msacm32.drv # Synced to WineStaging-1.9.11 +reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.9.11 +reactos/dll/win32/mscat32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mscms # Synced to WineStaging-1.9.11 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.9.11 -reactos/dll/win32/msftedit # Synced to WineStaging-1.9.4 -reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.4 -reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.4 +reactos/dll/win32/msftedit # Synced to WineStaging-1.9.11 +reactos/dll/win32/msg711.acm # Synced to WineStaging-1.9.11 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-1.9.12 -reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/msimtf # Synced to WineStaging-1.9.4 -reactos/dll/win32/msisip # Synced to WineStaging-1.9.4 -reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.9.4 -reactos/dll/win32/msnet32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mspatcha # Synced to WineStaging-1.9.4 +reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/msimtf # Synced to WineStaging-1.9.11 +reactos/dll/win32/msisip # Synced to WineStaging-1.9.11 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.9.11 +reactos/dll/win32/msnet32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mspatcha # Synced to WineStaging-1.9.11 reactos/dll/win32/msrle32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/mssign32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mssip32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/mstask # Synced to WineStaging-1.9.4 +reactos/dll/win32/mssign32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mssip32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/mstask # Synced to WineStaging-1.9.11 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml # Synced to WineStaging-1.9.4 -reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.4 +reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 +reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.4 -reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.4 -reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.11 +reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.11 +reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.11 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to WineStaging-1.9.4 -reactos/dll/win32/ntdsapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/ntprint # Synced to WineStaging-1.9.4 -reactos/dll/win32/objsel # Synced to WineStaging-1.9.4 -reactos/dll/win32/odbc32 # Synced to WineStaging-1.9.4. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/npptools # Synced to WineStaging-1.9.11 +reactos/dll/win32/ntdsapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/ntprint # Synced to WineStaging-1.9.11 +reactos/dll/win32/objsel # Synced to WineStaging-1.9.11 +reactos/dll/win32/odbc32 # Synced to WineStaging-1.9.11. Depends on port of Linux ODBC. +reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 reactos/dll/win32/ole32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/oleacc # Synced to WineStaging-1.9.4 +reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/oledlg # Synced to WineStaging-1.9.4 -reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/olesvr32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/olethk32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/pdh # Synced to WineStaging-1.9.4 -reactos/dll/win32/pidgen # Synced to WineStaging-1.9.4 +reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/oledlg # Synced to WineStaging-1.9.11 +reactos/dll/win32/olepro32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/olesvr32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/olethk32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/pdh # Synced to WineStaging-1.9.11 +reactos/dll/win32/pidgen # Synced to WineStaging-1.9.11 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to WineStaging-1.9.4 -reactos/dll/win32/propsys # Synced to WineStaging-1.9.4 -reactos/dll/win32/pstorec # Synced to WineStaging-1.9.4 +reactos/dll/win32/printui # Synced to WineStaging-1.9.11 +reactos/dll/win32/propsys # Synced to WineStaging-1.9.11 +reactos/dll/win32/pstorec # Synced to WineStaging-1.9.11 reactos/dll/win32/qmgr # Synced to WineStaging-1.9.11 -reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.4 -reactos/dll/win32/query # Synced to WineStaging-1.9.4 -reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/resutils # Synced to WineStaging-1.9.4 +reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.11 +reactos/dll/win32/query # Synced to WineStaging-1.9.11 +reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/resutils # Synced to WineStaging-1.9.11 reactos/dll/win32/riched20 # Synced to WineStaging-1.9.11 -reactos/dll/win32/riched32 # Synced to WineStaging-1.9.4 +reactos/dll/win32/riched32 # Synced to WineStaging-1.9.11 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.11 -reactos/dll/win32/rsabase # Synced to WineStaging-1.9.4 -reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.4 -reactos/dll/win32/sccbase # Synced to WineStaging-1.9.4 +reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 +reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 +reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 reactos/dll/win32/schannel # Synced to WineStaging-1.9.4 -reactos/dll/win32/scrrun # Synced to WineStaging-1.9.4 +reactos/dll/win32/scrrun # Synced to WineStaging-1.9.11 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-1.9.4 +reactos/dll/win32/sensapi # Synced to WineStaging-1.9.11 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-1.9.4 -reactos/dll/win32/shdocvw # Synced to WineStaging-1.9.4 +reactos/dll/win32/shdoclc # Synced to WineStaging-1.9.11 +reactos/dll/win32/shdocvw # Synced to WineStaging-1.9.11 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-1.9.4 +reactos/dll/win32/shfolder # Synced to WineStaging-1.9.11 reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.4 -reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/softpub # Synced to WineStaging-1.9.4 -reactos/dll/win32/spoolss # Synced to WineStaging-1.9.4 -reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.4 +reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.11 +reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/softpub # Synced to WineStaging-1.9.11 +reactos/dll/win32/spoolss # Synced to WineStaging-1.9.11 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 -reactos/dll/win32/sti # Synced to WineStaging-1.9.4 -reactos/dll/win32/sxs # Synced to WineStaging-1.9.4 +reactos/dll/win32/sti # Synced to WineStaging-1.9.11 +reactos/dll/win32/sxs # Synced to WineStaging-1.9.11 reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 -reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/traffic # Synced to WineStaging-1.9.4 -reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/url # Synced to WineStaging-1.9.4 +reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/traffic # Synced to WineStaging-1.9.11 +reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/url # Synced to WineStaging-1.9.11 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.11 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/version # Synced to WineStaging-1.9.11 -reactos/dll/win32/vssapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4 +reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.11 reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.11 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.11 -reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.4 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.4 -reactos/dll/win32/wing32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/winhttp # Synced to WineStaging-1.9.4 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.11 +reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/winhttp # Synced to WineStaging-1.9.11 reactos/dll/win32/wininet # Synced to WineStaging-1.9.11 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 @@ -212,46 +212,45 @@ reactos/dll/win32/winscard # Synced to WineStaging-1.9.11 reactos/dll/win32/wintrust # Synced to WineStaging-1.9.11 reactos/dll/win32/wldap32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/wmi # Synced to WineStaging-1.9.4 -reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.4 -reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.4 -reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.4 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/wuapi # Synced to WineStaging-1.9.4 -reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.9.4 -reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.4 -reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.9.4 -reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.4 +reactos/dll/win32/wmi # Synced to WineStaging-1.9.11 +reactos/dll/win32/wmiutils # Synced to WineStaging-1.9.11 +reactos/dll/win32/wmvcore # Synced to WineStaging-1.9.11 +reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.9.11 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.9.11 +reactos/dll/win32/wuapi # Synced to WineStaging-1.9.11 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.9.11 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.9.11 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.9.11 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.9.11 reactos/dll/win32/xmllite # Synced to WineStaging-1.9.11 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.11 ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.4 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.4 -reactos/base/applications/games/winmine # Synced to WineStaging-1.9.4 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-1.9.4 -reactos/base/applications/iexplore # Synced to WineStaging-1.9.4 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.11 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11 +reactos/base/applications/games/winmine # Synced to WineStaging-1.9.11 with our own resources. +reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11 +reactos/base/applications/iexplore # Synced to WineStaging-1.9.11 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.11 reactos/base/applications/wordpad # Synced to WineStaging-1.9.11 -reactos/base/services/rpcss # Synced to WineStaging-1.9.4 -reactos/base/shell/progman # Forked at WineStaging-1.9.4 -reactos/base/system/expand # Synced to WineStaging-1.9.4 -reactos/base/system/msiexec # Synced to WineStaging-1.9.4 +reactos/base/services/rpcss # Synced to WineStaging-1.9.11 +reactos/base/system/expand # Synced to WineStaging-1.9.11 +reactos/base/system/msiexec # Synced to WineStaging-1.9.11 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.9.4 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.9.11 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55

8 years, 5 months

[akhaldi] 71789: [WINMM_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 11:58:56 2016 New Revision: 71789 URL: http://svn.reactos.org/svn/reactos?rev=71789&view=rev Log: [WINMM_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/winmm/mci.c trunk/rostests/winetests/winmm/midi.c Modified: trunk/rostests/winetests/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mci.c?rev… ============================================================================== --- trunk/rostests/winetests/winmm/mci.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/mci.c [iso-8859-1] Sun Jul 3 11:58:56 2016 @@ -721,10 +721,8 @@ /* A few ME machines pass all tests except set format tag pcm! */ err = mciSendStringA("record x to 2000 wait", NULL, 0, hwnd); ok(err || !ok_pcm,"can record yet set wave format pcm returned %s\n", dbg_mcierr(ok_pcm)); - if(!ndevs) todo_wine /* with sound disabled */ - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); - else - ok(ndevs>0 ? !err : err==MCIERR_WAVE_INPUTSUNSUITABLE,"mci record to 2000 returned %s\n", dbg_mcierr(err)); + todo_wine_if (!ndevs) /* with sound disabled */ + ok(ndevs > 0 ? !err : err == MCIERR_WAVE_INPUTSUNSUITABLE, "mci record to 2000 returned %s\n", dbg_mcierr(err)); if(err) { if (err==MCIERR_WAVE_INPUTSUNSUITABLE) skip("Please install audio driver. Everything is skipped.\n"); @@ -1165,10 +1163,8 @@ test_notification(hwnd, "-prior to auto-open-", 0); err = mciSendStringA("play tempfile.wav notify", buf, sizeof(buf), hwnd); - if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); - else - ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + todo_wine_if (ok_saved == MCIERR_FILE_NOT_FOUND) /* same as above */ + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); if(err) /* FIXME: don't open twice yet, it confuses Wine. */ err = mciSendStringA("play tempfile.wav", buf, sizeof(buf), hwnd); @@ -1395,6 +1391,46 @@ test_notification(hwnd,"play (aborted by close)",MCI_NOTIFY_ABORTED); } +static DWORD CALLBACK thread_cb(void *p) +{ + HANDLE evt = p; + MCIERROR mr; + + mr = mciSendStringA("play x", NULL, 0, NULL); + ok(mr == MCIERR_INVALID_DEVICE_NAME, "play gave: 0x%x\n", mr); + + mr = mciSendStringA("close x", NULL, 0, NULL); + ok(mr == MCIERR_INVALID_DEVICE_NAME, "close gave: 0x%x\n", mr); + + SetEvent(evt); + + return 0; +} + +static void test_threads(void) +{ + MCIERROR mr; + HANDLE evt; + + mr = mciSendStringA("open tempfile.wav alias x", NULL, 0, NULL); + ok(mr == 0 || mr == ok_saved, "open gave: 0x%x\n", mr); + if(mr){ + skip("Cannot open tempfile.wav for playing (%s), skipping\n", dbg_mcierr(mr)); + return; + } + + evt = CreateEventW( NULL, TRUE, FALSE, NULL ); + + CloseHandle(CreateThread(NULL, 0, &thread_cb, evt, 0, NULL)); + + WaitForSingleObject(evt, INFINITE); + + CloseHandle(evt); + + mr = mciSendStringA("close x", NULL, 0, NULL); + ok(mr == 0, "close gave: 0x%x\n", mr); +} + START_TEST(mci) { char curdir[MAX_PATH], tmpdir[MAX_PATH]; @@ -1411,6 +1447,7 @@ test_openCloseWAVE(hwnd); test_recordWAVE(hwnd); if(waveOutGetNumDevs()){ + test_threads(); test_playWAVE(hwnd); test_asyncWAVE(hwnd); test_AutoOpenWAVE(hwnd); Modified: trunk/rostests/winetests/winmm/midi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/midi.c?re… ============================================================================== --- trunk/rostests/winetests/winmm/midi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/midi.c [iso-8859-1] Sun Jul 3 11:58:56 2016 @@ -802,11 +802,9 @@ ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*nt,w2k*/), "midiOutGetDevCaps MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); rc = midiOutOpen(&hm, MIDIMAPPER, 0, 0, CALLBACK_NULL); - if (rc==MIDIERR_INVALIDSETUP) todo_wine /* Wine without snd-seq */ - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k*/), "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || broken(rc==MMSYSERR_NODRIVER /*w2k sound disabled*/), - "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); + todo_wine_if (rc == MIDIERR_INVALIDSETUP) /* Wine without snd-seq */ + ok(rc == MMSYSERR_BADDEVICEID || broken(rc == MMSYSERR_NODRIVER /*w2k sound disabled*/), + "midiOutOpen MAPPER with no MIDI rc=%s\n", mmsys_error(rc)); if (!rc) { rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc));

8 years, 5 months

[akhaldi] 71788: [IPHLPAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 11:56:44 2016 New Revision: 71788 URL: http://svn.reactos.org/svn/reactos?rev=71788&view=rev Log: [IPHLPAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpa… ============================================================================== --- trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] Sun Jul 3 11:56:44 2016 @@ -1028,13 +1028,13 @@ replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); +todo_wine ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); todo_wine ok (error == IP_GENERAL_FAILURE @@ -1379,13 +1379,14 @@ size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize); for (aa = ptr; !ret && aa; aa = aa->Next) { char temp[128]; + IP_ADAPTER_PREFIX *prefix; ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) || S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP), @@ -1452,6 +1453,18 @@ sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]); trace("ZoneIndices: %s\n", temp); trace("FirstPrefix: %p\n", aa->FirstPrefix); + prefix = aa->FirstPrefix; + while (prefix) + { + trace("\tLength: %u\n", S(U(*prefix)).Length); + trace("\tFlags: 0x%08x\n", S(U(*prefix)).Flags); + trace("\tNext: %p\n", prefix->Next); + trace("\tAddress.lpSockaddr: %p\n", prefix->Address.lpSockaddr); + trace("\tAddress.iSockaddrLength: %d\n", prefix->Address.iSockaddrLength); + trace("\tPrefixLength: %u\n", prefix->PrefixLength); + trace("\n"); + prefix = prefix->Next; + } if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue; #ifndef __REACTOS__

8 years, 5 months

[akhaldi] 71787: [SETUPAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 3 11:54:30 2016 New Revision: 71787 URL: http://svn.reactos.org/svn/reactos?rev=71787&view=rev Log: [SETUPAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368 Added: trunk/rostests/winetests/setupapi/setupapi.manifest (with props) trunk/rostests/winetests/setupapi/setupapi.rc (with props) Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/setupapi/diskspace.c trunk/rostests/winetests/setupapi/install.c trunk/rostests/winetests/setupapi/parser.c trunk/rostests/winetests/setupapi/setupcab.c Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -11,7 +11,7 @@ stringtable.c testlist.c) -add_executable(setupapi_winetest ${SOURCE}) +add_executable(setupapi_winetest ${SOURCE} setupapi.rc) set_module_type(setupapi_winetest win32cui) -add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32) +add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/setupapi/diskspace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/disksp… ============================================================================== --- trunk/rostests/winetests/setupapi/diskspace.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/diskspace.c [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -30,6 +31,30 @@ #include "wine/test.h" static BOOL is_win9x; + +#define STD_HEADER "[Version]\r\nSignature=\"$CHICAGO$\"\r\n" + +static inline const char* debugstr_longlong(ULONGLONG ll) +{ + static char string[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(string, "%lx", (unsigned long)ll); + return string; +} + +/* create a new file with specified contents and open it */ +static HINF inf_open_file_content(const char * tmpfilename, const char *data, UINT *err_line) +{ + DWORD res; + HANDLE handle = CreateFileA(tmpfilename, GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0); + if (handle == INVALID_HANDLE_VALUE) return 0; + if (!WriteFile( handle, data, strlen(data), &res, NULL )) trace( "write error\n" ); + CloseHandle( handle ); + return SetupOpenInfFileA( tmpfilename, 0, INF_STYLE_WIN4, err_line ); +} static void test_SetupCreateDiskSpaceListA(void) { @@ -300,11 +325,31 @@ ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); } +static LONGLONG get_file_size(char *path) +{ + HANDLE file; + LARGE_INTEGER size; + + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) return 0; + + if (!GetFileSizeEx(file, &size)) + size.QuadPart = 0; + + CloseHandle(file); + return size.QuadPart; +} + static void test_SetupQuerySpaceRequiredOnDriveA(void) { BOOL ret; HDSKSPC handle; LONGLONG space; + char windir[MAX_PATH]; + char drive[3]; + char tmp[MAX_PATH]; + LONGLONG size; if (is_win9x) win_skip("SetupQuerySpaceRequiredOnDriveA crashes with NULL disk space handle on Win9x\n"); @@ -369,7 +414,7 @@ ret = SetupQuerySpaceRequiredOnDriveA(handle, "", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveA to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_DRIVE, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + "Expected GetLastError() to return ERROR_INVALID_DRIVE, got %u\n", GetLastError()); SetLastError(0xdeadbeef); @@ -380,6 +425,155 @@ ok(GetLastError() == ERROR_INVALID_DRIVE, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + GetWindowsDirectoryA(windir, MAX_PATH); + drive[0] = windir[0]; drive[1] = windir[1]; drive[2] = 0; + + snprintf(tmp, MAX_PATH, "%c:\\wine-test-should-not-exist.txt", drive[0]); + ret = SetupAddToDiskSpaceListA(handle, tmp, 0x100000, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0x100000, "Expected 0x100000 as required space, got %s\n", debugstr_longlong(space)); + + /* adding the same file again doesn't sum up the size */ + ret = SetupAddToDiskSpaceListA(handle, tmp, 0x200000, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0x200000, "Expected 0x200000 as required space, got %s\n", debugstr_longlong(space)); + + /* the device doesn't need to exist */ + snprintf(tmp, MAX_PATH, "F:\\wine-test-should-not-exist.txt"); + ret = SetupAddToDiskSpaceListA(handle, tmp, 0x200000, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupQuerySpaceRequiredOnDriveA(handle, "F:", &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0x200000, "Expected 0x200000 as required space, got %s\n", debugstr_longlong(space)); + + snprintf(tmp, MAX_PATH, "F:\\wine-test-should-not-exist.txt"); + ret = SetupAddToDiskSpaceListA(handle, tmp, 0x200000, FILEOP_DELETE, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupQuerySpaceRequiredOnDriveA(handle, "F:", &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0x200000, "Expected 0x200000 as required space, got %s\n", debugstr_longlong(space)); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + /* the real size is subtracted unless SPDSL_IGNORE_DISK is specified */ + snprintf(tmp, MAX_PATH, "%s\\regedit.exe", windir); + + size = get_file_size(tmp); + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0 || broken(space == -0x5000) || broken(space == -0x7000), + "Expected 0x0 as required space, got %s\n", debugstr_longlong(space)); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size + 0x100000, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0x100000 || broken(space == 0xf9000) || broken(space == 0xfb000), + "Expected 0x100000 as required space, got %s\n", debugstr_longlong(space)); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size - 0x1000, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == -0x1000 || broken(space == -0x6000) || broken(space == -0x8000), + "Expected -0x1000 as required space, got %s\n", debugstr_longlong(space)); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + /* test FILEOP_DELETE, then FILEOP_COPY */ + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_DELETE, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0 || broken(space == -0x5000) || broken(space == -0x7000), + "Expected 0x0 as required space, got %s\n", debugstr_longlong(space)); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + /* test FILEOP_COPY, then FILEOP_DELETE */ + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_DELETE, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0 || broken(space == -0x5000) || broken(space == -0x7000), + "Expected 0x0 as required space, got %s\n", debugstr_longlong(space)); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + /* test FILEOP_DELETE without SPDSL_IGNORE_DISK */ + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_DELETE, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space <= -size, "Expected space <= -size, got %s\n", debugstr_longlong(space)); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + /* test FILEOP_COPY and FILEOP_DELETE with SPDSL_IGNORE_DISK */ + handle = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(handle != NULL, + "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_DELETE, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space == 0, "Expected size = 0, got %s\n", debugstr_longlong(space)); + + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + ret = SetupAddToDiskSpaceListA(handle, tmp, size, FILEOP_DELETE, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(handle, drive, &space, NULL, 0); + ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); + ok(space >= size, "Expected size >= %s\n", debugstr_longlong(space)); ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); @@ -470,6 +664,456 @@ ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +static void test_SetupAddToDiskSpaceListA(void) +{ + HDSKSPC handle; + BOOL ret; + + ret = SetupAddToDiskSpaceListA(NULL, "C:\\some-file.dat", 0, FILEOP_COPY, 0, 0); + ok(!ret, "Expected SetupAddToDiskSpaceListA to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + + handle = SetupCreateDiskSpaceListA(NULL, 0, 0); + ok(handle != NULL,"Expected SetupCreateDiskSpaceListA to return a valid handle\n"); + + ret = SetupAddToDiskSpaceListA(handle, NULL, 0, FILEOP_COPY, 0, 0); + ok(ret || broken(!ret) /* >= Vista */, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupAddToDiskSpaceListA(handle, "C:\\some-file.dat", -20, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupAddToDiskSpaceListA(handle, "C:\\some-file.dat", 0, FILEOP_RENAME, 0, 0); + ok(!ret, "Expected SetupAddToDiskSpaceListA to return FALSE\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + ret = SetupAddToDiskSpaceListA(handle, NULL, 0, FILEOP_RENAME, 0, 0); + ok(ret || broken(!ret) /* >= Vista */, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupAddToDiskSpaceListA(NULL, NULL, 0, FILEOP_RENAME, 0, 0); + ok(ret || broken(!ret) /* >= Vista */, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +static void test_SetupQueryDrivesInDiskSpaceListA(void) +{ + char buffer[MAX_PATH]; + HDSKSPC handle; + DWORD size; + BOOL ret; + + handle = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(handle != NULL,"Expected SetupCreateDiskSpaceListA to return a valid handle\n"); + + ret = SetupQueryDrivesInDiskSpaceListA(handle, NULL, 0, NULL); + ok(ret, "Expected SetupQueryDrivesInDiskSpaceListA to succeed\n"); + + size = 0; + ret = SetupQueryDrivesInDiskSpaceListA(handle, NULL, 0, &size); + ok(ret, "Expected SetupQueryDrivesInDiskSpaceListA to succeed\n"); + ok(size == 1, "Expected size 1, got %u\n", size); + + ret = SetupAddToDiskSpaceListA(handle, "F:\\random-file.dat", 0, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupAddToDiskSpaceListA(handle, "G:\\random-file.dat", 0, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupAddToDiskSpaceListA(handle, "G:\\random-file2.dat", 0, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + ret = SetupAddToDiskSpaceListA(handle, "X:\\random-file.dat", 0, FILEOP_COPY, 0, 0); + ok(ret, "Expected SetupAddToDiskSpaceListA to succeed\n"); + + size = 0; + ret = SetupQueryDrivesInDiskSpaceListA(handle, NULL, 0, &size); + ok(ret, "Expected SetupQueryDrivesInDiskSpaceListA to succeed\n"); + ok(size == 10, "Expected size 10, got %u\n", size); + + size = 0; + ret = SetupQueryDrivesInDiskSpaceListA(handle, buffer, 0, &size); + ok(!ret, "Expected SetupQueryDrivesInDiskSpaceListA to fail\n"); + ok(size == 4, "Expected size 4, got %u\n", size); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + + size = 0; + ret = SetupQueryDrivesInDiskSpaceListA(handle, buffer, 4, &size); + ok(!ret, "Expected SetupQueryDrivesInDiskSpaceListA to fail\n"); + ok(size == 7, "Expected size 7, got %u\n", size); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + + size = 0; + ret = SetupQueryDrivesInDiskSpaceListA(handle, buffer, 7, &size); + ok(!ret, "Expected SetupQueryDrivesInDiskSpaceListA to fail\n"); + ok(size == 10, "Expected size 10, got %u\n", size); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected GetLastError() to return ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + + size = 0; + memset(buffer, 0xff, sizeof(buffer)); + ret = SetupQueryDrivesInDiskSpaceListA(handle, buffer, sizeof(buffer), &size); + ok(ret, "Expected SetupQueryDrivesInDiskSpaceListA to succeed\n"); + ok(size == 10, "Expected size 10, got %u\n", size); + ok(!memcmp("f:\0g:\0x:\0\0", buffer, 10), "Device list does not match\n"); + + memset(buffer, 0xff, sizeof(buffer)); + ret = SetupQueryDrivesInDiskSpaceListA(handle, buffer, sizeof(buffer), NULL); + ok(ret, "Expected SetupQueryDrivesInDiskSpaceListA to succeed\n"); + ok(!memcmp("f:\0g:\0x:\0\0", buffer, 10), "Device list does not match\n"); + + ok(SetupDestroyDiskSpaceList(handle), + "Expected SetupDestroyDiskSpaceList to succeed\n"); +} + +struct device_usage +{ + const char *dev; + LONGLONG usage; +}; + +struct section +{ + const char *name; + UINT fileop; + BOOL result; + DWORD error_code; +}; + +static const struct +{ + const char *data; + struct section sections[2]; + const char *devices; + int device_length; + struct device_usage usage[2]; +} +section_test[] = +{ + /* 0 */ + {STD_HEADER "[a]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {NULL, 0, TRUE, 0}}, + "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 1 */ + {STD_HEADER "[a]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", FILEOP_DELETE, TRUE, 0}, {NULL, 0, TRUE, 0}}, + "c:\00", sizeof("c:\00"), {{"c:", 0}, {NULL, 0}}}, + /* 2 */ + {STD_HEADER "[a]\ntest,,,\n\r\n", + {{"a", FILEOP_COPY, FALSE, ERROR_LINE_NOT_FOUND}, {NULL, 0, TRUE, 0}}, + "", sizeof(""), {{NULL, 0}, {NULL, 0}}}, + /* 3 */ + {STD_HEADER "[a]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\n[DestinationDirs]\nDefaultDestDir=-1,F:\\test\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {NULL, 0, TRUE, 0}}, + "f:\00", sizeof("f:\00"), {{"f:", 4096}, {NULL, 0}}}, + /* 4 */ + {STD_HEADER "[a]\ntest,test2,,\n[SourceDisksFiles]\ntest2=1,,4096\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {NULL, 0, TRUE, 0}}, + "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 5 */ + {STD_HEADER "[a]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"b", FILEOP_COPY, FALSE, ERROR_SECTION_NOT_FOUND}, {NULL, 0, TRUE, 0}}, + "", sizeof(""), {{NULL, 0}, {NULL, 0}}}, + /* 6 */ + {STD_HEADER "[a]\ntest,,,\n[b]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {"b", FILEOP_COPY, TRUE, 0}}, + "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 7 */ + {STD_HEADER "[a]\ntest,,,\n[b]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\n[DestinationDirs]\nb=-1,F:\\test\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {"b", FILEOP_COPY, TRUE, 0}}, + "c:\00f:\00", sizeof("c:\00f:\00"), {{"c:", 4096}, {"f:", 4096}}}, + /* 8 */ + {STD_HEADER "[a]\ntest,test1,,\n[b]\ntest,test2,,\n[SourceDisksFiles]\ntest1=1,,4096\ntest2=1,,8192\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {"b", FILEOP_COPY, TRUE, 0}}, + "c:\00", sizeof("c:\00"), {{"c:", 8192}, {NULL, 0}}}, + /* 9 */ + {STD_HEADER "[a]\ntest1,test,,\n[b]\ntest2,test,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", FILEOP_COPY, TRUE, 0}, {"b", FILEOP_COPY, TRUE, 0}}, + "c:\00", sizeof("c:\00"), {{"c:", 8192}, {NULL, 0}}}, +}; + +static void test_SetupAddSectionToDiskSpaceListA(void) +{ + char tmp[MAX_PATH]; + char tmpfilename[MAX_PATH]; + char buffer[MAX_PATH]; + HDSKSPC diskspace; + UINT err_line; + LONGLONG space; + BOOL ret; + int i, j; + HINF inf; + + if (!GetTempPathA(MAX_PATH, tmp)) + { + win_skip("GetTempPath failed with error %d\n", GetLastError()); + return; + } + + if (!GetTempFileNameA(tmp, "inftest", 0, tmpfilename)) + { + win_skip("GetTempFileNameA failed with error %d\n", GetLastError()); + return; + } + + inf = inf_open_file_content(tmpfilename, STD_HEADER "[a]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", &err_line); + ok(!!inf, "Failed to open inf file (%d, line %d)\n", GetLastError(), err_line); + + diskspace = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(diskspace != NULL,"Expected SetupCreateDiskSpaceListA to return a valid handle\n"); + + ret = SetupAddSectionToDiskSpaceListA(diskspace, NULL, NULL, "a", FILEOP_COPY, 0, 0); + ok(!ret, "Expected SetupAddSectionToDiskSpaceListA to fail\n"); + ok(GetLastError() == ERROR_SECTION_NOT_FOUND, "Expected ERROR_SECTION_NOT_FOUND as error, got %u\n", + GetLastError()); + + ret = SetupAddSectionToDiskSpaceListA(NULL, inf, NULL, "a", FILEOP_COPY, 0, 0); + ok(!ret, "Expected SetupAddSectionToDiskSpaceListA to fail\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE as error, got %u\n", + GetLastError()); + + ret = SetupAddSectionToDiskSpaceListA(NULL, inf, NULL, "b", FILEOP_COPY, 0, 0); + ok(!ret, "Expected SetupAddSectionToDiskSpaceListA to fail\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE as error, got %u\n", + GetLastError()); + + ret = SetupAddSectionToDiskSpaceListA(diskspace, inf, NULL, "a", 0, 0, 0); + ok(ret, "Expected SetupAddSectionToDiskSpaceListA to succeed (%u)\n", GetLastError()); + + ok(SetupDestroyDiskSpaceList(diskspace), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + for (i = 0; i < sizeof(section_test) / sizeof(section_test[0]); i++) + { + err_line = 0; + + inf = inf_open_file_content(tmpfilename, section_test[i].data, &err_line); + ok(!!inf, "test %d: Failed to open inf file (%d, line %d)\n", i, GetLastError(), err_line); + if (!inf) continue; + + diskspace = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(diskspace != NULL, "Expected SetupCreateDiskSpaceListA to return a valid handle\n"); + + for (j = 0; j < 2; j++) + { + const struct section *section = &section_test[i].sections[j]; + if (!section->name) + continue; + + SetLastError(0xdeadbeef); + ret = SetupAddSectionToDiskSpaceListA(diskspace, inf, NULL, section->name, section->fileop, 0, 0); + if (section->result) + ok(ret, "test %d: Expected adding section %d to succeed (%u)\n", i, j, GetLastError()); + else + { + ok(!ret, "test %d: Expected adding section %d to fail\n", i, j); + ok(GetLastError() == section->error_code, "test %d: Expected %u as error, got %u\n", + i, section->error_code, GetLastError()); + } + } + + memset(buffer, 0x0, sizeof(buffer)); + ret = SetupQueryDrivesInDiskSpaceListA(diskspace, buffer, sizeof(buffer), NULL); + ok(ret, "test %d: Expected SetupQueryDrivesInDiskSpaceListA to succeed (%u)\n", i, GetLastError()); + ok(!memcmp(section_test[i].devices, buffer, section_test[i].device_length), + "test %d: Device list (%s) does not match\n", i, buffer); + + for (j = 0; j < 2; j++) + { + const struct device_usage *usage = &section_test[i].usage[j]; + if (!usage->dev) + continue; + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(diskspace, usage->dev, &space, NULL, 0); + ok(ret, "test %d: Expected SetupQuerySpaceRequiredOnDriveA to succeed for device %s (%u)\n", + i, usage->dev, GetLastError()); + ok(space == usage->usage, "test %d: Expected size %u for device %s, got %u\n", + i, (DWORD)usage->usage, usage->dev, (DWORD)space); + } + + ok(SetupDestroyDiskSpaceList(diskspace), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetupCloseInfFile(inf); + } + + DeleteFileA(tmpfilename); +} + +struct section_i +{ + const char *name; + BOOL result; + DWORD error_code; +}; + +static const struct +{ + const char *data; + struct section_i sections[2]; + const char *devices; + int device_length; + struct device_usage usage[2]; +} +section_test_i[] = +{ + /* 0 */ + {STD_HEADER "[a.Install]\nCopyFiles=a.CopyFiles\n" + "[a.CopyFiles]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a.Install", TRUE, 0}, {NULL, TRUE, 0}}, "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 1 */ + {STD_HEADER "[a]\nCopyFiles=a.CopyFiles\n" + "[a.CopyFiles]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 2 */ + {STD_HEADER "[a]\nCopyFiles=a.CopyFiles\nCopyFiles=a.CopyFiles2\n" + "[a.CopyFiles]\ntest,,,\n[a.CopyFiles2]\ntest2,,,\n" + "[SourceDisksFiles]\ntest=1,,4096\ntest2=1,,4096\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "c:\00", sizeof("c:\00"), {{"c:", 8192}, {NULL, 0}}}, + /* 3 */ + {STD_HEADER "[a]\nCopyFiles=a.CopyFiles,a.CopyFiles2\n" + "[a.CopyFiles]\ntest,,,\n[a.CopyFiles2]\ntest2,,,\n" + "[SourceDisksFiles]\ntest=1,,4096\ntest2=1,,4096\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "c:\00", sizeof("c:\00"), {{"c:", 8192}, {NULL, 0}}}, + /* 4 */ + {STD_HEADER "[a]\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "", sizeof(""), {{NULL, 0}, {NULL, 0}}}, + /* 5 */ + {STD_HEADER "[a]\nDelFiles=a.DelFiles\n" + "[a.nDelFiles]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "", sizeof(""), {{NULL, 0}, {NULL, 0}}}, + /* 6 */ + {STD_HEADER "[a]\nCopyFiles=a.CopyFiles\nDelFiles=a.DelFiles\n" + "[a.CopyFiles]\ntest,,,\n[a.DelFiles]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 7 */ + {STD_HEADER "[a]\nCopyFiles=a.CopyFiles\n[b]\nDelFiles=b.DelFiles\n" + "[a.CopyFiles]\ntest,,,\n[b.DelFiles]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", + {{"a", TRUE, 0}, {"b", TRUE, 0}}, "c:\00", sizeof("c:\00"), {{"c:", 4096}, {NULL, 0}}}, + /* 7 */ + {STD_HEADER "[a]\nCopyFiles=\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "", sizeof(""), {{NULL, 0}, {NULL, 0}}}, + /* 8 */ + {STD_HEADER "[a]\nCopyFiles=something\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "", sizeof(""), {{NULL, 0}, {NULL, 0}}}, + /* 9 */ + {STD_HEADER "[a]\nCopyFiles=a.CopyFiles,b.CopyFiles\n[a.CopyFiles]\ntest,,,\n[b.CopyFiles]\ntest,,,\n" + "[SourceDisksFiles]\ntest=1,,4096\n[DestinationDirs]\nb.CopyFiles=-1,F:\\test\r\n", + {{"a", TRUE, 0}, {NULL, TRUE, 0}}, "c:\00f:\00", sizeof("c:\00f:\00"), {{"c:", 4096}, {"f:", 4096}}}, +}; + +static void test_SetupAddInstallSectionToDiskSpaceListA(void) +{ + char tmp[MAX_PATH]; + char tmpfilename[MAX_PATH]; + char buffer[MAX_PATH]; + HDSKSPC diskspace; + LONGLONG space; + UINT err_line; + BOOL ret; + int i, j; + HINF inf; + + if (!GetTempPathA(MAX_PATH, tmp)) + { + win_skip("GetTempPath failed with error %d\n", GetLastError()); + return; + } + + if (!GetTempFileNameA(tmp, "inftest", 0, tmpfilename)) + { + win_skip("GetTempFileNameA failed with error %d\n", GetLastError()); + return; + } + + inf = inf_open_file_content(tmpfilename, STD_HEADER "[a]\nCopyFiles=b\n[b]\ntest,,,\n[SourceDisksFiles]\ntest=1,,4096\r\n", &err_line); + ok(!!inf, "Failed to open inf file (%d, line %d)\n", GetLastError(), err_line); + + diskspace = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(diskspace != NULL,"Expected SetupCreateDiskSpaceListA to return a valid handle\n"); + + ret = SetupAddInstallSectionToDiskSpaceListA(diskspace, NULL, NULL, "a", 0, 0); + ok(ret, "Expected SetupAddInstallSectionToDiskSpaceListA to succeed\n"); + + ret = SetupAddInstallSectionToDiskSpaceListA(NULL, inf, NULL, "a", 0, 0); + ok(!ret, "Expected SetupAddInstallSectionToDiskSpaceListA to fail\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE as error, got %u\n", + GetLastError()); + + ret = SetupAddInstallSectionToDiskSpaceListA(diskspace, inf, NULL, NULL, 0, 0); + ok(!ret || broken(ret), "Expected SetupAddSectionToDiskSpaceListA to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(ret), + "Expected ERROR_INVALID_PARAMETER as error, got %u\n", GetLastError()); + + ret = SetupAddInstallSectionToDiskSpaceListA(diskspace, inf, NULL, "", 0, 0); + ok(ret, "Expected SetupAddInstallSectionToDiskSpaceListA to succeed (%u)\n", GetLastError()); + + ok(SetupDestroyDiskSpaceList(diskspace), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + for (i = 0; i < sizeof(section_test_i) / sizeof(section_test_i[0]); i++) + { + err_line = 0; + + inf = inf_open_file_content(tmpfilename, section_test_i[i].data, &err_line); + ok(!!inf, "test %d: Failed to open inf file (%d, line %d)\n", i, GetLastError(), err_line); + if (!inf) continue; + + diskspace = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); + ok(diskspace != NULL,"Expected SetupCreateDiskSpaceListA to return a valid handle\n"); + + for (j = 0; j < 2; j++) + { + const struct section_i *section = &section_test_i[i].sections[j]; + if (!section->name) + continue; + + SetLastError(0xdeadbeef); + ret = SetupAddInstallSectionToDiskSpaceListA(diskspace, inf, NULL, section->name, 0, 0); + if (section->result) + ok(ret, "test %d: Expected adding section %d to succeed (%u)\n", i, j, GetLastError()); + else + { + ok(!ret, "test %d: Expected adding section %d to fail\n", i, j); + ok(GetLastError() == section->error_code, "test %d: Expected %u as error, got %u\n", + i, section->error_code, GetLastError()); + } + } + + memset(buffer, 0x0, sizeof(buffer)); + ret = SetupQueryDrivesInDiskSpaceListA(diskspace, buffer, sizeof(buffer), NULL); + ok(ret, "test %d: Expected SetupQueryDrivesInDiskSpaceListA to succeed (%u)\n", i, GetLastError()); + ok(!memcmp(section_test_i[i].devices, buffer, section_test_i[i].device_length), + "test %d: Device list (%s) does not match\n", i, buffer); + + for (j = 0; j < 2; j++) + { + const struct device_usage *usage = &section_test_i[i].usage[j]; + if (!usage->dev) + continue; + + space = 0; + ret = SetupQuerySpaceRequiredOnDriveA(diskspace, usage->dev, &space, NULL, 0); + ok(ret, "test %d: Expected SetupQuerySpaceRequiredOnDriveA to succeed for device %s (%u)\n", + i, usage->dev, GetLastError()); + ok(space == usage->usage, "test %d: Expected size %u for device %s, got %u\n", + i, (DWORD)usage->usage, usage->dev, (DWORD)space); + } + + ok(SetupDestroyDiskSpaceList(diskspace), + "Expected SetupDestroyDiskSpaceList to succeed\n"); + + SetupCloseInfFile(inf); + } + + DeleteFileA(tmpfilename); } START_TEST(diskspace) @@ -482,4 +1126,8 @@ test_SetupDuplicateDiskSpaceListW(); test_SetupQuerySpaceRequiredOnDriveA(); test_SetupQuerySpaceRequiredOnDriveW(); -} + test_SetupAddToDiskSpaceListA(); + test_SetupQueryDrivesInDiskSpaceListA(); + test_SetupAddSectionToDiskSpaceListA(); + test_SetupAddInstallSectionToDiskSpaceListA(); +} Modified: trunk/rostests/winetests/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/instal… ============================================================================== --- trunk/rostests/winetests/setupapi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/install.c [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -174,7 +174,6 @@ /* Check if the registry key is recursively deleted */ res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); - todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n"); /* Just in case */ if (res == ERROR_SUCCESS) Modified: trunk/rostests/winetests/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/parser… ============================================================================== --- trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/parser.c [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -133,6 +133,18 @@ { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, }; static void test_invalid_files(void) @@ -152,14 +164,7 @@ if (invalid_files[i].error) /* should fail */ { ok( hinf == INVALID_HANDLE_VALUE, "file %u: Open succeeded\n", i ); - if (invalid_files[i].todo) todo_wine - { - ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n", - i, err, invalid_files[i].error ); - ok( err_line == invalid_files[i].err_line, "file %u: Bad error line %d/%d\n", - i, err_line, invalid_files[i].err_line ); - } - else + todo_wine_if (invalid_files[i].todo) { ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n", i, err, invalid_files[i].error ); Added: trunk/rostests/winetests/setupapi/setupapi.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupa… ============================================================================== --- trunk/rostests/winetests/setupapi/setupapi.manifest (added) +++ trunk/rostests/winetests/setupapi/setupapi.manifest [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Wine.SetupapiTest" version="0.0.0.0"/> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Propchange: trunk/rostests/winetests/setupapi/setupapi.manifest ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupa… ============================================================================== --- trunk/rostests/winetests/setupapi/setupapi.rc (added) +++ trunk/rostests/winetests/setupapi/setupapi.rc [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -0,0 +1,25 @@ +/* + * setupapi test resources + * + * Copyright 2015 Vincent Povirk + * + * 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 <winuser.rh> + +/* @makedep: setupapi.manifest */ +1 RT_MANIFEST setupapi.manifest Propchange: trunk/rostests/winetests/setupapi/setupapi.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/setupc… ============================================================================== --- trunk/rostests/winetests/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/setupcab.c [iso-8859-1] Sun Jul 3 11:54:30 2016 @@ -115,19 +115,10 @@ ret = SetupIterateCabinetA(invalid_parameters[i].CabinetFile, 0, invalid_parameters[i].MsgHandler, NULL); ok(!ret, "[%d] Expected SetupIterateCabinetA to return 0, got %d\n", i, ret); - if (invalid_parameters[i].todo_lasterror) - { - todo_wine + todo_wine_if (invalid_parameters[i].todo_lasterror) ok(GetLastError() == invalid_parameters[i].expected_lasterror, "[%d] Expected GetLastError() to return %u, got %u\n", i, invalid_parameters[i].expected_lasterror, GetLastError()); - } - else - { - ok(GetLastError() == invalid_parameters[i].expected_lasterror, - "[%d] Expected GetLastError() to return %u, got %u\n", - i, invalid_parameters[i].expected_lasterror, GetLastError()); - } } SetLastError(0xdeadbeef); @@ -190,19 +181,10 @@ ret = SetupIterateCabinetW(invalid_parameters[i].CabinetFile, 0, invalid_parameters[i].MsgHandler, NULL); ok(!ret, "[%d] Expected SetupIterateCabinetW to return 0, got %d\n", i, ret); - if (invalid_parameters[i].todo_lasterror) - { - todo_wine + todo_wine_if (invalid_parameters[i].todo_lasterror) ok(GetLastError() == invalid_parameters[i].expected_lasterror, "[%d] Expected GetLastError() to return %u, got %u\n", i, invalid_parameters[i].expected_lasterror, GetLastError()); - } - else - { - ok(GetLastError() == invalid_parameters[i].expected_lasterror, - "[%d] Expected GetLastError() to return %u, got %u\n", - i, invalid_parameters[i].expected_lasterror, GetLastError()); - } } SetLastError(0xdeadbeef);

8 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016