January 2009 - Wine-Commits

Huw Davies : comdlg32: Simplify the DEVNAMES access functions are unify the release.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: e2f81f1b33351cad5aa05d31e77cec33a6da34d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f81f1b33351cad5aa05d31e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 16:49:52 2009 +0000 comdlg32: Simplify the DEVNAMES access functions are unify the release. --- dlls/comdlg32/printdlg.c | 73 ++++++++++++++++++++++------------------------ 1 files changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 1adbb90..da77362 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2660,59 +2660,56 @@ static void pagesetup_set_defaultsource(pagesetup_data *data, WORD source) GlobalUnlock(data->dlga->hDevMode); } -static WCHAR *pagesetup_get_drvname(const pagesetup_data *data) +typedef enum { - DEVNAMES *dn; - int len; - WCHAR *name; + devnames_driver_name, + devnames_device_name, + devnames_output_name +} devnames_name; - dn = GlobalLock(data->dlga->hDevNames); - len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDriverOffset, -1, NULL, 0); - name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDriverOffset, -1, name, len); - GlobalUnlock(data->dlga->hDevNames); - return name; -} -static void pagesetup_release_drvname(const pagesetup_data *data, WCHAR *name) +static inline WORD get_devname_offset(DEVNAMES *dn, devnames_name which) { - HeapFree(GetProcessHeap(), 0, name); + switch(which) + { + case devnames_driver_name: return dn->wDriverOffset; + case devnames_device_name: return dn->wDeviceOffset; + case devnames_output_name: return dn->wOutputOffset; + } + ERR("Souldn't be here\n"); + return 0; } -static WCHAR *pagesetup_get_devname(const pagesetup_data *data) +static WCHAR *pagesetup_get_a_devname(const pagesetup_data *data, devnames_name which) { DEVNAMES *dn; int len; WCHAR *name; dn = GlobalLock(data->dlga->hDevNames); - len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDeviceOffset, -1, NULL, 0); + len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + get_devname_offset(dn, which), -1, NULL, 0); name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wDeviceOffset, -1, name, len); + MultiByteToWideChar(CP_ACP, 0, (char*)dn + get_devname_offset(dn, which), -1, name, len); GlobalUnlock(data->dlga->hDevNames); return name; } -static void pagesetup_release_devname(const pagesetup_data *data, WCHAR *name) +static WCHAR *pagesetup_get_drvname(const pagesetup_data *data) { - HeapFree(GetProcessHeap(), 0, name); + return pagesetup_get_a_devname(data, devnames_driver_name); } -static WCHAR *pagesetup_get_portname(const pagesetup_data *data) +static WCHAR *pagesetup_get_devname(const pagesetup_data *data) { - DEVNAMES *dn; - int len; - WCHAR *name; + return pagesetup_get_a_devname(data, devnames_device_name); +} - dn = GlobalLock(data->dlga->hDevNames); - len = MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wOutputOffset, -1, NULL, 0); - name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, (char*)dn + dn->wOutputOffset, -1, name, len); - GlobalUnlock(data->dlga->hDevNames); - return name; +static WCHAR *pagesetup_get_portname(const pagesetup_data *data) +{ + return pagesetup_get_a_devname(data, devnames_output_name); } -static void pagesetup_release_portname(const pagesetup_data *data, WCHAR *name) +static void pagesetup_release_a_devname(const pagesetup_data *data, WCHAR *name) { HeapFree(GetProcessHeap(), 0, name); } @@ -2860,8 +2857,8 @@ static BOOL pagesetup_update_papersize(pagesetup_data *data) end: HeapFree(GetProcessHeap(), 0, words); HeapFree(GetProcessHeap(), 0, points); - pagesetup_release_portname(data, portname); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, portname); + pagesetup_release_a_devname(data, devname); pagesetup_release_devmode(data, dm); return retval; @@ -2991,8 +2988,8 @@ static void pagesetup_init_combos(HWND hDlg, pagesetup_data *data) PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2, devname, portname, dm); PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb3, devname, portname, dm); - pagesetup_release_portname(data, portname); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, portname); + pagesetup_release_a_devname(data, devname); pagesetup_release_devmode(data, dm); } @@ -3020,9 +3017,9 @@ static void pagesetup_change_printer_dialog(HWND hDlg, pagesetup_data *data) portname = pagesetup_get_portname(data); prnt.hDevNames = 0; PRINTDLG_CreateDevNamesW(&prnt.hDevNames, drvname, devname, portname); - pagesetup_release_portname(data, portname); - pagesetup_release_devname(data, devname); - pagesetup_release_drvname(data, drvname); + pagesetup_release_a_devname(data, portname); + pagesetup_release_a_devname(data, devname); + pagesetup_release_a_devname(data, drvname); tmp_dm = pagesetup_get_devmode(data); prnt.hDevMode = GlobalAlloc(GMEM_MOVEABLE, tmp_dm->dmSize + tmp_dm->dmDriverExtra); @@ -3259,7 +3256,7 @@ static void pagesetup_printer_properties(HWND hDlg, pagesetup_data *data) if (!OpenPrinterW(devname, &hprn, NULL)) { FIXME("Call to OpenPrinter did not succeed!\n"); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, devname); return; } @@ -3267,7 +3264,7 @@ static void pagesetup_printer_properties(HWND hDlg, pagesetup_data *data) DocumentPropertiesW(hDlg, hprn, devname, dm, dm, DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT); pagesetup_set_devmode(data, dm); pagesetup_release_devmode(data, dm); - pagesetup_release_devname(data, devname); + pagesetup_release_a_devname(data, devname); ClosePrinter(hprn); /* Changing paper */

1 0

Huw Davies : comdlg32: Add a helper to access the margin rect.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 2bd53e2786b9a7b6cafc2eab22244284d0c0c2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd53e2786b9a7b6cafc2eab2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 15:47:07 2009 +0000 comdlg32: Add a helper to access the margin rect. --- dlls/comdlg32/printdlg.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c07e72b..f7c5901 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2789,6 +2789,11 @@ static inline POINT *pagesetup_get_papersize_pt(const pagesetup_data *data) return &data->dlga->ptPaperSize; } +static inline RECT *pagesetup_get_margin_rect(const pagesetup_data *data) +{ + return &data->dlga->rtMargin; +} + static inline void swap_point(POINT *pt) { LONG tmp = pt->x; @@ -3169,7 +3174,7 @@ static void update_margin_edits(HWND hDlg, const pagesetup_data *data, WORD id) { if(id == 0 || id == idx) { - size2str(data, *element_from_margin_id(&data->dlga->rtMargin, idx), str); + size2str(data, *element_from_margin_id(pagesetup_get_margin_rect(data), idx), str); SetDlgItemTextW(hDlg, idx, str); } } @@ -3183,7 +3188,7 @@ static void margin_edit_notification(HWND hDlg, pagesetup_data *data, WORD msg, { WCHAR buf[10]; LONG val = 0; - LONG *value = element_from_margin_id(&data->dlga->rtMargin, id); + LONG *value = element_from_margin_id(pagesetup_get_margin_rect(data), id); if (GetDlgItemTextW(hDlg, id, buf, sizeof(buf) / sizeof(buf[0])) != 0) { @@ -3325,7 +3330,7 @@ static BOOL PRINTDLG_PS_WMCommandA(HWND hDlg, WPARAM wParam, LPARAM lParam, page { pagesetup_set_orientation(data, (id == rad1) ? DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE); pagesetup_update_papersize(data); - rotate_rect(&data->dlga->rtMargin, (id == rad2)); + rotate_rect(pagesetup_get_margin_rect(data), (id == rad2)); update_margin_edits(hDlg, data, 0); pagesetup_change_preview(data); } @@ -3566,10 +3571,10 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) scaly = rcClient.bottom / (double)pagesetup_get_papersize_pt(data)->y; rcMargin = rcClient; - rcMargin.left += data->dlga->rtMargin.left * scalx; - rcMargin.top += data->dlga->rtMargin.top * scalx; - rcMargin.right -= data->dlga->rtMargin.right * scaly; - rcMargin.bottom -= data->dlga->rtMargin.bottom * scaly; + rcMargin.left += pagesetup_get_margin_rect(data)->left * scalx; + rcMargin.top += pagesetup_get_margin_rect(data)->top * scalx; + rcMargin.right -= pagesetup_get_margin_rect(data)->right * scaly; + rcMargin.bottom -= pagesetup_get_margin_rect(data)->bottom * scaly; /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); @@ -3720,10 +3725,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { /* default is 1 inch */ LONG size = thousandths_inch_to_size(data, 1000); - data->dlga->rtMargin.left = size; - data->dlga->rtMargin.top = size; - data->dlga->rtMargin.right = size; - data->dlga->rtMargin.bottom = size; + SetRect(pagesetup_get_margin_rect(data), size, size, size, size); } update_margin_edits(hDlg, data, 0); subclass_margin_edits(hDlg);

1 0

Huw Davies : comdlg32: Fix incorrect scaling.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 2e2a0774b4e1f3e4d55673fc434938952d763c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2a0774b4e1f3e4d55673fc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 15:48:01 2009 +0000 comdlg32: Fix incorrect scaling. --- dlls/comdlg32/printdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f7c5901..1adbb90 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3572,8 +3572,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) rcMargin = rcClient; rcMargin.left += pagesetup_get_margin_rect(data)->left * scalx; - rcMargin.top += pagesetup_get_margin_rect(data)->top * scalx; - rcMargin.right -= pagesetup_get_margin_rect(data)->right * scaly; + rcMargin.top += pagesetup_get_margin_rect(data)->top * scaly; + rcMargin.right -= pagesetup_get_margin_rect(data)->right * scalx; rcMargin.bottom -= pagesetup_get_margin_rect(data)->bottom * scaly; /* if the space is too small then we make sure to not draw anything */

1 0

Michael Stefaniuc : msdmo: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: dfd821d6a98bd52f7ffcb19c32e65e90b26aad78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd821d6a98bd52f7ffcb19c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 10:36:56 2009 +0100 msdmo: Remove superfluous pointer casts. --- dlls/msdmo/dmoreg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 97388c9..a3dc930 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -450,11 +450,11 @@ static HRESULT WINAPI IEnumDMO_fnQueryInterface( if(IsEqualIID(riid, &IID_IUnknown)) *ppvObj = This; else if(IsEqualIID(riid, &IID_IEnumDMO)) - *ppvObj = (IEnumDMO*)This; + *ppvObj = This; if(*ppvObj) { - IEnumDMO_fnAddRef((IEnumDMO*)*ppvObj); + IEnumDMO_fnAddRef(*ppvObj); return S_OK; }

1 0

Huw Davies : comdlg32: Use a helper function to retrieve pagesetup flags.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: de7be5885cc32f5bde18c20ddd707b23397e1e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7be5885cc32f5bde18c20dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 15:16:26 2009 +0000 comdlg32: Use a helper function to retrieve pagesetup flags. --- dlls/comdlg32/printdlg.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2b95ac2..e88ed82 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2438,9 +2438,14 @@ static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd) return hDlgTmpl; } +static inline DWORD pagesetup_get_flags(const pagesetup_data *data) +{ + return data->dlga->Flags; +} + static inline BOOL is_metric(const pagesetup_data *data) { - return data->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS; + return pagesetup_get_flags(data) & PSD_INHUNDREDTHSOFMILLIMETERS; } static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) @@ -3433,7 +3438,7 @@ PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa INT oldbkmode; TRACE("uMsg: WM_USER+%d\n",uMsg-WM_USER); /* Call user paint hook if enable */ - if (data->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) + if (pagesetup_get_flags(data) & PSD_ENABLEPAGEPAINTHOOK) if (data->dlga->lpfnPagePaintHook(hwndDlg, uMsg, wParam, lParam)) return TRUE; @@ -3673,17 +3678,17 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) /* FIXME: Paint hook. Must it be at begin of initialization or at end? */ res = TRUE; - if (data->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) + if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { if (!data->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)data->dlga)) FIXME("Setup page hook failed?\n"); } /* if printer button disabled */ - if (data->dlga->Flags & PSD_DISABLEPRINTER) + if (pagesetup_get_flags(data) & PSD_DISABLEPRINTER) EnableWindow(GetDlgItem(hDlg, psh3), FALSE); /* if margin edit boxes disabled */ - if (data->dlga->Flags & PSD_DISABLEMARGINS) + if (pagesetup_get_flags(data) & PSD_DISABLEMARGINS) { EnableWindow(GetDlgItem(hDlg, edt4), FALSE); EnableWindow(GetDlgItem(hDlg, edt5), FALSE); @@ -3695,14 +3700,14 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pagesetup_update_orientation_buttons(hDlg, data); /* if orientation disabled */ - if (data->dlga->Flags & PSD_DISABLEORIENTATION) + if (pagesetup_get_flags(data) & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE); } /* We fill them out enabled or not */ - if (!(data->dlga->Flags & PSD_MARGINS)) + if (!(pagesetup_get_flags(data) & PSD_MARGINS)) { /* default is 1 inch */ LONG size = thousandths_inch_to_size(data, 1000); @@ -3716,7 +3721,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) set_margin_groupbox_title(hDlg, data); /* if paper disabled */ - if (data->dlga->Flags & PSD_DISABLEPAPER) + if (pagesetup_get_flags(data) & PSD_DISABLEPAPER) { EnableWindow(GetDlgItem(hDlg,cmb2),FALSE); EnableWindow(GetDlgItem(hDlg,cmb3),FALSE); @@ -3737,7 +3742,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; } - if (data->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) + if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { res = data->dlga->lpfnPageSetupHook(hDlg, uMsg, wParam, lParam); if (res) return res;

1 0

Michael Stefaniuc : ifsmgr.vxd: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 3b4bf2f6f2e3fb010fb637f9d37846ec9e92e073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4bf2f6f2e3fb010fb637f9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 10:37:15 2009 +0100 ifsmgr.vxd: Remove superfluous pointer casts. --- dlls/ifsmgr.vxd/ifsmgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ifsmgr.vxd/ifsmgr.c b/dlls/ifsmgr.vxd/ifsmgr.c index 499507f..47053e0 100644 --- a/dlls/ifsmgr.vxd/ifsmgr.c +++ b/dlls/ifsmgr.vxd/ifsmgr.c @@ -117,8 +117,8 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DW case IFS_IOCTL_2F: { CONTEXT86 cxt; - struct win32apireq *pIn=(struct win32apireq *) lpvInBuffer; - struct win32apireq *pOut=(struct win32apireq *) lpvOutBuffer; + struct win32apireq *pIn=lpvInBuffer; + struct win32apireq *pOut=lpvOutBuffer; TRACE( "Control '%s': " "proid=0x%08lx, eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, "

1 0

Huw Davies : comdlg32: Add a helper function to access the PAGESETUPDLG' s ptPaperSize element.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 30aa997b69db367d48d9d03e852cdbdb626d2f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30aa997b69db367d48d9d03e8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 15:33:09 2009 +0000 comdlg32: Add a helper function to access the PAGESETUPDLG's ptPaperSize element. --- dlls/comdlg32/printdlg.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index e88ed82..c07e72b 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2784,6 +2784,18 @@ static void pagesetup_set_devmode(pagesetup_data *data, DEVMODEW *dm) HeapFree(GetProcessHeap(), 0, tmp_dm); } +static inline POINT *pagesetup_get_papersize_pt(const pagesetup_data *data) +{ + return &data->dlga->ptPaperSize; +} + +static inline void swap_point(POINT *pt) +{ + LONG tmp = pt->x; + pt->x = pt->y; + pt->y = tmp; +} + static BOOL pagesetup_update_papersize(pagesetup_data *data) { DEVMODEW *dm; @@ -2832,15 +2844,12 @@ static BOOL pagesetup_update_papersize(pagesetup_data *data) } /* this is _10ths_ of a millimeter */ - data->dlga->ptPaperSize.x = tenths_mm_to_size(data, points[i].x); - data->dlga->ptPaperSize.y = tenths_mm_to_size(data, points[i].y); + pagesetup_get_papersize_pt(data)->x = tenths_mm_to_size(data, points[i].x); + pagesetup_get_papersize_pt(data)->y = tenths_mm_to_size(data, points[i].y); if(pagesetup_get_orientation(data) == DMORIENT_LANDSCAPE) - { - LONG tmp = data->dlga->ptPaperSize.x; - data->dlga->ptPaperSize.x = data->dlga->ptPaperSize.y; - data->dlga->ptPaperSize.y = tmp; - } + swap_point(pagesetup_get_papersize_pt(data)); + retval = TRUE; end: @@ -3117,12 +3126,12 @@ static void pagesetup_change_preview(const pagesetup_data *data) if(pagesetup_get_orientation(data) == DMORIENT_LANDSCAPE) { width = data->rtDrawRect.right - data->rtDrawRect.left; - height = data->dlga->ptPaperSize.y * width / data->dlga->ptPaperSize.x; + height = pagesetup_get_papersize_pt(data)->y * width / pagesetup_get_papersize_pt(data)->x; } else { height = data->rtDrawRect.bottom - data->rtDrawRect.top; - width = data->dlga->ptPaperSize.x * height / data->dlga->ptPaperSize.y; + width = pagesetup_get_papersize_pt(data)->x * height / pagesetup_get_papersize_pt(data)->y; } x = (data->rtDrawRect.right + data->rtDrawRect.left - width) / 2; y = (data->rtDrawRect.bottom + data->rtDrawRect.top - height) / 2; @@ -3553,8 +3562,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rcClient); - scalx = rcClient.right / (double)data->dlga->ptPaperSize.x; - scaly = rcClient.bottom / (double)data->dlga->ptPaperSize.y; + scalx = rcClient.right / (double)pagesetup_get_papersize_pt(data)->x; + scaly = rcClient.bottom / (double)pagesetup_get_papersize_pt(data)->y; rcMargin = rcClient; rcMargin.left += data->dlga->rtMargin.left * scalx;

1 0

Michael Stefaniuc : winealsa.drv: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: aea94788e4187944f688061a9ea4ad7beab21a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea94788e4187944f688061a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 10:36:15 2009 +0100 winealsa.drv: Remove superfluous pointer casts. --- dlls/winealsa.drv/dscapture.c | 4 ++-- dlls/winealsa.drv/midi.c | 13 ++++++------- dlls/winealsa.drv/mixer.c | 14 +++++++------- dlls/winealsa.drv/wavein.c | 2 +- dlls/winealsa.drv/waveout.c | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 872a80c..304a5eb 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -477,7 +477,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFE if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsCaptureDriverBuffer) ) { IDsCaptureDriverBuffer_AddRef(iface); - *ppobj = (LPVOID)iface; + *ppobj = iface; return DS_OK; } @@ -494,7 +494,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFE IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); } IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); - *ppobj = (LPVOID)This->notify; + *ppobj = This->notify; return DS_OK; } diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 24a9b65..b62a885 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -376,7 +376,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) { int pos = 0; int len = ev->data.ext.len; - LPBYTE ptr = (BYTE*) ev->data.ext.ptr; + LPBYTE ptr = ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; EnterCriticalSection(&crit_sect); @@ -393,7 +393,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) WARN("Couldn't notify client\n"); } @@ -594,10 +594,9 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } else { LPMIDIHDR ptr; - for (ptr = MidiInDev[wDevID].lpQueueHdr; - ptr->lpNext != 0; - ptr = (LPMIDIHDR)ptr->lpNext); - ptr->lpNext = (struct midihdr_tag*)lpMidiHdr; + for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; + ptr = ptr->lpNext); + ptr->lpNext = lpMidiHdr; } LeaveCriticalSection(&crit_sect); @@ -666,7 +665,7 @@ static DWORD midReset(WORD wDevID) (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { WARN("Couldn't notify client\n"); } - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)MidiInDev[wDevID].lpQueueHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&crit_sect); diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 426656d..e5cd347 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -915,7 +915,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)mctrld->paDetails; + mcdu = mctrld->paDetails; if (mctrld->cChannels != 1 && mmixer->lines[line].chans != mctrld->cChannels) { @@ -966,7 +966,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; if (line == 1) for (chn = 0; chn <= SND_MIXER_SCHN_LAST; ++chn) @@ -1009,7 +1009,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; for (x = 0; x<mmixer->chans; ++x) if (line != x && mmixer->lines[x].dst == line) @@ -1045,7 +1045,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW if (ct->c.dwControlType == MIXERCONTROL_CONTROLTYPE_MUX || ct->c.dwControlType == MIXERCONTROL_CONTROLTYPE_MIXER) { - LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt = (LPMIXERCONTROLDETAILS_LISTTEXTW)mctrld->paDetails; + LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt = mctrld->paDetails; int i, j; for (i = j = 0; j < mmixer->chans; ++j) @@ -1143,7 +1143,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW } TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)mctrld->paDetails; + mcdu = mctrld->paDetails; for (chn=0; chn<mctrld->cChannels;++chn) { @@ -1191,7 +1191,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; if (line == 1) /* Mute/unmute capturing */ for (i = 0; i <= SND_MIXER_SCHN_LAST; ++i) { @@ -1219,7 +1219,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW } TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; for (x=i=0; x < mmixer->chans; ++x) if (line != x && mmixer->lines[x].dst == line) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 89ad9df..d6337bc 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -142,7 +142,7 @@ static void widRecorder_ReadHeaders(WINE_WAVEDEV * wwi) static DWORD CALLBACK widRecorder(LPVOID pmt) { WORD uDevID = (DWORD_PTR)pmt; - WINE_WAVEDEV* wwi = (WINE_WAVEDEV*)&WInDev[uDevID]; + WINE_WAVEDEV* wwi = &WInDev[uDevID]; WAVEHDR* lpWaveHdr; DWORD dwSleepTime; DWORD bytesRead; diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index b99731b..b785dce 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -521,7 +521,7 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEDEV* wwo) static DWORD CALLBACK wodPlayer(LPVOID pmt) { WORD uDevID = (DWORD_PTR)pmt; - WINE_WAVEDEV* wwo = (WINE_WAVEDEV*)&WOutDev[uDevID]; + WINE_WAVEDEV* wwo = &WOutDev[uDevID]; DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */ DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */ DWORD dwSleepTime;

1 0

Alexandre Julliard : user32/tests: Don't try to do hook tests if we can' t set hooks.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: c83b4e230c8621d99236d120713a480a7f54da04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83b4e230c8621d99236d1207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 13:14:05 2009 +0100 user32/tests: Don't try to do hook tests if we can't set hooks. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19c89ad..a3d1627 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11380,7 +11380,7 @@ START_TEST(msg) test_accelerators(); test_timers(); test_timers_no_wnd(); - test_set_hook(); + if (hCBT_hook) test_set_hook(); test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout();

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10Buffer implementation.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 6d2d5318c474f97f9ecaec3b059b62cb9afd86e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2d5318c474f97f9ecaec3b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:34 2009 +0100 d3d10core: Add a stub ID3D10Buffer implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/buffer.c | 164 ++++++++++++++++++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 8 ++ dlls/d3d10core/device.c | 20 ++++- 4 files changed, 191 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 6521150..80f0def 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = d3d10core IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ + buffer.c \ d3d10core_main.c \ device.c \ texture2d.c \ diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c new file mode 100644 index 0000000..b6d60af --- /dev/null +++ b/dlls/d3d10core/buffer.c @@ -0,0 +1,164 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Buffer) + || IsEqualGUID(riid, &IID_ID3D10Resource) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) +{ + struct d3d10_buffer *This = (struct d3d10_buffer *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) +{ + struct d3d10_buffer *This = (struct d3d10_buffer *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10Resource methods */ + +static void STDMETHODCALLTYPE d3d10_buffer_GetType(ID3D10Buffer *iface, D3D10_RESOURCE_DIMENSION *resource_dimension) +{ + FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); +} + +static void STDMETHODCALLTYPE d3d10_buffer_SetEvictionPriority(ID3D10Buffer *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Buffer methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) +{ + FIXME("iface %p, map_type %u, map_flags %#x, data %p stub!\n", iface, map_type, map_flags, data); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10BufferVtbl d3d10_buffer_vtbl = +{ + /* IUnknown methods */ + d3d10_buffer_QueryInterface, + d3d10_buffer_AddRef, + d3d10_buffer_Release, + /* ID3D10DeviceChild methods */ + d3d10_buffer_GetDevice, + d3d10_buffer_GetPrivateData, + d3d10_buffer_SetPrivateData, + d3d10_buffer_SetPrivateDataInterface, + /* ID3D10Resource methods */ + d3d10_buffer_GetType, + d3d10_buffer_SetEvictionPriority, + d3d10_buffer_GetEvictionPriority, + /* ID3D10Buffer methods */ + d3d10_buffer_Map, + d3d10_buffer_Unmap, + d3d10_buffer_GetDesc, +}; diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ab79a80..b9e3a49 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -62,6 +62,14 @@ struct d3d10_texture2d IWineD3DSurface *wined3d_surface; }; +/* ID3D10Buffer */ +extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; +struct d3d10_buffer +{ + const struct ID3D10BufferVtbl *vtbl; + LONG refcount; +}; + /* ID3D10RenderTargetView */ extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 5268ac4..71291cf 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -558,9 +558,25 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device *iface) static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { - FIXME("iface %p, desc %p, data %p, buffer %p stub!\n", iface, desc, data, buffer); + struct d3d10_buffer *object; - return E_NOTIMPL; + FIXME("iface %p, desc %p, data %p, buffer %p partial stub!\n", iface, desc, data, buffer); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 buffer object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_buffer_vtbl; + object->refcount = 1; + + *buffer = (ID3D10Buffer *)object; + + TRACE("Created ID3D10Buffer %p\n", object); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device *iface,

1 0