January 2009 - Wine-Commits

Huw Davies : comdlg32: Add a helper for setting the defaultsource.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: b6ed969ee5c9b8516c84eb4d115da93e0af4a7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ed969ee5c9b8516c84eb4d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 16:57:24 2009 +0000 comdlg32: Add a helper for setting the defaultsource. --- dlls/comdlg32/printdlg.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 0634381..3e5eac3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2590,6 +2590,13 @@ static WORD pagesetup_get_papersize(PageSetupDataA *pda) return paper; } +static void pagesetup_set_defaultsource(PageSetupDataA *pda, WORD source) +{ + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); + dm->u1.s1.dmDefaultSource = source; + GlobalUnlock(pda->dlga->hDevMode); +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; @@ -3070,14 +3077,14 @@ PRINTDLG_PS_WMCommandA( FIXME("could not get dialog text for papersize cmbbox?\n"); } break; - case cmb3: - if(msg == CBN_SELCHANGE){ - DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); - dm->u1.s1.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA, - SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); - GlobalUnlock(pda->dlga->hDevMode); - } - break; + case cmb3: /* Paper Source */ + if(msg == CBN_SELCHANGE) + { + WORD source = SendDlgItemMessageA(hDlg, cmb3, CB_GETITEMDATA, + SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0); + pagesetup_set_defaultsource(pda, source); + } + break; case psh2: /* Printer Properties button */ { HANDLE hPrinter; @@ -3419,7 +3426,6 @@ static void subclass_margin_edits(HWND hDlg) static INT_PTR CALLBACK PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - DEVMODEA *dm; PageSetupDataA *pda; INT_PTR res = FALSE; HWND hDrawWnd; @@ -3489,15 +3495,12 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg,cmb2),FALSE); EnableWindow(GetDlgItem(hDlg,cmb3),FALSE); } + /* filling combos: printer, paper, source. selecting current printer (from DEVMODEA) */ PRINTDLG_PS_ChangePrinterA(hDlg, pda); pagesetup_update_papersize(pda); - dm = GlobalLock(pda->dlga->hDevMode); - if(dm){ - dm->u1.s1.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */ - GlobalUnlock(pda->dlga->hDevMode); - } else - WARN("GlobalLock(pda->dlga->hDevMode) fail? hDevMode=%p\n", pda->dlga->hDevMode); + pagesetup_set_defaultsource(pda, DMBIN_FORMSOURCE); /* FIXME: This is the auto select bin. Is this correct? */ + /* Drawing paper prev */ PRINTDLG_PS_ChangePaperPrev(pda); return TRUE;

1 0

Huw Davies : comdlg32: Add helpers for getting and setting the devmode papersize.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 562dd4ab65c11d7221d4a1092643dd447e6b22b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=562dd4ab65c11d7221d4a1092… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 16:38:43 2009 +0000 comdlg32: Add helpers for getting and setting the devmode papersize. --- dlls/comdlg32/printdlg.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d58ddb2..0634381 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2575,13 +2575,28 @@ static WORD pagesetup_get_orientation(PageSetupDataA *pda) return orient; } +static void pagesetup_set_papersize(PageSetupDataA *pda, WORD paper) +{ + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); + dm->u1.s1.dmPaperSize = paper; + GlobalUnlock(pda->dlga->hDevMode); +} + +static WORD pagesetup_get_papersize(PageSetupDataA *pda) +{ + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); + WORD paper = dm->u1.s1.dmPaperSize; + GlobalUnlock(pda->dlga->hDevMode); + return paper; +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; DEVMODEA *dm; LPSTR devname, portname; int i, num; - WORD *words = NULL; + WORD *words = NULL, paperword; POINT *points = NULL; BOOL retval = FALSE; @@ -2612,13 +2627,15 @@ static BOOL pagesetup_update_papersize(PageSetupDataA *pda) goto end; } + paperword = pagesetup_get_papersize(pda); + for (i = 0; i < num; i++) - if (words[i] == dm->u1.s1.dmPaperSize) + if (words[i] == paperword) break; if (i == num) { - FIXME("Papersize %d not found in list?\n", dm->u1.s1.dmPaperSize); + FIXME("Papersize %d not found in list?\n", paperword); goto end; } @@ -3046,9 +3063,7 @@ PRINTDLG_PS_WMCommandA( SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0); if (paperword != CB_ERR) { - DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); - dm->u1.s1.dmPaperSize = paperword; - GlobalUnlock(pda->dlga->hDevMode); + pagesetup_set_papersize(pda, paperword); pagesetup_update_papersize(pda); PRINTDLG_PS_ChangePaperPrev(pda); } else @@ -3090,9 +3105,10 @@ PRINTDLG_PS_WMCommandA( PRINTDLG_PS_ChangePaperPrev(pda); /* Selecting paper in combo */ count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0); - if(count != CB_ERR){ + if(count != CB_ERR) { + WORD paperword = pagesetup_get_papersize(pda); for(i=0; i<count; ++i){ - if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == dm->u1.s1.dmPaperSize) { + if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == paperword) { SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0); break; }

1 0

Huw Davies : comdlg32: Add a helper for getting the orientation.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: c1209a68c3484159129ceb93b1d3ab0b05360835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1209a68c3484159129ceb93b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 15:52:09 2009 +0000 comdlg32: Add a helper for getting the orientation. --- dlls/comdlg32/printdlg.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 45b8fb9..d58ddb2 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2567,6 +2567,14 @@ static void pagesetup_set_orientation(PageSetupDataA *pda, WORD orient) GlobalUnlock(pda->dlga->hDevMode); } +static WORD pagesetup_get_orientation(PageSetupDataA *pda) +{ + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); + WORD orient = dm->u1.s1.dmOrientation; + GlobalUnlock(pda->dlga->hDevMode); + return orient; +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; @@ -2618,7 +2626,7 @@ static BOOL pagesetup_update_papersize(PageSetupDataA *pda) pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga, points[i].x); pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga, points[i].y); - if(dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + if(pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) { LONG tmp = pda->dlga->ptPaperSize.x; pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; @@ -3014,8 +3022,8 @@ PRINTDLG_PS_WMCommandA( } case rad1: case rad2: - if((id == rad1 && pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) || - (id == rad2 && pda->dlga->ptPaperSize.y > pda->dlga->ptPaperSize.x)) + if((id == rad1 && pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) || + (id == rad2 && pagesetup_get_orientation(pda) == DMORIENT_PORTRAIT)) { pagesetup_set_orientation(pda, (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE); pagesetup_update_papersize(pda); @@ -3074,7 +3082,7 @@ PRINTDLG_PS_WMCommandA( ClosePrinter(hPrinter); /* Changing paper */ pagesetup_update_papersize(pda); - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + if (pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) CheckRadioButton(hDlg, rad1, rad2, rad2); else CheckRadioButton(hDlg, rad1, rad2, rad1); @@ -3433,16 +3441,12 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg, edt6), FALSE); EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } + /* Set orientation radiobutton properly */ - if(pda->dlga->hDevMode) - { - dm = GlobalLock(pda->dlga->hDevMode); - if (dm->u1.s1.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 (pagesetup_get_orientation(pda) == DMORIENT_LANDSCAPE) + CheckRadioButton(hDlg, rad1, rad2, rad2); + else + CheckRadioButton(hDlg, rad1, rad2, rad1); /* if orientation disabled */ if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {

1 0

Huw Davies : comdlg32: Add a helper for setting the orientation.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 6b6adccc8cc884af019dc5be05c737cc33d195d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6adccc8cc884af019dc5be0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 15:40:02 2009 +0000 comdlg32: Add a helper for setting the orientation. --- dlls/comdlg32/printdlg.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c157799..45b8fb9 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2557,6 +2557,16 @@ static inline void rotate_rect(RECT *rc, BOOL sense) } } +static void pagesetup_set_orientation(PageSetupDataA *pda, WORD orient) +{ + DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); + + assert(orient == DMORIENT_PORTRAIT || orient == DMORIENT_LANDSCAPE); + + dm->u1.s1.dmOrientation = orient; + GlobalUnlock(pda->dlga->hDevMode); +} + static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; @@ -3007,18 +3017,10 @@ PRINTDLG_PS_WMCommandA( if((id == rad1 && pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) || (id == rad2 && pda->dlga->ptPaperSize.y > pda->dlga->ptPaperSize.x)) { - DWORD tmp = pda->dlga->ptPaperSize.x; - DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); - - pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; - pda->dlga->ptPaperSize.y = tmp; - - dm->u1.s1.dmOrientation = (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; - GlobalUnlock(pda->dlga->hDevMode); - + pagesetup_set_orientation(pda, (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE); + pagesetup_update_papersize(pda); rotate_rect(&pda->dlga->rtMargin, (id == rad2)); update_margin_edits(hDlg, pda, 0); - PRINTDLG_PS_ChangePaperPrev(pda); } break;

1 0

Huw Davies : comdlg32: Let pagesetup_update_papersize take care of landscape mode.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: e75b7ad74523854b764feae2cb70b14440ef4039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75b7ad74523854b764feae2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 15:33:05 2009 +0000 comdlg32: Let pagesetup_update_papersize take care of landscape mode. --- dlls/comdlg32/printdlg.c | 60 ++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f9f1ba1..c157799 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -2556,7 +2557,7 @@ static inline void rotate_rect(RECT *rc, BOOL sense) } } -static BOOL pagesetup_papersizeA(PAGESETUPDLGA *dlg, const WORD paperword, LPPOINT size) +static BOOL pagesetup_update_papersize(PageSetupDataA *pda) { DEVNAMES *dn; DEVMODEA *dm; @@ -2566,8 +2567,8 @@ static BOOL pagesetup_papersizeA(PAGESETUPDLGA *dlg, const WORD paperword, LPPOI POINT *points = NULL; BOOL retval = FALSE; - dn = GlobalLock(dlg->hDevNames); - dm = GlobalLock(dlg->hDevMode); + dn = GlobalLock(pda->dlga->hDevNames); + dm = GlobalLock(pda->dlga->hDevMode); devname = ((char*)dn)+dn->wDeviceOffset; portname = ((char*)dn)+dn->wOutputOffset; @@ -2594,25 +2595,32 @@ static BOOL pagesetup_papersizeA(PAGESETUPDLGA *dlg, const WORD paperword, LPPOI } for (i = 0; i < num; i++) - if (words[i] == paperword) + if (words[i] == dm->u1.s1.dmPaperSize) break; if (i == num) { - FIXME("Papersize %d not found in list?\n", paperword); + FIXME("Papersize %d not found in list?\n", dm->u1.s1.dmPaperSize); goto end; } /* this is _10ths_ of a millimeter */ - size->x = _c_10mm2size(dlg, points[i].x); - size->y = _c_10mm2size(dlg, points[i].y); + pda->dlga->ptPaperSize.x = _c_10mm2size(pda->dlga, points[i].x); + pda->dlga->ptPaperSize.y = _c_10mm2size(pda->dlga, points[i].y); + + if(dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) + { + LONG tmp = pda->dlga->ptPaperSize.x; + pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; + pda->dlga->ptPaperSize.y = tmp; + } retval = TRUE; end: HeapFree(GetProcessHeap(), 0, words); HeapFree(GetProcessHeap(), 0, points); - GlobalUnlock(dlg->hDevNames); - GlobalUnlock(dlg->hDevMode); + GlobalUnlock(pda->dlga->hDevNames); + GlobalUnlock(pda->dlga->hDevMode); return retval; } @@ -3031,12 +3039,7 @@ PRINTDLG_PS_WMCommandA( DEVMODEA *dm = GlobalLock(pda->dlga->hDevMode); dm->u1.s1.dmPaperSize = paperword; GlobalUnlock(pda->dlga->hDevMode); - pagesetup_papersizeA(pda->dlga, paperword, &(pda->dlga->ptPaperSize)); - if (IsDlgButtonChecked(hDlg, rad2)) { - DWORD tmp = pda->dlga->ptPaperSize.x; - pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; - pda->dlga->ptPaperSize.y = tmp; - } + pagesetup_update_papersize(pda); PRINTDLG_PS_ChangePaperPrev(pda); } else FIXME("could not get dialog text for papersize cmbbox?\n"); @@ -3068,13 +3071,9 @@ PRINTDLG_PS_WMCommandA( DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); ClosePrinter(hPrinter); /* Changing paper */ - pagesetup_papersizeA(pda->dlga, dm->u1.s1.dmPaperSize, &(pda->dlga->ptPaperSize)); - if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE){ - DWORD tmp = pda->dlga->ptPaperSize.x; - pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; - pda->dlga->ptPaperSize.y = tmp; + pagesetup_update_papersize(pda); + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) CheckRadioButton(hDlg, rad1, rad2, rad2); - } else CheckRadioButton(hDlg, rad1, rad2, rad1); /* Changing paper preview */ @@ -3470,16 +3469,11 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } /* filling combos: printer, paper, source. selecting current printer (from DEVMODEA) */ PRINTDLG_PS_ChangePrinterA(hDlg, pda); + pagesetup_update_papersize(pda); dm = GlobalLock(pda->dlga->hDevMode); if(dm){ dm->u1.s1.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */ - pagesetup_papersizeA(pda->dlga, dm->u1.s1.dmPaperSize, &pda->dlga->ptPaperSize); GlobalUnlock(pda->dlga->hDevMode); - if (IsDlgButtonChecked(hDlg, rad2) == BST_CHECKED) { /* Landscape orientation */ - DWORD tmp = pda->dlga->ptPaperSize.y; - pda->dlga->ptPaperSize.y = pda->dlga->ptPaperSize.x; - pda->dlga->ptPaperSize.x = tmp; - } } else WARN("GlobalLock(pda->dlga->hDevMode) fail? hDevMode=%p\n", pda->dlga->hDevMode); /* Drawing paper prev */ @@ -3671,12 +3665,13 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { setupdlg->hDevNames = pdlg.hDevNames; } + pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda)); + pda->dlga = setupdlg; + /* short cut exit, just return default values */ if (setupdlg->Flags & PSD_RETURNDEFAULT) { - DEVMODEA *dm; - dm = GlobalLock(setupdlg->hDevMode); - pagesetup_papersizeA(setupdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize); - GlobalUnlock(setupdlg->hDevMode); + pagesetup_update_papersize(pda); + HeapFree(GetProcessHeap(), 0, pda); return TRUE; } @@ -3692,9 +3687,6 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { return FALSE; } - pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda)); - pda->dlga = setupdlg; - bRet = (0<DialogBoxIndirectParamW( setupdlg->hInstance, ptr,

1 0

Huw Davies : comdlg32: Switch to using a locale dependent decimal separator .
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 276434caa9264d20cf962966f06516c15c244404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276434caa9264d20cf962966f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 14:28:43 2009 +0000 comdlg32: Switch to using a locale dependent decimal separator. --- dlls/comdlg32/printdlg.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 54de61e..f9f1ba1 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2416,26 +2416,38 @@ _c_inch2size(PAGESETUPDLGA *dlga,DWORD size) { return (size*254)/100; } +static WCHAR get_decimal_sep(void) +{ + static WCHAR sep; + + if(!sep) + { + WCHAR buf[2] = {'.',0}; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buf, sizeof(buf) / sizeof(buf[0])); + sep = buf[0]; + } + return sep; +} + static void size2str(const PageSetupDataA *pda, DWORD size, LPWSTR strout) { - WCHAR decimal[2] = {'.', 0}; WCHAR integer_fmt[] = {'%','d',0}; - WCHAR hundredths_fmt[] = {'%','d','%','s','%','0','2','d',0}; - WCHAR thousandths_fmt[] = {'%','d','%','s','%','0','3','d',0}; + WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0}; + WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0}; /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */ if (is_metric(pda)) { if(size % 100) - wsprintfW(strout, hundredths_fmt, size / 100, decimal, size % 100); + wsprintfW(strout, hundredths_fmt, size / 100, get_decimal_sep(), size % 100); else wsprintfW(strout, integer_fmt, size / 100); } else { if(size % 1000) - wsprintfW(strout, thousandths_fmt, size / 1000, decimal, size % 1000); + wsprintfW(strout, thousandths_fmt, size / 1000, get_decimal_sep(), size % 1000); else wsprintfW(strout, integer_fmt, size / 1000); @@ -2896,7 +2908,7 @@ static void margin_edit_notification(HWND hDlg, PageSetupDataA *pda, WORD msg, W if (GetDlgItemTextW(hDlg, id, buf, sizeof(buf) / sizeof(buf[0])) != 0) { WCHAR *end; - WCHAR decimal = '.'; + WCHAR decimal = get_decimal_sep(); val = strtolW(buf, &end, 10); if(end != buf || *end == decimal) @@ -3351,13 +3363,10 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) */ static LRESULT CALLBACK pagesetup_margin_editproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - WCHAR decimal = '.'; - - /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */ - switch(msg) case WM_CHAR: { + WCHAR decimal = get_decimal_sep(); WCHAR wc = (WCHAR)wparam; if(!isdigitW(wc) && wc != decimal && wc != VK_BACK) return 0; }

1 0

Huw Davies : comdlg32: Fix parsing of the margin edit controls.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 5f15c1c12ea1846e8bbb7405b54911770fef41f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f15c1c12ea1846e8bbb7405b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 14:11:20 2009 +0000 comdlg32: Fix parsing of the margin edit controls. --- dlls/comdlg32/printdlg.c | 66 ++++++++++++++++++++++++++++++++------------- 1 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 41ead34..54de61e 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2856,14 +2856,6 @@ PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda) return TRUE; } -#define GETVAL(idc,val) \ -if(msg == EN_CHANGE){ \ - if (GetDlgItemTextA(hDlg,idc,buf,sizeof(buf)) > 0)\ - val = _c_str2sizeA(pda->dlga,buf); \ - else\ - FIXME("could not get dlgitemtexta for %x\n",id); \ -} - static inline LONG *element_from_margin_id(RECT *rc, WORD id) { switch(id) @@ -2891,6 +2883,50 @@ static void update_margin_edits(HWND hDlg, const PageSetupDataA *pda, WORD id) } } +static void margin_edit_notification(HWND hDlg, PageSetupDataA *pda, WORD msg, WORD id) +{ + switch (msg) + { + case EN_CHANGE: + { + WCHAR buf[10]; + LONG val = 0; + LONG *value = element_from_margin_id(&pda->dlga->rtMargin, id); + + if (GetDlgItemTextW(hDlg, id, buf, sizeof(buf) / sizeof(buf[0])) != 0) + { + WCHAR *end; + WCHAR decimal = '.'; + + val = strtolW(buf, &end, 10); + if(end != buf || *end == decimal) + { + int mult = is_metric(pda) ? 100 : 1000; + val *= mult; + if(*end == decimal) + { + while(mult > 1) + { + end++; + mult /= 10; + if(isdigitW(*end)) + val += (*end - '0') * mult; + else + break; + } + } + } + } + *value = val; + return; + } + + case EN_KILLFOCUS: + update_margin_edits(hDlg, pda, id); + return; + } +} + static void set_margin_groupbox_title(HWND hDlg, const PageSetupDataA *pda) { WCHAR title[256]; @@ -2917,8 +2953,7 @@ PRINTDLG_PS_WMCommandA( ) { WORD msg = HIWORD(wParam); WORD id = LOWORD(wParam); - char buf[200]; - + TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n", LOWORD(lParam),wParam,lParam); switch (id) { @@ -3047,22 +3082,15 @@ PRINTDLG_PS_WMCommandA( break; } case edt4: - GETVAL(id, pda->dlga->rtMargin.left); - break; case edt5: - GETVAL(id, pda->dlga->rtMargin.top); - break; case edt6: - GETVAL(id, pda->dlga->rtMargin.right); - break; case edt7: - GETVAL(id, pda->dlga->rtMargin.bottom); - break; + margin_edit_notification(hDlg, pda, msg, id); + break; } InvalidateRect(GetDlgItem(hDlg, rct1), NULL, TRUE); return FALSE; } -#undef GETVAL static BOOL PRINTDLG_PS_WMCommandW(

1 0

Michael Stefaniuc : objsel: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 170f7f8dc19770421df2deb119e48b4ea404be40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170f7f8dc19770421df2deb11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 11:21:10 2009 +0100 objsel: Remove superfluous pointer casts. --- dlls/objsel/factory.c | 2 +- dlls/objsel/objsel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/objsel/factory.c b/dlls/objsel/factory.c index f104c00..11d81b9 100644 --- a/dlls/objsel/factory.c +++ b/dlls/objsel/factory.c @@ -41,7 +41,7 @@ static HRESULT WINAPI OBJSEL_IClassFactory_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; IClassFactory_AddRef(iface); return S_OK; } diff --git a/dlls/objsel/objsel.c b/dlls/objsel/objsel.c index 06fbf4d..51e8d0b 100644 --- a/dlls/objsel/objsel.c +++ b/dlls/objsel/objsel.c @@ -142,7 +142,7 @@ static HRESULT WINAPI OBJSEL_IDsObjectPicker_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsObjectPicker)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; OBJSEL_IDsObjectPicker_AddRef(iface); return S_OK; }

1 0

Huw Davies : comdlg32: Give update_margin_edits the ability to update just one edit control if required .
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: 11e028be8e62c5e952880bc9dc5d4b90a83ba892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e028be8e62c5e952880bc9d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 19 12:50:51 2009 +0000 comdlg32: Give update_margin_edits the ability to update just one edit control if required. --- dlls/comdlg32/printdlg.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 8217d0a..41ead34 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2864,18 +2864,31 @@ if(msg == EN_CHANGE){ \ FIXME("could not get dlgitemtexta for %x\n",id); \ } -static void update_margin_edits(HWND hDlg, const PageSetupDataA *pda) +static inline LONG *element_from_margin_id(RECT *rc, WORD id) +{ + switch(id) + { + case edt4: return &rc->left; + case edt5: return &rc->top; + case edt6: return &rc->right; + case edt7: return &rc->bottom; + } + return NULL; +} + +static void update_margin_edits(HWND hDlg, const PageSetupDataA *pda, WORD id) { WCHAR str[100]; + WORD idx; - size2str(pda, pda->dlga->rtMargin.left, str); - SetDlgItemTextW(hDlg, edt4, str); - size2str(pda, pda->dlga->rtMargin.top, str); - SetDlgItemTextW(hDlg, edt5, str); - size2str(pda, pda->dlga->rtMargin.right, str); - SetDlgItemTextW(hDlg, edt6, str); - size2str(pda, pda->dlga->rtMargin.bottom, str); - SetDlgItemTextW(hDlg, edt7, str); + for(idx = edt4; idx <= edt7; idx++) + { + if(id == 0 || id == idx) + { + size2str(pda, *element_from_margin_id(&pda->dlga->rtMargin, idx), str); + SetDlgItemTextW(hDlg, idx, str); + } + } } static void set_margin_groupbox_title(HWND hDlg, const PageSetupDataA *pda) @@ -2949,7 +2962,7 @@ PRINTDLG_PS_WMCommandA( GlobalUnlock(pda->dlga->hDevMode); rotate_rect(&pda->dlga->rtMargin, (id == rad2)); - update_margin_edits(hDlg, pda); + update_margin_edits(hDlg, pda, 0); PRINTDLG_PS_ChangePaperPrev(pda); } @@ -3409,7 +3422,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pda->dlga->rtMargin.right = size; pda->dlga->rtMargin.bottom = size; } - update_margin_edits(hDlg, pda); + update_margin_edits(hDlg, pda, 0); subclass_margin_edits(hDlg); set_margin_groupbox_title(hDlg, pda);

1 0

Michael Stefaniuc : ole32/tests: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 20, 2009

Jan. 20, 2009

Module: wine Branch: master Commit: bdbfac59968bd685881142e7ac009efc4a6ae2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbfac59968bd685881142e7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 11:21:23 2009 +0100 ole32/tests: Remove superfluous pointer casts. --- dlls/ole32/tests/clipboard.c | 4 ++-- dlls/ole32/tests/compobj.c | 8 ++++---- dlls/ole32/tests/marshal.c | 32 ++++++++++++++++---------------- dlls/ole32/tests/moniker.c | 4 ++-- dlls/ole32/tests/ole2.c | 4 ++-- dlls/ole32/tests/stg_prop.c | 10 +++++----- dlls/ole32/tests/usrmarshal.c | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bdbfac59968bd68588114…

1 0