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