11 Jan
2005
11 Jan
'05
11:05 p.m.
Sync to Wine-20050111:
Robert Shearman <rob(a)codeweavers.com>
- Change dialog templates to not explicitly specify extended window
styles for the static rects on the Page Setup dialog as the ones
specified were wrong anyway.
Dmitry Timoshkov <dmitry(a)codeweavers.com>
- Replace 'All xxx pages' text in common print dialog by simple 'All'.
Jose Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es>
- Updated Spanish resource.
Jacek Caban <jack(a)itma.pwr.wroc.pl>
- Moved save* strings to resources.
- Moved string to resources.
- Get rid of W->A calls.
- Unicodified fontdlg.
Eric Pouech <pouech-eric(a)wanadoo.fr>
- Removed excessive statement (break after return or goto, not useful
break, not needed vars...)
Paul Vriens <Paul.Vriens(a)xs4all.nl>
- use Interlocked* functions in AddRef and Release.
- store the result of the Interlocked functions and use only this.
Michael Stefaniuc <mstefani(a)redhat.de>
- Do not check for non NULL pointer before HeapFree'ing it. It's
redundant.
Alexandre Julliard <julliard(a)winehq.org>
- Janitorial: C booleans must not be compared against TRUE.
Modified: trunk/reactos/lib/comdlg32/cdlg.h
Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Th.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc
Modified: trunk/reactos/lib/comdlg32/colordlg.c
Modified: trunk/reactos/lib/comdlg32/filedlg.c
Modified: trunk/reactos/lib/comdlg32/filedlg31.c
Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c
Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h
Modified: trunk/reactos/lib/comdlg32/fontdlg.c
Modified: trunk/reactos/lib/comdlg32/fontdlg16.c
Modified: trunk/reactos/lib/comdlg32/printdlg.c
_____
Modified: trunk/reactos/lib/comdlg32/cdlg.h
--- trunk/reactos/lib/comdlg32/cdlg.h 2005-01-11 22:46:30 UTC (rev
12934)
+++ trunk/reactos/lib/comdlg32/cdlg.h 2005-01-11 23:05:16 UTC (rev
12935)
@@ -93,7 +93,7 @@
#define PD32_DEFAULT_PRINTER 1582
#define PD32_NR_OF_DOCUMENTS_IN_QUEUE 1583
-#define PD32_PRINT_ALL_X_PAGES 1584
+
#define PD32_MARGINS_IN_INCHES 1585
#define PD32_MARGINS_IN_MILIMETERS 1586
#define PD32_MILIMETERS 1587
@@ -145,6 +145,13 @@
#define IDS_COLOR_AQUA 1054
#define IDS_COLOR_WHITE 1055
+#define IDS_FONT_SIZE 1200
+#define IDS_SAVE_BUTTON 1201
+#define IDS_SAVE_IN 1202
+#define IDS_SAVE 1203
+#define IDS_SAVE_AS 1204
+#define IDS_OPEN_FILE 1205
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
@@ -199,26 +206,25 @@
{
HWND hWnd1;
HWND hWnd2;
- LPCHOOSEFONTA lpcf32a;
+ LPCHOOSEFONTW lpcf32w;
int added;
} CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT;
-INT AddFontFamily(const ENUMLOGFONTEXA *lpElfex, const NEWTEXTMETRICEXA
*lpNTM,
- UINT nFontType, LPCHOOSEFONTA lpcf, HWND hwnd,
+INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW
*lpNTM,
+ UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd,
LPCFn_ENUMSTRUCT e);
-INT AddFontStyle(const ENUMLOGFONTEXA *lpElfex, const NEWTEXTMETRICEXA
*metrics,
- UINT nFontType, LPCHOOSEFONTA lpcf, HWND hcmb2, HWND
hcmb3,
+INT AddFontStyle(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW
*metrics,
+ UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND
hcmb3,
HWND hDlg, BOOL iswin16);
void _dump_cf_flags(DWORD cflags);
LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
- LPCHOOSEFONTA lpcf);
+ LPCHOOSEFONTW lpcf);
LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam);
LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam);
LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
- LPCHOOSEFONTA lpcf);
+ LPCHOOSEFONTW lpcf);
LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
- LPCHOOSEFONTA lpcf);
-LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam);
+ LPCHOOSEFONTW lpcf);
#endif /* _WINE_DLL_CDLG_H */
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc
--- trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -300,9 +300,9 @@
CAPTION "Ò³ÃæÉèÖÃ"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Ö½ÕÅ", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "´óС(&S):", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -408,7 +408,6 @@
PD32_DEFAULT_PRINTER "Default Printer; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in
the queue"
- PD32_PRINT_ALL_X_PAGES "&All %d pages"
PD32_MARGINS_IN_INCHES "Margins [inches]"
PD32_MARGINS_IN_MILIMETERS "Margins [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc
--- trunk/reactos/lib/comdlg32/cdlg_De.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_De.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -120,9 +120,9 @@
CAPTION "Seite einrichten"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Größe:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -402,7 +402,6 @@
PD32_DEFAULT_PRINTER "Standard Drucker; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Es sind %d Dokumente in der
Queue"
- PD32_PRINT_ALL_X_PAGES "&Alle %d Seiten"
PD32_MARGINS_IN_INCHES "Ränder [inches/zoll]"
PD32_MARGINS_IN_MILIMETERS "Ränder [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc
--- trunk/reactos/lib/comdlg32/cdlg_En.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_En.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -300,9 +300,9 @@
CAPTION "Setup Page"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Size:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -408,7 +408,6 @@
PD32_DEFAULT_PRINTER "Default Printer; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in
the queue"
- PD32_PRINT_ALL_X_PAGES "&All %d pages"
PD32_MARGINS_IN_INCHES "Margins [inches]"
PD32_MARGINS_IN_MILIMETERS "Margins [mm]"
PD32_MILIMETERS "mm"
@@ -461,6 +460,15 @@
IDS_COLOR_WHITE "White"
}
+STRINGTABLE DISCARDABLE
+{
+ IDS_FONT_SIZE "Select a font size between %d and %d points."
+ IDS_SAVE_BUTTON "&Save"
+ IDS_SAVE_IN "Save &in:"
+ IDS_SAVE "Save"
+ IDS_SAVE_AS "Save as"
+ IDS_OPEN_FILE "Open File"
+}
/****************************************************************/
/* English neutral resources
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc
--- trunk/reactos/lib/comdlg32/cdlg_Es.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Es.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -1,6 +1,6 @@
/*
* Copyright 1995 Jon Tombs
- * Copyright 2004 José Manuel Ferrer Ortiz
+ * Copyright 2004, 2005 José Manuel Ferrer Ortiz
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -139,7 +139,7 @@
CHECKBOX "&Subrayado", chx2, 10,94,50,10, BS_AUTOCHECKBOX
LTEXT "&Color:", stc4 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST |
CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
- CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL |
WS_TABSTOP
+ CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL |
WS_TABSTOP
GROUPBOX "Ejemplo",grp2,98,72,120,36,WS_GROUP
CTEXT "AaBbYyZzÑñ",stc5,103,80,109,24,SS_NOPREFIX | NOT
WS_VISIBLE
LTEXT "Codificación:",stc7 ,98,114,80,9
@@ -155,7 +155,7 @@
{
LTEXT "Colores &básicos:", 1088, 4, 4, 140, 10
LTEXT "Colores person&alizados:", 1089, 4, 106, 140, 10
- LTEXT "Color|Sól&ido", 1090, 150, 151, 48, 10
+ LTEXT "Color | Sól&ido", 1090, 150, 151, 48, 10
LTEXT "&Rojo:", 726 /*1094*/,249,126,24,10
EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
LTEXT "&Verde:",727/*1095*/,249,140,24,10
@@ -178,7 +178,7 @@
PUSHBUTTON "A&yuda", pshHelp,100,166, 44, 14
PUSHBUTTON "Añadir a &colores personalizados", 712/*1024*/, 152, 166,
142, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Definir colores personalizados >>", 719/*1025*/, 4,
150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like
&i
in "sol&id" */
+ PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like
&i
in "sol&id" */
}
@@ -267,7 +267,7 @@
BEGIN
DEFPUSHBUTTON "Aceptar",IDOK,180,156,48,14,WS_GROUP
PUSHBUTTON "Cancelar",IDCANCEL,232,156,48,14
-/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */
+/* PUSHBUTTON "Red...", psh5, 284,156,48,14 */
GROUPBOX "Impresora", grp4, 8, 4, 272,84, WS_GROUP
PUSHBUTTON "&Propiedades", psh2, 212, 17, 60,14, WS_GROUP
@@ -299,9 +299,9 @@
CAPTION "Página de configuración"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Tamaño:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -409,7 +409,6 @@
PD32_DEFAULT_PRINTER "Impresora por defecto; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Hay %d documentos en la
cola"
- PD32_PRINT_ALL_X_PAGES "&Todas las %d páginas"
PD32_MARGINS_IN_INCHES "Márgenes [pulgadas]"
PD32_MARGINS_IN_MILIMETERS "Márgenes [mm]"
PD32_MILIMETERS "mm"
@@ -418,7 +417,7 @@
PD32_PRINTER_STATUS_PAUSED "Pausada; "
PD32_PRINTER_STATUS_ERROR "Error; "
PD32_PRINTER_STATUS_PENDING_DELETION "Borrado pendiente; "
- PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; "
+ PD32_PRINTER_STATUS_PAPER_JAM "Papel atascado; "
PD32_PRINTER_STATUS_PAPER_OUT "Sin papel; "
PD32_PRINTER_STATUS_MANUAL_FEED "Ponga papel a mano; "
PD32_PRINTER_STATUS_PAPER_PROBLEM "Problema con el papel; "
@@ -451,7 +450,7 @@
IDS_COLOR_OLIVE "Oliva"
IDS_COLOR_NAVY "Azul marino"
IDS_COLOR_PURPLE "Morado"
- IDS_COLOR_TEAL "Teal"
+ IDS_COLOR_TEAL "Turquesa"
IDS_COLOR_GRAY "Gris"
IDS_COLOR_SILVER "Plateado"
IDS_COLOR_RED "Rojo"
@@ -462,3 +461,8 @@
IDS_COLOR_AQUA "Agua"
IDS_COLOR_WHITE "Blanco"
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_FONT_SIZE "Elija un tamaño de fuente entre %d and %d puntos."
+}
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc
--- trunk/reactos/lib/comdlg32/cdlg_Fr.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Fr.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -303,9 +303,9 @@
CAPTION "Mise en page"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Taille:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -411,7 +411,6 @@
PD32_DEFAULT_PRINTER "Imprimante par défaut; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Il y a %d documents dans la
file d'attente"
- PD32_PRINT_ALL_X_PAGES "&Toutes les %d pages"
PD32_MARGINS_IN_INCHES "Marges [pouces]"
PD32_MARGINS_IN_MILIMETERS "Marges [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc
--- trunk/reactos/lib/comdlg32/cdlg_It.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_It.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -300,9 +300,9 @@
CAPTION "Setup di Pagina"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Carta", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Dimensione:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -407,7 +407,6 @@
PD32_DEFAULT_PRINTER "Stampante predefinita; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Ci sono %d documenti nella
coda di stampa"
- PD32_PRINT_ALL_X_PAGES "&Tutte le %d pagine"
PD32_MARGINS_IN_INCHES "Margini [pollici]"
PD32_MARGINS_IN_MILIMETERS "Margini [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc
--- trunk/reactos/lib/comdlg32/cdlg_Nl.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Nl.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -251,7 +251,7 @@
EDITTEXT edt3, 240,106, 32,12, WS_GROUP |
ES_NUMBER
GROUPBOX "Afdrukbereik", grp1, 8,92, 144,64, WS_GROUP
- CONTROL "&Alle xx",
rad1,"Button",BS_AUTORADIOBUTTON
| WS_GROUP | WS_TABSTOP,16,106,64,12
+ CONTROL "&Alle",
rad1,"Button",BS_AUTORADIOBUTTON
| WS_GROUP | WS_TABSTOP,16,106,64,12
CONTROL "&Pagina's",
rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
CONTROL "Sele&ctie",
rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
EDITTEXT edt1, 74,122, 26,12, WS_GROUP |
ES_NUMBER
@@ -289,7 +289,6 @@
PD32_DEFAULT_PRINTER "Default Printer, "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Er staan %d documenten in de
\
wachtrij"
- PD32_PRINT_ALL_X_PAGES "&Alle %d pagina's"
PD32_MARGINS_IN_INCHES "Marges [inch]"
PD32_MARGINS_IN_MILIMETERS "Marges [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc
--- trunk/reactos/lib/comdlg32/cdlg_Pl.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Pl.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -302,9 +302,9 @@
CAPTION "Ustawienia Strony"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Rozmiar:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -405,7 +405,6 @@
PD32_DEFAULT_PRINTER "Domyolna Drukarka; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "W kolejce znajduj¹ siê %d
dokumenty"
- PD32_PRINT_ALL_X_PAGES "&Wszystkie %d strony"
PD32_MARGINS_IN_INCHES "Marginesy [cale]"
PD32_MARGINS_IN_MILIMETERS "Marginesy [mm]"
PD32_MILIMETERS "mm"
@@ -437,6 +436,16 @@
PD32_PRINTER_STATUS_POWER_SAVE "Tryb oszczêdzania energii; "
}
+STRINGTABLE DISCARDABLE
+{
+ IDS_FONT_SIZE "Wybierz czcionkê o rozmiarze pomiêdzy %d a %d
punktami."
+ IDS_SAVE_BUTTON "&Zapisz"
+ IDS_SAVE_IN "Zapisz &w:"
+ IDS_SAVE "Zapisz"
+ IDS_SAVE_AS "Zapisz jako"
+ IDS_OPEN_FILE "Otwórz Plik"
+}
+
STRINGTABLE DISCARDABLE /* Color names */
{
IDS_COLOR_BLACK "Czarny"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc
--- trunk/reactos/lib/comdlg32/cdlg_Pt.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Pt.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -301,9 +301,9 @@
CAPTION "Configurações de Página"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Tamanho:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -407,7 +407,6 @@
PD32_DEFAULT_PRINTER "Impressora Padrão; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos
na fila"
- PD32_PRINT_ALL_X_PAGES "&Todas %d páginas"
PD32_MARGINS_IN_INCHES "Margens [polegadas]"
PD32_MARGINS_IN_MILIMETERS "Margens [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc
--- trunk/reactos/lib/comdlg32/cdlg_Ru.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Ru.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -376,7 +376,6 @@
PD32_DEFAULT_PRINTER "Ïðèíòåð ïî óìîë÷àíèþ; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíòîâ â î÷åðåäè"
- PD32_PRINT_ALL_X_PAGES "&Âñå %d ñòðàíèö"
PD32_MARGINS_IN_INCHES "Ãðàíèöû [äþéìû)"
PD32_MARGINS_IN_MILIMETERS "Ãðàíèöû [ìì]"
PD32_MILIMETERS "ìì"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc
--- trunk/reactos/lib/comdlg32/cdlg_Si.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Si.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -300,9 +300,9 @@
CAPTION "Priprava strani"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papir", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "Veli&kost:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -405,7 +405,6 @@
PD32_DEFAULT_PRINTER "Privzeti tiskalnik; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d èakajoèih dok."
- PD32_PRINT_ALL_X_PAGES "&Vse strani -- %d"
PD32_MARGINS_IN_INCHES "Robovi [palci]"
PD32_MARGINS_IN_MILIMETERS "Robovi [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc
--- trunk/reactos/lib/comdlg32/cdlg_Sk.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Sk.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -378,7 +378,6 @@
PD32_DEFAULT_PRINTER "Implicitná tlaèiareò; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in
queue"
- PD32_PRINT_ALL_X_PAGES "&Vsetky %d strany"
PD32_MARGINS_IN_INCHES "Okraje [palce]"
PD32_MARGINS_IN_MILIMETERS "Okraje [mm]"
PD32_MILIMETERS "mm"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc
--- trunk/reactos/lib/comdlg32/cdlg_Sv.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Sv.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -293,9 +293,9 @@
CAPTION "Utskriftsformat"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "Papper", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "&Storlek:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160,
160,CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -398,7 +398,6 @@
PD32_DEFAULT_PRINTER "Standardskrivare; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det är %d dokument i kön"
- PD32_PRINT_ALL_X_PAGES "&Alla %d sidor"
PD32_MARGINS_IN_INCHES "Marginaler [inches]"
PD32_MARGINS_IN_MILIMETERS "Marginaler [millimeter]"
PD32_MILIMETERS "millimeter"
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Th.rc
--- trunk/reactos/lib/comdlg32/cdlg_Th.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Th.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -297,9 +297,9 @@
CAPTION "»ÃѺáµè§"
FONT 8, "MS Shell Dlg"
BEGIN
- CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
- CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
- CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
GROUPBOX "¡ÃдÒÉ", grp2, 8, 96, 224, 56, BS_GROUPBOX
LTEXT "¢¹Ò´:", stc2, 16, 112, 36, 8
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
@@ -402,7 +402,6 @@
PD32_DEFAULT_PRINTER "à¤Ã×èͧ¾ÔÁ¾ì»¡µÔ; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "ÁÕ %d á¿éÁÃÍÍÂÙè"
- PD32_PRINT_ALL_X_PAGES "·Ø¡ %d ˹éÒ"
PD32_MARGINS_IN_INCHES "¢Íº¡ÃдÒÉ [¹ÔéÇ]"
PD32_MARGINS_IN_MILIMETERS "¢Íº¡ÃдÒÉ [ÁÁ.]"
PD32_MILIMETERS "ÁÁ."
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc
--- trunk/reactos/lib/comdlg32/cdlg_Uk.rc 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/cdlg_Uk.rc 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -376,7 +376,6 @@
PD32_DEFAULT_PRINTER "Ïðèíòåð çà îáóìîâëåííÿì; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d äîêóìåíò³â ó ÷åðç³"
- PD32_PRINT_ALL_X_PAGES "&Âñ³ %d ñòîð³íîê"
PD32_MARGINS_IN_INCHES "Ìåæ³ [äþéìè]"
PD32_MARGINS_IN_MILIMETERS "Ìåæ³ [ìì]"
PD32_MILIMETERS "ìì"
_____
Modified: trunk/reactos/lib/comdlg32/colordlg.c
--- trunk/reactos/lib/comdlg32/colordlg.c 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/colordlg.c 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -1057,11 +1057,10 @@
*/
LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam )
{
- HDC hdc;
PAINTSTRUCT ps;
LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER);
- hdc = BeginPaint(hDlg, &ps);
+ BeginPaint(hDlg, &ps);
/* we have to paint dialog children except text and buttons */
CC_PaintPredefColorArray(hDlg, 6, 8);
CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors);
@@ -1072,7 +1071,7 @@
CC_PaintColorGraph(hDlg);
EndPaint(hDlg, &ps);
- return TRUE;
+ return TRUE;
}
/***********************************************************************
@@ -1289,7 +1288,8 @@
{
HRSRC hResInfo;
HGLOBAL hDlgTmpl;
- if (!(hResInfo = FindResourceA(COMDLG32_hInstance,
"CHOOSE_COLOR", (LPSTR)RT_DIALOG)))
+ static const WCHAR wszCHOOSE_COLOR[] =
{'C','H','O','O','S','E','_','C','O','L','O','R',0};
+ if (!(hResInfo = FindResourceW(COMDLG32_hInstance,
wszCHOOSE_COLOR, (LPWSTR)RT_DIALOG)))
{
COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
return FALSE;
_____
Modified: trunk/reactos/lib/comdlg32/filedlg.c
--- trunk/reactos/lib/comdlg32/filedlg.c 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/filedlg.c 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -314,7 +314,7 @@
ZeroMemory(&fodInfos, sizeof(FileOpenDlgInfos));
/* Pass in the original ofn */
- fodInfos.ofnInfos = ofn;
+ fodInfos.ofnInfos = (LPOPENFILENAMEW)ofn;
/* save current directory */
if (ofn->Flags & OFN_NOCHANGEDIR)
@@ -445,13 +445,13 @@
{
BOOL ret;
FileOpenDlgInfos fodInfos;
- LPSTR lpstrSavDir = NULL;
+ LPWSTR lpstrSavDir = NULL;
/* Initialize FileOpenDlgInfos structure */
ZeroMemory(&fodInfos, sizeof(FileOpenDlgInfos));
/* Pass in the original ofn */
- fodInfos.ofnInfos = (LPOPENFILENAMEA) ofn;
+ fodInfos.ofnInfos = ofn;
fodInfos.title = ofn->lpstrTitle;
fodInfos.defext = ofn->lpstrDefExt;
@@ -479,8 +479,8 @@
/* save current directory */
if (ofn->Flags & OFN_NOCHANGEDIR)
{
- lpstrSavDir = MemAlloc(MAX_PATH);
- GetCurrentDirectoryA(MAX_PATH, lpstrSavDir);
+ lpstrSavDir = MemAlloc(MAX_PATH*sizeof(WCHAR));
+ GetCurrentDirectoryW(MAX_PATH, lpstrSavDir);
}
fodInfos.unicode = TRUE;
@@ -500,7 +500,7 @@
if (lpstrSavDir)
{
- SetCurrentDirectoryA(lpstrSavDir);
+ SetCurrentDirectoryW(lpstrSavDir);
MemFree(lpstrSavDir);
}
@@ -729,12 +729,12 @@
hinst = fodInfos->ofnInfos->hInstance;
if(fodInfos->unicode)
{
- LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos;
+ LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
hRes = FindResourceW( hinst, ofn->lpTemplateName,
(LPWSTR)RT_DIALOG);
}
else
{
- LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+ LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos;
hRes = FindResourceA( hinst, ofn->lpTemplateName,
(LPSTR)RT_DIALOG);
}
if (!hRes)
@@ -807,7 +807,7 @@
ofnNotify.hdr.hwndFrom=hwndParentDlg;
ofnNotify.hdr.idFrom=0;
ofnNotify.hdr.code = uCode;
- ofnNotify.lpOFN = (LPOPENFILENAMEW) fodInfos->ofnInfos;
+ ofnNotify.lpOFN = fodInfos->ofnInfos;
ofnNotify.pszFile = NULL;
ret =
SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo
tify);
}
@@ -817,7 +817,7 @@
ofnNotify.hdr.hwndFrom=hwndParentDlg;
ofnNotify.hdr.idFrom=0;
ofnNotify.hdr.code = uCode;
- ofnNotify.lpOFN = fodInfos->ofnInfos;
+ ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos;
ofnNotify.pszFile = NULL;
ret =
SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo
tify);
}
@@ -1164,7 +1164,9 @@
}
else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
{
- SetWindowTextA(hwnd,"Save");
+ WCHAR buf[16];
+ LoadStringW(COMDLG32_hInstance, IDS_SAVE, buf,
sizeof(buf)/sizeof(WCHAR));
+ SetWindowTextW(hwnd, buf);
}
/* Initialise the file name edit control */
@@ -1388,11 +1390,14 @@
(rectDlg.bottom-rectDlg.top) - (rectHelp.bottom -
rectCancel.bottom),
SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
}
- /* change Open to Save FIXME: use resources */
+ /* change Open to Save */
if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
{
- SetDlgItemTextA(hwnd,IDOK,"&Save");
- SetDlgItemTextA(hwnd,IDC_LOOKINSTATIC,"Save &in");
+ WCHAR buf[16];
+ LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf,
sizeof(buf)/sizeof(WCHAR));
+ SetDlgItemTextW(hwnd, IDOK, buf);
+ LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf,
sizeof(buf)/sizeof(WCHAR));
+ SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf);
}
return 0;
}
@@ -1582,12 +1587,12 @@
if(fodInfos->unicode)
{
- LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos;
+ LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
ofn->lpstrFile[0] = '\0';
}
else
{
- LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+ LPOPENFILENAMEA ofn = (LPOPENFILENAMEA) fodInfos->ofnInfos;
ofn->lpstrFile[0] = '\0';
}
@@ -1640,13 +1645,13 @@
}
if(fodInfos->unicode)
{
- LPOPENFILENAMEW ofn = (LPOPENFILENAMEW) fodInfos->ofnInfos;
+ LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
strcpyW( ofn->lpstrFile, lpstrPathSpec);
memcpy( ofn->lpstrFile + nSizePath, lpstrFileList,
sizeUsed*sizeof(WCHAR) );
}
else
{
- LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+ LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos;
if (ofn->lpstrFile != NULL)
{
@@ -1684,14 +1689,14 @@
#define ONOPEN_SEARCH 3
static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int
idText)
{
- char strMsgTitle[MAX_PATH];
- char strMsgText [MAX_PATH];
+ WCHAR strMsgTitle[MAX_PATH];
+ WCHAR strMsgText [MAX_PATH];
if (idCaption)
- LoadStringA(COMDLG32_hInstance, idCaption, strMsgTitle,
sizeof(strMsgTitle));
+ LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle,
sizeof(strMsgTitle)/sizeof(WCHAR));
else
strMsgTitle[0] = '\0';
- LoadStringA(COMDLG32_hInstance, idText, strMsgText,
sizeof(strMsgText));
- MessageBoxA(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND);
+ LoadStringW(COMDLG32_hInstance, idText, strMsgText,
sizeof(strMsgText)/sizeof(WCHAR));
+ MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND);
}
BOOL FILEDLG95_OnOpen(HWND hwnd)
@@ -2027,7 +2032,7 @@
{
if(fodInfos->unicode)
{
- LPOPENFILENAMEW ofn = (LPOPENFILENAMEW)
fodInfos->ofnInfos;
+ LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
strncpyW(ofn->lpstrFile, lpstrPathAndFile,
ofn->nMaxFile);
if (ofn->Flags & OFN_ALLOWMULTISELECT)
@@ -2035,7 +2040,7 @@
}
else
{
- LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+ LPOPENFILENAMEA ofn =
(LPOPENFILENAMEA)fodInfos->ofnInfos;
WideCharToMultiByte(CP_ACP, 0, lpstrPathAndFile, -1,
ofn->lpstrFile, ofn->nMaxFile, NULL,
NULL);
@@ -2058,12 +2063,12 @@
LPWSTR lpstrFileTitle =
PathFindFileNameW(lpstrPathAndFile);
if(fodInfos->unicode)
{
- LPOPENFILENAMEW ofn = (LPOPENFILENAMEW)
fodInfos->ofnInfos;
+ LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
strncpyW(ofn->lpstrFileTitle, lpstrFileTitle,
ofn->nMaxFileTitle);
}
else
{
- LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+ LPOPENFILENAMEA ofn =
(LPOPENFILENAMEA)fodInfos->ofnInfos;
WideCharToMultiByte(CP_ACP, 0, lpstrFileTitle, -1,
ofn->lpstrFileTitle, ofn->nMaxFileTitle, NULL,
NULL);
}
@@ -2072,7 +2077,7 @@
/* copy currently selected filter to lpstrCustomFilter */
if (fodInfos->ofnInfos->lpstrCustomFilter)
{
- LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+ LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos;
int len = WideCharToMultiByte(CP_ACP, 0,
fodInfos->ShellInfos.lpstrCurrentFilter, -1,
NULL, 0, NULL, NULL);
if (len + strlen(ofn->lpstrCustomFilter) + 1 <=
ofn->nMaxCustFilter)
@@ -3208,7 +3213,6 @@
if(!lpsf)
{
- HRESULT hRes;
SHGetDesktopFolder(&lpsf);
hRes = GetName(lpsf,pidl,dwFlags,lpstrFileName);
IShellFolder_Release(lpsf);
@@ -3358,10 +3362,7 @@
static void MemFree(void *mem)
{
- if(mem)
- {
- HeapFree(GetProcessHeap(),0,mem);
- }
+ HeapFree(GetProcessHeap(),0,mem);
}
/*
_____
Modified: trunk/reactos/lib/comdlg32/filedlg31.c
--- trunk/reactos/lib/comdlg32/filedlg31.c 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/filedlg31.c 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -586,11 +586,8 @@
static LRESULT FD31_FileTypeChange( PFD31_DATA lfs )
{
LONG lRet;
- WCHAR diskname[BUFFILE];
LPWSTR pstr;
- diskname[0] = 0;
-
lRet = SendDlgItemMessageW(lfs->hwnd, cmb1, CB_GETCURSEL, 0, 0);
if (lRet == LB_ERR)
return TRUE;
@@ -705,7 +702,6 @@
*/
void FD31_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW,
BOOL open)
{
- LPCSTR str;
UNICODE_STRING usBuffer;
ofnW->lStructSize = sizeof(OPENFILENAMEW);
@@ -727,13 +723,18 @@
RtlCreateUnicodeStringFromAsciiz
(&usBuffer,ofnA->lpstrInitialDir);
ofnW->lpstrInitialDir = usBuffer.Buffer;
}
- if (ofnA->lpstrTitle)
- str = ofnA->lpstrTitle;
- else
- /* Allocates default title (FIXME : get it from resource) */
- str = open ? "Open File" : "Save as";
- RtlCreateUnicodeStringFromAsciiz (&usBuffer,str);
- ofnW->lpstrTitle = usBuffer.Buffer;
+ if (ofnA->lpstrTitle) {
+ RtlCreateUnicodeStringFromAsciiz (&usBuffer, ofnA->lpstrTitle);
+ ofnW->lpstrTitle = usBuffer.Buffer;
+ } else {
+ WCHAR buf[16];
+ int len;
+ LoadStringW(COMDLG32_hInstance, open ? IDS_OPEN_FILE :
IDS_SAVE_AS,
+ buf, sizeof(buf)/sizeof(WCHAR));
+ len = lstrlenW(buf)+1;
+ ofnW->lpstrTitle = HeapAlloc(GetProcessHeap(), 0,
len*sizeof(WCHAR));
+ memcpy((void*)ofnW->lpstrTitle, buf, len*sizeof(WCHAR));
+ }
ofnW->Flags = ofnA->Flags;
ofnW->nFileOffset = ofnA->nFileOffset;
ofnW->nFileExtension = ofnA->nFileExtension;
@@ -757,12 +758,12 @@
*/
void FD31_FreeOfnW(LPOPENFILENAMEW ofnW)
{
- if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR)
ofnW->lpstrFilter);
- if (ofnW->lpstrCustomFilter) HeapFree(GetProcessHeap(), 0,
ofnW->lpstrCustomFilter);
- if (ofnW->lpstrFile) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile);
- if (ofnW->lpstrFileTitle) HeapFree(GetProcessHeap(), 0,
ofnW->lpstrFileTitle);
- if (ofnW->lpstrInitialDir) HeapFree(GetProcessHeap(), 0, (LPWSTR)
ofnW->lpstrInitialDir);
- if (ofnW->lpstrTitle) HeapFree(GetProcessHeap(), 0, (LPWSTR)
ofnW->lpstrTitle);
+ HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter);
+ HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter);
+ HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile);
+ HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle);
+ HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir);
+ HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle);
if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName)))
HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName);
}
_____
Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c
--- trunk/reactos/lib/comdlg32/filedlgbrowser.c 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/filedlgbrowser.c 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -216,10 +216,11 @@
ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
{
IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
+ ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p,%lu)\n", This, This->ref);
+ TRACE("(%p,%lu)\n", This, ref - 1);
- return ++(This->ref);
+ return ref;
}
/***********************************************************************
***
@@ -228,16 +229,17 @@
ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
{
IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
+ ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p,%lu)\n", This, This->ref);
+ TRACE("(%p,%lu)\n", This, ref + 1);
- if (!--(This->ref))
+ if (!ref)
{
COMDLG32_SHFree(This);
TRACE("-- destroyed\n");
return 0;
}
- return This->ref;
+ return ref;
}
/*
_____
Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h
--- trunk/reactos/lib/comdlg32/filedlgbrowser.h 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/filedlgbrowser.h 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -56,7 +56,7 @@
typedef struct
{
- LPOPENFILENAMEA ofnInfos;
+ LPOPENFILENAMEW ofnInfos;
BOOL unicode;
LPWSTR initdir;
LPWSTR filename;
_____
Modified: trunk/reactos/lib/comdlg32/fontdlg.c
--- trunk/reactos/lib/comdlg32/fontdlg.c 2005-01-11 22:46:30 UTC
(rev 12934)
+++ trunk/reactos/lib/comdlg32/fontdlg.c 2005-01-11 23:05:16 UTC
(rev 12935)
@@ -36,7 +36,10 @@
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-#define WINE_FONTDATA "__WINE_FONTDLGDATA"
+static const WCHAR strWineFontData[] =
{'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A'
,0};
+static const WCHAR strWineFontData_a[] =
+
{'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A'
,'_','A',0};
+static const WCHAR chooseFontW[] =
{'C','H','O','O','S','E','_','F','O','N','T',0};
#include "cdlg.h"
@@ -44,12 +47,9 @@
static HIMAGELIST himlTT = 0;
#define TTBITMAP_XSIZE 20 /* x-size of the bitmaps */
+INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM
wParam, LPARAM lParam);
+INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM
wParam, LPARAM lParam);
-INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM
wParam,
- LPARAM lParam);
-INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM
wParam,
- LPARAM lParam);
-
/* There is a table here of all charsets, and the sample text for each.
* There is a second table that translates a charset into an index into
* the first table.
@@ -168,8 +168,7 @@
HINSTANCE hDlginst;
HGLOBAL hDlgTmpl;
- static const WCHAR chooseFontW[] =
{'C','H','O','O','S','E','_',
-
'F','O','N','T',0};
+ TRACE("(%p)\n", lpChFont);
if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 )
{
@@ -221,6 +220,8 @@
HINSTANCE hDlginst;
HGLOBAL hDlgTmpl;
+ TRACE("(%p)\n", lpChFont);
+
if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 )
{
template=(LPCVOID)lpChFont->hInstance;
@@ -238,7 +239,7 @@
} else
{
hDlginst=COMDLG32_hInstance;
- if (!(hResInfo = FindResourceA(hDlginst, "CHOOSE_FONT",
(LPSTR)RT_DIALOG)))
+ if (!(hResInfo = FindResourceW(hDlginst, chooseFontW,
(LPWSTR)RT_DIALOG)))
{
COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
return FALSE;
@@ -253,7 +254,6 @@
}
if (TRACE_ON(commdlg))
_dump_cf_flags(lpChFont->Flags);
-
if (lpChFont->Flags & (CF_SELECTSCRIPT | CF_NOVERTFONTS ))
FIXME(": unimplemented flag (ignored)\n");
@@ -261,7 +261,6 @@
lpChFont->hwndOwner, FormatCharDlgProcA, (LPARAM)lpChFont
);
}
-
#define TEXT_EXTRAS 4
#define TEXT_COLORS 16
@@ -276,7 +275,7 @@
/***********************************************************************
* CFn_HookCallChk32
[internal]
*/
-static BOOL CFn_HookCallChk32(LPCHOOSEFONTA lpcf)
+static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf)
{
if (lpcf)
if(lpcf->Flags & CF_ENABLEHOOK)
@@ -288,14 +287,14 @@
/***********************************************************************
**
* AddFontFamily [internal]
*/
-INT AddFontFamily(const ENUMLOGFONTEXA *lpElfex, const NEWTEXTMETRICEXA
*lpNTM,
- UINT nFontType, LPCHOOSEFONTA lpcf, HWND hwnd, LPCFn_ENUMSTRUCT
e)
+INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW
*lpNTM,
+ UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, LPCFn_ENUMSTRUCT
e)
{
int i;
WORD w;
- const LOGFONTA *lplf = &(lpElfex->elfLogFont);
+ const LOGFONTW *lplf = &(lpElfex->elfLogFont);
- TRACE("font=%s (nFontType=%d)\n", lplf->lfFaceName,nFontType);
+ TRACE("font=%s (nFontType=%d)\n", debugstr_w(lplf->lfFaceName),
nFontType);
if (lpcf->Flags & CF_FIXEDPITCHONLY)
if (!(lplf->lfPitchAndFamily & FIXED_PITCH))
@@ -309,14 +308,14 @@
if (e) e->added++;
- i=SendMessageA(hwnd, CB_FINDSTRINGEXACT, 0,
(LPARAM)lplf->lfFaceName);
+ i=SendMessageW(hwnd, CB_FINDSTRINGEXACT, 0,
(LPARAM)lplf->lfFaceName);
if (i == CB_ERR) {
- i = SendMessageA(hwnd, CB_ADDSTRING, 0,
(LPARAM)lplf->lfFaceName);
+ i = SendMessageW(hwnd, CB_ADDSTRING, 0,
(LPARAM)lplf->lfFaceName);
if( i != CB_ERR) {
/* store some important font information */
w = (lplf->lfPitchAndFamily) << 8 |
(HIWORD(lpNTM->ntmTm.ntmFlags) & 0xff);
- SendMessageA(hwnd, CB_SETITEMDATA, i,
MAKELONG(nFontType,w));
+ SendMessageW(hwnd, CB_SETITEMDATA, i,
MAKELONG(nFontType,w));
}
}
return 1;
[truncated at 1000 lines; 1205 more skipped]