November 2007 - Wine-Commits

Misha Koshelev : msi/tests: Close opened service handles.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 74a2ce4d994f3b9818ece06eac728ce94e81833d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a2ce4d994f3b9818ece06ea… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Nov 18 23:36:56 2007 -0600 msi/tests: Close opened service handles. --- dlls/msi/tests/automation.c | 3 +++ dlls/msi/tests/install.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index d074d34..2db947e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -387,6 +387,9 @@ static void check_service_is_installed(void) res = DeleteService(service); ok(res, "Failed to delete TestService\n"); + + CloseServiceHandle(service); + CloseServiceHandle(scm); } /* diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3e48233..b8817d9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1265,6 +1265,9 @@ static void check_service_is_installed(void) res = DeleteService(service); ok(res, "Failed to delete TestService\n"); + + CloseServiceHandle(service); + CloseServiceHandle(scm); } static void test_MsiInstallProduct(void)

1 0

Misha Koshelev : msi/tests: automation: Add missing VariantClear.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: c30d03f8cc045aff8e4d02595ccd2748dd9cd2d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30d03f8cc045aff8e4d02595… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Nov 18 23:37:01 2007 -0600 msi/tests: automation: Add missing VariantClear. --- dlls/msi/tests/automation.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 2db947e..269d17c 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1368,6 +1368,8 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in } else skip("SummaryInfo_Property (pid %d) unhandled result type %d\n", entry->property, vt); + + VariantClear(&varresult); } /* SummaryInfo::Property, get; invalid arguments */

1 0

David Adam : d3dx8: Implement D3DXPlaneFromPoints.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 54d3bb28fd38badbc227d9cc0266d2ff88fd6770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d3bb28fd38badbc227d9cc0… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 14:34:46 2007 +0100 d3dx8: Implement D3DXPlaneFromPoints. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 14 ++++++++++++++ dlls/d3dx8/tests/math.c | 16 +++++++++++++++- include/d3dx8math.h | 1 + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 5b35df4..4dd230b 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -64,7 +64,7 @@ @ stdcall D3DXPlaneNormalize(ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) -@ stub D3DXPlaneFromPoints +@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stub D3DXPlaneTransform @ stub D3DXColorAdjustSaturation @ stub D3DXColorAdjustContrast diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 875ca49..0727492 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -491,6 +491,20 @@ D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *p return pout; } +D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3) +{ + D3DXVECTOR3 edge1, edge2, normal, Nnormal; + + edge1.x = 0.0f; edge1.y = 0.0f; edge1.z = 0.0f; + edge2.x = 0.0f; edge2.y = 0.0f; edge2.z = 0.0f; + D3DXVec3Subtract(&edge1, pv2, pv1); + D3DXVec3Subtract(&edge2, pv3, pv1); + D3DXVec3Cross(&normal, &edge1, &edge2); + D3DXVec3Normalize(&Nnormal, &normal); + D3DXPlaneFromPointNormal(pout, pv1, &Nnormal); + return pout; +} + D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { D3DXVECTOR3 direction, normal; diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 2811fea..05b84fb 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -437,12 +437,13 @@ static void D3DXMatrixTest(void) static void D3DXPlaneTest(void) { D3DXPLANE expectedplane, gotplane, nulplane, plane; - D3DXVECTOR3 expectedvec, gotvec, vec1, vec2; + D3DXVECTOR3 expectedvec, gotvec, vec1, vec2, vec3; LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 vec; FLOAT expected, got; plane.a = -3.0f; plane.b = -1.0f; plane.c = 4.0f; plane.d = 7.0f; + vec.x = 2.0f; vec.y = 5.0f; vec.z = -6.0f; vec.w = 11.0f; /*_______________D3DXPlaneDot________________*/ @@ -485,6 +486,19 @@ static void D3DXPlaneTest(void) D3DXPlaneFromPointNormal(&gotplane,&vec1,&vec2); expect_plane(expectedplane, gotplane); +/*_______________D3DXPlaneFromPoints_______*/ + vec1.x = 1.0f; vec1.y = 2.0f; vec1.z = 3.0f; + vec2.x = 1.0f; vec2.y = -6.0f; vec2.z = -5.0f; + vec3.x = 83.0f; vec3.y = 74.0f; vec3.z = 65.0f; + expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f; + D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); + expect_plane(expectedplane, gotplane); + /* Test if 2 vectors are parallels */ + vec3.x = 1.0f; vec3.y = 1.0f; vec3.z = 2.0f; + expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; + D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); + expect_plane(expectedplane, gotplane); + /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f; vec2.x = 2.0f; vec2.y = 5.0f; vec2.z = 8.0f; diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 8c2cdc3..8082876 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -294,6 +294,7 @@ D3DXMATRIX* WINAPI D3DXMatrixTranslation(D3DXMATRIX *pout, FLOAT x, FLOAT y, FLO D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm); D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *pvpoint, CONST D3DXVECTOR3 *pvnormal); +D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3); D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2); D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp);

1 0

Misha Koshelev : msi: automation: Fix ITypeInfo leak.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: ac2c1b807072a15ba22b111fc0da906b70bed764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2c1b807072a15ba22b111fc… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Nov 18 23:37:05 2007 -0600 msi: automation: Fix ITypeInfo leak. --- dlls/msi/automation.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 292034a..0b631ac 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -282,6 +282,7 @@ static ULONG WINAPI AutomationObject_Release(IDispatch* iface) if (!ref) { if (This->funcFree) This->funcFree(This); + ITypeInfo_Release(This->iTypeInfo); MsiCloseHandle(This->msiHandle); HeapFree(GetProcessHeap(), 0, This); }

1 0

David Adam : d3dx8: Implement D3DXPlaneTransform.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 4a289455051d46ef4d29426b7d953006169292a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a289455051d46ef4d29426b7… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Mon Nov 19 15:05:50 2007 +0100 d3dx8: Implement D3DXPlaneTransform. --- dlls/d3dx8/d3dx8.spec | 2 +- dlls/d3dx8/math.c | 9 +++++++++ dlls/d3dx8/tests/math.c | 14 ++++++++++++++ include/d3dx8math.h | 1 + 4 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 4dd230b..3a27e1a 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -65,7 +65,7 @@ @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) -@ stub D3DXPlaneTransform +@ stdcall D3DXPlaneTransform(ptr ptr ptr) @ stub D3DXColorAdjustSaturation @ stub D3DXColorAdjustContrast @ stub D3DXCreateMatrixStack diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 0727492..6372271 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -547,6 +547,15 @@ D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp) return pout; } +D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm) +{ + pout->a = pm->u.m[0][0] * pplane->a + pm->u.m[1][0] * pplane->b + pm->u.m[2][0] * pplane->c + pm->u.m[3][0] * pplane->d; + pout->b = pm->u.m[0][1] * pplane->a + pm->u.m[1][1] * pplane->b + pm->u.m[2][1] * pplane->c + pm->u.m[3][1] * pplane->d; + pout->c = pm->u.m[0][2] * pplane->a + pm->u.m[1][2] * pplane->b + pm->u.m[2][2] * pplane->c + pm->u.m[3][2] * pplane->d; + pout->d = pm->u.m[0][3] * pplane->a + pm->u.m[1][3] * pplane->b + pm->u.m[2][3] * pplane->c + pm->u.m[3][3] * pplane->d; + return pout; +} + /*_________________D3DXQUATERNION________________*/ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 05b84fb..cb72b31 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -436,12 +436,21 @@ static void D3DXMatrixTest(void) static void D3DXPlaneTest(void) { + + D3DXMATRIX mat; D3DXPLANE expectedplane, gotplane, nulplane, plane; D3DXVECTOR3 expectedvec, gotvec, vec1, vec2, vec3; LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 vec; FLOAT expected, got; + U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; + U(mat).m[2][0] = 19.0f; U(mat).m[2][1] = -21.0f; U(mat).m[2][3] = 43.0f; + U(mat).m[3][0] = 2.0f; U(mat).m[3][1] = 3.0f; U(mat).m[3][2] = -4.0f; + U(mat).m[0][0] = 10.0f; U(mat).m[1][1] = 20.0f; U(mat).m[2][2] = 30.0f; + U(mat).m[3][3] = -40.0f; + plane.a = -3.0f; plane.b = -1.0f; plane.c = 4.0f; plane.d = 7.0f; vec.x = 2.0f; vec.y = 5.0f; vec.z = -6.0f; vec.w = 11.0f; @@ -524,6 +533,11 @@ static void D3DXPlaneTest(void) expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); expect_plane(expectedplane, gotplane); + +/*_______________D3DXPlaneTransform____________*/ + expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f; + D3DXPlaneTransform(&gotplane,&plane,&mat); + expect_plane(expectedplane, gotplane); } static void D3X8QuaternionTest(void) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 8082876..06bc562 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -297,6 +297,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPointNormal(D3DXPLANE *pout, CONST D3DXVECTOR3 *p D3DXPLANE* WINAPI D3DXPlaneFromPoints(D3DXPLANE *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2, CONST D3DXVECTOR3 *pv3); D3DXVECTOR3* WINAPI D3DXPlaneIntersectLine(D3DXVECTOR3 *pout, CONST D3DXPLANE *pp, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2); D3DXPLANE* WINAPI D3DXPlaneNormalize(D3DXPLANE *pout, CONST D3DXPLANE *pp); +D3DXPLANE* WINAPI D3DXPlaneTransform(D3DXPLANE *pout, CONST D3DXPLANE *pplane, CONST D3DXMATRIX *pm); D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq);

1 0

Misha Koshelev : msi: automation: Fix automation object reference counts when objects are created.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: fce6f56f93e2e5f3c73336cf9214620ae5c5eabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce6f56f93e2e5f3c73336cf9… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Nov 18 23:36:53 2007 -0600 msi: automation: Fix automation object reference counts when objects are created. --- dlls/msi/automation.c | 27 --------------------------- dlls/msi/script.c | 2 -- 2 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index fb8d4f5..292034a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -682,7 +682,6 @@ static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **p return hr; } - IUnknown_AddRef(*ppEnum); return S_OK; } @@ -997,10 +996,7 @@ static HRESULT WINAPI ListImpl_Invoke( if (wFlags & DISPATCH_METHOD) { V_VT(pVarResult) = VT_UNKNOWN; if (SUCCEEDED(hr = create_list_enumerator(NULL, (LPVOID *)&pUnk, This, 0))) - { - IUnknown_AddRef(pUnk); V_UNKNOWN(pVarResult) = pUnk; - } else ERR("Failed to create IEnumVARIANT object, hresult 0x%08x\n", hr); } @@ -1086,10 +1082,7 @@ static HRESULT WINAPI ViewImpl_Invoke( if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL, 0))) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create Record object, hresult 0x%08x\n", hr); } @@ -1174,10 +1167,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( { hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, &DIID_SummaryInfo, SummaryInfoImpl_Invoke, NULL, 0); if (SUCCEEDED(hr)) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create SummaryInfo object: 0x%08x\n", hr); } @@ -1199,10 +1189,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( if ((ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle)) == ERROR_SUCCESS) { if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL, 0))) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create View object, hresult 0x%08x\n", hr); } @@ -1332,10 +1319,7 @@ static HRESULT WINAPI SessionImpl_Invoke( if ((msiHandle = MsiGetActiveDatabase(This->msiHandle))) { if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke, NULL, 0))) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create Database object, hresult 0x%08x\n", hr); } @@ -1565,10 +1549,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( if ((msiHandle = MsiCreateRecord(V_I4(&varg0)))) { if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL, 0))) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create Record object, hresult 0x%08x\n", hr); } @@ -1596,10 +1577,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) { if (SUCCEEDED(hr = create_session(msiHandle, (IDispatch *)This, &pDispatch))) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create Session object, hresult 0x%08x\n", hr); } @@ -1632,10 +1610,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, &DIID_Database, DatabaseImpl_Invoke, NULL, 0); if (SUCCEEDED(hr)) - { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; - } else ERR("Failed to create Database object: 0x%08x\n", hr); } @@ -1820,7 +1795,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, ListImpl_Invoke, ListImpl_Free, sizeof(ListData)))) { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; /* Save product strings */ @@ -1867,7 +1841,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, ListImpl_Invoke, ListImpl_Free, sizeof(ListData)))) { - IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; /* Save product strings */ diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 2f2a17e..014ba6b 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -102,12 +102,10 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function /* Create an installer object */ hr = create_msiserver(NULL, (LPVOID *)&pActiveScriptSite->pInstaller); if (hr != S_OK) goto done; - IUnknown_AddRef((IUnknown *)pActiveScriptSite->pInstaller); /* Create a session object */ hr = create_session(hPackage, pActiveScriptSite->pInstaller, &pActiveScriptSite->pSession); if (hr != S_OK) goto done; - IUnknown_AddRef((IUnknown *)pActiveScriptSite->pSession); /* Create the scripting engine */ if ((type & 7) == msidbCustomActionTypeJScript)

1 0

Alexander Nicolaysen Sørnes : wordpad: Move printing functions to a separate file.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: a1378190a51b37f8ff57b204b0fa56c3e162ee74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1378190a51b37f8ff57b204b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Nov 11 01:06:46 2007 +0100 wordpad: Move printing functions to a separate file. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/print.c | 602 +++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 2 +- programs/wordpad/wordpad.c | 609 ++-------------------------- programs/wordpad/{resource.h => wordpad.h} | 15 + 5 files changed, 660 insertions(+), 569 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1378190a51b37f8ff57b…

1 0

Alexander Nicolaysen Sørnes : wordpad: Fix print preview bar.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 62d90a60ca9f46e87b148f6ad803f8fd772dd954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d90a60ca9f46e87b148f6ad… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Nov 19 20:13:48 2007 +0100 wordpad: Fix print preview bar. --- programs/wordpad/wordpad.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2f6af3c..2fa9f01 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -150,19 +150,17 @@ static void AddButton(HWND hwndToolBar, int nImage, int nCommand) SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); } -static void AddTextButton(HWND hWnd, int string, int command, int id) +static void AddTextButton(HWND hRebarWnd, int string, int command, int id) { REBARBANDINFOW rb; - HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - static const WCHAR button[] = {'B','U','T','T','O','N',0}; + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hRebarWnd, GWLP_HINSTANCE); WCHAR text[MAX_STRING_LEN]; HWND hButton; - RECT rc; LoadStringW(hInstance, string, text, MAX_STRING_LEN); - hButton = CreateWindowW(button, text, + hButton = CreateWindowW(WC_BUTTONW, text, WS_VISIBLE | WS_CHILD, 5, 5, 100, 15, - hMainWnd, (HMENU)command, hInstance, NULL); + hRebarWnd, (HMENU)command, hInstance, NULL); rb.cbSize = sizeof(rb); rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; @@ -173,11 +171,7 @@ static void AddTextButton(HWND hWnd, int string, int command, int id) rb.cxIdeal = 100; rb.wID = id; - rc.bottom = 22; - rc.right = 90; - - SendMessageW(hWnd, RB_INSERTBAND, -1, (LPARAM)&rb); - SetWindowPos(hButton, 0, 0, 0, 90, 22, SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER); + SendMessageW(hRebarWnd, RB_INSERTBAND, -1, (LPARAM)&rb); } static void AddSeparator(HWND hwndToolBar) @@ -1502,15 +1496,21 @@ static void preview_bar_show(BOOL show) if(show) { REBARBANDINFOW rb; + HWND hStatic; AddTextButton(hReBar, STRING_PREVIEW_PRINT, ID_PRINT, BANDID_PREVIEW_BTN1); AddTextButton(hReBar, STRING_PREVIEW_NEXTPAGE, ID_PREVIEW_NEXTPAGE, BANDID_PREVIEW_BTN2); AddTextButton(hReBar, STRING_PREVIEW_PREVPAGE, ID_PREVIEW_PREVPAGE, BANDID_PREVIEW_BTN3); AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN4); + hStatic = CreateWindowW(WC_STATICW, NULL, + WS_VISIBLE | WS_CHILD, 0, 0, 0, 0, + hReBar, NULL, NULL, NULL); + rb.cbSize = sizeof(rb); rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; rb.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT; + rb.hwndChild = hStatic; rb.cyChild = rb.cyMinChild = 22; rb.cx = rb.cxMinChild = 90; rb.cxIdeal = 100;

1 0

Alexander Nicolaysen Sørnes : wordpad: Refer to main menu using IDM_MAINMENU.
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: 04aefe8647e6683b7f656ea61fa2e4f99aea0764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04aefe8647e6683b7f656ea61… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Nov 4 12:34:03 2007 +0100 wordpad: Refer to main menu using IDM_MAINMENU. --- programs/wordpad/De.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/Ko.rc | 3 ++- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/resource.h | 3 ++- programs/wordpad/wordpad.c | 5 ++--- 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 7175fa7..079d63d 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index a14ec7f..a2b26f6 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&File" BEGIN diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 1902a0a..46928f6 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fichier" BEGIN diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 7b72a7f..0070d86 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&F�jl" BEGIN diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 5e6633e..9ef5d59 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -19,7 +19,8 @@ LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL -MAINMENU MENU DISCARDABLE + +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "��(&F)" BEGIN diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 04042d8..52f826e 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Bestand" BEGIN diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 0c203ed..5907e44 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Fil" BEGIN diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 3ed7e81..5438433 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -19,7 +19,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Plik" BEGIN diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 3eaf438..5c813e9 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -18,7 +18,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&��" BEGIN diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index b3463f0..60cf300 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -20,7 +20,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -MAINMENU MENU DISCARDABLE +IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Dosya" BEGIN diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 130eb94..f1c277d 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -138,7 +138,8 @@ #define IDD_TABSTOPS 2103 #define IDD_FORMATOPTS 2104 -#define IDM_POPUP 2200 +#define IDM_MAINMENU 2200 +#define IDM_POPUP 2201 #define IDB_TOOLBAR 100 #define IDB_FORMATBAR 101 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a117a75..2f6af3c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -52,7 +52,6 @@ /* use LoadString */ static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; -static const WCHAR xszMainMenu[] = {'M','A','I','N','M','E','N','U',0}; static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0}; @@ -1528,7 +1527,7 @@ static void preview_bar_show(BOOL show) static void preview_exit(void) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HMENU hMenu = LoadMenuW(hInstance, xszMainMenu); + HMENU hMenu = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDM_MAINMENU)); set_bar_states(); preview.window.right = 0; @@ -3261,7 +3260,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar wc.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); wc.hCursor = LoadCursor(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); - wc.lpszMenuName = xszMainMenu; + wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU); wc.lpszClassName = wszMainWndClass; RegisterClassW(&wc);

1 0

Rob Shearman : server: Change the get_dll_info server request to allow retrieving the image file name of a process .
by Alexandre Julliard Nov. 20, 2007

Nov. 20, 2007

Module: wine Branch: master Commit: bf2a35b78d93fc5762d711fc889aca51eb01ea0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2a35b78d93fc5762d711fc8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 09:30:50 2007 +0000 server: Change the get_dll_info server request to allow retrieving the image file name of a process. Implement NtQueryInformationProcess(ProcessImageFileName). --- dlls/ntdll/process.c | 22 +++++++++++++++++++++- dlls/ntdll/tests/info.c | 36 ++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 3 ++- server/process.c | 15 ++++++++++++--- server/protocol.def | 1 + server/trace.c | 1 + 6 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index b059c94..b5e6a64 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -137,7 +137,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); UNIMPLEMENTED_INFO_CLASS(ProcessSessionInformation); UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation); - UNIMPLEMENTED_INFO_CLASS(ProcessImageFileName); UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled); UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination); UNIMPLEMENTED_INFO_CLASS(ProcessDebugObjectHandle); @@ -309,6 +308,27 @@ NTSTATUS WINAPI NtQueryInformationProcess( } else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessImageFileName: + SERVER_START_REQ(get_dll_info) + { + UNICODE_STRING *image_file_name_str = ProcessInformation; + + req->handle = ProcessHandle; + req->base_address = NULL; /* main module */ + wine_server_set_reply( req, image_file_name_str ? image_file_name_str + 1 : NULL, + ProcessInformationLength > sizeof(UNICODE_STRING) ? ProcessInformationLength - sizeof(UNICODE_STRING) : 0 ); + ret = wine_server_call( req ); + if (ret == STATUS_BUFFER_TOO_SMALL) ret = STATUS_INFO_LENGTH_MISMATCH; + + len = sizeof(UNICODE_STRING) + reply->filename_len; + if (ret == STATUS_SUCCESS) + { + image_file_name_str->MaximumLength = image_file_name_str->Length = reply->filename_len; + image_file_name_str->Buffer = (PWSTR)(image_file_name_str + 1); + } + } + SERVER_END_REQ; + break; default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 526c62e..08ab192 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -19,6 +19,7 @@ */ #include "ntdll_test.h" +#include <winnls.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -754,6 +755,37 @@ static void test_query_process_handlecount(void) } } +static void test_query_process_image_file_name(void) +{ + DWORD status; + ULONG ReturnLength; + UNICODE_STRING image_file_name; + void *buffer; + char *file_nameA; + INT len; + + status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, sizeof(image_file_name), &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + buffer = HeapAlloc(GetProcessHeap(), 0, ReturnLength); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, buffer, ReturnLength, &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + memcpy(&image_file_name, buffer, sizeof(image_file_name)); + len = WideCharToMultiByte(CP_ACP, 0, image_file_name.Buffer, image_file_name.Length/sizeof(WCHAR), NULL, 0, NULL, NULL); + file_nameA = HeapAlloc(GetProcessHeap(), 0, len + 1); + WideCharToMultiByte(CP_ACP, 0, image_file_name.Buffer, image_file_name.Length/sizeof(WCHAR), file_nameA, len, NULL, NULL); + file_nameA[len] = '\0'; + HeapFree(GetProcessHeap(), 0, buffer); + trace("process image file name: %s\n", file_nameA); + HeapFree(GetProcessHeap(), 0, file_nameA); +} + static void test_readvirtualmemory(void) { @@ -886,6 +918,10 @@ START_TEST(info) trace("Starting test_query_process_handlecount()\n"); test_query_process_handlecount(); + /* 27 ProcessImageFileName */ + trace("Starting test_query_process_image_file_name()\n"); + test_query_process_image_file_name(); + /* belongs into it's own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory(); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c56089..5564ae3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -672,6 +672,7 @@ struct get_dll_info_reply struct reply_header __header; size_t size; void* entry_point; + data_size_t filename_len; /* VARARG(filename,unicode_str); */ }; @@ -4905,6 +4906,6 @@ union generic_reply struct add_fd_completion_reply add_fd_completion_reply; }; -#define SERVER_PROTOCOL_VERSION 331 +#define SERVER_PROTOCOL_VERSION 332 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 7031e14..e276dc4 100644 --- a/server/process.c +++ b/server/process.c @@ -1129,16 +1129,25 @@ DECL_HANDLER(get_dll_info) if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) { - struct process_dll *dll = find_process_dll( process, req->base_address ); + struct process_dll *dll; + + if (req->base_address) + dll = find_process_dll( process, req->base_address ); + else /* NULL means main module */ + dll = list_head( &process->dlls ) ? + LIST_ENTRY(list_head( &process->dlls ), struct process_dll, entry) : NULL; if (dll) { reply->size = dll->size; reply->entry_point = NULL; /* FIXME */ + reply->filename_len = dll->namelen; if (dll->filename) { - data_size_t len = min( dll->namelen, get_reply_max_size() ); - set_reply_data( dll->filename, len ); + if (dll->namelen <= get_reply_max_size()) + set_reply_data( dll->filename, dll->namelen ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); } } else diff --git a/server/protocol.def b/server/protocol.def index dfb5d48..ae5f2ac 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -620,6 +620,7 @@ typedef union @REPLY size_t size; /* module size */ void* entry_point; + data_size_t filename_len; /* buffer len in bytes required to store filename */ VARARG(filename,unicode_str); /* file name of module */ @END diff --git a/server/trace.c b/server/trace.c index c580139..38a2991 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1004,6 +1004,7 @@ static void dump_get_dll_info_reply( const struct get_dll_info_reply *req ) { fprintf( stderr, " size=%lu,", (unsigned long)req->size ); fprintf( stderr, " entry_point=%p,", req->entry_point ); + fprintf( stderr, " filename_len=%u,", req->filename_len ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size ); }

1 0