January 2009 - Wine-commits

Huw Davies : comdlg32: Add a function to access the hooks.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 50843270886518e307ae2391c6fd3c3de2d75b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50843270886518e307ae2391c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 22 23:11:21 2009 +0000 comdlg32: Add a function to access the hooks. --- dlls/comdlg32/printdlg.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 3885c9a..1d1d2da 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2791,6 +2791,22 @@ static inline RECT *pagesetup_get_margin_rect(const pagesetup_data *data) return &data->dlga->rtMargin; } +typedef enum +{ + page_setup_hook, + page_paint_hook +} hook_type; + +static inline LPPAGESETUPHOOK pagesetup_get_hook(const pagesetup_data *data, hook_type which) +{ + switch(which) + { + case page_setup_hook: return data->dlga->lpfnPageSetupHook; + case page_paint_hook: return data->dlga->lpfnPagePaintHook; + } + return NULL; +} + static inline void swap_point(POINT *pt) { LONG tmp = pt->x; @@ -3448,7 +3464,7 @@ static UINT_PTR default_page_paint_hook(HWND hwndDlg, UINT uMsg, WPARAM wParam, TRACE("uMsg: WM_USER+%d\n",uMsg-WM_USER); /* Call user paint hook if enable */ if (pagesetup_get_flags(data) & PSD_ENABLEPAGEPAINTHOOK) - if (data->dlga->lpfnPagePaintHook(hwndDlg, uMsg, wParam, lParam)) + if (pagesetup_get_hook(data, page_paint_hook)(hwndDlg, uMsg, wParam, lParam)) return TRUE; switch (uMsg) { @@ -3687,7 +3703,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) res = TRUE; if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { - if (!data->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)data->dlga)) + if (!pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, (LPARAM)data->dlga)) FIXME("Setup page hook failed?\n"); } @@ -3748,7 +3764,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { - res = data->dlga->lpfnPageSetupHook(hDlg, uMsg, wParam, lParam); + res = pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, lParam); if (res) return res; } }

1 0

Huw Davies : comdlg32: Add a helper to return the dialog struct.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 2409e33f0826fc5c187f68ed10ce292a1e894b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2409e33f0826fc5c187f68ed1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 23 11:12:17 2009 +0000 comdlg32: Add a helper to return the dialog struct. --- dlls/comdlg32/printdlg.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 1d1d2da..12c0b6a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2807,6 +2807,14 @@ static inline LPPAGESETUPHOOK pagesetup_get_hook(const pagesetup_data *data, hoo return NULL; } +/* This should only be used in calls to hook procs so we return the ptr + already cast to LPARAM */ +static inline LPARAM pagesetup_get_dlg_struct(const pagesetup_data *data) +{ + return (LPARAM)data->dlga; +} + + static inline void swap_point(POINT *pt) { LONG tmp = pt->x; @@ -3571,7 +3579,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; } - if (default_page_paint_hook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), (LPARAM)data->dlga, data)) + if (default_page_paint_hook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), + pagesetup_get_dlg_struct(data), data)) return FALSE; hdc = BeginPaint(hWnd, &ps); @@ -3703,7 +3712,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) res = TRUE; if (pagesetup_get_flags(data) & PSD_ENABLEPAGESETUPHOOK) { - if (!pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, (LPARAM)data->dlga)) + if (!pagesetup_get_hook(data, page_setup_hook)(hDlg, uMsg, wParam, + pagesetup_get_dlg_struct(data))) FIXME("Setup page hook failed?\n"); }

1 0

Hans Leidekker : loadperf: Add stub implementations for InstallPerfDllA/W.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 0dd925b0010b79548e7df7a75d69d945621b2e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd925b0010b79548e7df7a75… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 23 10:32:20 2009 +0100 loadperf: Add stub implementations for InstallPerfDllA/W. --- dlls/loadperf/loadperf.spec | 4 +- dlls/loadperf/loadperf_main.c | 60 +++++++++++++++++++++++++++++++--------- include/loadperf.h | 4 +++ 3 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/loadperf/loadperf.spec b/dlls/loadperf/loadperf.spec index b46fe29..06e7891 100644 --- a/dlls/loadperf/loadperf.spec +++ b/dlls/loadperf/loadperf.spec @@ -1,6 +1,6 @@ @ stub BackupPerfRegistryToFileW -@ stub InstallPerfDllA -@ stub InstallPerfDllW +@ stdcall InstallPerfDllA(str str ptr) +@ stdcall InstallPerfDllW(wstr wstr ptr) @ stub LoadMofFromInstalledServiceA @ stub LoadMofFromInstalledServiceW @ stdcall LoadPerfCounterTextStringsA(str long) diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 89a9c4f..54fe2d6 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -50,6 +50,50 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +static WCHAR *strdupAW(const char *str) +{ + WCHAR *ret = NULL; + if (str) + { + INT len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if (!(ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) return NULL; + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + return ret; +} + +/************************************************************* + * InstallPerfDllA (loadperf.@) + */ +DWORD WINAPI InstallPerfDllA(LPCSTR computer, LPCSTR ini, ULONG_PTR flags) +{ + DWORD ret; + LPWSTR computerW = NULL, iniW = NULL; + + if (computer && !(computerW = strdupAW(computer))) return ERROR_OUTOFMEMORY; + if (ini && !(iniW = strdupAW(ini))) + { + HeapFree(GetProcessHeap(), 0, computerW); + return ERROR_OUTOFMEMORY; + } + + ret = InstallPerfDllW(computerW, iniW, flags); + + HeapFree(GetProcessHeap(), 0, computerW); + HeapFree(GetProcessHeap(), 0, iniW); + + return ret; +} + +/************************************************************* + * InstallPerfDllW (loadperf.@) + */ +DWORD WINAPI InstallPerfDllW(LPCWSTR computer, LPCWSTR ini, ULONG_PTR flags) +{ + FIXME("(%s, %s, %lx)\n", debugstr_w(computer), debugstr_w(ini), flags); + return ERROR_SUCCESS; +} + /************************************************************* * LoadPerfCounterTextStringsA (loadperf.@) * @@ -61,13 +105,7 @@ DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet) DWORD ret; LPWSTR cmdlineW = NULL; - if (cmdline) - { - INT len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); - cmdlineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!cmdlineW) return ERROR_NOT_ENOUGH_MEMORY; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlineW, len); - } + if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; ret = LoadPerfCounterTextStringsW(cmdlineW, quiet); @@ -102,13 +140,7 @@ DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL verbose) DWORD ret; LPWSTR cmdlineW = NULL; - if (cmdline) - { - INT len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); - cmdlineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!cmdlineW) return ERROR_NOT_ENOUGH_MEMORY; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlineW, len); - } + if (cmdline && !(cmdlineW = strdupAW(cmdline))) return ERROR_OUTOFMEMORY; ret = UnloadPerfCounterTextStringsW(cmdlineW, verbose); diff --git a/include/loadperf.h b/include/loadperf.h index 45679a2..d11186a 100644 --- a/include/loadperf.h +++ b/include/loadperf.h @@ -23,6 +23,10 @@ extern "C" { #endif +DWORD WINAPI InstallPerfDllA(LPCSTR, LPCSTR, ULONG_PTR); +DWORD WINAPI InstallPerfDllW(LPCWSTR, LPCWSTR, ULONG_PTR); +#define InstallPerfDll WINELIB_NAME_AW(InstallPerfDll); + DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL); DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL); #define LoadPerfCounterTextStrings WINELIB_NAME_AW(LoadPerfCounterTextStrings)

1 0

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

23 Jan '09

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

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

23 Jan '09

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 23 Jan '09

23 Jan '09

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

Michael Stefaniuc : msdmo: Remove superfluous pointer casts.
by Alexandre Julliard 23 Jan '09

23 Jan '09

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

Michael Stefaniuc : dinput8: Remove superfluous pointer casts.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 70a4954840129fbc1f37a1f37e99bd8018b91755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a4954840129fbc1f37a1f37… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 10:36:48 2009 +0100 dinput8: Remove superfluous pointer casts. --- dlls/dinput8/dinput8_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 4902903..c855caf 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -74,12 +74,12 @@ HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) { - LPDIRECTINPUTA DI = (LPDIRECTINPUTA)*ppDI; + LPDIRECTINPUTA DI = *ppDI; IDirectInput8_Initialize(DI, hinst, dwVersion); } if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) { - LPDIRECTINPUTW DI = (LPDIRECTINPUTW)*ppDI; + LPDIRECTINPUTW DI = *ppDI; IDirectInput8_Initialize(DI, hinst, dwVersion); } @@ -159,7 +159,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = (LPVOID)&DINPUT8_CF; + *ppv = &DINPUT8_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; }

1 0

Alexandre Julliard : user32/tests: Make the DC test window top-most. Ignore an extra WM_MOUSEMOVE.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 00b851d8644c914aa1772bc1349277b297268da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b851d8644c914aa1772bc13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 13:13:54 2009 +0100 user32/tests: Make the DC test window top-most. Ignore an extra WM_MOUSEMOVE. --- dlls/user32/tests/win.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8ec8a61..d2e9bc6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2786,6 +2786,12 @@ static void test_mouse_input(HWND hwnd) ret = wait_for_message( &msg ); ok(ret, "no message available\n"); + if (msg.message == WM_MOUSEMOVE) /* win2k has an extra WM_MOUSEMOVE here */ + { + ret = wait_for_message( &msg ); + ok(ret, "no message available\n"); + } + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); @@ -3795,6 +3801,7 @@ static void test_csparentdc(void) ShowWindow(hwndMain, SW_SHOW); ShowWindow(hwnd1, SW_SHOW); ShowWindow(hwnd2, SW_SHOW); + SetWindowPos(hwndMain, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); flush_events( TRUE ); zero_parentdc_test(&test_answer);

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10RenderTargetView implementation .
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: b279d6574a6641c7775b7cc580c1cbbcec22d05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b279d6574a6641c7775b7cc58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:34 2009 +0100 d3d10core: Add a stub ID3D10RenderTargetView implementation. --- dlls/d3d10core/Makefile.in | 3 +- dlls/d3d10core/d3d10core_private.h | 10 +++ dlls/d3d10core/device.c | 20 +++++- dlls/d3d10core/view.c | 145 ++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index fe3ead6..6521150 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ d3d10core_main.c \ device.c \ texture2d.c \ - utils.c + utils.c \ + view.c RC_SRCS = version.rc diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 5453600..ab79a80 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -62,6 +62,16 @@ struct d3d10_texture2d IWineD3DSurface *wined3d_surface; }; +/* ID3D10RenderTargetView */ +extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; +struct d3d10_rendertarget_view +{ + const struct ID3D10RenderTargetViewVtbl *vtbl; + LONG refcount; + + ID3D10Resource *resource; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2e4c5c1..5268ac4 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -656,9 +656,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d10_rendertarget_view *object; - return E_NOTIMPL; + TRACE("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 rendertarget view object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_rendertarget_view_vtbl; + object->refcount = 1; + object->resource = resource; + ID3D10Resource_AddRef(resource); + + *view = (ID3D10RenderTargetView *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device *iface, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c new file mode 100644 index 0000000..7810c82 --- /dev/null +++ b/dlls/d3d10core/view.c @@ -0,0 +1,145 @@ +/* + * 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_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10RenderTargetView) + || IsEqualGUID(riid, &IID_ID3D10View) + || 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_rendertarget_view_AddRef(ID3D10RenderTargetView *iface) +{ + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTargetView *iface) +{ + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + ID3D10Resource_Release(This->resource); + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTargetView *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *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_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *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_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10View methods */ + +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetResource(ID3D10RenderTargetView *iface, + ID3D10Resource **resource) +{ + struct d3d10_rendertarget_view *This = (struct d3d10_rendertarget_view *)iface; + + TRACE("iface %p, resource %p\n", iface, resource); + + ID3D10Resource_AddRef(This->resource); + *resource = This->resource; +} + +/* ID3D10RenderTargetView methods */ + +static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDesc(ID3D10RenderTargetView* iface, + D3D10_RENDER_TARGET_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = +{ + /* IUnknown methods */ + d3d10_rendertarget_view_QueryInterface, + d3d10_rendertarget_view_AddRef, + d3d10_rendertarget_view_Release, + /* ID3D10DeviceChild methods */ + d3d10_rendertarget_view_GetDevice, + d3d10_rendertarget_view_GetPrivateData, + d3d10_rendertarget_view_SetPrivateData, + d3d10_rendertarget_view_SetPrivateDataInterface, + /* ID3D10View methods */ + d3d10_rendertarget_view_GetResource, + /* ID3D10RenderTargetView methods */ + d3d10_rendertarget_view_GetDesc, +};

1 0