Author: winesync Date: Fri Aug 24 13:07:34 2007 New Revision: 28510
URL: http://svn.reactos.org/svn/reactos?rev=28510&view=rev Log: Autosyncing with Wine HEAD
Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg31.c trunk/reactos/dll/win32/comdlg32/printdlg.c
Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pl.... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc Fri Aug 24 13:07:34 2007 @@ -86,19 +86,19 @@ LTEXT "&Do:", 1091, 120, 80, 30, 9 LTEXT "Jakoæ &wydruku:", 1092, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Drukuj do Pli&ku", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Drukuj do pli&ku", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Sortuj kopie", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP }
PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ustawienia Wydruku" +CAPTION "Ustawienia wydruku" FONT 8, "MS Shell Dlg" { GROUPBOX "Drukarka", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "&Domylna drukarka", rad1, 16, 20, 80, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 + LTEXT "[brak]", 1088, 35, 35, 120, 9 RADIOBUTTON "&Inna drukarka", rad2, 16, 50, 80, 12 COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -178,7 +178,7 @@ PUSHBUTTON "Anuluj", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Pomoc", pshHelp,100,166, 44, 14 PUSHBUTTON "&Dodaj do dowolnych", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Z&definiuj Kolor >>", 719/*1025*/, 4, 150, 140, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Z&definiuj kolor >>", 719/*1025*/, 4, 150, 140, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ }
@@ -209,7 +209,7 @@ { LTEXT "&Znajd:", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Zanieñ &na:", -1, 4, 26, 48, 8 + LTEXT "Zamieñ &na:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Uwzglêdniaj &tylko ca³e wyrazy", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "&Uwzglêdniaj wielkoæ liter", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -238,13 +238,13 @@ LTEXT "&Nazwa:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stan:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Symulowany Stan", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowany stan", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Typ:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Symulowany Typ", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowany typ", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Gdzie:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Symulowana Lokalizacja", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowana lokalizacja", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Komentarz:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Symulowany Komentarz", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowany komentarz", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
GROUPBOX "Kopie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Lczba &kopii:",stc5,168,108,68,8 @@ -277,13 +277,13 @@ LTEXT "&Nazwa:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stan:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Symulowany Stan", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowany stan", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Typ:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Symulowany Typ", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowany typ", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Gdzie:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Symulowana Lokalizacja", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowana lokalizacja", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Komentarz:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Symulowany Komentarz", stc13, 60, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Symulowany komentarz", stc13, 60, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP LTEXT "&Rozmiar:", stc2, 16,108, 36, 8 @@ -357,15 +357,15 @@ IDS_DOCUMENTFOLDERS "Katalog Dokumentów" IDS_PERSONAL "Moje Dokumenty" IDS_FAVORITES "Moje Ulubione" - IDS_PATH "cie¿ka Systemowa" + IDS_PATH "cie¿ka systemowa" IDS_DESKTOP "Pulpit" IDS_FONTS "Czcionki" - IDS_MYCOMPUTER "Mój Komputer" + IDS_MYCOMPUTER "Mój komputer" }
STRINGTABLE DISCARDABLE { - IDS_SYSTEMFOLDERS "Katalogi Systemowe" + IDS_SYSTEMFOLDERS "Katalogi systemowe" IDS_LOCALHARDRIVES "Lokalne dyski twarde" IDS_FILENOTFOUND "Nie znaleziono pliku" IDS_VERIFYFILE "Sprawd, czy podana nazwa pliku jest prawid³owa." @@ -380,7 +380,7 @@ STRINGTABLE DISCARDABLE { IDS_UPFOLDER "Poziom w górê" - IDS_NEWFOLDER "Utwórz nowy folded" + IDS_NEWFOLDER "Utwórz nowy folder" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Szczegó³y" IDS_TODESKTOP "Przegl¹daj pulpit" @@ -391,7 +391,7 @@ PD32_PRINT_TITLE "Drukuj"
PD32_VALUE_UREADABLE "Sk³adnia zakresu stron jest nieprawid³owa." - PD32_INVALID_PAGE_RANGE "Ta wartoæ nie mieci siê w zakresie strony.\nWprowad liczbê pomiêdzy 'od' a 'do'" + PD32_INVALID_PAGE_RANGE "Ta wartoæ nie mieci siê w zakresie stron.\nWprowad liczbê pomiêdzy %d a %d." PD32_FROM_NOT_ABOVE_TO "Wartoæ od nie mo¿e byæ wiêksza ni¿ wartoæ do." PD32_MARGINS_OVERLAP "Marginesy znajduj¹ siê poza stron¹.\nWprowad inn¹ wielkoæ marginesu." PD32_NR_OF_COPIES_EMPTY "Wartoæ liczba kopii nie mo¿e byæ pusta." @@ -402,11 +402,11 @@ PD32_OUT_OF_MEMORY "Za ma³o pamiêci dla tej operacji." PD32_GENERIC_ERROR "Podczas tej operacji wyst¹pi³ b³¹d." PD32_DRIVER_UNKNOWN "Nieznany sterownik drukarki." - PD32_NO_DEVICES "Zanim bêdzie mo¿na wykonywaæ czynnoci zwi¹zane \ -z drukowaniem takie jak ustawienie strony lub wydruk dokumentu nale¿y zainstalowaæ drukarkê. \ + PD32_NO_DEVICES "Zanim bêdzie mo¿na wykonywaæ czynnoci zwi¹zane \ +z drukowaniem, takie jak ustawienie strony lub wydruk dokumentu, nale¿y zainstalowaæ drukarkê. \ Po zainstalowaniu spróbuj ponownie."
- PD32_DEFAULT_PRINTER "Domylna Drukarka; " + PD32_DEFAULT_PRINTER "Domylna drukarka; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "W kolejce znajduj¹ siê %d dokumenty" PD32_MARGINS_IN_INCHES "Marginesy [cale]" PD32_MARGINS_IN_MILIMETERS "Marginesy [mm]" @@ -417,19 +417,19 @@ PD32_PRINTER_STATUS_PENDING_DELETION "Kasowanie" PD32_PRINTER_STATUS_PAPER_JAM "Problemy z papierem; " PD32_PRINTER_STATUS_PAPER_OUT "Koniec papieru; " - PD32_PRINTER_STATUS_MANUAL_FEED "W³ó¿ papierl; " + PD32_PRINTER_STATUS_MANUAL_FEED "W³ó¿ papier; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemy z papierem; " PD32_PRINTER_STATUS_OFFLINE "Drukarka jest offline; " PD32_PRINTER_STATUS_IO_ACTIVE "Aktywnoæ I/O; " PD32_PRINTER_STATUS_BUSY "Zajêta; " PD32_PRINTER_STATUS_PRINTING "Drukuje; " PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Pojemnik jest zape³niony; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "Nie osi¹gala; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Nie osi¹galna; " PD32_PRINTER_STATUS_WAITING "Oczekuje; " PD32_PRINTER_STATUS_PROCESSING "Zajêta; " PD32_PRINTER_STATUS_INITIALIZING "Inicjuje; " PD32_PRINTER_STATUS_WARMING_UP "Uruchamianie; " - PD32_PRINTER_STATUS_TONER_LOW "Mo³o toneru; " + PD32_PRINTER_STATUS_TONER_LOW "Ma³o toneru; " PD32_PRINTER_STATUS_NO_TONER "Brak toneru; " PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " PD32_PRINTER_STATUS_USER_INTERVENTION "Przerwane przez u¿ytkownika; " @@ -446,7 +446,7 @@ IDS_SAVE_IN "Zapisz &w:" IDS_SAVE "Zapisz" IDS_SAVE_AS "Zapisz jako" - IDS_OPEN_FILE "Otwórz Plik" + IDS_OPEN_FILE "Otwórz plik" }
STRINGTABLE DISCARDABLE /* Color names */
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg32... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Fri Aug 24 13:07:34 2007 @@ -1,4 +1,4 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> @@ -8,12 +8,6 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> - - <metadata - description = "Common dialog boxes used by ReactOS" - version = "Autosync" - owner = "Wine" /> - <library>wine</library> <library>shell32</library> <library>shlwapi</library>
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg32... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff Fri Aug 24 13:07:34 2007 @@ -2,7 +2,7 @@ =================================================================== --- printdlg.c (revision 23123) +++ printdlg.c (working copy) -@@ -347,7 +347,7 @@ +@@ -352,7 +352,7 @@ lpdm->dmCollate = (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED); if (lpdm->dmFields & DM_COPIES) @@ -11,7 +11,7 @@ } else { if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) lppd->Flags |= PD_COLLATE; -@@ -425,7 +425,7 @@ +@@ -435,7 +435,7 @@ lpdm->dmCollate = (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED); if (lpdm->dmFields & DM_COPIES) @@ -20,7 +20,7 @@ } else { if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) lppd->Flags |= PD_COLLATE; -@@ -590,9 +590,9 @@ +@@ -600,9 +600,9 @@ Sel, 0); if (dm) { if (nIDComboBox == cmb2) @@ -32,7 +32,7 @@ } } else { -@@ -602,9 +602,9 @@ +@@ -612,9 +612,9 @@ */ if (dm) { if (nIDComboBox == cmb2) @@ -44,7 +44,7 @@ } }
-@@ -700,9 +700,9 @@ +@@ -710,9 +710,9 @@ Sel, 0); if (dm) { if (nIDComboBox == cmb2) @@ -56,7 +56,7 @@ } } else { -@@ -712,9 +712,9 @@ +@@ -722,9 +722,9 @@ */ if (dm) { if (nIDComboBox == cmb2) @@ -68,7 +68,7 @@ } }
-@@ -964,7 +964,7 @@ +@@ -974,7 +974,7 @@ if (lppd->hDevMode == 0) copies = lppd->nCopies; else @@ -77,7 +77,7 @@ if(copies == 0) copies = 1; else if(copies < 0) copies = MAX_COPIES; SetDlgItemInt(hDlg, edt3, copies, FALSE); -@@ -986,7 +986,7 @@ +@@ -996,7 +996,7 @@ ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */ @@ -86,7 +86,7 @@
PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2, PrintStructures->lpPrinterInfo->pPrinterName, -@@ -1113,7 +1113,7 @@ +@@ -1123,7 +1123,7 @@ if (lppd->hDevMode == 0) copies = lppd->nCopies; else @@ -95,7 +95,7 @@ if(copies == 0) copies = 1; else if(copies < 0) copies = MAX_COPIES; SetDlgItemInt(hDlg, edt3, copies, FALSE); -@@ -1135,7 +1135,7 @@ +@@ -1145,7 +1145,7 @@ ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */ @@ -104,7 +104,7 @@
PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2, PrintStructures->lpPrinterInfo->pPrinterName, -@@ -1509,7 +1509,7 @@ +@@ -1519,7 +1519,7 @@ case rad1: /* Paperorientation */ if (lppd->Flags & PD_PRINTSETUP) { @@ -113,7 +113,7 @@ SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM)(PrintStructures->hPortraitIcon)); } -@@ -1518,7 +1518,7 @@ +@@ -1528,7 +1528,7 @@ case rad2: /* Paperorientation */ if (lppd->Flags & PD_PRINTSETUP) { @@ -122,7 +122,7 @@ SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM)(PrintStructures->hLandscapeIcon)); } -@@ -1542,7 +1542,7 @@ +@@ -1552,7 +1552,7 @@ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); if(Sel != CB_ERR) @@ -131,7 +131,7 @@ CB_GETITEMDATA, Sel, 0); } -@@ -1552,7 +1552,7 @@ +@@ -1562,7 +1562,7 @@ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0); if(Sel != CB_ERR) @@ -140,7 +140,7 @@ CB_GETITEMDATA, Sel, 0); } -@@ -1563,8 +1563,8 @@ +@@ -1573,8 +1573,8 @@ case rad1: /* orientation */ case rad2: if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { @@ -151,7 +151,7 @@ SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)PrintStructures->hPortraitIcon); -@@ -1573,8 +1573,8 @@ +@@ -1583,8 +1583,8 @@ (LPARAM)PrintStructures->hPortraitIcon); } } else { @@ -162,7 +162,7 @@ SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)PrintStructures->hLandscapeIcon); -@@ -1673,7 +1673,7 @@ +@@ -1683,7 +1683,7 @@ case rad1: /* Paperorientation */ if (lppd->Flags & PD_PRINTSETUP) { @@ -171,7 +171,7 @@ SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM)(PrintStructures->hPortraitIcon)); } -@@ -1682,7 +1682,7 @@ +@@ -1692,7 +1692,7 @@ case rad2: /* Paperorientation */ if (lppd->Flags & PD_PRINTSETUP) { @@ -180,7 +180,7 @@ SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM)(PrintStructures->hLandscapeIcon)); } -@@ -1706,7 +1706,7 @@ +@@ -1716,7 +1716,7 @@ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); if(Sel != CB_ERR) @@ -189,7 +189,7 @@ CB_GETITEMDATA, Sel, 0); } -@@ -1716,7 +1716,7 @@ +@@ -1726,7 +1726,7 @@ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0); if(Sel != CB_ERR) @@ -198,7 +198,7 @@ CB_GETITEMDATA, Sel, 0); } -@@ -1727,8 +1727,8 @@ +@@ -1737,8 +1737,8 @@ case rad1: /* orientation */ case rad2: if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { @@ -209,7 +209,7 @@ SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)PrintStructures->hPortraitIcon); -@@ -1737,8 +1737,8 @@ +@@ -1747,8 +1747,8 @@ (LPARAM)PrintStructures->hPortraitIcon); } } else { @@ -220,7 +220,7 @@ SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)PrintStructures->hLandscapeIcon); -@@ -2499,15 +2499,15 @@ +@@ -2507,15 +2507,15 @@
/* Save paper orientation into device context */ if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) @@ -239,7 +239,7 @@ else FIXME("could not get dialog text for papersize cmbbox?\n");
-@@ -2515,7 +2515,7 @@ +@@ -2523,7 +2523,7 @@ paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA, SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) @@ -248,7 +248,19 @@ else FIXME("could not get dialog text for papersize cmbbox?\n");
-@@ -2809,7 +2809,7 @@ +@@ -2574,9 +2574,9 @@ + + /* Save orientation */ + if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) +- dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; ++ dm->u.s.dmOrientation = DMORIENT_LANDSCAPE; + else +- dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; ++ dm->u.s.dmOrientation = DMORIENT_PORTRAIT; + + GlobalUnlock(pda->pdlg.hDevNames); + GlobalUnlock(pda->pdlg.hDevMode); +@@ -2824,7 +2824,7 @@ case cmb3: if(msg == CBN_SELCHANGE){ DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode); @@ -257,7 +269,7 @@ SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); GlobalUnlock(pda->pdlg.hDevMode); } -@@ -2832,10 +2832,10 @@ +@@ -2847,10 +2847,10 @@ DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); ClosePrinter(hPrinter); /* Changing paper */ @@ -270,7 +282,7 @@ DWORD tmp = pda->curdlg.ptPaperSize.x; pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; pda->curdlg.ptPaperSize.y = tmp; -@@ -2849,7 +2849,7 @@ +@@ -2864,7 +2864,7 @@ count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0); if(count != CB_ERR){ for(i=0; i<count; ++i){ @@ -279,7 +291,7 @@ SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0); break; } -@@ -3153,7 +3153,7 @@ +@@ -3168,7 +3168,7 @@ } /* Set orientation radiobutton properly */ dm = GlobalLock(pda->dlga->hDevMode); @@ -288,7 +300,7 @@ CheckRadioButton(hDlg, rad1, rad2, rad2); else /* this is default if papersize is not set */ CheckRadioButton(hDlg, rad1, rad2, rad1); -@@ -3198,8 +3198,8 @@ +@@ -3213,8 +3213,8 @@ PRINTDLG_PS_ChangePrinterA(hDlg, pda); dm = GlobalLock(pda->pdlg.hDevMode); if(dm){ @@ -299,12 +311,21 @@ GlobalUnlock(pda->pdlg.hDevMode); pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x); pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y); -@@ -3401,7 +3401,7 @@ - DEVMODEA *dm; - - dm = GlobalLock(pdlg.hDevMode); -- PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize); -+ PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize); - GlobalUnlock(pdlg.hDevMode); - setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x); - setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y); +@@ -3282,7 +3282,7 @@ + + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ +- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) ++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else /* this is default if papersize is not set */ + CheckRadioButton(hDlg, rad1, rad2, rad1); +@@ -3422,7 +3422,7 @@ + setupdlg->hDevMode = pdlg.hDevMode; + setupdlg->hDevNames = pdlg.hDevNames; + dm = GlobalLock(pdlg.hDevMode); +- PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize); ++ PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize); + GlobalUnlock(pdlg.hDevMode); + setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x); + setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg.... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c Fri Aug 24 13:07:34 2007 @@ -1958,7 +1958,8 @@ } else if (!(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) { - if(*lpszTemp) /* points to trailing null for last path element */ + if(*lpszTemp || /* points to trailing null for last path element */ + (lpwstrTemp[strlenW(lpwstrTemp)-1] == '\')) /* or if last element ends in '' */ { if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST) {
Modified: trunk/reactos/dll/win32/comdlg32/filedlg31.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg3... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg31.c (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg31.c Fri Aug 24 13:07:34 2007 @@ -783,7 +783,7 @@ /************************************************************************ * FD31_AllocPrivate [internal] * allocate a private object to hold 32 bits Unicode - * structure that will be used throughtout the calls, while + * structure that will be used throughout the calls, while * keeping available the original structures and a few variables * On entry : type = dialog procedure type (16,32A,32W) * dlgType = dialog type (open or save)
Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdlg... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c Fri Aug 24 13:07:34 2007 @@ -324,6 +324,11 @@ else lppd->Flags &= ~PD_PAGENUMS;
+ if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) /* Selection */ + lppd->Flags |= PD_SELECTION; + else + lppd->Flags &= ~PD_SELECTION; + if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ static char file[] = "FILE:"; lppd->Flags |= PD_PRINTTOFILE; @@ -401,6 +406,11 @@ } else lppd->Flags &= ~PD_PAGENUMS; + + if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) /* Selection */ + lppd->Flags |= PD_SELECTION; + else + lppd->Flags &= ~PD_SELECTION;
if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ static WCHAR file[] = {'F','I','L','E',':',0}; @@ -2403,21 +2413,19 @@ } static void _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) { - static const WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 }; - static const WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 }; - static const WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 }; - lstrcpyW(strout, UNDEF); + static const char mm_fmt[] = "%.2f mm"; + static const char in_fmt[] = "%.2f in"; + char buf[20]; if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { - wsprintfW(strout,mm_fmt,(size*1.0)/100.0); - return; - } - if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { - wsprintfW(strout,in_fmt,(size*1.0)/1000.0); - return; - } - pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - wsprintfW(strout,mm_fmt,(size*1.0)/100.0); - return; + sprintf(buf, mm_fmt, (size * 1.0) / 100.0); + } else if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { + sprintf(buf, in_fmt, (size * 1.0) / 1000.0); + } else { + pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; + sprintf(buf, mm_fmt, (size * 1.0) / 100.0); + } + + MultiByteToWideChar(CP_ACP, 0, buf, -1, strout, 20); }
static DWORD @@ -2563,6 +2571,13 @@ pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; pda->dlga->ptPaperSize.y = tmp; } + + /* Save orientation */ + if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) + dm->u.s.dmOrientation = DMORIENT_LANDSCAPE; + else + dm->u.s.dmOrientation = DMORIENT_PORTRAIT; + GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); return TRUE; @@ -3238,6 +3253,7 @@ { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda; + LPDEVMODEW dm; BOOL res = FALSE;
if (uMsg==WM_INITDIALOG) { @@ -3263,11 +3279,14 @@ EnableWindow(GetDlgItem(hDlg, edt6), FALSE); EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - /* width larger as height -> landscape */ - if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) + + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ + if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE) CheckRadioButton(hDlg, rad1, rad2, rad2); else /* this is default if papersize is not set */ CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE); @@ -3398,14 +3417,16 @@
/* short cut exit, just return default values */ if (setupdlg->Flags & PSD_RETURNDEFAULT) { - DEVMODEA *dm; - - dm = GlobalLock(pdlg.hDevMode); - PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize); - GlobalUnlock(pdlg.hDevMode); - setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x); - setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y); - return TRUE; + DEVMODEA *dm; + + setupdlg->hDevMode = pdlg.hDevMode; + setupdlg->hDevNames = pdlg.hDevNames; + dm = GlobalLock(pdlg.hDevMode); + PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize); + GlobalUnlock(pdlg.hDevMode); + setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x); + setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y); + return TRUE; }
/* get dialog template */
-
winesync＠svn.reactos.org