Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[akhaldi] 55067: [XDK] * Massive annotations commit. Dedicated to Timo.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:43:53 2012 New Revision: 55067 URL: http://svn.reactos.org/svn/reactos?rev=55067&view=rev Log: [XDK] * Massive annotations commit. Dedicated to Timo. Modified: trunk/reactos/include/xdk/ccfuncs.h trunk/reactos/include/xdk/cctypes.h trunk/reactos/include/xdk/cmfuncs.h trunk/reactos/include/xdk/cmtypes.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/extypes.h trunk/reactos/include/xdk/fsrtlfuncs.h trunk/reactos/include/xdk/fsrtltypes.h trunk/reactos/include/xdk/halfuncs.h trunk/reactos/include/xdk/haltypes.h trunk/reactos/include/xdk/interlocked.h trunk/reactos/include/xdk/iofuncs.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/include/xdk/kdfuncs.h trunk/reactos/include/xdk/kdtypes.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/mmfuncs.h trunk/reactos/include/xdk/mmtypes.h trunk/reactos/include/xdk/ntddk.template.h trunk/reactos/include/xdk/ntifs.template.h trunk/reactos/include/xdk/nttmapi.h trunk/reactos/include/xdk/obfuncs.h trunk/reactos/include/xdk/obtypes.h trunk/reactos/include/xdk/pofuncs.h trunk/reactos/include/xdk/potypes.h trunk/reactos/include/xdk/psfuncs.h trunk/reactos/include/xdk/pstypes.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/include/xdk/rtltypes.h trunk/reactos/include/xdk/sefuncs.h trunk/reactos/include/xdk/setypes.h trunk/reactos/include/xdk/wdm.template.h trunk/reactos/include/xdk/wmifuncs.h trunk/reactos/include/xdk/wmitypes.h trunk/reactos/include/xdk/x86/ke.h trunk/reactos/include/xdk/zwfuncs.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/xdk/ccfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ccfuncs.h?rev=… Modified: trunk/reactos/include/xdk/cctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/cctypes.h?rev=… Modified: trunk/reactos/include/xdk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/cmfuncs.h?rev=… Modified: trunk/reactos/include/xdk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/cmtypes.h?rev=… Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… Modified: trunk/reactos/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/extypes.h?rev=… Modified: trunk/reactos/include/xdk/fsrtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtlfuncs.h?r… Modified: trunk/reactos/include/xdk/fsrtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtltypes.h?r… Modified: trunk/reactos/include/xdk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/halfuncs.h?rev… Modified: trunk/reactos/include/xdk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/haltypes.h?rev… Modified: trunk/reactos/include/xdk/interlocked.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/interlocked.h?… Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=… Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… Modified: trunk/reactos/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdfuncs.h?rev=… Modified: trunk/reactos/include/xdk/kdtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdtypes.h?rev=… Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… Modified: trunk/reactos/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmfuncs.h?rev=… Modified: trunk/reactos/include/xdk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmtypes.h?rev=… Modified: trunk/reactos/include/xdk/ntddk.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntddk.template… Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… Modified: trunk/reactos/include/xdk/nttmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/nttmapi.h?rev=… Modified: trunk/reactos/include/xdk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obfuncs.h?rev=… Modified: trunk/reactos/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obtypes.h?rev=… Modified: trunk/reactos/include/xdk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pofuncs.h?rev=… Modified: trunk/reactos/include/xdk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/potypes.h?rev=… Modified: trunk/reactos/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/psfuncs.h?rev=… Modified: trunk/reactos/include/xdk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/pstypes.h?rev=… Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… Modified: trunk/reactos/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtltypes.h?rev… Modified: trunk/reactos/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sefuncs.h?rev=… Modified: trunk/reactos/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/setypes.h?rev=… Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… Modified: trunk/reactos/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wmifuncs.h?rev… Modified: trunk/reactos/include/xdk/wmitypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wmitypes.h?rev… Modified: trunk/reactos/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/x86/ke.h?rev=5… Modified: trunk/reactos/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/zwfuncs.h?rev=…

1 0

[akhaldi] 55066: [MSI] * Adopt a compatible syntax for the resource file.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:33:44 2012 New Revision: 55066 URL: http://svn.reactos.org/svn/reactos?rev=55066&view=rev Log: [MSI] * Adopt a compatible syntax for the resource file. Modified: trunk/reactos/dll/win32/msi/msi.rc Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=5… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rc [iso-8859-1] Sun Jan 22 14:33:44 2012 @@ -27,33 +27,33 @@ 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "path %s not found" 9 "insert disk %s" - 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parameter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|product_code} [property]\n" \ - "\t/package {package|product_code} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|product_code} [property]\n" \ - "\t/x {package|product_code} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patch_package [property]\n" \ - "\t/p patch_package /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ - "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ - "\t/y\n" \ - "Unregister MSI Service:\n" \ - "\t/z\n" \ - "Display this help:\n" \ - "\t/help\n" \ - "\t/?\n" + 10 "Windows Installer %s\n\n\ +Usage:\n\ +msiexec command {required parameter} [optional parameter]\n\n\ +Install a product:\n\ +\t/i {package|product_code} [property]\n\ +\t/package {package|product_code} [property]\n\ +\t/a package [property]\n\ +Repair an installation:\n\ +\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n\ +Uninstall a product:\n\ +\t/uninstall {package|product_code} [property]\n\ +\t/x {package|product_code} [property]\n\ +Advertise a product:\n\ +\t/j[u|m] package [/t transform] [/g languageid]\n\ +Apply a patch:\n\ +\t/p patch_package [property]\n\ +\t/p patch_package /a package [property]\n\ +Log and UI Modifiers for above commands:\n\ +\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n\ +\t/q{|n|b|r|f|n+|b+|b-}\n\ +Register MSI Service:\n\ +\t/y\n\ +Unregister MSI Service:\n\ +\t/z\n\ +Display this help:\n\ +\t/help\n\ +\t/?\n" 11 "enter which folder contains %s" 12 "install source for feature missing" 13 "network drive for feature missing"

1 0

[akhaldi] 55065: [MSHTML] * Adopt a compatible syntax for the resource files.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:32:11 2012 New Revision: 55065 URL: http://svn.reactos.org/svn/reactos?rev=55065&view=rev Log: [MSHTML] * Adopt a compatible syntax for the resource files. Modified: trunk/reactos/dll/win32/mshtml/Bg.rc trunk/reactos/dll/win32/mshtml/Da.rc trunk/reactos/dll/win32/mshtml/De.rc trunk/reactos/dll/win32/mshtml/En.rc trunk/reactos/dll/win32/mshtml/Es.rc trunk/reactos/dll/win32/mshtml/Fr.rc trunk/reactos/dll/win32/mshtml/Hu.rc trunk/reactos/dll/win32/mshtml/It.rc trunk/reactos/dll/win32/mshtml/Ja.rc trunk/reactos/dll/win32/mshtml/Ko.rc trunk/reactos/dll/win32/mshtml/Lt.rc trunk/reactos/dll/win32/mshtml/Nl.rc trunk/reactos/dll/win32/mshtml/No.rc trunk/reactos/dll/win32/mshtml/Pl.rc trunk/reactos/dll/win32/mshtml/Pt.rc trunk/reactos/dll/win32/mshtml/Ro.rc trunk/reactos/dll/win32/mshtml/Ru.rc trunk/reactos/dll/win32/mshtml/Si.rc trunk/reactos/dll/win32/mshtml/Sv.rc trunk/reactos/dll/win32/mshtml/Tr.rc trunk/reactos/dll/win32/mshtml/Uk.rc trunk/reactos/dll/win32/mshtml/Zh.rc trunk/reactos/dll/win32/mshtml/rsrc.rc Modified: trunk/reactos/dll/win32/mshtml/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Bg.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Bg.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -33,9 +33,9 @@ CAPTION "Wine Gecko Installer" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Íàïðåäúê", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "Èíñòàëèðàé", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Da.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Da.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -38,9 +38,9 @@ CAPTION "Installere Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine kunne ikke finde Gecko Pakken, som er nÃ¸dvendig for at fÃ¥ applikationers indlejringaf HTML til at fungere korrekt. " \ - "Wine kan automatisk downloade, og installere det for dig.\n\n" \ - "BemÃ¦rk: Det anbefales at bruge distributions pakker i stedet. Se http://wiki.winehq.org/Gecko for flere detaljer.", + LTEXT "Wine kunne ikke finde Gecko Pakken, som er nÃ¸dvendig for at fÃ¥ applikationers indlejringaf HTML til at fungere korrekt. Wine kan automatisk downloade, og installere det for dig.\n\ +\n\ +BemÃ¦rk: Det anbefales at bruge distributions pakker i stedet. Se http://wiki.winehq.org/Gecko for flere detaljer.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Fremgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/De.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/De.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -37,11 +37,10 @@ CAPTION "Wine-Gecko-Installation" FONT 8, "MS Shell Dlg" { - LTEXT "Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit eingebettetem HTML benÃ¶tigt, " \ - "damit diese richtig funktionieren.\n" \ - "Wine kann das Paket fÃ¼r Sie herunterladen und installieren.\n\n" \ - "Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. " \ - "Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko", + LTEXT "Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit eingebettetem HTML benÃ¶tigt, damit diese richtig funktionieren.\n\ +Wine kann das Paket fÃ¼r Sie herunterladen und installieren.\n\ +\n\ +Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/En.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -33,9 +33,9 @@ CAPTION "Wine Gecko Installer" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Es.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Es.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -35,9 +35,9 @@ CAPTION "Instalador de Gecko de Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progreso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Fr.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -40,11 +40,10 @@ CAPTION "Programme d'installation de Gecko pour Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Wine n'a pu trouver de paquet Gecko, qui est nÃ©cessaire pour que les applications "\ - "incorporant du HTML puissent fonctionner correctement.\nWine peut automatiquement "\ - "le tÃ©lÃ©charger et l'installer pour vous.\n\n" \ - "Note : il est recommandÃ© d'utiliser le paquet de votre distribution si disponible. " \ - "Consultez http://wiki.winehq.org/Gecko pour plus de dÃ©tails.", + LTEXT "Wine n'a pu trouver de paquet Gecko, qui est nÃ©cessaire pour que les applications incorporant du HTML puissent fonctionner correctement.\n\ +Wine peut automatiquement le tÃ©lÃ©charger et l'installer pour vous.\n\ +\n\ +Note : il est recommandÃ© d'utiliser le paquet de votre distribution si disponible. Consultez http://wiki.winehq.org/Gecko pour plus de dÃ©tails.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 85, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Hu.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Hu.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -36,9 +36,9 @@ CAPTION "Wine Gecko Installer" FONT 8, "MS Shell Dlg" { - LTEXT "A Wine nem talÃ¡lt Gecko csomagot, ami ahhoz szÃ¼ksÃ©ges hogy a HTML-t beÃ¡gyazÃ³ alkalmazÃ¡sok " \ - "megfelelÅen mÅ±kÃ¶djenek. A Wine ezt automatikusan letÃ¶ltheti Ã©s feltelepÃtheti Ãnnek.\n\n" \ - "MegjegyzÃ©s: AjÃ¡nlott a disztribÃºciÃ³ csomagjÃ¡nak hasznÃ¡lata ez helyet. LÃ¡sd a http://wiki.winehq.org/Gecko cÃmet a rÃ©szletekÃ©rt.", + LTEXT "A Wine nem talÃ¡lt Gecko csomagot, ami ahhoz szÃ¼ksÃ©ges hogy a HTML-t beÃ¡gyazÃ³ alkalmazÃ¡sok megfelelÅen mÅ±kÃ¶djenek. A Wine ezt automatikusan letÃ¶ltheti Ã©s feltelepÃtheti Ãnnek.\n\ +\n\ +MegjegyzÃ©s: AjÃ¡nlott a disztribÃºciÃ³ csomagjÃ¡nak hasznÃ¡lata ez helyet. LÃ¡sd a http://wiki.winehq.org/Gecko cÃmet a rÃ©szletekÃ©rt.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Folyamat", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&TelepÃtÃ©s", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/It.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/It.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -36,9 +36,9 @@ CAPTION "Installer di Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine non ha trovato un pacchetto Gecko che Ã¨ necessario per applicazioni che incorporano HTML " \ - "per funzionare correttamente. Wine puÃ² automaticamente scaricarlo ed installarlo per te.\n\n" \ - "Nota: Ã¨ raccomandato usare i pacchetti delle distribuzioni. Leggi http://wiki.winehq.org/Gecko per i dettagli.", + LTEXT "Wine non ha trovato un pacchetto Gecko che Ã¨ necessario per applicazioni che incorporano HTML per funzionare correttamente. Wine puÃ² automaticamente scaricarlo ed installarlo per te.\n\ +\n\ +Nota: Ã¨ raccomandato usare i pacchetti delle distribuzioni. Leggi http://wiki.winehq.org/Gecko per i dettagli.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Avanzamento", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installa", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ja.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Ja.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -36,9 +36,9 @@ CAPTION "Wine Gecko ã¤ã³ã¹ãã¼ã©" FONT 9, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "ã¤ã³ã¹ãã¼ã«(&I)", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ko.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Ko.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -34,9 +34,9 @@ CAPTION "Wine Gecko ¼³Ä¡ Ç®±×¸²" FONT 9, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "ÁøÇàÁß", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "¼³Ä¡(&I)", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Lt.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Lt.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -36,9 +36,9 @@ CAPTION "Wine Gecko diegimo programa" FONT 8, "MS Shell Dlg" { - LTEXT "Wine nepavyko rasti Gecko paketo reikalingo programoms Ä¯terpianÄioms HTML " \ - "teisingai veikti. Wine gali automatiÅ¡kai atsiÅ³sti ir Ä¯diegti Å¡Ä¯ paketÄ.\n\n" \ - "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos http://wiki.winehq.org/Gecko.", + LTEXT "Wine nepavyko rasti Gecko paketo reikalingo programoms Ä¯terpianÄioms HTML teisingai veikti. Wine gali automatiÅ¡kai atsiÅ³sti ir Ä¯diegti Å¡Ä¯ paketÄ.\n\ +\n\ +Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 DEFPUSHBUTTON "&Ä®diegti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Nl.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Nl.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -35,9 +35,9 @@ CAPTION "Wine-Gecko-Installatie" FONT 8, "MS Shell Dlg" { - LTEXT "Wine kon geen Gecko pakket vinden. Gecko is nodig voor programma's die gebruik maken " \ - "van embedded HTML. Wine kan het automatisch voor u downloaden en installeren.\n\n" \ - "Noot: het is aanbevolen om distro pakketten te gebruiken. Zie http://wiki.winehq.org/Gecko voor details.", + LTEXT "Wine kon geen Gecko pakket vinden. Gecko is nodig voor programma's die gebruik maken van embedded HTML. Wine kan het automatisch voor u downloaden en installeren.\n\ +\n\ +Noot: het is aanbevolen om distro pakketten te gebruiken. Zie http://wiki.winehq.org/Gecko voor details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Voortgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/No.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/No.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -37,9 +37,9 @@ CAPTION "Installere Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Pl.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Pl.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -35,9 +35,9 @@ CAPTION "Instalator Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Nie znaleziono paczki Gecko potrzebnej do prawid³owego dzia³ania aplikacji " \ - "zawieraj¹cych kod HTML . Wine mo¿e automatycznie pobraæ i zainstalowaæ t¹ paczkê dla ciebie.\n\n" \ - "Uwaga: Lepiej jednak u¿yæ paczki z twojej dystrybucji. Po szczegó³y zajrzyj na http://wiki.winehq.org/Gecko.", + LTEXT "Nie znaleziono paczki Gecko potrzebnej do prawid³owego dzia³ania aplikacji zawieraj¹cych kod HTML . Wine mo¿e automatycznie pobraæ i zainstalowaæ t¹ paczkê dla ciebie.\n\ +\n\ +Uwaga: Lepiej jednak u¿yæ paczki z twojej dystrybucji. Po szczegó³y zajrzyj na http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Postêp", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Zainstaluj", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Pt.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Pt.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -49,9 +49,9 @@ CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "O Wine nÃ£o pÃ´de encontrar o pacote Gecko que Ã© necessÃ¡rio para aplicaÃ§Ãµes com HTML embutido " \ - "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalÃ¡-lo para vocÃª.\n\n" \ - "Nota: Ã© recomendÃ¡vel usar os pacotes da sua distribuiÃ§Ã£o ao invÃ©s disso. \n\ + LTEXT "O Wine nÃ£o pÃ´de encontrar o pacote Gecko que Ã© necessÃ¡rio para aplicaÃ§Ãµes com HTML embutido funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalÃ¡-lo para vocÃª.\n\ +\n\ +Nota: Ã© recomendÃ¡vel usar os pacotes da sua distribuiÃ§Ã£o ao invÃ©s disso.\n\ Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 60, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 @@ -66,10 +66,9 @@ CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "O Wine nÃ£o conseguiu encontrar o pacote Gecko que Ã© necessÃ¡rio para aplicaÃ§Ãµes com HTML embutido " \ - "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalÃ¡-lo por si.\n\n" \ - "Nota: Ã© recomendÃ¡vel usar os pacotes da sua distribuiÃ§Ã£o em vez disso. \n\ -Veja http://wiki.winehq.org/Gecko para mais detalhes.", + LTEXT "O Wine nÃ£o conseguiu encontrar o pacote Gecko que Ã© necessÃ¡rio para aplicaÃ§Ãµes com HTML embutido funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalÃ¡-lo por si.\n\n\ + Nota: Ã© recomendÃ¡vel usar os pacotes da sua distribuiÃ§Ã£o em vez disso. \n\ + Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ro.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Ro.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -36,9 +36,9 @@ CAPTION "Instalator Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progres", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&InstaleazÄ", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Ru.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Ru.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -36,11 +36,9 @@ CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð°ÐºÐµÑ Gecko, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ "\ - "Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹ HTML. " \ - "Wine Ð¼Ð¾Ð¶ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÐµÐ³Ð¾ Ð´Ð»Ñ Ð²Ð°Ñ.\n\n" \ - "ÐÑÐ¸Ð¼ÐµÑÐ°Ð½Ð¸Ðµ: ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð°ÐºÐµÑ, Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐ¹ Ð²Ð°ÑÐ¸Ð¼ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ð¾Ð¼. "\ - "ÐÐ¾ÑÐµÑÐ¸ÑÐµ http://wiki.winehq.org/Gecko Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸.", + LTEXT "Wine Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð°ÐºÐµÑ Gecko, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÐ¾Ð¹ HTML. Wine Ð¼Ð¾Ð¶ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÐµÐ³Ð¾ Ð´Ð»Ñ Ð²Ð°Ñ.\n\ +\n\ +ÐÑÐ¸Ð¼ÐµÑÐ°Ð½Ð¸Ðµ: ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð°ÐºÐµÑ, Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐ¹ Ð²Ð°ÑÐ¸Ð¼ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ð¾Ð¼. ÐÐ¾ÑÐµÑÐ¸ÑÐµ http://wiki.winehq.org/Gecko Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸.", ID_DWL_STATUS, 10, 10, 240, 70, SS_LEFT CONTROL "ÐÑÐ¾Ð³ÑÐµÑÑ", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 65, 240, 12 DEFPUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ", ID_DWL_INSTALL, 180, 85, 70, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Si.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Si.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -35,9 +35,9 @@ CAPTION "Namestitev Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Sv.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Sv.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -33,9 +33,9 @@ CAPTION "Wine Gecko Installationsprogram" FONT 8, "MS Shell Dlg" { - LTEXT "Wine kunde inte hitta paketet Gecko vilket krävs för att program med inbäddad HTML " \ - "ska fungera korrekt. Wine kan hämta och installera det automatiskt åt dig.\n\n" \ - "Obs: Du rekommenderas att använda din distributions paket i stället. Se http://wiki.winehq.org/Gecko för mer information.", + LTEXT "Wine kunde inte hitta paketet Gecko vilket krävs för att program med inbäddad HTML ska fungera korrekt. Wine kan hämta och installera det automatiskt åt dig.\n\ +\n\ +Obs: Du rekommenderas att använda din distributions paket i stället. Se http://wiki.winehq.org/Gecko för mer information.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Förlopp", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installera", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Tr.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Tr.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -33,9 +33,9 @@ CAPTION "Wine Gecko Kurucusu" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\ +\n\ +Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Ýlerleme", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Uk.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Uk.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -37,9 +37,9 @@ CAPTION "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÑÐ²Ð°Ñ Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð°ÐºÑÐ½Ð¾Ðº Gecko, ÑÐºÐ¸Ð¹ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð´Ð»Ñ ÐºÐ¾ÑÐµÐºÑÐ½Ð¾Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐºÑÐ² " \ - "Ð· Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¾Ñ HTML. Wine Ð¼Ð¾Ð¶Ðµ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ° Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¹Ð¾Ð³Ð¾ Ð´Ð»Ñ ÐÐ°Ñ.\n\n" \ - "ÐÐ°ÑÐ²Ð°Ð¶ÑÐµ: Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÑÑÑÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°ÑÐ¸ Ð¿Ð°ÐºÐµÑ Ð· Ð²Ð°ÑÐ¾Ð³Ð¾ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ñ. ÐÐµÑÐ°Ð»ÑÐ½ÑÑÐµ ÑÐ¸ÑÐ°Ð¹ÑÐµ http://wiki.winehq.org/Gecko.", + LTEXT "Wine Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð°ÐºÑÐ½Ð¾Ðº Gecko, ÑÐºÐ¸Ð¹ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð´Ð»Ñ ÐºÐ¾ÑÐµÐºÑÐ½Ð¾Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐºÑÐ² Ð· Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¾Ñ HTML. Wine Ð¼Ð¾Ð¶Ðµ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ° Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¹Ð¾Ð³Ð¾ Ð´Ð»Ñ ÐÐ°Ñ.\n\ +\n\ +ÐÐ°ÑÐ²Ð°Ð¶ÑÐµ: Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÑÑÑÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°ÑÐ¸ Ð¿Ð°ÐºÐµÑ Ð· Ð²Ð°ÑÐ¾Ð³Ð¾ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ñ. ÐÐµÑÐ°Ð»ÑÐ½ÑÑÐµ ÑÐ¸ÑÐ°Ð¹ÑÐµ http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "ÐÑÐ¾Ð³ÑÐµÑ", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/Zh.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/mshtml/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/Zh.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -39,8 +39,9 @@ CAPTION "Wine Gecko å®è£" FONT 9, "MS Shell Dlg" { - LTEXT "Wine æªæ¾å°å°ç¨äºæ¯æåµå¥ HTML ç Gecko å¼æãWine å¯ä»¥èªå¨å¹¶ä¸è½½å®è£å®ã\n\n" \ - "æ³¨æ: æ¨èæ¨å®è£ä¸ºåè¡çå®å¶çè½¯ä»¶åãå·ä½åç http://wiki.winehq.org/Geckoã", + LTEXT "Wine æªæ¾å°å°ç¨äºæ¯æåµå¥ HTML ç Gecko å¼æãWine å¯ä»¥èªå¨å¹¶ä¸è½½å®è£å®ã\n\ +\n\ +æ³¨æ: æ¨èæ¨å®è£ä¸ºåè¡çå®å¶çè½¯ä»¶åãå·ä½åç http://wiki.winehq.org/Geckoã", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "è¿åº¦", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "å®è£(&I)", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP @@ -87,9 +88,7 @@ CAPTION "Wine Gecko å®è£" FONT 9, "MS Shell Dlg" { - LTEXT "éåéç¨ç¨å¼è¦é¡¯ç¤ºä¸åHTML ç¶²é . Wine éè¦è£ä¸ Gecko (Mozilla HTML " \ - "engine)æè½é¡¯ç¤ºHTMLç¶²é . å¦æä½ æ³èªåä¸è¼åå®è£Geckoï¼" \ - "è«æ'å®è£'.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT + LTEXT "éåéç¨ç¨å¼è¦é¡¯ç¤ºä¸åHTML ç¶²é . Wine éè¦è£ä¸ Gecko (Mozilla HTML engine)æè½é¡¯ç¤ºHTMLç¶²é . å¦æä½ æ³èªåä¸è¼åå®è£Geckoï¼ è«æ'å®è£'.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "å®è£(&I)", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "åæ¶(&C)", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/rsrc.rc [iso-8859-1] Sun Jan 22 14:32:11 2012 @@ -59,7 +59,6 @@ #include "Uk.rc" #include "Zh.rc" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: mshtml.inf */

1 0

[akhaldi] 55064: [GDI32] * Fix a typo.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:24:23 2012 New Revision: 55064 URL: http://svn.reactos.org/svn/reactos?rev=55064&view=rev Log: [GDI32] * Fix a typo. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Sun Jan 22 14:24:23 2012 @@ -1784,7 +1784,7 @@ pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; } - if ( D3dBufferCallbacks.CanCreateD3DBuffer) + if (D3dBufferCallbacks.CreateD3DBuffer) { pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; }

1 0

[akhaldi] 55063: [PSDK] * Add some annotations.
by akhaldi＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: akhaldi Date: Sun Jan 22 14:15:04 2012 New Revision: 55063 URL: http://svn.reactos.org/svn/reactos?rev=55063&view=rev Log: [PSDK] * Add some annotations. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=550… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sun Jan 22 14:15:04 2012 @@ -308,6 +308,8 @@ #else #define _SA_Must_inspect_ #endif +#define _Old_(x) x +#define __AuToQuOtE _SA_annotes0(SAL_AuToQuOtE) /****************************************************************************** * Public macros * @@ -390,7 +392,14 @@ #define _At_buffer_(t, i, b, a) _SA_annotes3(SAL_at_buffer, t, i, b) _Group_(a) #define _Must_inspect_result_ _SA_Must_inspect_ _Check_return_ #define _Always_(annos) _Group_(annos) _On_failure_(annos) + +#if (_MSC_VER >= 1600) #define _Points_to_data_ _Pre_ _At_(*_Curr_, _SA_annotes1(SAL_mayBePointer, __no)) +#else +// FIXME +#define _Points_to_data_ +#endif + #define _Return_type_success_(expr) _Success_(expr) #define _Struct_size_bytes_(size) _Writable_bytes_(size) #define _Unchanged_(e) _At_(e, _Post_equal_to_(_Old_(e)) _Const_) @@ -940,6 +949,8 @@ #define _Result_nullonfailure_ _On_failure_(_Notref_ _SA_Deref_ _Post_null_) #define _Result_zeroonfailure_ _On_failure_(_Notref_ _SA_Deref_ _Out_range_(==, 0)) +#define __inner_callback _SA_annotes0(__callback) + #define _Ret_ _Ret_valid_ #define _Ret_bytecap_(size) _SA_Ret1_(__notnull_impl_notref) _SA_Ret1_(__bytecap_impl(size)) #define _Ret_bytecap_c_(size) _SA_Ret1_(__notnull_impl_notref) _SA_Ret1_(__bytecap_c_impl(size)) @@ -995,6 +1006,29 @@ #define _Deref_ret_opt_z_ _SA_Deref_ret1_(__maybenull_impl_notref) _SA_Ret1_(__zterm_impl) #define _Deref_ret_z_ _SA_Deref_ret1_(__notnull_impl_notref) _SA_Deref_ret1_(__zterm_impl) + +/* Additional annotation declarations */ +#define __ANNOTATION(fun) _SA_annotes0(SAL_annotation) void __SA_##fun +#define __PRIMOP(type, fun) _SA_annotes0(SAL_primop) type __SA_##fun; +#if (_MSC_VER < 1600) + +__ANNOTATION(SAL_satisfies(_In_ char);) + +#define _Inexpressible_(x) (x) + +#endif + +__ANNOTATION(SAL_constant(enum __SAL_YesNo);) +__ANNOTATION(SAL_TypeName(__AuToQuOtE char *)); + +__ANNOTATION(SAL_functionClassNew(_In_ char*);) +__PRIMOP(int, _In_function_class_(_In_ char*);) +#define _In_function_class_(x) _In_function_class_(#x) + +__ANNOTATION(SAL_interlocked(void);) + +__ANNOTATION(SAL_untrusted_data_source(__AuToQuOtE char *)); + #else /* _USE_ATTRIBUTES_FOR_SAL || _USE_DECLSPECS_FOR_SAL */ @@ -1567,6 +1601,7 @@ #define _Reserved_ #define _Result_nullonfailure_ #define _Result_zeroonfailure_ +#define __inner_callback #define _Ret_ #define _Ret_bound_ #define _Ret_bytecap_(size)

1 0

[pschweitzer] 55062: [MSI] Partly revert r55050. It should work without now
by pschweitzer＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: pschweitzer Date: Sun Jan 22 11:04:20 2012 New Revision: 55062 URL: http://svn.reactos.org/svn/reactos?rev=55062&view=rev Log: [MSI] Partly revert r55050. It should work without now Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Jan 22 11:04:20 2012 @@ -96,8 +96,6 @@ add_pch(msi msipriv.h) add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) -allow_warnings(msi) - endif(NOT MSVC) add_importlib_target(msi.spec)

1 0

[pschweitzer] 55061: [MSI] Delete useless file. Spotted by Thomas Faber
by pschweitzer＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: pschweitzer Date: Sun Jan 22 11:01:32 2012 New Revision: 55061 URL: http://svn.reactos.org/svn/reactos?rev=55061&view=rev Log: [MSI] Delete useless file. Spotted by Thomas Faber Removed: trunk/reactos/dll/win32/msi/join.c Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Jan 22 11:01:32 2012 @@ -34,7 +34,6 @@ handle.c insert.c install.c - join.c media.c msi.c msi_main.c Removed: trunk/reactos/dll/win32/msi/join.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/join.c?rev=5… ============================================================================== --- trunk/reactos/dll/win32/msi/join.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/join.c (removed) @@ -1,495 +1,0 @@ -/* - * Implementation of the Microsoft Installer (msi.dll) - * - * Copyright 2006 Mike McCormack for CodeWeavers - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "msi.h" -#include "msiquery.h" -#include "objbase.h" -#include "objidl.h" -#include "msipriv.h" -#include "query.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msidb); - -typedef struct tagJOINTABLE -{ - struct list entry; - MSIVIEW *view; - UINT columns; - UINT rows; - UINT next_rows; -} JOINTABLE; - -typedef struct tagMSIJOINVIEW -{ - MSIVIEW view; - MSIDATABASE *db; - struct list tables; - UINT columns; - UINT rows; -} MSIJOINVIEW; - -static UINT JOIN_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; - UINT cols = 0; - UINT prev_rows = 1; - - if (col == 0 || col > jv->columns) - return ERROR_FUNCTION_FAILED; - - if (row >= jv->rows) - return ERROR_FUNCTION_FAILED; - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - if (col <= cols + table->columns) - { - row = (row % (jv->rows / table->next_rows)) / prev_rows; - col -= cols; - break; - } - - prev_rows *= table->rows; - cols += table->columns; - } - - return table->view->ops->fetch_int( table->view, row, col, val ); -} - -static UINT JOIN_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; - UINT cols = 0; - UINT prev_rows = 1; - - TRACE("%p %d %d %p\n", jv, row, col, stm ); - - if (col == 0 || col > jv->columns) - return ERROR_FUNCTION_FAILED; - - if (row >= jv->rows) - return ERROR_FUNCTION_FAILED; - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - if (col <= cols + table->columns) - { - row = (row % (jv->rows / table->next_rows)) / prev_rows; - col -= cols; - break; - } - - prev_rows *= table->rows; - cols += table->columns; - } - - return table->view->ops->fetch_stream( table->view, row, col, stm ); -} - -static UINT JOIN_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - - TRACE("%p %d %p\n", jv, row, rec); - - return msi_view_get_row( jv->db, view, row, rec ); -} - -static UINT JOIN_execute( struct tagMSIVIEW *view, MSIRECORD *record ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; - UINT r, rows; - - TRACE("%p %p\n", jv, record); - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - table->view->ops->execute(table->view, NULL); - - r = table->view->ops->get_dimensions(table->view, &table->rows, NULL); - if (r != ERROR_SUCCESS) - { - ERR("failed to get table dimensions\n"); - return r; - } - - /* each table must have at least one row */ - if (table->rows == 0) - { - jv->rows = 0; - return ERROR_SUCCESS; - } - - if (jv->rows == 0) - jv->rows = table->rows; - else - jv->rows *= table->rows; - } - - rows = jv->rows; - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - rows /= table->rows; - table->next_rows = rows; - } - - return ERROR_SUCCESS; -} - -static UINT JOIN_close( struct tagMSIVIEW *view ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; - - TRACE("%p\n", jv ); - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - table->view->ops->close(table->view); - } - - return ERROR_SUCCESS; -} - -static UINT JOIN_get_dimensions( struct tagMSIVIEW *view, UINT *rows, UINT *cols ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - - TRACE("%p %p %p\n", jv, rows, cols ); - - if (cols) - *cols = jv->columns; - - if (rows) - *rows = jv->rows; - - return ERROR_SUCCESS; -} - -static UINT JOIN_get_column_info( struct tagMSIVIEW *view, - UINT n, LPWSTR *name, UINT *type, BOOL *temporary, - LPWSTR *table_name ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; - UINT cols = 0; - - TRACE("%p %d %p %p %p %p\n", jv, n, name, type, temporary, table_name ); - - if (n == 0 || n > jv->columns) - return ERROR_FUNCTION_FAILED; - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - if (n <= cols + table->columns) - return table->view->ops->get_column_info(table->view, n - cols, - name, type, temporary, - table_name); - - cols += table->columns; - } - - return ERROR_FUNCTION_FAILED; -} - -static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row ) -{ - LPCWSTR str; - UINT r, i, id, data; - - str = MSI_RecordGetString( rec, 1 ); - r = msi_string2idW( jv->db->strings, str, &id ); - if (r != ERROR_SUCCESS) - return r; - - for (i = 0; i < jv->rows; i++) - { - JOIN_fetch_int( &jv->view, i, 1, &data ); - - if (data == id) - { - *row = i; - return ERROR_SUCCESS; - } - } - - return ERROR_FUNCTION_FAILED; -} - -static UINT JOIN_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - JOINTABLE *table; - UINT i, reduced_mask = 0, r = ERROR_SUCCESS, offset = 0, col_count; - MSIRECORD *reduced; - - TRACE("%p %d %p %u %08x\n", jv, row, rec, rec->count, mask ); - - if (mask >= 1 << jv->columns) - return ERROR_INVALID_PARAMETER; - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - r = table->view->ops->get_dimensions( table->view, NULL, &col_count ); - if (r != ERROR_SUCCESS) - return r; - - reduced = MSI_CreateRecord( col_count ); - if (!reduced) - return ERROR_FUNCTION_FAILED; - - for (i = 0; i < col_count; i++) - { - r = MSI_RecordCopyField( rec, i + offset + 1, reduced, i + 1 ); - if (r != ERROR_SUCCESS) - break; - } - - offset += col_count; - reduced_mask = mask >> (jv->columns - offset) & ((1 << col_count) - 1); - - if (r == ERROR_SUCCESS) - r = table->view->ops->set_row( table->view, row, reduced, reduced_mask ); - - msiobj_release( &reduced->hdr ); - } - - return r; -} - -static UINT join_modify_update( struct tagMSIVIEW *view, MSIRECORD *rec ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW *)view; - UINT r, row; - - r = join_find_row( jv, rec, &row ); - if (r != ERROR_SUCCESS) - return r; - - return JOIN_set_row( view, row, rec, (1 << jv->columns) - 1 ); -} - -static UINT JOIN_modify( struct tagMSIVIEW *view, MSIMODIFY mode, MSIRECORD *rec, UINT row ) -{ - UINT r; - - TRACE("%p %d %p %u\n", view, mode, rec, row); - - switch (mode) - { - case MSIMODIFY_UPDATE: - return join_modify_update( view, rec ); - - case MSIMODIFY_ASSIGN: - case MSIMODIFY_DELETE: - case MSIMODIFY_INSERT: - case MSIMODIFY_INSERT_TEMPORARY: - case MSIMODIFY_MERGE: - case MSIMODIFY_REPLACE: - case MSIMODIFY_SEEK: - case MSIMODIFY_VALIDATE: - case MSIMODIFY_VALIDATE_DELETE: - case MSIMODIFY_VALIDATE_FIELD: - case MSIMODIFY_VALIDATE_NEW: - r = ERROR_FUNCTION_FAILED; - break; - - case MSIMODIFY_REFRESH: - r = ERROR_CALL_NOT_IMPLEMENTED; - break; - - default: - WARN("%p %d %p %u - unknown mode\n", view, mode, rec, row ); - r = ERROR_INVALID_PARAMETER; - break; - } - - return r; -} - -static UINT JOIN_delete( struct tagMSIVIEW *view ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - struct list *item, *cursor; - - TRACE("%p\n", jv ); - - LIST_FOR_EACH_SAFE(item, cursor, &jv->tables) - { - JOINTABLE* table = LIST_ENTRY(item, JOINTABLE, entry); - - list_remove(&table->entry); - table->view->ops->delete(table->view); - table->view = NULL; - msi_free(table); - } - - msi_free(jv); - - return ERROR_SUCCESS; -} - -static UINT JOIN_find_matching_rows( struct tagMSIVIEW *view, UINT col, - UINT val, UINT *row, MSIITERHANDLE *handle ) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW*)view; - UINT i, row_value; - - TRACE("%p, %d, %u, %p\n", view, col, val, *handle); - - if (col == 0 || col > jv->columns) - return ERROR_INVALID_PARAMETER; - - for (i = PtrToUlong(*handle); i < jv->rows; i++) - { - if (view->ops->fetch_int( view, i, col, &row_value ) != ERROR_SUCCESS) - continue; - - if (row_value == val) - { - *row = i; - (*(UINT *)handle) = i + 1; - return ERROR_SUCCESS; - } - } - - return ERROR_NO_MORE_ITEMS; -} - -static UINT JOIN_sort(struct tagMSIVIEW *view, column_info *columns) -{ - MSIJOINVIEW *jv = (MSIJOINVIEW *)view; - JOINTABLE *table; - UINT r; - - TRACE("%p %p\n", view, columns); - - LIST_FOR_EACH_ENTRY(table, &jv->tables, JOINTABLE, entry) - { - r = table->view->ops->sort(table->view, columns); - if (r != ERROR_SUCCESS) - return r; - } - - return ERROR_SUCCESS; -} - -static const MSIVIEWOPS join_ops = -{ - JOIN_fetch_int, - JOIN_fetch_stream, - JOIN_get_row, - NULL, - NULL, - NULL, - JOIN_execute, - JOIN_close, - JOIN_get_dimensions, - JOIN_get_column_info, - JOIN_modify, - JOIN_delete, - JOIN_find_matching_rows, - NULL, - NULL, - NULL, - NULL, - JOIN_sort, - NULL, -}; - -UINT JOIN_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables ) -{ - MSIJOINVIEW *jv = NULL; - UINT r = ERROR_SUCCESS; - JOINTABLE *table; - LPWSTR ptr; - - TRACE("%p (%s)\n", jv, debugstr_w(tables) ); - - jv = msi_alloc_zero( sizeof *jv ); - if( !jv ) - return ERROR_FUNCTION_FAILED; - - /* fill the structure */ - jv->view.ops = &join_ops; - jv->db = db; - jv->columns = 0; - jv->rows = 0; - - list_init(&jv->tables); - - while (*tables) - { - if ((ptr = strchrW(tables, ' '))) - *ptr = '\0'; - - table = msi_alloc(sizeof(JOINTABLE)); - if (!table) - { - r = ERROR_OUTOFMEMORY; - goto end; - } - - r = TABLE_CreateView( db, tables, &table->view ); - if( r != ERROR_SUCCESS ) - { - WARN("can't create table: %s\n", debugstr_w(tables)); - msi_free(table); - r = ERROR_BAD_QUERY_SYNTAX; - goto end; - } - - r = table->view->ops->get_dimensions( table->view, NULL, - &table->columns ); - if( r != ERROR_SUCCESS ) - { - ERR("can't get table dimensions\n"); - goto end; - } - - jv->columns += table->columns; - - list_add_head( &jv->tables, &table->entry ); - - if (!ptr) - break; - - tables = ptr + 1; - } - - *view = &jv->view; - return ERROR_SUCCESS; - -end: - jv->view.ops->delete( &jv->view ); - - return r; -} Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Sun Jan 22 11:01:32 2012 @@ -29,7 +29,6 @@ <file>handle.c</file> <file>insert.c</file> <file>install.c</file> - <file>join.c</file> <file>media.c</file> <file>msi.c</file> <file>msi_main.c</file>

1 0

[jimtabor] 55060: - Remove 16 bit code.
by jimtabor＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: jimtabor Date: Sun Jan 22 03:05:59 2012 New Revision: 55060 URL: http://svn.reactos.org/svn/reactos?rev=55060&view=rev Log: - Remove 16 bit code. Removed: trunk/reactos/dll/win32/comdlg32/cdlg16.h trunk/reactos/dll/win32/comdlg32/colordlg16.c trunk/reactos/dll/win32/comdlg32/commdlg.spec trunk/reactos/dll/win32/comdlg32/filedlg16.c trunk/reactos/dll/win32/comdlg32/printdlg.h Removed: trunk/reactos/dll/win32/comdlg32/cdlg16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg16.… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg16.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg16.h (removed) @@ -1,162 +1,0 @@ -/* - * Common Dialog Boxes interface (16 bit implementation) - * - * Copyright 1994 Martin Ayotte - * Copyright 1996 Albrecht Kleine - * Copyright 1998 Bertho A. Stultiens - * - * 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 - */ - -#ifndef _WINE_DLL_CDLG16_H -#define _WINE_DLL_CDLG16_H - -#include "dlgs.h" -#include "wine/windef16.h" -#include "wine/winbase16.h" -#include "wine/winuser16.h" -#include "wownt32.h" - -/* 16 bit api */ - -#include "pshpack1.h" - -typedef UINT16 (CALLBACK *LPOFNHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM); - -typedef struct { - DWORD lStructSize; - HWND16 hwndOwner; - HINSTANCE16 hInstance; - SEGPTR lpstrFilter; - SEGPTR lpstrCustomFilter; - DWORD nMaxCustFilter; - DWORD nFilterIndex; - SEGPTR lpstrFile; - DWORD nMaxFile; - SEGPTR lpstrFileTitle; - DWORD nMaxFileTitle; - SEGPTR lpstrInitialDir; - SEGPTR lpstrTitle; - DWORD Flags; - UINT16 nFileOffset; - UINT16 nFileExtension; - SEGPTR lpstrDefExt; - LPARAM lCustData; - LPOFNHOOKPROC16 lpfnHook; - SEGPTR lpTemplateName; -} OPENFILENAME16,*LPOPENFILENAME16; - -typedef UINT16 (CALLBACK *LPCCHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM); - -typedef struct { - DWORD lStructSize; - HWND16 hwndOwner; - HWND16 hInstance; - COLORREF rgbResult; - SEGPTR lpCustColors; - DWORD Flags; - LPARAM lCustData; - LPCCHOOKPROC16 lpfnHook; - SEGPTR lpTemplateName; -} CHOOSECOLOR16; -typedef CHOOSECOLOR16 *LPCHOOSECOLOR16; - -typedef UINT16 (CALLBACK *LPFRHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM); -typedef struct { - DWORD lStructSize; /* size of this struct 0x20 */ - HWND16 hwndOwner; /* handle to owner's window */ - HINSTANCE16 hInstance; /* instance handle of.EXE that */ - /* contains cust. dlg. template */ - DWORD Flags; /* one or more of the FR_?? */ - SEGPTR lpstrFindWhat; /* ptr. to search string */ - SEGPTR lpstrReplaceWith; /* ptr. to replace string */ - UINT16 wFindWhatLen; /* size of find buffer */ - UINT16 wReplaceWithLen; /* size of replace buffer */ - LPARAM lCustData; /* data passed to hook fn. */ - LPFRHOOKPROC16 lpfnHook; - SEGPTR lpTemplateName; /* custom template name */ -} FINDREPLACE16, *LPFINDREPLACE16; - -typedef UINT16 (CALLBACK *LPCFHOOKPROC16)(HWND16,UINT16,WPARAM16,LPARAM); -typedef struct -{ - DWORD lStructSize; - HWND16 hwndOwner; /* caller's window handle */ - HDC16 hDC; /* printer DC/IC or NULL */ - SEGPTR lpLogFont; /* ptr. to a LOGFONT struct */ - short iPointSize; /* 10 * size in points of selected font */ - DWORD Flags; /* enum. type flags */ - COLORREF rgbColors; /* returned text color */ - LPARAM lCustData; /* data passed to hook fn. */ - LPCFHOOKPROC16 lpfnHook; - SEGPTR lpTemplateName; /* custom template name */ - HINSTANCE16 hInstance; /* instance handle of.EXE that */ - /* contains cust. dlg. template */ - SEGPTR lpszStyle; /* return the style field here */ - /* must be LF_FACESIZE or bigger */ - UINT16 nFontType; /* same value reported to the */ - /* EnumFonts callback with the */ - /* extra FONTTYPE_ bits added */ - short nSizeMin; /* minimum pt size allowed & */ - short nSizeMax; /* max pt size allowed if */ - /* CF_LIMITSIZE is used */ -} CHOOSEFONT16, *LPCHOOSEFONT16; - - -typedef UINT16 (CALLBACK *LPPRINTHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM); -typedef UINT16 (CALLBACK *LPSETUPHOOKPROC16) (HWND16, UINT16, WPARAM16, LPARAM); -typedef struct -{ - DWORD lStructSize; - HWND16 hwndOwner; - HGLOBAL16 hDevMode; - HGLOBAL16 hDevNames; - HDC16 hDC; - DWORD Flags; - WORD nFromPage; - WORD nToPage; - WORD nMinPage; - WORD nMaxPage; - WORD nCopies; - HINSTANCE16 hInstance; - LPARAM lCustData; - LPPRINTHOOKPROC16 lpfnPrintHook; - LPSETUPHOOKPROC16 lpfnSetupHook; - SEGPTR lpPrintTemplateName; - SEGPTR lpSetupTemplateName; - HGLOBAL16 hPrintTemplate; - HGLOBAL16 hSetupTemplate; -} PRINTDLG16, *LPPRINTDLG16; - -BOOL16 WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol); -HWND16 WINAPI FindText16( SEGPTR find); -BOOL16 WINAPI GetOpenFileName16(SEGPTR ofn); -BOOL16 WINAPI GetSaveFileName16(SEGPTR ofn); -BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 print); -HWND16 WINAPI ReplaceText16( SEGPTR find); -BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16); -BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LONG lParam ); -BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam); -BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam); -INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam ); -INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics, UINT16 nFontType, LPARAM lParam); -BOOL16 CALLBACK FormatCharDlgProc16(HWND16 hDlg16, UINT16 message, WPARAM16 wParam, LPARAM lParam); -short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf); -BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam); -BOOL16 CALLBACK PrintSetupDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam); - -#include "poppack.h" - -#endif /* _WINE_DLL_CDLG16_H */ Removed: trunk/reactos/dll/win32/comdlg32/colordlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/colordlg16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/colordlg16.c (removed) @@ -1,476 +1,0 @@ -/* - * COMMDLG - Color Dialog - * - * Copyright 1994 Martin Ayotte - * Copyright 1996 Albrecht Kleine - * - * 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 - */ - -/* BUGS : still seems to not refresh correctly - sometimes, especially when 2 instances of the - dialog are loaded at the same time */ - -#include <ctype.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "wine/winbase16.h" -#include "wine/winuser16.h" -#include "winuser.h" -#include "commdlg.h" -#include "dlgs.h" -#include "wine/debug.h" -#include "cderr.h" -#include "cdlg.h" -#include "cdlg16.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -/* Chose Color PRIVATE Structure: - * - * This is a duplicate of the 32bit code with - * an extra member - */ -typedef struct CCPRIVATE -{ - LPCHOOSECOLORW lpcc; /* points to public known data structure */ - LPCHOOSECOLOR16 lpcc16; /* save the 16 bits pointer */ - int nextuserdef; /* next free place in user defined color array */ - HDC hdcMem; /* color graph used for BitBlt() */ - HBITMAP hbmMem; /* color graph bitmap */ - RECT fullsize; /* original dialog window size */ - UINT msetrgb; /* # of SETRGBSTRING message (today not used) */ - RECT old3angle; /* last position of l-marker */ - RECT oldcross; /* last position of color/saturation marker */ - BOOL updating; /* to prevent recursive WM_COMMAND/EN_UPDATE processing */ - int h; - int s; - int l; /* for temporary storing of hue,sat,lum */ - int capturedGraph; /* control mouse captured */ - RECT focusRect; /* rectangle last focused item */ - HWND hwndFocus; /* handle last focused item */ -} *LCCPRIV; - -/*********************************************************************** - * CC_WMInitDialog16 [internal] - */ -static LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam ) -{ - int i, res; - int r, g, b; - HWND hwnd; - RECT rect; - POINT point; - LCCPRIV lpp; - CHOOSECOLORW *ch32; - CHOOSECOLOR16 *ch16 = (CHOOSECOLOR16 *) lParam; - - TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); - lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) ); - - if (ch16->lStructSize != sizeof(CHOOSECOLOR16) ) - { - HeapFree(GetProcessHeap(), 0, lpp); - EndDialog (hDlg, 0) ; - return FALSE; - } - ch32 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW) ); - lpp->lpcc = ch32; - lpp->lpcc16 = ch16; - ch32->lStructSize = sizeof(CHOOSECOLORW); - ch32->hwndOwner = HWND_32(ch16->hwndOwner); - /* Should be an HINSTANCE but MS made a typo */ - ch32->hInstance = HWND_32(ch16->hInstance); - ch32->lpCustColors = MapSL(ch16->lpCustColors); - ch32->lpfnHook = (LPCCHOOKPROC) ch16->lpfnHook; /* only used as flag */ - ch32->Flags = ch16->Flags; - - SetWindowLongPtrW(hDlg, DWLP_USER, (LONG_PTR)lpp); - - if (!(lpp->lpcc->Flags & CC_SHOWHELP)) - ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE); - lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA); - -#if 0 - cpos = MAKELONG(5,7); /* init */ - if (lpp->lpcc->Flags & CC_RGBINIT) - { - for (i = 0; i < 6; i++) - for (j = 0; j < 8; j++) - if (predefcolors[i][j] == lpp->lpcc->rgbResult) - { - cpos = MAKELONG(i,j); - goto found; - } - } - found: - /* FIXME: Draw_a_focus_rect & set_init_values */ -#endif - - GetWindowRect(hDlg, &lpp->fullsize); - if (lpp->lpcc->Flags & CC_FULLOPEN || lpp->lpcc->Flags & CC_PREVENTFULLOPEN) - { - hwnd = GetDlgItem(hDlg, 0x2cf); - EnableWindow(hwnd, FALSE); - } - if (!(lpp->lpcc->Flags & CC_FULLOPEN ) || lpp->lpcc->Flags & CC_PREVENTFULLOPEN) - { - rect = lpp->fullsize; - res = rect.bottom - rect.top; - hwnd = GetDlgItem(hDlg, 0x2c6); /* cut at left border */ - point.x = point.y = 0; - ClientToScreen(hwnd, &point); - ScreenToClient(hDlg,&point); - GetClientRect(hDlg, &rect); - point.x += GetSystemMetrics(SM_CXDLGFRAME); - SetWindowPos(hDlg, 0, 0, 0, point.x, res, SWP_NOMOVE|SWP_NOZORDER); - - for (i = 0x2bf; i < 0x2c5; i++) - ShowWindow( GetDlgItem(hDlg, i), SW_HIDE); - for (i = 0x2d3; i < 0x2d9; i++) - ShowWindow( GetDlgItem(hDlg, i), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c9), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c8), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c6), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 0x2c5), SW_HIDE); - ShowWindow( GetDlgItem(hDlg, 1090 ), SW_HIDE); - } - else - CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, NULL); - res = TRUE; - for (i = 0x2bf; i < 0x2c5; i++) - SendMessageA( GetDlgItem(hDlg, i), EM_LIMITTEXT, 3, 0); /* max 3 digits: xyz */ - if (CC_HookCallChk(lpp->lpcc)) - { - res = CallWindowProc16( (WNDPROC16)lpp->lpcc16->lpfnHook, - HWND_16(hDlg), WM_INITDIALOG, wParam, lParam); - } - - /* Set the initial values of the color chooser dialog */ - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - - /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */ - SetDlgItemInt(hDlg, 703, lpp->h, TRUE); - SetDlgItemInt(hDlg, 704, lpp->s, TRUE); - SetDlgItemInt(hDlg, 705, lpp->l, TRUE); - SetDlgItemInt(hDlg, 706, r, TRUE); - SetDlgItemInt(hDlg, 707, g, TRUE); - SetDlgItemInt(hDlg, 708, b, TRUE); - - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - - return res; -} - -/*********************************************************************** - * CC_WMCommand16 [internal] - */ -static LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) -{ - int r, g, b, i, xx; - UINT cokmsg; - HDC hdc; - COLORREF *cr; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); - TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam); - switch (wParam) - { - case 0x2c2: /* edit notify RGB */ - case 0x2c3: - case 0x2c4: - if (notifyCode == EN_UPDATE && !lpp->updating) - { - i = CC_CheckDigitsInEdit(hwndCtl, 255); - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b= GetBValue(lpp->lpcc->rgbResult); - xx = 0; - switch (wParam) - { - case 0x2c2: if ((xx = (i != r))) r = i; break; - case 0x2c3: if ((xx = (i != g))) g = i; break; - case 0x2c4: if ((xx = (i != b))) b = i; break; - } - if (xx) /* something has changed */ - { - lpp->lpcc->rgbResult = RGB(r, g, b); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - } - } - break; - - case 0x2bf: /* edit notify HSL */ - case 0x2c0: - case 0x2c1: - if (notifyCode == EN_UPDATE && !lpp->updating) - { - i = CC_CheckDigitsInEdit(hwndCtl , wParam == 0x2bf ? 239:240); - xx = 0; - switch (wParam) - { - case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break; - case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break; - case 0x2c1: if ((xx = ( i != lpp->l))) lpp->l = i; break; - } - if (xx) /* something has changed */ - { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - } - } - break; - - case 0x2cf: - CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, &lpp->fullsize); - SetFocus( GetDlgItem(hDlg, 0x2bf)); - break; - - case 0x2c8: /* add colors ... column by column */ - cr = lpp->lpcc->lpCustColors; - cr[(lpp->nextuserdef % 2) * 8 + lpp->nextuserdef / 2] = lpp->lpcc->rgbResult; - if (++lpp->nextuserdef == 16) - lpp->nextuserdef = 0; - CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); - break; - - case 0x2c9: /* resulting color */ - hdc = GetDC(hDlg); - lpp->lpcc->rgbResult = GetNearestColor(hdc, lpp->lpcc->rgbResult); - ReleaseDC(hDlg, hdc); - CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); - CC_PaintCross(hDlg, lpp->h, lpp->s); - CC_PaintTriangle(hDlg, lpp->l); - break; - - case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */ - i = RegisterWindowMessageA(HELPMSGSTRINGA); - if (lpp->lpcc16) - { - if (lpp->lpcc->hwndOwner) - SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc16); - if ( CC_HookCallChk(lpp->lpcc)) - CallWindowProc16( (WNDPROC16) lpp->lpcc16->lpfnHook, - HWND_16(hDlg), WM_COMMAND, psh15, - (LPARAM)lpp->lpcc16); - } - break; - - case IDOK : - cokmsg = RegisterWindowMessageA(COLOROKSTRINGA); - if (lpp->lpcc16) - { - if (lpp->lpcc->hwndOwner) - if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc16)) - break; /* do NOT close */ - } - if (lpp->lpcc16) - { - BYTE *ptr = MapSL(lpp->lpcc16->lpCustColors); - memcpy(ptr, lpp->lpcc->lpCustColors, sizeof(COLORREF)*16); - lpp->lpcc16->rgbResult = lpp->lpcc->rgbResult; - } - EndDialog(hDlg, 1) ; - return TRUE ; - - case IDCANCEL : - EndDialog(hDlg, 0) ; - return TRUE ; - - } - return FALSE; -} - -/*********************************************************************** - * ColorDlgProc (COMMDLG.8) - */ -BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, - WPARAM16 wParam, LONG lParam ) -{ - BOOL16 res; - HWND hDlg = HWND_32(hDlg16); - - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); - if (message != WM_INITDIALOG) - { - if (!lpp) - return FALSE; - res=0; - if (CC_HookCallChk(lpp->lpcc)) - res = CallWindowProc16( (WNDPROC16)lpp->lpcc16->lpfnHook, hDlg16, message, wParam, lParam); - if (res) - return res; - } - - /* FIXME: SetRGB message - if (message && message == msetrgb) - return HandleSetRGB(hDlg, lParam); - */ - - switch (message) - { - case WM_INITDIALOG: - return CC_WMInitDialog16(hDlg, wParam, lParam); - case WM_NCDESTROY: - DeleteDC(lpp->hdcMem); - DeleteObject(lpp->hbmMem); - HeapFree(GetProcessHeap(), 0, lpp->lpcc); - HeapFree(GetProcessHeap(), 0, lpp); - SetWindowLongPtrW(hDlg, DWLP_USER, 0); /* we don't need it anymore */ - break; - case WM_COMMAND: - if (CC_WMCommand16(hDlg, wParam, lParam, - HIWORD(lParam), HWND_32(LOWORD(lParam)))) - return TRUE; - break; - case WM_PAINT: - if (CC_WMPaint(hDlg, wParam, lParam)) - return TRUE; - break; - case WM_LBUTTONDBLCLK: - if (CC_MouseCheckResultWindow(hDlg,lParam)) - return TRUE; - break; - case WM_MOUSEMOVE: - if (CC_WMMouseMove(hDlg, lParam)) - return TRUE; - break; - case WM_LBUTTONUP: /* FIXME: ClipCursor off (if in color graph)*/ - if (CC_WMLButtonUp(hDlg, wParam, lParam)) - return TRUE; - break; - case WM_LBUTTONDOWN:/* FIXME: ClipCursor on (if in color graph)*/ - if (CC_WMLButtonDown(hDlg, wParam, lParam)) - return TRUE; - break; - } - return FALSE ; -} - -/*********************************************************************** - * ChooseColor (COMMDLG.5) - */ -BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol ) -{ - HINSTANCE16 hInst; - HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; - HGLOBAL16 hGlobal16 = 0; - BOOL16 bRet = FALSE; - LPVOID template; - FARPROC16 ptr; - - TRACE("ChooseColor\n"); - if (!lpChCol) return FALSE; - - if (lpChCol->Flags & CC_ENABLETEMPLATEHANDLE) - hDlgTmpl16 = lpChCol->hInstance; - else if (lpChCol->Flags & CC_ENABLETEMPLATE) - { - HANDLE16 hResInfo; - if (!(hResInfo = FindResource16(lpChCol->hInstance, - MapSL(lpChCol->lpTemplateName), - (LPSTR)RT_DIALOG))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl16 = LoadResource16(lpChCol->hInstance, hResInfo))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - hResource16 = hDlgTmpl16; - } - else - { - HRSRC hResInfo; - HGLOBAL hDlgTmpl32; - LPCVOID template32; - DWORD size; - if (!(hResInfo = FindResourceA(COMDLG32_hInstance, "CHOOSE_COLOR", (LPSTR)RT_DIALOG))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl32 = LoadResource(COMDLG32_hInstance, hResInfo)) || - !(template32 = LockResource(hDlgTmpl32))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - size = SizeofResource(COMDLG32_hInstance, hResInfo); - hGlobal16 = GlobalAlloc16(0, size); - if (!hGlobal16) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - ERR("alloc failure for %d bytes\n", size); - return FALSE; - } - template = GlobalLock16(hGlobal16); - if (!template) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE); - ERR("global lock failure for %x handle\n", hDlgTmpl16); - GlobalFree16(hGlobal16); - return FALSE; - } - ConvertDialog32To16(template32, size, template); - hDlgTmpl16 = hGlobal16; - } - - ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 8); - hInst = GetWindowLongPtrA(HWND_32(lpChCol->hwndOwner), GWLP_HINSTANCE); - bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChCol->hwndOwner, - (DLGPROC16) ptr, (DWORD)lpChCol); - if (hResource16) FreeResource16(hDlgTmpl16); - if (hGlobal16) - { - GlobalUnlock16(hGlobal16); - GlobalFree16(hGlobal16); - } - return bRet; -} Removed: trunk/reactos/dll/win32/comdlg32/commdlg.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/commdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/commdlg.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/commdlg.spec (removed) @@ -1,26 +1,0 @@ -1 pascal -ret16 GetOpenFileName(segptr) GetOpenFileName16 -2 pascal -ret16 GetSaveFileName(segptr) GetSaveFileName16 -5 pascal -ret16 ChooseColor(ptr) ChooseColor16 -6 pascal FileOpenDlgProc(word word word long) FileOpenDlgProc16 -7 pascal FileSaveDlgProc(word word word long) FileSaveDlgProc16 -8 pascal ColorDlgProc(word word word long) ColorDlgProc16 -#9 pascal LOADALTERBITMAP exported, shared data -11 pascal -ret16 FindText(segptr) FindText16 -12 pascal -ret16 ReplaceText(segptr) ReplaceText16 -13 pascal FindTextDlgProc(word word word long) FindTextDlgProc16 -14 pascal ReplaceTextDlgProc(word word word long) ReplaceTextDlgProc16 -15 pascal -ret16 ChooseFont(ptr) ChooseFont16 -16 pascal -ret16 FormatCharDlgProc(word word word long) FormatCharDlgProc16 -18 pascal -ret16 FontStyleEnumProc(ptr ptr word long) FontStyleEnumProc16 -19 pascal -ret16 FontFamilyEnumProc(ptr ptr word long) FontFamilyEnumProc16 -20 pascal -ret16 PrintDlg(ptr) PrintDlg16 -21 pascal PrintDlgProc(word word word long) PrintDlgProc16 -22 pascal PrintSetupDlgProc(word word word long) PrintSetupDlgProc16 -#23 pascal EDITINTEGERONLY exported, shared data -#25 pascal WANTARROWS exported, shared data -26 pascal CommDlgExtendedError() CommDlgExtendedError -27 pascal -ret16 GetFileTitle(str ptr word) GetFileTitle16 -#28 pascal WEP exported, shared data -#29 pascal DWLBSUBCLASS exported, shared data -#30 pascal DWUPARROWHACK exported, shared data -#31 pascal DWOKSUBCLASS exported, shared data Removed: trunk/reactos/dll/win32/comdlg32/filedlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg16.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg16.c (removed) @@ -1,524 +1,0 @@ -/* - * COMMDLG - File Dialogs - * - * Copyright 1994 Martin Ayotte - * Copyright 1996 Albrecht Kleine - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/winbase16.h" -#include "winuser.h" -#include "wine/winuser16.h" -#include "wine/debug.h" -#include "cderr.h" -#include "commdlg.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -#include "cdlg.h" -#include "cdlg16.h" -#include "filedlg31.h" - -typedef struct tagFD16_PRIVATE -{ - HANDLE16 hDlgTmpl16; /* handle for resource 16 */ - HANDLE16 hResource16; /* handle for allocated resource 16 */ - HANDLE16 hGlobal16; /* 16 bits mem block (resources) */ - OPENFILENAME16 *ofn16; /* original structure if 16 bits dialog */ -} FD16_PRIVATE, *PFD16_PRIVATE; - -/************************************************************************ - * FD16_MapOfnStruct16 [internal] - * map a 16 bits structure to a Unicode one - */ -static void FD16_MapOfnStruct16(const OPENFILENAME16 *ofn16, LPOPENFILENAMEW ofnW, BOOL open) -{ - OPENFILENAMEA ofnA; - /* first convert to linear pointers */ - memset(&ofnA, 0, sizeof(OPENFILENAMEA)); - ofnA.lStructSize = sizeof(OPENFILENAMEA); - ofnA.hwndOwner = HWND_32(ofn16->hwndOwner); - ofnA.hInstance = HINSTANCE_32(ofn16->hInstance); - if (ofn16->lpstrFilter) - ofnA.lpstrFilter = MapSL(ofn16->lpstrFilter); - if (ofn16->lpstrCustomFilter) - ofnA.lpstrCustomFilter = MapSL(ofn16->lpstrCustomFilter); - ofnA.nMaxCustFilter = ofn16->nMaxCustFilter; - ofnA.nFilterIndex = ofn16->nFilterIndex; - ofnA.lpstrFile = MapSL(ofn16->lpstrFile); - ofnA.nMaxFile = ofn16->nMaxFile; - ofnA.lpstrFileTitle = MapSL(ofn16->lpstrFileTitle); - ofnA.nMaxFileTitle = ofn16->nMaxFileTitle; - ofnA.lpstrInitialDir = MapSL(ofn16->lpstrInitialDir); - ofnA.lpstrTitle = MapSL(ofn16->lpstrTitle); - ofnA.Flags = ofn16->Flags; - ofnA.nFileOffset = ofn16->nFileOffset; - ofnA.nFileExtension = ofn16->nFileExtension; - ofnA.lpstrDefExt = MapSL(ofn16->lpstrDefExt); - if (HIWORD(ofn16->lpTemplateName)) - ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName); - else - ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* resource number */ - /* now calls the 32 bits Ansi to Unicode version to complete the job */ - FD31_MapOfnStructA(&ofnA, ofnW, open); -} - -/*********************************************************************** - * FD16_GetTemplate [internal] - * - * Get a template (FALSE if failure) when 16 bits dialogs are used - * by a 16 bits application - * - */ -static BOOL FD16_GetTemplate(const FD31_DATA *lfs) -{ - PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; - LPOPENFILENAME16 ofn16 = priv->ofn16; - LPVOID template; - HGLOBAL16 hGlobal16 = 0; - - if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE) - priv->hDlgTmpl16 = ofn16->hInstance; - else if (ofn16->Flags & OFN_ENABLETEMPLATE) - { - HANDLE16 hResInfo; - if (!(hResInfo = FindResource16(ofn16->hInstance, - MapSL(ofn16->lpTemplateName), - (LPSTR)RT_DIALOG))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(priv->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - priv->hResource16 = priv->hDlgTmpl16; - } - else - { /* get resource from (32 bits) own Wine resource; convert it to 16 */ - HRSRC hResInfo; - HGLOBAL hDlgTmpl32; - LPCVOID template32; - DWORD size; - - if (!(hResInfo = FindResourceA(COMDLG32_hInstance, - lfs->open ? "OPEN_FILE":"SAVE_FILE", (LPSTR)RT_DIALOG))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl32 = LoadResource(COMDLG32_hInstance, hResInfo )) || - !(template32 = LockResource( hDlgTmpl32 ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - size = SizeofResource(COMDLG32_hInstance, hResInfo); - hGlobal16 = GlobalAlloc16(0, size); - if (!hGlobal16) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - ERR("alloc failure for %d bytes\n", size); - return FALSE; - } - template = GlobalLock16(hGlobal16); - if (!template) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE); - ERR("global lock failure for %x handle\n", hGlobal16); - GlobalFree16(hGlobal16); - return FALSE; - } - ConvertDialog32To16(template32, size, template); - priv->hDlgTmpl16 = hGlobal16; - priv->hGlobal16 = hGlobal16; - } - return TRUE; -} - -/************************************************************************ - * FD16_Init [internal] - * called from the common 16/32 code to initialize 16 bit data - */ -static BOOL CALLBACK FD16_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data) -{ - PFD16_PRIVATE priv; - - priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD16_PRIVATE)); - lfs->private1632 = priv; - if (NULL == lfs->private1632) return FALSE; - - priv->ofn16 = MapSL(lParam); - if (priv->ofn16->Flags & OFN_ENABLEHOOK) - if (priv->ofn16->lpfnHook) - lfs->hook = TRUE; - - lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lfs->ofnW)); - FD16_MapOfnStruct16(priv->ofn16, lfs->ofnW, lfs->open); - - if (! FD16_GetTemplate(lfs)) return FALSE; - - return TRUE; -} - -/*********************************************************************** - * FD16_CallWindowProc [internal] - * - * called from the common 16/32 code to call the appropriate hook - */ -static BOOL CALLBACK FD16_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, - LPARAM lParam) -{ - PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; - - if (priv->ofn16) - { - return (BOOL16) CallWindowProc16( - (WNDPROC16)priv->ofn16->lpfnHook, HWND_16(lfs->hwnd), - (UINT16)wMsg, (WPARAM16)wParam, lParam); - } - return FALSE; -} - - -/*********************************************************************** - * FD31_UpdateResult [internal] - * update the real client structures - */ -static void CALLBACK FD16_UpdateResult(const FD31_DATA *lfs) -{ - PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; - LPOPENFILENAMEW ofnW = lfs->ofnW; - - if (priv->ofn16) - { /* we have to convert to short (8.3) path */ - char tmp[1024]; /* MAX_PATHNAME_LEN */ - LPOPENFILENAME16 ofn16 = priv->ofn16; - char *dest = MapSL(ofn16->lpstrFile); - char *bs16; - if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1, - tmp, sizeof(tmp), NULL, NULL )) - tmp[sizeof(tmp)-1] = 0; - GetShortPathNameA(tmp, dest, ofn16->nMaxFile); - - /* the same procedure as every year... */ - if((bs16 = strrchr(dest, '\\')) != NULL) - ofn16->nFileOffset = bs16 - dest +1; - else - ofn16->nFileOffset = 0; - ofn16->nFileExtension = 0; - while(dest[ofn16->nFileExtension] != '.' && dest[ofn16->nFileExtension] != '\0') - ofn16->nFileExtension++; - if (dest[ofn16->nFileExtension] == '\0') - ofn16->nFileExtension = 0; - else - ofn16->nFileExtension++; - } -} - - -/*********************************************************************** - * FD16_UpdateFileTitle [internal] - * update the real client structures - */ -static void CALLBACK FD16_UpdateFileTitle(const FD31_DATA *lfs) -{ - PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; - LPOPENFILENAMEW ofnW = lfs->ofnW; - - if (priv->ofn16) - { - char *dest = MapSL(priv->ofn16->lpstrFileTitle); - if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFileTitle, -1, - dest, ofnW->nMaxFileTitle, NULL, NULL )) - dest[ofnW->nMaxFileTitle-1] = 0; - } -} - - -/*********************************************************************** - * FD16_SendLbGetCurSel [internal] - * retrieve selected listbox item - */ -static LRESULT CALLBACK FD16_SendLbGetCurSel(const FD31_DATA *lfs) -{ - return SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL16, 0, 0); -} - - -/************************************************************************ - * FD16_Destroy [internal] - * called from the common 16/32 code to cleanup 32 bit data - */ -static void CALLBACK FD16_Destroy(const FD31_DATA *lfs) -{ - PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; - - /* free resources for a 16 bits dialog */ - if (NULL != priv) - { - if (priv->hResource16) FreeResource16(priv->hResource16); - if (priv->hGlobal16) - { - GlobalUnlock16(priv->hGlobal16); - GlobalFree16(priv->hGlobal16); - } - FD31_FreeOfnW(lfs->ofnW); - HeapFree(GetProcessHeap(), 0, lfs->ofnW); - } -} - -static void FD16_SetupCallbacks(PFD31_CALLBACKS callbacks) -{ - callbacks->Init = FD16_Init; - callbacks->CWP = FD16_CallWindowProc; - callbacks->UpdateResult = FD16_UpdateResult; - callbacks->UpdateFileTitle = FD16_UpdateFileTitle; - callbacks->SendLbGetCurSel = FD16_SendLbGetCurSel; - callbacks->Destroy = FD16_Destroy; -} - -/*********************************************************************** - * FD16_MapDrawItemStruct [internal] - * map a 16 bits drawitem struct to 32 - */ -static void FD16_MapDrawItemStruct(const DRAWITEMSTRUCT16 *lpdis16, LPDRAWITEMSTRUCT lpdis) -{ - lpdis->CtlType = lpdis16->CtlType; - lpdis->CtlID = lpdis16->CtlID; - lpdis->itemID = lpdis16->itemID; - lpdis->itemAction = lpdis16->itemAction; - lpdis->itemState = lpdis16->itemState; - lpdis->hwndItem = HWND_32(lpdis16->hwndItem); - lpdis->hDC = HDC_32(lpdis16->hDC); - lpdis->rcItem.right = lpdis16->rcItem.right; - lpdis->rcItem.left = lpdis16->rcItem.left; - lpdis->rcItem.top = lpdis16->rcItem.top; - lpdis->rcItem.bottom = lpdis16->rcItem.bottom; - lpdis->itemData = lpdis16->itemData; -} - - -/*********************************************************************** - * FD16_WMMeasureItem16 [internal] - */ -static LONG FD16_WMMeasureItem(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam) -{ - LPMEASUREITEMSTRUCT16 lpmeasure; - - lpmeasure = MapSL(lParam); - lpmeasure->itemHeight = FD31_GetFldrHeight(); - return TRUE; -} - -/* ------------------ Dialog procedures ---------------------- */ - -/*********************************************************************** - * FileOpenDlgProc (COMMDLG.6) - */ -BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) -{ - HWND hWnd = HWND_32(hWnd16); - PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP); - DRAWITEMSTRUCT dis; - - TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam); - if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook) - { - LRESULT lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam); - if (lRet) - return lRet; /* else continue message processing */ - } - switch (wMsg) - { - case WM_INITDIALOG: - return FD31_WMInitDialog(hWnd, wParam, lParam); - - case WM_MEASUREITEM: - return FD16_WMMeasureItem(hWnd16, wParam, lParam); - - case WM_DRAWITEM: - FD16_MapDrawItemStruct(MapSL(lParam), &dis); - return FD31_WMDrawItem(hWnd, wParam, lParam, FALSE, &dis); - - case WM_COMMAND: - return FD31_WMCommand(hWnd, lParam, HIWORD(lParam),wParam, lfs); -#if 0 - case WM_CTLCOLOR: - SetBkColor((HDC16)wParam, 0x00C0C0C0); - switch (HIWORD(lParam)) - { - case CTLCOLOR_BTN: - SetTextColor((HDC16)wParam, 0x00000000); - return hGRAYBrush; - case CTLCOLOR_STATIC: - SetTextColor((HDC16)wParam, 0x00000000); - return hGRAYBrush; - } - break; -#endif - } - return FALSE; -} - -/*********************************************************************** - * FileSaveDlgProc (COMMDLG.7) - */ -BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, LPARAM lParam) -{ - HWND hWnd = HWND_32(hWnd16); - PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP); - DRAWITEMSTRUCT dis; - - TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam); - if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook) - { - LRESULT lRet; - lRet = (BOOL16)FD31_CallWindowProc(lfs, wMsg, wParam, lParam); - if (lRet) - return lRet; /* else continue message processing */ - } - switch (wMsg) { - case WM_INITDIALOG: - return FD31_WMInitDialog(hWnd, wParam, lParam); - - case WM_MEASUREITEM: - return FD16_WMMeasureItem(hWnd16, wParam, lParam); - - case WM_DRAWITEM: - FD16_MapDrawItemStruct(MapSL(lParam), &dis); - return FD31_WMDrawItem(hWnd, wParam, lParam, TRUE, &dis); - - case WM_COMMAND: - return FD31_WMCommand(hWnd, lParam, HIWORD(lParam), wParam, lfs); - } - - /* - case WM_CTLCOLOR: - SetBkColor((HDC16)wParam, 0x00C0C0C0); - switch (HIWORD(lParam)) - { - case CTLCOLOR_BTN: - SetTextColor((HDC16)wParam, 0x00000000); - return hGRAYBrush; - case CTLCOLOR_STATIC: - SetTextColor((HDC16)wParam, 0x00000000); - return hGRAYBrush; - } - return FALSE; - - */ - return FALSE; -} - -/* ------------------ APIs ---------------------- */ - -/*********************************************************************** - * GetOpenFileName (COMMDLG.1) - * - * Creates a dialog box for the user to select a file to open. - * - * RETURNS - * TRUE on success: user selected a valid file - * FALSE on cancel, error, close or filename-does-not-fit-in-buffer. - * - * BUGS - * unknown, there are some FIXME's left. - */ -BOOL16 WINAPI GetOpenFileName16( - SEGPTR ofn /* [in/out] address of structure with data*/ - ) -{ - HINSTANCE16 hInst; - BOOL bRet = FALSE; - LPOPENFILENAME16 lpofn = MapSL(ofn); - PFD31_DATA lfs; - FARPROC16 ptr; - FD31_CALLBACKS callbacks; - PFD16_PRIVATE priv; - - if (!lpofn || !FD31_Init()) return FALSE; - - FD16_SetupCallbacks(&callbacks); - lfs = FD31_AllocPrivate((LPARAM) ofn, OPEN_DIALOG, &callbacks, 0); - if (lfs) - { - priv = (PFD16_PRIVATE) lfs->private1632; - hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE ); - ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6); - bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner, - (DLGPROC16) ptr, (LPARAM) lfs); - FD31_DestroyPrivate(lfs); - } - - TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile)); - return bRet; -} - -/*********************************************************************** - * GetSaveFileName (COMMDLG.2) - * - * Creates a dialog box for the user to select a file to save. - * - * RETURNS - * TRUE on success: user enters a valid file - * FALSE on cancel, error, close or filename-does-not-fit-in-buffer. - * - * BUGS - * unknown. There are some FIXME's left. - */ -BOOL16 WINAPI GetSaveFileName16( - SEGPTR ofn /* [in/out] address of structure with data*/ - ) -{ - HINSTANCE16 hInst; - BOOL bRet = FALSE; - LPOPENFILENAME16 lpofn = MapSL(ofn); - PFD31_DATA lfs; - FARPROC16 ptr; - FD31_CALLBACKS callbacks; - PFD16_PRIVATE priv; - - if (!lpofn || !FD31_Init()) return FALSE; - - FD16_SetupCallbacks(&callbacks); - lfs = FD31_AllocPrivate((LPARAM) ofn, SAVE_DIALOG, &callbacks, 0); - if (lfs) - { - priv = (PFD16_PRIVATE) lfs->private1632; - hInst = GetWindowLongPtrA( HWND_32(lpofn->hwndOwner), GWLP_HINSTANCE ); - ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7); - bRet = DialogBoxIndirectParam16( hInst, priv->hDlgTmpl16, lpofn->hwndOwner, - (DLGPROC16) ptr, (LPARAM) lfs); - FD31_DestroyPrivate(lfs); - } - - TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile)); - return bRet; -} - - -/*********************************************************************** - * GetFileTitle (COMMDLG.27) - */ -short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf) -{ - return GetFileTitleA(lpFile, lpTitle, cbBuf); -} Removed: trunk/reactos/dll/win32/comdlg32/printdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.h (removed) @@ -1,102 +1,0 @@ -/* - * COMMDLG - Print Dialog - * - * Copyright 1994 Martin Ayotte - * Copyright 1996 Albrecht Kleine - * Copyright 1999 Klaas van Gend - * Copyright 2000 Huw D M Davies - * - * 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 - */ - -#ifndef _WINE_PRINTDLG_H -#define _WINE_PRINTDLG_H - -#include "cdlg.h" - -/* This PRINTDLGA internal structure stores - * pointers to several throughout useful structures. - */ - -typedef struct -{ - LPDEVMODEA lpDevMode; - LPPRINTDLGA lpPrintDlg; - LPPRINTER_INFO_2A lpPrinterInfo; - LPDRIVER_INFO_3A lpDriverInfo; - UINT HelpMessageID; - HICON hCollateIcon; /* PrintDlg only */ - HICON hNoCollateIcon; /* PrintDlg only */ - HICON hPortraitIcon; /* PrintSetupDlg only */ - HICON hLandscapeIcon; /* PrintSetupDlg only */ - HWND hwndUpDown; -} PRINT_PTRA; - -typedef struct -{ - LPDEVMODEW lpDevMode; - LPPRINTDLGW lpPrintDlg; - LPPRINTER_INFO_2W lpPrinterInfo; - LPDRIVER_INFO_3W lpDriverInfo; - UINT HelpMessageID; - HICON hCollateIcon; /* PrintDlg only */ - HICON hNoCollateIcon; /* PrintDlg only */ - HICON hPortraitIcon; /* PrintSetupDlg only */ - HICON hLandscapeIcon; /* PrintSetupDlg only */ - HWND hwndUpDown; -} PRINT_PTRW; - -/* Debugging info */ -static const struct pd_flags { - DWORD flag; - LPCSTR name; -} pd_flags[] = { - {PD_SELECTION, "PD_SELECTION "}, - {PD_PAGENUMS, "PD_PAGENUMS "}, - {PD_NOSELECTION, "PD_NOSELECTION "}, - {PD_NOPAGENUMS, "PD_NOPAGENUMS "}, - {PD_COLLATE, "PD_COLLATE "}, - {PD_PRINTTOFILE, "PD_PRINTTOFILE "}, - {PD_PRINTSETUP, "PD_PRINTSETUP "}, - {PD_NOWARNING, "PD_NOWARNING "}, - {PD_RETURNDC, "PD_RETURNDC "}, - {PD_RETURNIC, "PD_RETURNIC "}, - {PD_RETURNDEFAULT, "PD_RETURNDEFAULT "}, - {PD_SHOWHELP, "PD_SHOWHELP "}, - {PD_ENABLEPRINTHOOK, "PD_ENABLEPRINTHOOK "}, - {PD_ENABLESETUPHOOK, "PD_ENABLESETUPHOOK "}, - {PD_ENABLEPRINTTEMPLATE, "PD_ENABLEPRINTTEMPLATE "}, - {PD_ENABLESETUPTEMPLATE, "PD_ENABLESETUPTEMPLATE "}, - {PD_ENABLEPRINTTEMPLATEHANDLE, "PD_ENABLEPRINTTEMPLATEHANDLE "}, - {PD_ENABLESETUPTEMPLATEHANDLE, "PD_ENABLESETUPTEMPLATEHANDLE "}, - {PD_USEDEVMODECOPIES, "PD_USEDEVMODECOPIES[ANDCOLLATE] "}, - {PD_DISABLEPRINTTOFILE, "PD_DISABLEPRINTTOFILE "}, - {PD_HIDEPRINTTOFILE, "PD_HIDEPRINTTOFILE "}, - {PD_NONETWORKBUTTON, "PD_NONETWORKBUTTON "}, - {-1, NULL} -}; - -/* Internal Functions - * Do not Export to other applications or dlls - */ - -INT PRINTDLG_SetUpPrinterListComboA(HWND hDlg, UINT id, LPCSTR name); -BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, - PRINT_PTRA *PrintStructures); -BOOL PRINTDLG_OpenDefaultPrinter(HANDLE *hprn); -LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, - LPARAM lParam, PRINT_PTRA* PrintStructures); - -#endif /* _WINE_PRINTDLG_H */

1 0

[jimtabor] 55059: - Add surrogate pair macros.
by jimtabor＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: jimtabor Date: Sun Jan 22 00:44:51 2012 New Revision: 55059 URL: http://svn.reactos.org/svn/reactos?rev=55059&view=rev Log: - Add surrogate pair macros. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Jan 22 00:44:51 2012 @@ -597,6 +597,15 @@ BYTE abBuffer[8]; } FILEMUIINFO, *PFILEMUIINFO; +#define HIGH_SURROGATE_START 0xd800 +#define HIGH_SURROGATE_END 0xdbff +#define LOW_SURROGATE_START 0xdc00 +#define LOW_SURROGATE_END 0xdfff + +#define IS_HIGH_SURROGATE(ch) ((ch) >= HIGH_SURROGATE_START && (ch) <= HIGH_SURROGATE_END) +#define IS_LOW_SURROGATE(ch) ((ch) >= LOW_SURROGATE_START && (ch) <= LOW_SURROGATE_END) +#define IS_SURROGATE_PAIR(high,low) (IS_HIGH_SURROGATE(high) && IS_LOW_SURROGATE(low)) + int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int); int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int); LCID WINAPI ConvertDefaultLocale(LCID);

1 0

[tfaber] 55058: [NETSHELL] - Fix MSVC build
by tfaber＠svn.reactos.org 22 Jan '12

22 Jan '12

Author: tfaber Date: Sun Jan 22 00:39:44 2012 New Revision: 55058 URL: http://svn.reactos.org/svn/reactos?rev=55058&view=rev Log: [NETSHELL] - Fix MSVC build Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp trunk/reactos/dll/win32/netshell/lanstatusui.cpp trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] Sun Jan 22 00:39:44 2012 @@ -78,7 +78,7 @@ memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); ppage.dwSize = sizeof(PROPSHEETPAGEW); ppage.dwFlags = PSP_DEFAULT; - ppage.u.pszTemplate = resname; + ppage.pszTemplate = resname; ppage.pfnDlgProc = dlgproc; ppage.lParam = lParam; ppage.hInstance = netshell_hInstance; Modified: trunk/reactos/dll/win32/netshell/lanstatusui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] Sun Jan 22 00:39:44 2012 @@ -232,7 +232,7 @@ nid.cbSize = sizeof(nid); nid.uID = pContext->uID; nid.hWnd = pContext->hwndStatusDlg; - nid.u.uVersion = 3; + nid.uVersion = 3; if (pContext->pNet->GetProperties(&pProperties) == S_OK) { @@ -859,7 +859,7 @@ ZeroMemory(hppages, sizeof(hppages)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; - pinfo.u3.phpage = hppages; + pinfo.phpage = hppages; pinfo.hwndParent = hwndDlg; if (pContext->pNet->GetProperties(&pProperties) == S_OK) @@ -1035,7 +1035,7 @@ nid.cbSize = sizeof(nid); nid.uID = Index++; nid.uFlags = NIF_MESSAGE; - nid.u.uVersion = 3; + nid.uVersion = 3; nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.hWnd = hwndDlg; Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Sun Jan 22 00:39:44 2012 @@ -9,9 +9,6 @@ #include <ctype.h> #include <malloc.h> -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <winsock2.h> #include <windows.h> Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] Sun Jan 22 00:39:44 2012 @@ -498,7 +498,7 @@ if (SUCCEEDED(hr)) { strRet->uType = STRRET_WSTR; - strRet->u.pOleStr = pszName; + strRet->pOleStr = pszName; } else { @@ -578,7 +578,7 @@ { psd->str.uType = STRRET_WSTR; if (LoadStringW(netshell_hInstance, NetConnectSFHeader[iColumn].colnameid, buffer, MAX_PATH)) - hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + hr = SHStrDupW(buffer, &psd->str.pOleStr); return hr; } @@ -608,7 +608,7 @@ if (LoadStringW(netshell_hInstance, IDS_TYPE_ETHERNET, buffer, MAX_PATH)) { psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + hr = SHStrDupW(buffer, &psd->str.pOleStr); } } break; @@ -629,7 +629,7 @@ { buffer[MAX_PATH-1] = L'\0'; psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + hr = SHStrDupW(buffer, &psd->str.pOleStr); } break; case COLUMN_DEVNAME: @@ -638,17 +638,17 @@ wcscpy(buffer, pProperties->pszwDeviceName); buffer[MAX_PATH-1] = L'\0'; psd->str.uType = STRRET_WSTR; - hr = SHStrDupW(buffer, &psd->str.u.pOleStr); + hr = SHStrDupW(buffer, &psd->str.pOleStr); } else { - psd->str.u.cStr[0] = '\0'; + psd->str.cStr[0] = '\0'; psd->str.uType = STRRET_CSTR; } break; case COLUMN_PHONE: case COLUMN_OWNER: - psd->str.u.cStr[0] = '\0'; + psd->str.cStr[0] = '\0'; psd->str.uType = STRRET_CSTR; break; } @@ -840,7 +840,7 @@ if (pinfo->nPages < MAX_PROPERTY_SHEET_PAGE) { - pinfo->u3.phpage[pinfo->nPages++] = hPage; + pinfo->phpage[pinfo->nPages++] = hPage; return TRUE; } return FALSE; @@ -903,7 +903,7 @@ ZeroMemory(hppages, sizeof(hppages)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; - pinfo.u3.phpage = hppages; + pinfo.phpage = hppages; pinfo.hwndParent = hwnd; pinfo.pszCaption = pProperties->pszwName;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012