wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Nozomi Kodama : d3dx9: Floatify sqrt into sqrtf.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: e2d3553642402b661b8fbad66905127d112f74c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d3553642402b661b8fbad66… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Thu Apr 4 09:07:38 2013 -1000 d3dx9: Floatify sqrt into sqrtf. --- dlls/d3dx9_36/math.c | 68 +++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index ae9daac..207d152 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2394,54 +2394,54 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir if ((order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER)) return out; - out[0] = 0.5f / sqrt(D3DX_PI); - out[1] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->y; - out[2] = 0.5f / sqrt(D3DX_PI / 3.0f) * dir->z; - out[3] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->x; + out[0] = 0.5f / sqrtf(D3DX_PI); + out[1] = -0.5f / sqrtf(D3DX_PI / 3.0f) * dir->y; + out[2] = 0.5f / sqrtf(D3DX_PI / 3.0f) * dir->z; + out[3] = -0.5f / sqrtf(D3DX_PI / 3.0f) * dir->x; if (order == 2) return out; - out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dirxy; - out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * diryz; - out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * (3.0f * dirzz - 1.0f); - out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dirxz; - out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * (dirxx - diryy); + out[4] = 0.5f / sqrtf(D3DX_PI / 15.0f) * dirxy; + out[5] = -0.5f / sqrtf(D3DX_PI / 15.0f) * diryz; + out[6] = 0.25f / sqrtf(D3DX_PI / 5.0f) * (3.0f * dirzz - 1.0f); + out[7] = -0.5f / sqrtf(D3DX_PI / 15.0f) * dirxz; + out[8] = 0.25f / sqrtf(D3DX_PI / 15.0f) * (dirxx - diryy); if (order == 3) return out; - out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); - out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; - out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); - out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); - out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); - out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); - out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); + out[9] = -sqrtf(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); + out[10] = sqrtf(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; + out[11] = -sqrtf(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); + out[12] = sqrtf(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); + out[13] = sqrtf(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); + out[14] = sqrtf(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); + out[15] = -sqrtf(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); if (order == 4) return out; - out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dirxy * (dirxx - diryy); + out[16] = 0.75f * sqrtf(35.0f / D3DX_PI) * dirxy * (dirxx - diryy); out[17] = 3.0f * dir->z * out[9]; - out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dirxy * (7.0f * dirzz - 1.0f); - out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * diryz * (3.0f - 7.0f * dirzz); - out[20] = 3.0f / (16.0f * sqrt(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); - out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); - out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); + out[18] = 0.75f * sqrtf(5.0f / D3DX_PI) * dirxy * (7.0f * dirzz - 1.0f); + out[19] = 0.375f * sqrtf(10.0f / D3DX_PI) * diryz * (3.0f - 7.0f * dirzz); + out[20] = 3.0f / (16.0f * sqrtf(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); + out[21] = 0.375f * sqrtf(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); + out[22] = 0.375f * sqrtf(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); out[23] = 3.0 * dir->z * out[15]; - out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); + out[24] = 3.0f / 16.0f * sqrtf(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); if (order == 5) return out; - out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * (5.0f * dirxxxx - 10.0f * dirxyxy + diryyyy); - out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dirxy * dir->z * (dirxx - diryy); - out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * (3.0f * dirxx - diryy) * (1.0f - 9.0f * dirzz); - out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dirxy * dir->z * (3.0f * dirzz - 1.0f); - out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); - out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * (63.0f * dirzzzz - 70.0f * dirzz + 15.0f); - out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); - out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); - out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); - out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); - out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); + out[25] = -3.0f/ 32.0f * sqrtf(154.0f / D3DX_PI) * dir->y * (5.0f * dirxxxx - 10.0f * dirxyxy + diryyyy); + out[26] = 0.75f * sqrtf(385.0f / D3DX_PI) * dirxy * dir->z * (dirxx - diryy); + out[27] = sqrtf(770.0f / D3DX_PI) / 32.0f * dir->y * (3.0f * dirxx - diryy) * (1.0f - 9.0f * dirzz); + out[28] = sqrtf(1155.0f / D3DX_PI) / 4.0f * dirxy * dir->z * (3.0f * dirzz - 1.0f); + out[29] = sqrtf(165.0f / D3DX_PI) / 16.0f * dir->y * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[30] = sqrtf(11.0f / D3DX_PI) / 16.0f * dir->z * (63.0f * dirzzzz - 70.0f * dirzz + 15.0f); + out[31] = sqrtf(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[32] = sqrtf(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); + out[33] = sqrtf(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); + out[34] = 3.0f / 16.0f * sqrtf(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); + out[35] = -3.0f/ 32.0f * sqrtf(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); return out; }

1 0

Nozomi Kodama : d3dx9: Floatify fabs into fabsf.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 574d4cfba94513f243d67bff1c48d78814c5ca39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574d4cfba94513f243d67bff1… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Thu Apr 4 09:04:45 2013 -1000 d3dx9: Floatify fabs into fabsf. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2ddd379..af44957 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -27,7 +27,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) (fabs(exp) < 0.01f ? fabs(exp - out) : fabs(1.0f - (out) / (exp))) +#define relative_error(exp, out) (fabsf(exp) < 0.01f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0

Kim Jung Eon : wbemprox: Implement some properties of Win32_ComputerSystem and Win32_DiskPartition.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: a9b2ce2c97411fe5e9d047957d674719333f480e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b2ce2c97411fe5e9d047957… Author: Kim Jung Eon <admin(a)mog422.net> Date: Mon Apr 8 17:21:29 2013 +0900 wbemprox: Implement some properties of Win32_ComputerSystem and Win32_DiskPartition. --- dlls/wbemprox/builtin.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f48eaff..8b3e3c3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -85,6 +85,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; +static const WCHAR prop_bootpartitionW[] = + {'B','o','o','t','P','a','r','t','i','t','i','o','n',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = @@ -239,6 +241,7 @@ static const struct column col_compsys[] = { prop_domainroleW, CIM_UINT16 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } @@ -246,6 +249,7 @@ static const struct column col_compsys[] = static const struct column col_diskdrive[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } @@ -253,6 +257,7 @@ static const struct column col_diskdrive[] = static const struct column col_diskpartition[] = { { prop_bootableW, CIM_BOOLEAN }, + { prop_bootpartitionW, CIM_BOOLEAN }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_diskindexW, CIM_UINT32, VT_I4 }, { prop_indexW, CIM_UINT32, VT_I4 }, @@ -409,6 +414,8 @@ static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_serialW[] = + {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', @@ -456,6 +463,7 @@ struct record_computersystem UINT16 domainrole; const WCHAR *manufacturer; const WCHAR *model; + const WCHAR *name; UINT32 num_logical_processors; UINT32 num_processors; UINT64 total_physical_memory; @@ -463,6 +471,7 @@ struct record_computersystem struct record_diskdrive { const WCHAR *device_id; + UINT32 index; const WCHAR *manufacturer; const WCHAR *name; const WCHAR *serialnumber; @@ -470,6 +479,7 @@ struct record_diskdrive struct record_diskpartition { int bootable; + int bootpartition; const WCHAR *device_id; UINT32 diskindex; UINT32 index; @@ -600,7 +610,7 @@ static const struct record_bios data_bios[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } + { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } }; static const struct record_param data_param[] = { @@ -726,6 +736,16 @@ static UINT64 get_total_physical_memory(void) return status.ullTotalPhys; } +static WCHAR *get_computername(void) +{ + WCHAR *ret; + DWORD size=MAX_COMPUTERNAME_LENGTH; + + if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + GetComputerNameW( ret, &size ); + return ret; +} + static void fill_compsys( struct table *table ) { struct record_computersystem *rec; @@ -738,6 +758,7 @@ static void fill_compsys( struct table *table ) rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; + rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count(); rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); @@ -807,6 +828,7 @@ static void fill_diskpartition( struct table *table ) } rec = (struct record_diskpartition *)(table->data + offset); rec->bootable = (i == 2) ? -1 : 0; + rec->bootpartition = (i == 2) ? -1 : 0; sprintfW( device_id, fmtW, index ); rec->device_id = heap_strdupW( device_id ); rec->diskindex = index;

1 0

Akihiro Sagawa : fonts: Add Japanese FixedSys font.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: c4408e0b621b99115247386e7095231be7e1045d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4408e0b621b99115247386e7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 8 21:55:08 2013 +0900 fonts: Add Japanese FixedSys font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 4 + fonts/fixedsys_jp.sfd | 2301 +++++++++++++++++++++++++++++++++++++++++++++++++ fonts/fixedsys_jp.ttf | Bin 0 -> 7704 bytes tools/sfnt2fnt.c | 6 +- 5 files changed, 2309 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4408e0b621b991152473…

1 0

Akihiro Sagawa : fonts: Add Fixedsys font.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 6eaa345261fad0e0a0e04f265ce6f731302ed674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaa345261fad0e0a0e04f265… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 8 21:55:05 2013 +0900 fonts: Add Fixedsys font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 4 + fonts/fixedsys.sfd | 2320 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/fixedsys.ttf | Bin 0 -> 10852 bytes tools/sfnt2fnt.c | 3 + 5 files changed, 2328 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaa345261fad0e0a0e04…

1 0

Dmitry Timoshkov : comdlg32: Add an interactive PrintDlgEx test.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: b73323d4e2049968e31f6d69ada2041580918e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73323d4e2049968e31f6d69a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 9 12:51:10 2013 +0900 comdlg32: Add an interactive PrintDlgEx test. --- dlls/comdlg32/tests/printdlg.c | 135 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index b6c8325..d004598 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -19,7 +19,11 @@ * */ +#define COBJMACROS +#define CONST_VTABLE + #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -35,6 +39,8 @@ /* ########################### */ +extern const IID IID_IObjectWithSite; + static HMODULE hcomdlg32; static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); @@ -43,6 +49,18 @@ static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + /* ########################### */ static void test_PageSetupDlgA(void) @@ -210,6 +228,98 @@ static void test_PrintDlgA(void) /* ########################### */ +static HRESULT WINAPI callback_QueryInterface(IPrintDialogCallback *iface, + REFIID riid, void **ppv) +{ + ok(0, "callback_QueryInterface(%s): unexpected call\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI callback_AddRef(IPrintDialogCallback *iface) +{ + trace("callback_AddRef\n"); + return 2; +} + +static ULONG WINAPI callback_Release(IPrintDialogCallback *iface) +{ + trace("callback_Release\n"); + return 1; +} + +static HRESULT WINAPI callback_InitDone(IPrintDialogCallback *iface) +{ + trace("callback_InitDone\n"); + return S_OK; +} + +static HRESULT WINAPI callback_SelectionChange(IPrintDialogCallback *iface) +{ + trace("callback_SelectionChange\n"); + return S_OK; +} + +static HRESULT WINAPI callback_HandleMessage(IPrintDialogCallback *iface, + HWND hdlg, UINT msg, WPARAM wp, LPARAM lp, LRESULT *res) +{ + trace("callback_HandleMessage %p,%04x,%lx,%lx,%p\n", hdlg, msg, wp, lp, res); + /* *res = PD_RESULT_PRINT; */ + return S_OK; +} + +static const IPrintDialogCallbackVtbl callback_Vtbl = +{ + callback_QueryInterface, + callback_AddRef, + callback_Release, + callback_InitDone, + callback_SelectionChange, + callback_HandleMessage +}; + +static IPrintDialogCallback callback = { &callback_Vtbl }; + +static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + trace("unknown_QueryInterface %s\n", debugstr_guid(riid)); + + if (IsEqualGUID(riid, &IID_IPrintDialogCallback)) + { + *ppv = &callback; + return S_OK; + } + else if (IsEqualGUID(riid, &IID_IObjectWithSite)) + { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected IID %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI unknown_AddRef(IUnknown *iface) +{ + trace("unknown_AddRef\n"); + return 2; +} + +static ULONG WINAPI unknown_Release(IUnknown *iface) +{ + trace("unknown_Release\n"); + return 1; +} + +static const IUnknownVtbl unknown_Vtbl = +{ + unknown_QueryInterface, + unknown_AddRef, + unknown_Release +}; + +static IUnknown unknown = { &unknown_Vtbl }; + static void test_PrintDlgExW(void) { PRINTPAGERANGE pagerange[2]; @@ -370,9 +480,30 @@ static void test_PrintDlgExW(void) GlobalFree(pDlg->hDevNames); DeleteDC(pDlg->hDC); - HeapFree(GetProcessHeap(), 0, pDlg); - return; + /* interactive PrintDlgEx tests */ + + if (!winetest_interactive) + { + skip("interactive PrintDlgEx tests (set WINETEST_INTERACTIVE=1)\n"); + return; + } + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + pDlg->hwndOwner = GetDesktopWindow(); + pDlg->Flags = PD_NOPAGENUMS | PD_RETURNIC; + pDlg->nStartPage = START_PAGE_GENERAL; + pDlg->lpCallback = &unknown; + pDlg->dwResultAction = S_OK; + res = pPrintDlgExW(pDlg); + ok(res == S_OK, "got 0x%x (expected S_OK)\n", res); + ok(pDlg->dwResultAction == PD_RESULT_PRINT, "expected PD_RESULT_PRINT, got %#x\n", pDlg->dwResultAction); + ok(pDlg->hDC != NULL, "HDC missing for PD_RETURNIC\n"); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + DeleteDC(pDlg->hDC); + + HeapFree(GetProcessHeap(), 0, pDlg); } static BOOL abort_proc_called = FALSE;

1 0

Dmitry Timoshkov : comdlg32: Add a simple PrintDlgEx implementation which wraps around the PrintDlg one .
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: e0b4b9f63fbda54432c8c5c1753bc2dace44b511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b4b9f63fbda54432c8c5c17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 9 12:50:40 2013 +0900 comdlg32: Add a simple PrintDlgEx implementation which wraps around the PrintDlg one. --- dlls/comdlg32/printdlg.c | 143 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 138 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2d80fd5..e3b89ea 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -28,6 +28,7 @@ #include <string.h> #include <assert.h> +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -36,11 +37,12 @@ #include "winuser.h" #include "winspool.h" #include "winerror.h" +#include "objbase.h" +#include "commdlg.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "commdlg.h" #include "dlgs.h" #include "cderr.h" #include "cdlg.h" @@ -3932,6 +3934,80 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) return pagesetup_common(&data); } +static void pdlgex_to_pdlg(const PRINTDLGEXW *pdlgex, PRINTDLGW *pdlg) +{ + pdlg->lStructSize = sizeof(*pdlg); + pdlg->hwndOwner = pdlgex->hwndOwner; + pdlg->hDevMode = pdlgex->hDevMode; + pdlg->hDevNames = pdlgex->hDevNames; + pdlg->hDC = pdlgex->hDC; + pdlg->Flags = pdlgex->Flags; + if ((pdlgex->Flags & PD_NOPAGENUMS) || !pdlgex->nPageRanges || !pdlgex->lpPageRanges) + { + pdlg->nFromPage = 0; + pdlg->nToPage = 65534; + } + else + { + pdlg->nFromPage = pdlgex->lpPageRanges[0].nFromPage; + pdlg->nToPage = pdlgex->lpPageRanges[0].nToPage; + } + pdlg->nMinPage = pdlgex->nMinPage; + pdlg->nMaxPage = pdlgex->nMaxPage; + pdlg->nCopies = pdlgex->nCopies; + pdlg->hInstance = pdlgex->hInstance; + pdlg->lCustData = 0; + pdlg->lpfnPrintHook = NULL; + pdlg->lpfnSetupHook = NULL; + pdlg->lpPrintTemplateName = pdlgex->lpPrintTemplateName; + pdlg->lpSetupTemplateName = NULL; + pdlg->hPrintTemplate = NULL; + pdlg->hSetupTemplate = NULL; +} + +/* Only copy fields that are supposed to be changed. */ +static void pdlg_to_pdlgex(const PRINTDLGW *pdlg, PRINTDLGEXW *pdlgex) +{ + pdlgex->hDevMode = pdlg->hDevMode; + pdlgex->hDevNames = pdlg->hDevNames; + pdlgex->hDC = pdlg->hDC; + if (!(pdlgex->Flags & PD_NOPAGENUMS) && pdlgex->nPageRanges && pdlgex->lpPageRanges) + { + pdlgex->lpPageRanges[0].nFromPage = pdlg->nFromPage; + pdlgex->lpPageRanges[0].nToPage = pdlg->nToPage; + } + pdlgex->nMinPage = pdlg->nMinPage; + pdlgex->nMaxPage = pdlg->nMaxPage; + pdlgex->nCopies = pdlg->nCopies; +} + +struct callback_data +{ + IPrintDialogCallback *callback; + IObjectWithSite *object; +}; + +static UINT CALLBACK pdlgex_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_INITDIALOG) + { + PRINTDLGW *pd = (PRINTDLGW *)lp; + struct callback_data *cb = (struct callback_data *)pd->lCustData; + + cb->callback->lpVtbl->SelectionChange(cb->callback); + cb->callback->lpVtbl->InitDone(cb->callback); + } + else + { +/* FIXME: store interface pointer somewhere in window properties and call it + HRESULT hres; + cb->callback->lpVtbl->HandleMessage(cb->callback, hwnd, msg, wp, lp, &hres); +*/ + } + + return 0; +} + /*********************************************************************** * PrintDlgExA (COMDLG32.@) * @@ -4003,9 +4079,39 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) } else { - FIXME("(%p) dialog not implemented\n", lppd); - return E_NOTIMPL; + PRINTDLGA pdlg; + struct callback_data cb_data = { 0 }; + + FIXME("(%p) semi-stub\n", lppd); + + if (lppd->lpCallback) + { + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IPrintDialogCallback, (void **)&cb_data.callback); + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IObjectWithSite, (void **)&cb_data.object); + } + + /* + * PRINTDLGEXA/W and PRINTDLGA/W layout is the same for A and W variants. + */ + pdlgex_to_pdlg((const PRINTDLGEXW *)lppd, (PRINTDLGW *)&pdlg); + pdlg.Flags |= PD_ENABLEPRINTHOOK; + pdlg.lpfnPrintHook = pdlgex_hook_proc; + pdlg.lCustData = (LPARAM)&cb_data; + + if (PrintDlgA(&pdlg)) + { + pdlg_to_pdlgex((const PRINTDLGW *)&pdlg, (PRINTDLGEXW *)lppd); + lppd->dwResultAction = PD_RESULT_PRINT; + } + else + lppd->dwResultAction = PD_RESULT_CANCEL; + + if (cb_data.callback) + cb_data.callback->lpVtbl->Release(cb_data.callback); + if (cb_data.object) + cb_data.object->lpVtbl->Release(cb_data.object); + return S_OK; } ClosePrinter(hprn); @@ -4124,9 +4230,36 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) } else { - FIXME("(%p) dialog not implemented\n", lppd); - return E_NOTIMPL; + PRINTDLGW pdlg; + struct callback_data cb_data = { 0 }; + + FIXME("(%p) semi-stub\n", lppd); + + if (lppd->lpCallback) + { + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IPrintDialogCallback, (void **)&cb_data.callback); + IUnknown_QueryInterface((IUnknown *)lppd->lpCallback, &IID_IObjectWithSite, (void **)&cb_data.object); + } + + pdlgex_to_pdlg(lppd, &pdlg); + pdlg.Flags |= PD_ENABLEPRINTHOOK; + pdlg.lpfnPrintHook = pdlgex_hook_proc; + pdlg.lCustData = (LPARAM)&cb_data; + + if (PrintDlgW(&pdlg)) + { + pdlg_to_pdlgex(&pdlg, lppd); + lppd->dwResultAction = PD_RESULT_PRINT; + } + else + lppd->dwResultAction = PD_RESULT_CANCEL; + + if (cb_data.callback) + cb_data.callback->lpVtbl->Release(cb_data.callback); + if (cb_data.object) + cb_data.object->lpVtbl->Release(cb_data.object); + return S_OK; } ClosePrinter(hprn);

1 0

Michael Stefaniuc : dplayx: Create a IDirectPlay interface in DirectPlayCreate().
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 16dc683996b47d3b8cec949bb4a613ec1abd37d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16dc683996b47d3b8cec949bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:21:28 2013 +0200 dplayx: Create a IDirectPlay interface in DirectPlayCreate(). --- dlls/dplayx/dplay.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 67e3c18..30a2ee3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5998,9 +5998,7 @@ HRESULT WINAPI DirectPlayCreate return DPERR_INVALIDPARAMS; } - /* Create an IDirectPlay object. We don't support that so we'll cheat and - give them an IDirectPlay2A object and hope that doesn't cause problems */ - if ( dplay_create( &IID_IDirectPlay2A, (void**)lplpDP ) != DP_OK ) + if ( dplay_create( &IID_IDirectPlay, (void**)lplpDP ) != DP_OK ) return DPERR_UNAVAILABLE; if( IsEqualGUID( &GUID_NULL, lpGUID ) )

1 0

Dmitry Timoshkov : include: Add COM interface definitions needed for PrintDlgEx implementation.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 04d3f6c1f5c0942b20217fb6b9f85886e7c09d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d3f6c1f5c0942b20217fb6b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 9 12:50:10 2013 +0900 include: Add COM interface definitions needed for PrintDlgEx implementation. --- dlls/uuid/uuid.c | 1 + include/commdlg.h | 34 ++++++++++++++++++++++++++++++++++ programs/oleview/main.h | 1 + programs/oleview/typelib.c | 1 - 4 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index fd96fe3..fb06f2d 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -83,6 +83,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "sensevts.h" #include "ocmm.h" #include "commoncontrols.h" +#include "commdlg.h" #include "tlogstg.h" #include "msdasc.h" diff --git a/include/commdlg.h b/include/commdlg.h index 1a6e1d9..db5aaaa 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -762,6 +762,40 @@ typedef struct tagPDEXW DECL_WINELIB_TYPE_AW(PRINTDLGEX) DECL_WINELIB_TYPE_AW(LPPRINTDLGEX) +#ifdef STDMETHOD + +DEFINE_GUID(IID_IPrintDialogCallback, 0x5852a2c3,0x6530,0x11d1,0xb6,0xa3,0x00,0x00,0xf8,0x75,0x7b,0xf9); +#define INTERFACE IPrintDialogCallback +DECLARE_INTERFACE_(IPrintDialogCallback,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IPrintDialogCallback methods ***/ + STDMETHOD(InitDone)(THIS) PURE; + STDMETHOD(SelectionChange)(THIS) PURE; + STDMETHOD(HandleMessage)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT *) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_IPrintDialogServices, 0x509aaeda,0x5639,0x11d1,0xb6,0xa1,0x00,0x00,0xf8,0x75,0x7b,0xf9); +#define INTERFACE IPrintDialogServices +DECLARE_INTERFACE_(IPrintDialogServices,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IPrintDialogServices methods ***/ + STDMETHOD(GetCurrentDevMode)(THIS_ LPDEVMODEW,UINT *) PURE; + STDMETHOD(GetCurrentPrinterName)(THIS_ LPWSTR,UINT *) PURE; + STDMETHOD(GetCurrentPortName)(THIS_ LPWSTR,UINT *) PURE; +}; +#undef INTERFACE + +#endif /* STDMETHOD */ + BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol); BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol); #define ChooseColor WINELIB_NAME_AW(ChooseColor) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index c3c358d..66bf70e 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -23,6 +23,7 @@ #include <windows.h> #include <winreg.h> #include <commctrl.h> +#include <commdlg.h> #include <unknwn.h> #ifdef NONAMELESSUNION diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index c6aec5f..21e9d96 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -19,7 +19,6 @@ */ #include "main.h" -#include "commdlg.h" #include "wine/debug.h" #include "wine/unicode.h"

1 0

Michael Stefaniuc : dplayx: Forward directly to IDirectPlay4 QueryInterface .
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3147647b4492bbb1b9072bf979b17f0327d78384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3147647b4492bbb1b9072bf97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:20:24 2013 +0200 dplayx: Forward directly to IDirectPlay4 QueryInterface. --- dlls/dplayx/dplay.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index c276dba..67e3c18 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -604,7 +604,7 @@ static HRESULT WINAPI IDirectPlay2AImpl_QueryInterface( IDirectPlay2A *iface, RE void **ppv ) { IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface ); - return IDirectPlayX_QueryInterface( &This->IDirectPlay4A_iface, riid, ppv ); + return IDirectPlayX_QueryInterface( &This->IDirectPlay4_iface, riid, ppv ); } static HRESULT WINAPI IDirectPlay2Impl_QueryInterface( IDirectPlay2 *iface, REFIID riid, @@ -5713,17 +5713,17 @@ HRESULT dplay_create( REFIID riid, void **ppv ) obj->ref2 = 0; obj->ref3A = 0; obj->ref3 = 0; - obj->ref4A = 1; - obj->ref4 = 0; + obj->ref4A = 0; + obj->ref4 = 1; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); if ( DP_CreateDirectPlay2( obj ) ) - hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4A_iface, riid, ppv ); + hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4_iface, riid, ppv ); else hr = DPERR_NOMEMORY; - IDirectPlayX_Release( &obj->IDirectPlay4A_iface ); + IDirectPlayX_Release( &obj->IDirectPlay4_iface ); return hr; }

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013