Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 2 00:51:48 2016 New Revision: 70857 URL: http://svn.reactos.org/svn/reactos?rev=70857&view=rev Log: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/da-DK.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/ms-MY.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -3154,13 +3154,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); - sprintf(Buffer, "Setup failed to verify the selected partition.\n" + // sprintf(Buffer, "Setup failed to verify the selected partition.\n" + sprintf(Buffer, "ChkDsk detected some disk errors.\n" "(Status 0x%08lx).\n", Status); PopupError(Buffer, - MUIGetString(STRING_REBOOTCOMPUTER), + // MUIGetString(STRING_REBOOTCOMPUTER), + MUIGetString(STRING_CONTINUE), Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; + // return QUIT_PAGE; } PartEntry->NeedsCheck = FALSE; Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1758,6 +1758,8 @@ "« £ ¥ ¥ ªâ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."}, + {STRING_CONTINUE, + "ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_QUITCONTINUE, "F3 = §å®¤ ENTER = à®¤ê«¦ ¢ ¥"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1751,6 +1751,8 @@ "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."}, + {STRING_CONTINUE, + "ENTER = Pokraovat"}, {STRING_QUITCONTINUE, "F3 = Ukonit ENTER = Pokraovat"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1763,6 +1763,8 @@ "Installationen installere ReactOS p partitionen"}, {STRING_CHECKINGPART, "Installationen tjekker den valgte partition."}, + {STRING_CONTINUE, + "ENTER = Fortst"}, {STRING_QUITCONTINUE, "F3 = Afslut ENTER = Fortst"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, "Die ausgewhlte Partition wird berprft."}, + {STRING_CONTINUE, + "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1762,6 +1762,8 @@ "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."}, + {STRING_CONTINUE, + "ENTER = ¬¤â® "}, {STRING_QUITCONTINUE, "F3 = §¦®é¨© ENTER = ¬¤â® "}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, "El instalador est comprobando la partici¢n seleccionada."}, + {STRING_CONTINUE, + "INTRO = Continuar"}, {STRING_QUITCONTINUE, "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."}, + {STRING_CONTINUE, + "ENTER = Jtka"}, {STRING_QUITCONTINUE, "F3 = Vlju ENTER = Jtka"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1768,6 +1768,8 @@ "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, "Setup vrifie la partition slectionne."}, + {STRING_CONTINUE, + "ENTRE = Continuer"}, {STRING_QUITCONTINUE, "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1745,6 +1745,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = "}, {STRING_QUITCONTINUE, "F3 = ENTER = "}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."}, + {STRING_CONTINUE, + "INVIO = Continua"}, {STRING_QUITCONTINUE, "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"}, + {STRING_CONTINUE, + "ENTER = ¿Þ¯º³"}, {STRING_QUITCONTINUE, "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."}, + {STRING_CONTINUE, + "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1632,6 +1632,8 @@ "Persediaan memasang ReactOS ke Partition"}, {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."}, + {STRING_CONTINUE, + "ENTER = Teruskan"}, {STRING_QUITCONTINUE, "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1785,6 +1785,8 @@ "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, "Setup controleert nu de geselecteerde partitie."}, + {STRING_CONTINUE, + "ENTER = Doorgaan"}, {STRING_QUITCONTINUE, "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1754,6 +1754,8 @@ "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."}, + {STRING_CONTINUE, + "ENTER = Kontynuacja"}, {STRING_QUITCONTINUE, "F3 = Wyjcie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1783,6 +1783,8 @@ "O instalador instala o ReactOS na partiÆo"}, {STRING_CHECKINGPART, "O instalador est verificando a partiÆo selecionada."}, + {STRING_CONTINUE, + "ENTER=Continuar"}, {STRING_QUITCONTINUE, "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1814,6 +1814,8 @@ "ReactOS va fi instalat pe partiþia"}, {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."}, + {STRING_CONTINUE, + "ENTER = Continuare"}, {STRING_QUITCONTINUE, "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1744,6 +1744,8 @@ "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."}, + {STRING_CONTINUE, + "ENTER = à®¤®«¦¨âì"}, {STRING_QUITCONTINUE, "F3 = ëå®¤ ENTER = à®¤®«¦¨âì"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1757,6 +1757,8 @@ "Inçtal tor nainçtaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblas."}, + {STRING_CONTINUE, + "ENTER = Pokraova"}, {STRING_QUITCONTINUE, "F3 = Skoni ENTER = Pokraova"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1750,6 +1750,8 @@ "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, "Instalimi tani sht duke kontrolluar particionin e przgjedhur."}, + {STRING_CONTINUE, + "ENTER = Vazhdo"}, {STRING_QUITCONTINUE, "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, "Setup undersker nu den valda partitionen."}, + {STRING_CONTINUE, + "ENTER = Fortstt"}, {STRING_QUITCONTINUE, "F3 = Avsluta ENTER = Fortstt"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1724,6 +1724,8 @@ "Kur, ReactOS'u blm zerine kurar."}, {STRING_CHECKINGPART, "Kur, imdi seili blm gzden geiriyor."}, + {STRING_CONTINUE, + "Giri = Srdr"}, {STRING_QUITCONTINUE, "3 = k Giri = Srdr"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "ReactOS ¢áâ ®¢«îóâìáï à®§¤i«"}, {STRING_CHECKINGPART, "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© à®§¤i«."}, + {STRING_CONTINUE, + "ENTER = à®¤®¢¦¨â¨"}, {STRING_QUITCONTINUE, "F3 = ¨©â¨ ENTER = à®¤®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER, Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -115,11 +115,12 @@ #define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 -#define STRING_QUITCONTINUE 12 -#define STRING_REBOOTCOMPUTER 13 -#define STRING_TXTSETUPFAILED 14 -#define STRING_COPYING 15 -#define STRING_SETUPCOPYINGFILES 16 +#define STRING_CONTINUE 12 +#define STRING_QUITCONTINUE 13 +#define STRING_REBOOTCOMPUTER 14 +#define STRING_TXTSETUPFAILED 15 +#define STRING_COPYING 16 +#define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYETTINGSUPDATE 22

8 years, 6 months

[akhaldi] 70856: [ADVPACK_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:31:48 2016 New Revision: 70856 URL: http://svn.reactos.org/svn/reactos?rev=70856&view=rev Log: [ADVPACK_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/advpack/advpack.c Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Tue Mar 1 19:31:48 2016 @@ -667,7 +667,7 @@ return; /* Make sure we create the temporary file in a directory - * were we have enough rights + * where we have adequate rights */ GetTempPathA(MAX_PATH, inf_file); lstrcatA(inf_file,"test.inf");

8 years, 6 months

[akhaldi] 70855: [CREDUI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:30:48 2016 New Revision: 70855 URL: http://svn.reactos.org/svn/reactos?rev=70855&view=rev Log: [CREDUI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/credui/credui.c Modified: trunk/rostests/winetests/credui/credui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/credui.c… ============================================================================== --- trunk/rostests/winetests/credui/credui.c [iso-8859-1] (original) +++ trunk/rostests/winetests/credui/credui.c [iso-8859-1] Tue Mar 1 19:30:48 2016 @@ -73,7 +73,7 @@ sizeof(username)/sizeof(username[0]), password, sizeof(password)/sizeof(password[0]), NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX); - ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); if (winetest_interactive) {

8 years, 6 months

[akhaldi] 70854: [DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:29:57 2016 New Revision: 70854 URL: http://svn.reactos.org/svn/reactos?rev=70854&view=rev Log: [DINPUT_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/dinput/keyboard.c trunk/rostests/winetests/dinput/mouse.c Modified: trunk/rostests/winetests/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/keyboard… ============================================================================== --- trunk/rostests/winetests/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/keyboard.c [iso-8859-1] Tue Mar 1 19:29:57 2016 @@ -125,6 +125,12 @@ E_INVALIDARG, E_HANDLE, S_OK, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static const HRESULT SetCoop_invalid_window[16] = { + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, + E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; + static const HRESULT SetCoop_real_window[16] = { E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, S_OK, S_OK, E_INVALIDARG, @@ -152,6 +158,11 @@ { hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, NULL, i); ok(hr == SetCoop_null_window[i], "SetCooperativeLevel(NULL, %d): %08x\n", i, hr); + } + for (i=0; i<16; i++) + { + hr = IDirectInputDevice_SetCooperativeLevel(pKeyboard, (HWND)0x400000, i); + ok(hr == SetCoop_invalid_window[i], "SetCooperativeLevel(invalid, %d): %08x\n", i, hr); } for (i=0; i<16; i++) { Modified: trunk/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?… ============================================================================== --- trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] Tue Mar 1 19:29:57 2016 @@ -132,7 +132,7 @@ /* Foreground coop level requires window to have focus */ /* Create a temporary window, this should make dinput - * loose mouse input */ + * lose mouse input */ hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError());

8 years, 6 months

[akhaldi] 70853: [DBGHELP] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:28:06 2016 New Revision: 70853 URL: http://svn.reactos.org/svn/reactos?rev=70853&view=rev Log: [DBGHELP] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] Tue Mar 1 19:28:06 2016 @@ -38,33 +38,33 @@ @ stdcall SymAddSourceStream(ptr double str ptr ptr) @ stdcall SymAddSourceStreamA(ptr double str ptr ptr) @ stdcall SymAddSourceStreamW(ptr double str ptr ptr) -@ stdcall SymAddSymbol(ptr double str double long long) -@ stdcall SymAddSymbolW(ptr double wstr double long long) +@ stdcall SymAddSymbol(ptr int64 str int64 long long) +@ stdcall SymAddSymbolW(ptr int64 wstr int64 long long) @ stdcall SymCleanup(long) @ stdcall SymDeleteSymbol(ptr double str double long) @ stdcall SymDeleteSymbolW(ptr double str double long) -@ stdcall SymEnumLines(ptr double str str ptr ptr) +@ stdcall SymEnumLines(ptr int64 str str ptr ptr) @ stdcall SymEnumLinesW(ptr double str str ptr ptr) @ stdcall SymEnumProcesses(ptr ptr) @ stdcall SymEnumSourceFileTokens(ptr double ptr) -@ stdcall SymEnumSourceFiles(ptr double str ptr ptr) -@ stdcall SymEnumSourceFilesW(ptr double str ptr ptr) -@ stdcall SymEnumSourceLines(ptr double str str long long ptr ptr) -@ stdcall SymEnumSourceLinesW(ptr double str str long long ptr ptr) +@ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) +@ stdcall SymEnumSourceFilesW(ptr int64 wstr ptr ptr) +@ stdcall SymEnumSourceLines(ptr int64 str str long long ptr ptr) +@ stdcall SymEnumSourceLinesW(ptr int64 wstr wstr long long ptr ptr) @ stdcall SymEnumSym(ptr double ptr ptr) -@ stdcall SymEnumSymbols(ptr double str ptr ptr) +@ stdcall SymEnumSymbols(ptr int64 str ptr ptr) @ stdcall SymEnumSymbolsForAddr(ptr double ptr ptr) @ stdcall SymEnumSymbolsForAddrW(ptr double ptr ptr) -@ stdcall SymEnumSymbolsW(ptr double wstr ptr ptr) -@ stdcall SymEnumTypes(ptr double ptr ptr) +@ stdcall SymEnumSymbolsW(ptr int64 wstr ptr ptr) +@ stdcall SymEnumTypes(ptr int64 ptr ptr) @ stdcall SymEnumTypesByName(ptr double str ptr ptr) @ stdcall SymEnumTypesByNameW(ptr double str ptr ptr) -@ stdcall SymEnumTypesW(ptr double ptr ptr) +@ stdcall SymEnumTypesW(ptr int64 ptr ptr) @ stdcall SymEnumerateModules(long ptr ptr) @ stdcall SymEnumerateModules64(long ptr ptr) @ stdcall SymEnumerateModulesW64(long ptr ptr) @ stdcall SymEnumerateSymbols(long long ptr ptr) -@ stdcall SymEnumerateSymbols64(long double ptr ptr) +@ stdcall SymEnumerateSymbols64(long int64 ptr ptr) @ stdcall SymEnumerateSymbolsW(ptr long ptr ptr) @ stdcall SymEnumerateSymbolsW64(ptr double ptr ptr) @ stdcall SymFindDebugInfoFile(ptr str str ptr ptr) @@ -73,22 +73,22 @@ @ stdcall SymFindExecutableImageW(ptr str str ptr ptr) @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) @ stdcall SymFindFileInPathW(long wstr wstr ptr long long long ptr ptr ptr) -@ stdcall SymFromAddr(ptr double ptr ptr) -@ stdcall SymFromAddrW(ptr double ptr ptr) -@ stdcall SymFromIndex(ptr double long ptr) -@ stdcall SymFromIndexW(ptr double long ptr) +@ stdcall SymFromAddr(ptr int64 ptr ptr) +@ stdcall SymFromAddrW(ptr int64 ptr ptr) +@ stdcall SymFromIndex(long int64 long ptr) +@ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) @ stdcall SymFromNameW(long str ptr) @ stdcall SymFromToken(ptr double long ptr) @ stdcall SymFromTokenW(ptr double long ptr) @ stdcall SymFunctionTableAccess(long long) -@ stdcall SymFunctionTableAccess64(long double) +@ stdcall SymFunctionTableAccess64(long int64) @ stdcall SymGetFileLineOffsets64(ptr str str ptr long) @ stdcall SymGetHomeDirectory(long str ptr) @ stdcall SymGetHomeDirectoryW(long str ptr) @ stdcall SymGetLineFromAddr(long long ptr ptr) -@ stdcall SymGetLineFromAddr64(long double ptr ptr) -@ stdcall SymGetLineFromAddrW64(long double ptr ptr) +@ stdcall SymGetLineFromAddr64(long int64 ptr ptr) +@ stdcall SymGetLineFromAddrW64(long int64 ptr ptr) @ stdcall SymGetLineFromName(long str str long ptr ptr) @ stdcall SymGetLineFromName64(long str str long ptr ptr) @ stdcall SymGetLineFromNameW64(long wstr wstr long ptr ptr) @@ -99,11 +99,11 @@ @ stdcall SymGetLinePrev64(long ptr) @ stdcall SymGetLinePrevW64(ptr ptr) @ stdcall SymGetModuleBase(long long) -@ stdcall SymGetModuleBase64(long double) +@ stdcall SymGetModuleBase64(long int64) @ stdcall SymGetModuleInfo(long long ptr) -@ stdcall SymGetModuleInfo64(long double ptr) +@ stdcall SymGetModuleInfo64(long int64 ptr) @ stdcall SymGetModuleInfoW(long long ptr) -@ stdcall SymGetModuleInfoW64(long double ptr) +@ stdcall SymGetModuleInfoW64(long int64 ptr) @ stub SymGetOmapBlockBase @ stdcall SymGetOptions() @ stdcall SymGetScope(ptr double long ptr) @@ -113,13 +113,13 @@ @ stdcall SymGetSourceFile(ptr double str str str long) @ stdcall SymGetSourceFileFromToken(ptr ptr str str long) @ stdcall SymGetSourceFileFromTokenW(ptr ptr str str long) -@ stdcall SymGetSourceFileToken(ptr double str ptr ptr) -@ stdcall SymGetSourceFileTokenW(ptr double wstr ptr ptr) +@ stdcall SymGetSourceFileToken(ptr int64 str ptr ptr) +@ stdcall SymGetSourceFileTokenW(ptr int64 wstr ptr ptr) @ stdcall SymGetSourceFileW(ptr double str str str long) @ stdcall SymGetSourceVarFromToken(ptr ptr str str str long) @ stdcall SymGetSourceVarFromTokenW(ptr ptr str str str long) @ stdcall SymGetSymFromAddr(long long ptr ptr) -@ stdcall SymGetSymFromAddr64(long double ptr ptr) +@ stdcall SymGetSymFromAddr64(long int64 ptr ptr) @ stdcall SymGetSymFromName(long str ptr) @ stdcall SymGetSymFromName64(long str ptr) @ stdcall SymGetSymNext(long ptr) @@ -128,40 +128,40 @@ @ stdcall SymGetSymPrev64(long ptr) @ stdcall SymGetSymbolFile(ptr str str long str ptr str ptr) @ stdcall SymGetSymbolFileW(ptr str str long str ptr str ptr) -@ stdcall SymGetTypeFromName(ptr double str ptr) +@ stdcall SymGetTypeFromName(ptr int64 str ptr) @ stdcall SymGetTypeFromNameW(ptr double str ptr) -@ stdcall SymGetTypeInfo(ptr double long long ptr) +@ stdcall SymGetTypeInfo(ptr int64 long long ptr) @ stdcall SymGetTypeInfoEx(ptr double ptr) @ stdcall SymGetUnwindInfo(ptr double ptr ptr) @ stdcall SymInitialize(long str long) @ stdcall SymInitializeW(long wstr long) @ stdcall SymLoadModule(long long str str long long) -@ stdcall SymLoadModule64(long long str str double long) -@ stdcall SymLoadModuleEx(long long str str double long ptr long) -@ stdcall SymLoadModuleExW(long long wstr wstr double long ptr long) +@ stdcall SymLoadModule64(long long str str int64 long) +@ stdcall SymLoadModuleEx(long long str str int64 long ptr long) +@ stdcall SymLoadModuleExW(long long wstr wstr int64 long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) @ stdcall SymMatchFileNameW(wstr wstr ptr ptr) @ stdcall SymMatchString(str str long) SymMatchStringA @ stdcall SymMatchStringA(str str long) -@ stdcall SymMatchStringW(str str long) +@ stdcall SymMatchStringW(wstr wstr long) @ stdcall SymNext(ptr ptr) @ stdcall SymNextW(ptr ptr) @ stdcall SymPrev(ptr ptr) @ stdcall SymPrevW(ptr ptr) @ stdcall SymRefreshModuleList(long) @ stdcall SymRegisterCallback(long ptr ptr) -@ stdcall SymRegisterCallback64(long ptr double) -@ stdcall SymRegisterCallbackW64(long ptr double) +@ stdcall SymRegisterCallback64(long ptr int64) +@ stdcall SymRegisterCallbackW64(long ptr int64) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) -@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) -@ stdcall SymSearch(long double long long str double ptr ptr long) -@ stdcall SymSearchW(long double long long wstr double ptr ptr long) +@ stdcall SymRegisterFunctionEntryCallback64(ptr ptr int64) +@ stdcall SymSearch(long int64 long long str int64 ptr ptr long) +@ stdcall SymSearchW(long int64 long long wstr int64 ptr ptr long) @ stdcall SymSetContext(long ptr ptr) -@ stdcall SymSetHomeDirectory(ptr str) -@ stdcall SymSetHomeDirectoryW(ptr str) +@ stdcall SymSetHomeDirectory(long str) +@ stdcall SymSetHomeDirectoryW(long wstr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) -@ stdcall SymSetScopeFromAddr(ptr double) +@ stdcall SymSetScopeFromAddr(ptr int64) @ stdcall SymSetScopeFromIndex(ptr double long) @ stdcall SymSetSearchPath(long str) @ stdcall SymSetSearchPathW(long wstr) @@ -185,8 +185,8 @@ @ stdcall SymUnDName(ptr str long) @ stdcall SymUnDName64(ptr str long) @ stdcall SymUnloadModule(long long) -@ stdcall SymUnloadModule64(long double) -@ stdcall UnDecorateSymbolName(str str long long) +@ stdcall SymUnloadModule64(long int64) +@ stdcall UnDecorateSymbolName(str ptr long long) @ stdcall UnDecorateSymbolNameW(wstr ptr long long) @ stdcall UnmapDebugInformation(ptr) @ stdcall WinDbgExtensionDllInit(ptr long long) 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] Tue Mar 1 19:28:06 2016 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptui # Synced to WineStaging-1.7.55 -reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.55 +reactos/dll/win32/dbghelp # Synced to WineStaging-1.9.4 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55

8 years, 6 months

[akhaldi] 70852: [CRYPT32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:21:01 2016 New Revision: 70852 URL: http://svn.reactos.org/svn/reactos?rev=70852&view=rev Log: [CRYPT32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/crypt32/base64.c trunk/rostests/winetests/crypt32/cert.c trunk/rostests/winetests/crypt32/chain.c trunk/rostests/winetests/crypt32/store.c trunk/rostests/winetests/crypt32/str.c Modified: trunk/rostests/winetests/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/base64.… ============================================================================== --- trunk/rostests/winetests/crypt32/base64.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/base64.c [iso-8859-1] Tue Mar 1 19:21:01 2016 @@ -319,20 +319,20 @@ ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got ret=%d le=%u\n", ret, GetLastError()); ret = pCryptStringToBinaryA(NULL, 0, 0, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got ret=%d le=%u\n", ret, GetLastError()); /* Bogus format */ ret = pCryptStringToBinaryA(tests[0].base64, 0, 0, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); /* Decoding doesn't expect the NOCR flag to be specified */ ret = pCryptStringToBinaryA(tests[0].base64, 1, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCR, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); /* Bad strings */ for (i = 0; i < sizeof(badStrings) / sizeof(badStrings[0]); i++) { @@ -340,7 +340,7 @@ ret = pCryptStringToBinaryA(badStrings[i].str, 0, badStrings[i].format, NULL, &bufLen, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected ERROR_INVALID_DATA, got ret=%d le=%u\n", ret, GetLastError()); } /* Good strings */ for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) Modified: trunk/rostests/winetests/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/cert.c?… ============================================================================== --- trunk/rostests/winetests/crypt32/cert.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/cert.c [iso-8859-1] Tue Mar 1 19:21:01 2016 @@ -3627,7 +3627,6 @@ "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); - ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Now add a CRL to the hCrlStore */ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… ============================================================================== --- trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/chain.c [iso-8859-1] Tue Mar 1 19:21:01 2016 @@ -2809,10 +2809,7 @@ checkTime->wDay, checkTime->wMonth, checkTime->wYear); ret = pCertGetCertificateChain(engine, endCert, &fileTime, includeStore ? store : NULL, &chainPara, flags, NULL, &chain); - if (todo & TODO_CHAIN) - todo_wine ok(ret, "Chain %d: CertGetCertificateChain failed: %08x\n", - testIndex, GetLastError()); - else + todo_wine_if (todo & TODO_CHAIN) ok(ret, "Chain %d: CertGetCertificateChain failed: %08x\n", testIndex, GetLastError()); CertFreeCertificateContext(endCert); @@ -2838,15 +2835,7 @@ "%s[%d], element [%d,%d]: expected error %08x, got %08x\n", testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); - else if (todo & TODO_ERROR) - todo_wine - ok(got->dwErrorStatus == expected->dwErrorStatus || - broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == - (expected->dwErrorStatus & ~ignore->dwErrorStatus)), - "%s[%d], element [%d,%d]: expected error %08x, got %08x\n", - testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, - got->dwErrorStatus); - else + else todo_wine_if (todo & TODO_ERROR) ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == (expected->dwErrorStatus & ~ignore->dwErrorStatus)), @@ -2859,15 +2848,7 @@ "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); - else if (todo & TODO_INFO) - todo_wine - ok(got->dwInfoStatus == expected->dwInfoStatus || - broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == - (expected->dwInfoStatus & ~ignore->dwInfoStatus)), - "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", - testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, - got->dwInfoStatus); - else + else todo_wine_if (todo & TODO_INFO) ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == (expected->dwInfoStatus & ~ignore->dwInfoStatus)), @@ -2881,11 +2862,7 @@ const CERT_TRUST_STATUS *ignore, DWORD todo, LPCSTR testName, DWORD testIndex, DWORD chainIndex) { - if (todo & TODO_ELEMENTS) - todo_wine ok(simpleChain->cElement == simpleChainStatus->cElement, - "%s[%d]: expected %d elements, got %d\n", testName, testIndex, - simpleChainStatus->cElement, simpleChain->cElement); - else + todo_wine_if (todo & TODO_ELEMENTS) ok(simpleChain->cElement == simpleChainStatus->cElement, "%s[%d]: expected %d elements, got %d\n", testName, testIndex, simpleChainStatus->cElement, simpleChain->cElement); @@ -2915,18 +2892,8 @@ ok(chain->cChain == chainStatus->cChain, "%s[%d]: expected %d simple chains, got %d\n", testName, testIndex, chainStatus->cChain, chain->cChain); - if (todo & TODO_ERROR && + todo_wine_if (todo & TODO_ERROR && chain->TrustStatus.dwErrorStatus != chainStatus->status.dwErrorStatus) - todo_wine ok(chain->TrustStatus.dwErrorStatus == - chainStatus->status.dwErrorStatus || - broken((chain->TrustStatus.dwErrorStatus & - ~chainStatus->statusToIgnore.dwErrorStatus) == - (chainStatus->status.dwErrorStatus & - ~chainStatus->statusToIgnore.dwErrorStatus)), - "%s[%d]: expected error %08x, got %08x\n", - testName, testIndex, chainStatus->status.dwErrorStatus, - chain->TrustStatus.dwErrorStatus); - else ok(chain->TrustStatus.dwErrorStatus == chainStatus->status.dwErrorStatus || broken((chain->TrustStatus.dwErrorStatus & @@ -2937,18 +2904,8 @@ "Verisign root certificate is available.\n", testName, testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); - if (todo & TODO_INFO && + todo_wine_if (todo & TODO_INFO && chain->TrustStatus.dwInfoStatus != chainStatus->status.dwInfoStatus) - todo_wine ok(chain->TrustStatus.dwInfoStatus == - chainStatus->status.dwInfoStatus || - broken((chain->TrustStatus.dwInfoStatus & - ~chainStatus->statusToIgnore.dwInfoStatus) == - (chainStatus->status.dwInfoStatus & - ~chainStatus->statusToIgnore.dwInfoStatus)), - "%s[%d]: expected info %08x, got %08x\n", - testName, testIndex, chainStatus->status.dwInfoStatus, - chain->TrustStatus.dwInfoStatus); - else ok(chain->TrustStatus.dwInfoStatus == chainStatus->status.dwInfoStatus || broken((chain->TrustStatus.dwInfoStatus & @@ -4411,16 +4368,7 @@ } if (ret) { - if (check->todo & TODO_ERROR) - todo_wine ok(policyStatus.dwError == check->status.dwError || - broken(policyStatus.dwError == CERT_TRUST_NO_ERROR) || - (check->brokenStatus && broken(policyStatus.dwError == - check->brokenStatus->dwError)), - "%s[%d](%s): expected %08x, got %08x\n", - testName, testIndex, - IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, - check->status.dwError, policyStatus.dwError); - else + todo_wine_if (check->todo & TODO_ERROR) ok(policyStatus.dwError == check->status.dwError || broken(policyStatus.dwError == CERT_TRUST_NO_ERROR) || (check->brokenStatus && broken(policyStatus.dwError == @@ -4438,16 +4386,7 @@ pCertFreeCertificateChain(chain); return; } - if (check->todo & TODO_CHAINS) - todo_wine ok(policyStatus.lChainIndex == - check->status.lChainIndex || - (check->brokenStatus && broken(policyStatus.lChainIndex == - check->brokenStatus->lChainIndex)), - "%s[%d](%s): expected %d, got %d\n", - testName, testIndex, - IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, - check->status.lChainIndex, policyStatus.lChainIndex); - else + todo_wine_if (check->todo & TODO_CHAINS) ok(policyStatus.lChainIndex == check->status.lChainIndex || (check->brokenStatus && broken(policyStatus.lChainIndex == check->brokenStatus->lChainIndex)), @@ -4455,21 +4394,12 @@ testName, testIndex, IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, check->status.lChainIndex, policyStatus.lChainIndex); - if (check->todo & TODO_ELEMENTS) - todo_wine ok(policyStatus.lElementIndex == - check->status.lElementIndex || + todo_wine_if (check->todo & TODO_ELEMENTS) + ok(policyStatus.lElementIndex == check->status.lElementIndex || (check->brokenStatus && broken(policyStatus.lElementIndex == check->brokenStatus->lElementIndex)), "%s[%d](%s): expected %d, got %d\n", testName, testIndex, - IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, - check->status.lElementIndex, policyStatus.lElementIndex); - else - ok(policyStatus.lElementIndex == check->status.lElementIndex || - (check->brokenStatus && broken(policyStatus.lElementIndex == - check->brokenStatus->lElementIndex)), - testName, testIndex, - "%s[%d](%s): expected %d, got %d\n", IS_INTOID(policy) ? num_to_str(LOWORD(policy)) : policy, check->status.lElementIndex, policyStatus.lElementIndex); } Modified: trunk/rostests/winetests/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/store.c… ============================================================================== --- trunk/rostests/winetests/crypt32/store.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/store.c [iso-8859-1] Tue Mar 1 19:21:01 2016 @@ -317,11 +317,7 @@ ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_MEMORY, &blob, 0); ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); - if (todo) - todo_wine - ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, - blob.cbData); - else + todo_wine_if (todo) ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, blob.cbData); blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); @@ -330,10 +326,7 @@ ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_MEMORY, &blob, 0); ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); - if (todo) - todo_wine - ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); - else + todo_wine_if (todo) ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); HeapFree(GetProcessHeap(), 0, blob.pbData); } Modified: trunk/rostests/winetests/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/str.c?r… ============================================================================== --- trunk/rostests/winetests/crypt32/str.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/str.c [iso-8859-1] Tue Mar 1 19:21:01 2016 @@ -254,16 +254,7 @@ { ret = pCertRDNValueToStrA(attrs[i].dwValueType, &attrs[i].Value, buffer, sizeof(buffer)); - if (attrs[i].todo) - { - todo_wine - ok(ret == strlen(attrs[i].str) + 1, "Expected length %d, got %d\n", - lstrlenA(attrs[i].str) + 1, ret); - todo_wine - ok(!strcmp(buffer, attrs[i].str), "Expected %s, got %s\n", - attrs[i].str, buffer); - } - else + todo_wine_if (attrs[i].todo) { ok(ret == strlen(attrs[i].str) + 1, "Expected length %d, got %d\n", lstrlenA(attrs[i].str) + 1, ret); @@ -359,16 +350,7 @@ { ret = pCertRDNValueToStrW(attrs[i].dwValueType, &attrs[i].Value, buffer, sizeof(buffer) / sizeof(buffer[0])); - if (attrs[i].todo) - { - todo_wine - ok(ret == lstrlenW(attrs[i].str) + 1, - "Expected length %d, got %d\n", lstrlenW(attrs[i].str) + 1, ret); - todo_wine - ok(!lstrcmpW(buffer, attrs[i].str), "Expected %s, got %s\n", - wine_dbgstr_w(attrs[i].str), wine_dbgstr_w(buffer)); - } - else + todo_wine_if (attrs[i].todo) { ok(ret == lstrlenW(attrs[i].str) + 1, "Expected length %d, got %d\n", lstrlenW(attrs[i].str) + 1, ret); @@ -394,27 +376,15 @@ DWORD i; i = pCertNameToStrA(X509_ASN_ENCODING, pName, dwStrType, NULL, 0); - if (todo) - todo_wine - ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", - lstrlenA(expected) + 1, i); - else + todo_wine_if (todo) ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", lstrlenA(expected) + 1, i); i = pCertNameToStrA(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer)); - if (todo) - todo_wine + todo_wine_if (todo) ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", lstrlenA(expected) + 1, i); - else - ok(i == strlen(expected) + 1, "Expected %d chars, got %d\n", - lstrlenA(expected) + 1, i); - if (todo) - todo_wine - ok(!strcmp(buffer, expected), "Expected %s, got %s\n", expected, - buffer); - else + todo_wine_if (todo) ok(!strcmp(buffer, expected), "Expected %s, got %s\n", expected, buffer); } @@ -577,24 +547,15 @@ DWORD i; i = pCertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, NULL, 0); - if (todo) - todo_wine ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", - lstrlenW(expected) + 1, i); - else + todo_wine_if (todo) ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", lstrlenW(expected) + 1, i); i = pCertNameToStrW(X509_ASN_ENCODING,pName, dwStrType, buffer, sizeof(buffer) / sizeof(buffer[0])); - if (todo) - todo_wine ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", - lstrlenW(expected) + 1, i); - else + todo_wine_if (todo) ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", lstrlenW(expected) + 1, i); - if (todo) - todo_wine ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", - wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); - else + todo_wine_if (todo) ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); }

8 years, 6 months

[akhaldi] 70851: [CRYPT32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:20:47 2016 New Revision: 70851 URL: http://svn.reactos.org/svn/reactos?rev=70851&view=rev Log: [CRYPT32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/crypt32/chain.c trunk/reactos/dll/win32/crypt32/str.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Tue Mar 1 19:20:47 2016 @@ -2286,7 +2286,10 @@ chain->context.dwRevocationFreshnessTime = 0; } else + { + CRYPT_FreeSimpleChain(simpleChain); ret = FALSE; + } *ppChain = chain; } return ret; Modified: trunk/reactos/dll/win32/crypt32/str.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Tue Mar 1 19:20:47 2016 @@ -760,7 +760,7 @@ { WCHAR buf[10]; /* big enough for L"GivenName" */ LPWSTR keyName; /* usually = buf, but may be allocated */ - DWORD keyLen; + DWORD keyLen; /* full available buffer size in WCHARs */ }; static void CRYPT_InitializeKeynameKeeper(struct KeynameKeeper *keeper) @@ -786,17 +786,13 @@ { DWORD len = key->end - key->start; - if (len > keeper->keyLen) - { - if (keeper->keyName == keeper->buf) - keeper->keyName = CryptMemAlloc(len * sizeof(WCHAR)); - else - keeper->keyName = CryptMemRealloc(keeper->keyName, - len * sizeof(WCHAR)); - keeper->keyLen = len; - } - memcpy(keeper->keyName, key->start, (key->end - key->start) * - sizeof(WCHAR)); + if (len >= keeper->keyLen) + { + CRYPT_FreeKeynameKeeper( keeper ); + keeper->keyLen = len + 1; + keeper->keyName = CryptMemAlloc(keeper->keyLen * sizeof(WCHAR)); + } + memcpy(keeper->keyName, key->start, len * sizeof(WCHAR)); keeper->keyName[len] = '\0'; TRACE("Keyname is %s\n", debugstr_w(keeper->keyName)); } 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] Tue Mar 1 19:20:47 2016 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.4 reactos/dll/win32/compstui # Synced to WineStaging-1.7.55 reactos/dll/win32/credui # Synced to WineStaging-1.7.55 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.4 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.55 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.55

8 years, 6 months

[akhaldi] 70850: [README.WINE] Mark the remaining DX modules as synced with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:13:32 2016 New Revision: 70850 URL: http://svn.reactos.org/svn/reactos?rev=70850&view=rev Log: [README.WINE] Mark the remaining DX modules as synced with Wine Staging 1.9.4. CORE-10912 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] Tue Mar 1 19:13:32 2016 @@ -21,24 +21,24 @@ The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.4 +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/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.7.55 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.4 +reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4

8 years, 6 months

[akhaldi] 70849: [COMDLG32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:12:27 2016 New Revision: 70849 URL: http://svn.reactos.org/svn/reactos?rev=70849&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/comdlg32/filedlg.c Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Tue Mar 1 19:12:27 2016 @@ -403,8 +403,7 @@ } else if( count == 1){ resize = resize_testcases[index].resize_check; GetWindowRect( parent, &rc); - if( resize_testcases[index].todo){ - todo_wine { + todo_wine_if( resize_testcases[index].todo){ ok( resize == rc.right - rc.left - initrc.right + initrc.left, "testid %d size-x change %d expected %d\n", index, rc.right - rc.left - initrc.right + initrc.left, resize); @@ -412,14 +411,6 @@ "testid %d size-y change %d expected %d\n", index, rc.bottom - rc.top - initrc.bottom + initrc.top, resize); } - }else{ - ok( resize == rc.right - rc.left - initrc.right + initrc.left, - "testid %d size-x change %d expected %d\n", index, - rc.right - rc.left - initrc.right + initrc.left, resize); - ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, - "testid %d size-y change %d expected %d\n", index, - rc.bottom - rc.top - initrc.bottom + initrc.top, resize); - } if( resize_testcases[index].testcontrols) { int i; RECT rc; @@ -789,7 +780,7 @@ ok( wrcParent.right - wrcParent.left == expectx, "Wrong width of dialog %d, expected %d\n", wrcParent.right - wrcParent.left, expectx); - } else todo_wine { + } else { /* with the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top > expecty, "Wrong height of dialog %d, expected more than %d\n",

8 years, 6 months

[akhaldi] 70848: [COMDLG32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:11:55 2016 New Revision: 70848 URL: http://svn.reactos.org/svn/reactos?rev=70848&view=rev Log: [COMDLG32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/itemdlg.c trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/comdlg32/resource.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/fontdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/fontdlg.c [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -34,6 +34,7 @@ static const WCHAR strWineFontData_a[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','_','A',0}; static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0}; +static const WCHAR fontsizefmtW[] = {'%','d',0}; /* image list with TrueType bitmaps and more */ static HIMAGELIST himlTT = 0; @@ -400,16 +401,15 @@ { int j; WCHAR buffer[20]; - static const WCHAR strFormat[] = {'%','2','d',0}; if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax))) { - wsprintfW(buffer, strFormat, h); + sprintfW(buffer, fontsizefmtW, h); j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer); if (j==CB_ERR) { - j=SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer); + j=SendMessageW(hwnd, CB_INSERTSTRING, -1, (LPARAM)buffer); if (j!=CB_ERR) j = SendMessageW(hwnd, CB_SETITEMDATA, j, h); if (j==CB_ERR) return TRUE; } @@ -515,10 +515,11 @@ return 1 ; } -static BOOL CFn_FitFontSize( HWND hDlg, int points) -{ +static void CFn_FitFontSize( HWND hDlg, int points) +{ + WCHAR buffW[16]; int i,n; - BOOL ret = FALSE; + /* look for fitting font size in combobox3 */ n=SendDlgItemMessageW(hDlg, cmb3, CB_GETCOUNT, 0, 0); for (i=0;i<n;i++) @@ -530,11 +531,13 @@ SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb3, CBN_SELCHANGE), (LPARAM)GetDlgItem(hDlg,cmb3)); - ret = TRUE; - break; - } - } - return ret; + return; + } + } + + /* no default matching size, set text manually */ + sprintfW(buffW, fontsizefmtW, points); + SetDlgItemTextW(hDlg, cmb3, buffW); } static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle ) @@ -737,6 +740,9 @@ SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), (LPARAM)GetDlgItem(hDlg,cmb5)); } + /* limit text length user can type in as font size */ + SendDlgItemMessageW(hDlg, cmb3, CB_LIMITTEXT, 5, 0); + if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle) { j=SendDlgItemMessageW(hDlg,cmb2,CB_FINDSTRING,-1,(LPARAM)lpcf->lpszStyle); @@ -886,6 +892,31 @@ return TRUE; } +static INT get_dialog_font_point_size(HWND hDlg, CHOOSEFONTW *cf) +{ + BOOL invalid_size = FALSE; + INT i, size; + + i = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0); + if (i != CB_ERR) + size = LOWORD(SendDlgItemMessageW(hDlg, cmb3, CB_GETITEMDATA , i, 0)); + else + { + WCHAR buffW[8], *endptrW; + + GetDlgItemTextW(hDlg, cmb3, buffW, sizeof(buffW)/sizeof(*buffW)); + size = strtolW(buffW, &endptrW, 10); + invalid_size = size == 0 && *endptrW; + + if (size == 0) + size = 10; + } + + cf->iPointSize = 10 * size; + cf->lpLogFont->lfHeight = -MulDiv(cf->iPointSize, GetScreenDPI(), 720); + return invalid_size ? -1 : size; +} + /*********************************************************************** * CFn_WMCommand [internal] */ @@ -959,9 +990,11 @@ LPLOGFONTW lpxx=lpcf->lpLogFont; TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam); + + /* face name */ i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0); if (i==CB_ERR) - i=GetDlgItemTextW( hDlg, cmb1, str, 256 ); + GetDlgItemTextW( hDlg, cmb1, str, sizeof(str)/sizeof(str[0]) ); else { SendDlgItemMessageW(hDlg,cmb1,CB_GETLBTEXT,i, @@ -974,6 +1007,8 @@ lpxx->lfPitchAndFamily = HIWORD(l) >> 8; } lstrcpynW(lpxx->lfFaceName, str, sizeof(lpxx->lfFaceName)/sizeof(lpxx->lfFaceName[0])); + + /* style */ i=SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); if (i!=CB_ERR) { @@ -983,14 +1018,11 @@ if ((lpxx->lfWeight=LOWORD(l)) > FW_MEDIUM) lpcf->nFontType |= BOLD_FONTTYPE; } - i=SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0); - if( i != CB_ERR) - lpcf->iPointSize = 10 * LOWORD(SendDlgItemMessageW(hDlg, cmb3, - CB_GETITEMDATA , i, 0)); - else - lpcf->iPointSize = 100; - lpxx->lfHeight = - MulDiv( lpcf->iPointSize , - GetScreenDPI(), 720); + + /* size */ + get_dialog_font_point_size(hDlg, lpcf); + + /* charset */ i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0); if (i!=CB_ERR) lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); @@ -1037,6 +1069,18 @@ break; case IDOK: + { + WCHAR msgW[80]; + INT pointsize; + + pointsize = get_dialog_font_point_size(hDlg, lpcf); + if (pointsize == -1) + { + LoadStringW(COMDLG32_hInstance, IDS_FONT_SIZE_INPUT, msgW, sizeof(msgW)/sizeof(*msgW)); + MessageBoxW(hDlg, msgW, NULL, MB_OK | MB_ICONINFORMATION); + return TRUE; + } + if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ( (lpcf->Flags & CF_LIMITSIZE) && (lpcf->iPointSize >= 10 * lpcf->nSizeMin) && @@ -1044,18 +1088,18 @@ EndDialog(hDlg, TRUE); else { - WCHAR buffer[80]; WCHAR format[80]; DWORD_PTR args[2]; LoadStringW(COMDLG32_hInstance, IDS_FONT_SIZE, format, sizeof(format)/sizeof(WCHAR)); args[0] = lpcf->nSizeMin; args[1] = lpcf->nSizeMax; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - format, 0, 0, buffer, sizeof(buffer)/sizeof(*buffer), + format, 0, 0, msgW, sizeof(msgW)/sizeof(*msgW), (__ms_va_list*)args); - MessageBoxW(hDlg, buffer, NULL, MB_OK); + MessageBoxW(hDlg, msgW, NULL, MB_OK); } return(TRUE); + } case IDCANCEL: EndDialog(hDlg, FALSE); return(TRUE); Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -372,13 +372,13 @@ lstrcpyW(*str, This->set_filename); return len; } - return FALSE; + return 0; } len = SendMessageW(hwnd_edit, WM_GETTEXTLENGTH, 0, 0); *str = CoTaskMemAlloc(sizeof(WCHAR)*(len+1)); if(!*str) - return FALSE; + return 0; SendMessageW(hwnd_edit, WM_GETTEXT, len+1, (LPARAM)*str); return len; Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Ð¡ÑÑÑÐ°Ð½Ð¸ ÐºÐ°ÑÐ¾" IDS_OPEN_FILE "ÐÑÐ²Ð¾ÑÐ¸ ÑÐ°Ð¹Ð»" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Anomenar i Desar" IDS_OPEN_FILE "Obre Fitxer" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "UloÅ¾ pod jmÃ©nem" IDS_OPEN_FILE "OtevÅÃt soubor" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Gem som" IDS_OPEN_FILE "Ãben fil" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Speichern als" IDS_OPEN_FILE "Ãffne Datei" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏ" IDS_OPEN_FILE "ÎÎ½Î¿Î¹Î³Î¼Î± ÎÏÏÎµÎ¯Î¿Ï" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Save As" IDS_OPEN_FILE "Open File" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* @@ -432,7 +433,7 @@ GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX + GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&eft:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Right:", stc16, 159, 172, 30, 8 @@ -477,14 +478,19 @@ CAPTION "Open" FONT 8, "MS Shell Dlg" { - LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP - - LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + LTEXT "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL + + LTEXT "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | - CBS_HASSTRINGS | CBS_DROPDOWNLIST - - DEFPUSHBUTTON "&Open", IDOK, 350, 240, 40, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 395, 240, 40, 14 - PUSHBUTTON "&Help", pshHelp, 350, 272, 40, 14 -} + WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&Open", IDOK, 350, 240, 32, 14, WS_GROUP | WS_CLIPSIBLINGS + + /* drop-down menu for open button */ + CONTROL "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP | + BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14 + + PUSHBUTTON "Cancel", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS + PUSHBUTTON "&Help", pshHelp, 350, 272, 40, 14, WS_CLIPSIBLINGS +} Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Konservu" IDS_OPEN_FILE "Malfermu Dosieron" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "&Guardar como" IDS_OPEN_FILE "Abrir archivo" IDS_SELECT_FOLDER "Elegir carpeta" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Tallenna nimellÃ¤" IDS_OPEN_FILE "Avaa tiedosto" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Enregistrer" IDS_OPEN_FILE "Ouvrir le fichier" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "×©×××¨× ××©×" IDS_OPEN_FILE "×¤×ª×××ª ×§×××¥" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "MentÃ©s mÃ¡skÃ©nt" IDS_OPEN_FILE "FÃ¡jl megnyitÃ¡sa" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Salva con nome" IDS_OPEN_FILE "Apri file" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "ååãä»ãã¦ä¿å" IDS_OPEN_FILE "ãã¡ã¤ã«ãéã" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "ë¤ë¥¸ ì´ë¦ì¼ë¡ ì ì¥" IDS_OPEN_FILE "íì¼ ì´ê¸°" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "IÅ¡saugoti kaip" IDS_OPEN_FILE "Atverti failÄ" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -137,6 +137,7 @@ IDS_SAVE_AS "&Opslaan als" IDS_OPEN_FILE "Open bestand" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Lagre som" IDS_OPEN_FILE "Ãpne fil" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Zapisz jako" IDS_OPEN_FILE "OtwÃ³rz plik" IDS_SELECT_FOLDER "Wybierz folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Gravar Como" IDS_OPEN_FILE "Abrir Ficheiro" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -140,6 +140,7 @@ IDS_SAVE_AS "PÄstrare Ã®n:" IDS_OPEN_FILE "Deschidere fiÈier" IDS_SELECT_FOLDER "SeleceazÄ dosar" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº" IDS_OPEN_FILE "ÐÑÐºÑÑÑÑ ÑÐ°Ð¹Ð»" IDS_SELECT_FOLDER "ÐÑÐ±ÑÐ°ÑÑ Ð¿Ð°Ð¿ÐºÑ" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "Shrani kot" IDS_OPEN_FILE "Odpri datoteko" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "UloÅ¾iÅ¥ ako" IDS_OPEN_FILE "OtvoriÅ¥ sÃºbor" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -142,6 +142,7 @@ IDS_SAVE_AS "Ruaj si " IDS_OPEN_FILE "Hap" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "SaÄuvaj kao" IDS_OPEN_FILE "Otvori datoteku" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -137,6 +137,7 @@ IDS_SAVE_AS "Spara som" IDS_OPEN_FILE "Ãppna fil" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -137,6 +137,7 @@ IDS_SAVE_AS "à¸à¸±à¸à¸à¸·à¸" IDS_OPEN_FILE "à¹à¸à¹à¸¡" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -137,6 +137,7 @@ IDS_SAVE_AS "AyrÄ± Sakla" IDS_OPEN_FILE "KÃ¼tÃ¼k AÃ§" IDS_SELECT_FOLDER "Dizin SeÃ§" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "å¦åæ°æª" IDS_OPEN_FILE "éåæªæ¡" IDS_SELECT_FOLDER "é¸æè³æå¤¾" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐº" IDS_OPEN_FILE "ÐÑÐ´ÐºÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð»" IDS_SELECT_FOLDER "Select Folder" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -138,6 +138,7 @@ IDS_SAVE_AS "å¦åä¸º" IDS_OPEN_FILE "æå¼æä»¶" IDS_SELECT_FOLDER "éæ©æä»¶å¤¹" + IDS_FONT_SIZE_INPUT "Font size has to be a number." } /* Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -4104,7 +4104,7 @@ hr = E_FAIL; lppd->hDevMode = update_devmode_handleA(lppd->hDevMode, dm); - if (!hr && lppd->hDevMode) { + if (hr == S_OK && lppd->hDevMode) { if (lppd->Flags & PD_RETURNDC) { lppd->hDC = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); if (!lppd->hDC) @@ -4252,7 +4252,7 @@ hr = E_FAIL; lppd->hDevMode = update_devmode_handleW(lppd->hDevMode, dm); - if (!hr && lppd->hDevMode) { + if (hr == S_OK && lppd->hDevMode) { if (lppd->Flags & PD_RETURNDC) { lppd->hDC = CreateDCW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm); if (!lppd->hDC) Modified: trunk/reactos/dll/win32/comdlg32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/resourc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/resource.h [iso-8859-1] Tue Mar 1 19:11:55 2016 @@ -126,12 +126,13 @@ #define IDC_COLOR_GL 727 #define IDC_COLOR_BL 728 -#define IDS_FONT_SIZE 1200 -#define IDS_SAVE_BUTTON 1201 -#define IDS_SAVE_IN 1202 -#define IDS_SAVE 1203 -#define IDS_SAVE_AS 1204 -#define IDS_OPEN_FILE 1205 -#define IDS_SELECT_FOLDER 1206 +#define IDS_FONT_SIZE 1200 +#define IDS_SAVE_BUTTON 1201 +#define IDS_SAVE_IN 1202 +#define IDS_SAVE 1203 +#define IDS_SAVE_AS 1204 +#define IDS_OPEN_FILE 1205 +#define IDS_SELECT_FOLDER 1206 +#define IDS_FONT_SIZE_INPUT 1207 #define IDS_FAKEDOCTEXT 1300 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] Tue Mar 1 19:11:55 2016 @@ -55,7 +55,7 @@ reactos/dll/win32/clusapi # Synced to WineStaging-1.7.55 reactos/dll/win32/comcat # Synced to WineStaging-1.7.55 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.4 -reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.4 reactos/dll/win32/compstui # Synced to WineStaging-1.7.55 reactos/dll/win32/credui # Synced to WineStaging-1.7.55 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.55

8 years, 6 months

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 March 2016