May 2007 - Wine-commits - list.winehq.org

Misha Koshelev : msi: automation: Generalize interface-specific data storage in AutomationObject.
by Alexandre Julliard 08 May '07

08 May '07

Module: wine Branch: master Commit: 715950bc7ed6180083ec582735cf1b2f027afbf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715950bc7ed6180083ec58273… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:49:45 2007 -0500 msi: automation: Generalize interface-specific data storage in AutomationObject. This makes a more general framework for interface/object-specific data storage. --- dlls/msi/automation.c | 50 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 169ad81..d14fefb 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -61,9 +61,6 @@ interface AutomationObject { /* The MSI handle of the current object */ MSIHANDLE msiHandle; - /* The parent Installer object (only used in the Session object) */ - IDispatch *pInstaller; - /* A function that is called from AutomationObject::Invoke, specific to this type of object. */ HRESULT (STDMETHODCALLTYPE *funcInvoke)( AutomationObject* This, @@ -75,8 +72,21 @@ interface AutomationObject { VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr); + + /* A function that is called from AutomationObject::Release when the object is being freed to free any private + * data structures (or NULL) */ + void (STDMETHODCALLTYPE *funcFree)(AutomationObject* This); }; +/* + * Structures for additional data required by specific automation objects + */ + +typedef struct { + /* The parent Installer object */ + IDispatch *pInstaller; +} SessionData; + /* VTables */ static const struct IDispatchVtbl AutomationObject_Vtbl; static const struct IProvideMultipleClassInfoVtbl AutomationObject_IProvideMultipleClassInfo_Vtbl; @@ -116,17 +126,19 @@ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID * with the appropriate clsid and invocation function. */ HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, HRESULT (STDMETHODCALLTYPE *funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*, - VARIANT*,EXCEPINFO*,UINT*)) + VARIANT*,EXCEPINFO*,UINT*), + void (STDMETHODCALLTYPE *funcFree)(AutomationObject*), + SIZE_T sizetPrivateData) { AutomationObject *object; HRESULT hr; - TRACE("(%ld,%p,%p,%s,%p)\n", (unsigned long)msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke); + TRACE("(%ld,%p,%p,%s,%p,%p,%ld)\n", (unsigned long)msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke, funcFree, sizetPrivateData); if( pUnkOuter ) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AutomationObject)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AutomationObject)+sizetPrivateData); /* Set all the VTable references */ object->lpVtbl = &AutomationObject_Vtbl; @@ -137,7 +149,7 @@ HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOI object->msiHandle = msiHandle; object->clsid = (LPCLSID)clsid; object->funcInvoke = funcInvoke; - object->pInstaller = NULL; + object->funcFree = funcFree; /* Load our TypeInfo so we don't have to process GetIDsOfNames */ object->iTypeInfo = NULL; @@ -158,6 +170,12 @@ static inline AutomationObject *obj_from_IProvideMultipleClassInfo( IProvideMult return (AutomationObject *)((char*)iface - FIELD_OFFSET(AutomationObject, lpvtblIProvideMultipleClassInfo)); } +/* Macro to get pointer to private object data */ +static inline void *private_data( AutomationObject *This ) +{ + return This + 1; +} + /* * AutomationObject methods */ @@ -213,6 +231,7 @@ static ULONG WINAPI AutomationObject_Release(IDispatch* iface) if (!ref) { + if (This->funcFree) This->funcFree(This); MsiCloseHandle(This->msiHandle); HeapFree(GetProcessHeap(), 0, This); } @@ -579,7 +598,7 @@ static HRESULT WINAPI ViewImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { - if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke))) + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL, 0))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; @@ -639,7 +658,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle)) == ERROR_SUCCESS) { - if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke))) + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke, NULL, 0))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; @@ -671,6 +690,7 @@ static HRESULT WINAPI SessionImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { + SessionData *data = private_data(This); WCHAR *szString; DWORD dwLen; IDispatch *pDispatch = NULL; @@ -689,8 +709,8 @@ static HRESULT WINAPI SessionImpl_Invoke( case DISPID_SESSION_INSTALLER: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_DISPATCH; - IDispatch_AddRef(This->pInstaller); - V_DISPATCH(pVarResult) = This->pInstaller; + IDispatch_AddRef(data->pInstaller); + V_DISPATCH(pVarResult) = data->pInstaller; } break; @@ -761,7 +781,7 @@ static HRESULT WINAPI SessionImpl_Invoke( V_VT(pVarResult) = VT_DISPATCH; if ((msiHandle = MsiGetActiveDatabase(This->msiHandle))) { - if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke))) + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke, NULL, 0))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; @@ -930,14 +950,14 @@ static HRESULT WINAPI InstallerImpl_Invoke( /* Wrapper around create_automation_object to create an installer object. */ HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj) { - return create_automation_object(0, pOuter, ppObj, &DIID_Installer, InstallerImpl_Invoke); + return create_automation_object(0, pOuter, ppObj, &DIID_Installer, InstallerImpl_Invoke, NULL, 0); } /* Wrapper around create_automation_object to create a session object. */ HRESULT create_session(MSIHANDLE msiHandle, IDispatch *pInstaller, IDispatch **pDispatch) { - HRESULT hr = create_automation_object(msiHandle, NULL, (LPVOID)pDispatch, &DIID_Session, SessionImpl_Invoke); + HRESULT hr = create_automation_object(msiHandle, NULL, (LPVOID)pDispatch, &DIID_Session, SessionImpl_Invoke, NULL, sizeof(SessionData)); if (SUCCEEDED(hr) && pDispatch && *pDispatch) - ((AutomationObject *)*pDispatch)->pInstaller = (IDispatch *)pInstaller; + ((SessionData *)private_data((AutomationObject *)*pDispatch))->pInstaller = pInstaller; return hr; }

1 0

Misha Koshelev : msi/tests: automation: Add tests for Installer:: Products and Installer::ProductState.
by Alexandre Julliard 08 May '07

08 May '07

Module: wine Branch: master Commit: 4ba4936dee9527fa7868b4f19a11d38042b39914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba4936dee9527fa7868b4f19… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:50:05 2007 -0500 msi/tests: automation: Add tests for Installer::Products and Installer::ProductState. --- dlls/msi/tests/automation.c | 105 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index d51b824..cd32efd 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -531,6 +531,34 @@ static HRESULT Installer_OpenPackage(LPCWSTR szPackagePath, int options, IDispat return hr; } +static HRESULT Installer_ProductState(LPCWSTR szProduct, int *pInstallState) +{ + VARIANT varresult; + VARIANTARG vararg[1]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(szProduct); + + hr = invoke(pInstaller, "ProductState", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_I4); + *pInstallState = V_I4(&varresult); + VariantClear(&varresult); + return hr; +} + +static HRESULT Installer_Products(IDispatch **pStringList) +{ + VARIANT varresult; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + HRESULT hr; + + hr = invoke(pInstaller, "Products", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH); + *pStringList = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Installer_VersionGet(LPCWSTR szVersion) { VARIANT varresult; @@ -815,6 +843,33 @@ static HRESULT Record_StringDataPut(IDispatch *pRecord, int iField, LPCWSTR szSt return invoke(pRecord, "StringData", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_BSTR); } +static HRESULT StringList_Item(IDispatch *pStringList, int iIndex, LPWSTR szString) +{ + VARIANT varresult; + VARIANTARG vararg[1]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = iIndex; + + hr = invoke(pStringList, "Item", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); + lstrcpyW(szString, V_BSTR(&varresult)); + VariantClear(&varresult); + return hr; +} + +static HRESULT StringList_Count(IDispatch *pStringList, int *pCount) +{ + VARIANT varresult; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + HRESULT hr = invoke(pStringList, "Count", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_I4); + *pCount = V_I4(&varresult); + VariantClear(&varresult); + return hr; +} + /* Test the various objects */ static void test_Database(IDispatch *pDatabase) @@ -995,11 +1050,13 @@ static void test_Session(IDispatch *pSession) static void test_Installer(void) { + static WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; static WCHAR szBackslash[] = { '\\',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; UINT len; - IDispatch *pSession = NULL, *pRecord = NULL; + IDispatch *pSession = NULL, *pRecord = NULL, *pStringList = NULL; + int iState; if (!pInstaller) return; @@ -1042,6 +1099,52 @@ static void test_Installer(void) DeleteFileA(msifile); + /* Installer::Products */ + todo_wine { + hr = Installer_Products(&pStringList); + ok(SUCCEEDED(hr), "Installer_Products failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + { + int iCount = 0, idx; + + /* StringList::Count */ + hr = StringList_Count(pStringList, &iCount); + ok(SUCCEEDED(hr), "StringList_Count failed, hresult 0x%08x\n", hr); + + for (idx=0; idx<iCount; idx++) + { + /* StringList::Item */ + memset(szPath, 0, sizeof(szPath)); + hr = StringList_Item(pStringList, idx, szPath); + ok(SUCCEEDED(hr), "StringList_Item failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); + + if (SUCCEEDED(hr)) + { + /* Installer::ProductState */ + hr = Installer_ProductState(szPath, &iState); + ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + ok(iState == INSTALLSTATE_DEFAULT || iState == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d", iState, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); + } + } + + /* StringList::Item using an invalid index */ + memset(szPath, 0, sizeof(szPath)); + hr = StringList_Item(pStringList, iCount, szPath); + ok(hr == DISP_E_BADINDEX, "StringList_Item for an invalid index did not return DISP_E_BADINDEX, hresult 0x%08x\n", hr); + + IDispatch_Release(pStringList); + } + } + + /* Installer::ProductState for our product code, which should not be installed */ + todo_wine { + hr = Installer_ProductState(szProductCode, &iState); + ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + ok(iState == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d", iState, INSTALLSTATE_UNKNOWN); + } + /* Installer::Version */ todo_wine { memset(szPath, 0, sizeof(szPath));

1 0

Misha Koshelev : msi: automation: Implement Installer:: Products and Installer::ProductState.
by Alexandre Julliard 08 May '07

08 May '07

Module: wine Branch: master Commit: 05de3b03deb12c2d5cc901cd0510e021f8dd93ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=05de3b03deb12c2d5cc901cd0… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:50:30 2007 -0500 msi: automation: Implement Installer::Products and Installer::ProductState. --- dlls/msi/automation.c | 106 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver.idl | 41 ++++++++++------ dlls/msi/msiserver_dispids.h | 5 ++ dlls/msi/tests/automation.c | 73 +++++++++++++++-------------- 4 files changed, 173 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05de3b03deb12c2d5cc90…

1 0

Misha Koshelev : msi: automation: Output FIXMEs for unknown member names.
by Alexandre Julliard 08 May '07

08 May '07

Module: wine Branch: master Commit: de8e566ebe74eaa4855e372e74358fa38897f1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e566ebe74eaa4855e372e7… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 7 17:51:07 2007 -0500 msi: automation: Output FIXMEs for unknown member names. --- dlls/msi/automation.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index dc85ead..025b4a9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -279,10 +279,21 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames( DISPID* rgDispId) { AutomationObject *This = (AutomationObject *)iface; + HRESULT hr; TRACE("(%p/%p)->(%p,%p,%d,%d,%p)\n", iface, This, riid, rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) return E_INVALIDARG; - return ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); + hr = ITypeInfo_GetIDsOfNames(This->iTypeInfo, rgszNames, cNames, rgDispId); + if (hr == DISP_E_UNKNOWNNAME) + { + int idx; + for (idx=0; idx<cNames; idx++) + { + if (rgDispId[idx] == DISPID_UNKNOWN) + FIXME("Unknown member %s, clsid %s\n", debugstr_w(rgszNames[idx]), debugstr_guid(This->clsid)); + } + } + return hr; } /* Maximum number of allowed function parameters+1 */

1 0

Louis Lenders : gdi32: Add check for null pointer in SetDIBitsToDevice.
by Alexandre Julliard 08 May '07

08 May '07

Module: wine Branch: master Commit: d711728a7e55daacbaabdebec60bbb88c8d4e580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d711728a7e55daacbaabdebec… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon May 7 21:03:16 2007 +0100 gdi32: Add check for null pointer in SetDIBitsToDevice. --- dlls/gdi32/dib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7b9ef6d..86e1308 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -364,6 +364,8 @@ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, INT ret; DC *dc; + if (!bits) return 0; + if (!(dc = DC_GetDCUpdate( hdc ))) return 0; if(dc->funcs->pSetDIBitsToDevice)

1 0

Detlef Riekenberg : localui: Add German resources.
by Alexandre Julliard 08 May '07

08 May '07

Module: wine Branch: master Commit: 526d2b4c33a4cf99dd7962cd02f2c2632185dc02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526d2b4c33a4cf99dd7962cd0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 7 22:34:12 2007 +0200 localui: Add German resources. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_De.rc | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index ff24209..4841708 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -38,4 +38,5 @@ #include "wine/wine_common_ver.rc" +#include "ui_De.rc" #include "ui_En.rc" diff --git a/dlls/localui/ui_De.rc b/dlls/localui/ui_De.rc new file mode 100644 index 0000000..5e82f22 --- /dev/null +++ b/dlls/localui/ui_De.rc @@ -0,0 +1,54 @@ +/* + * German resources for localui + * + * Copyright 2007 Detlef Riekenberg + * + * 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 + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Lokalen Anschluss hinzuf�gen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Lokaler Anschuss, der hinzugef�gt werden soll:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "LPT-Anschluss konfigurieren" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zeit�berschreitung (Sekunden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "�&bertragung wiederholen:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokaler Anschluss" + IDS_INVALIDNAME "'%s' ist kein g�ltiger Anschlussname" + IDS_PORTEXISTS "Der Anschluss %s existiert bereits" + IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren" +}

1 0

Stefan Dösinger : wined3d: Full surface DXTn copy.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: c87d5352a5508649071e932186aa1c13c113cf53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c87d5352a5508649071e93218… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 28 14:28:55 2007 +0200 wined3d: Full surface DXTn copy. Height * Pitch is not a valid way to calculate the surface size for DXTn surfaces. Instead of messing with format specific formulas just use the size stored in the destination surface. --- dlls/wined3d/surface_gdi.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index ce37680..9610d42 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -555,8 +555,7 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface, ret = WINED3DERR_WRONGTEXTUREFORMAT; goto release; } - TRACE("Fourcc->Fourcc copy)\n"); - memcpy(dlock.pBits, slock.pBits, This->currentDesc.Height * dlock.Pitch); + memcpy(dlock.pBits, slock.pBits, This->resource.size); goto release; }

1 0

Stefan Dösinger : ddraw: Adjust the d3d viewport when changing the back buffer.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 742260d418293e57afcb05e8c1fdc71ec4d99258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742260d418293e57afcb05e8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 28 14:50:15 2007 +0200 ddraw: Adjust the d3d viewport when changing the back buffer. WineD3D sets up the viewport according to the front buffer, so this needs to be changed to the values of the render target passed when the d3d7 device is created and this device turns out not to be the known front or back buffer. --- dlls/ddraw/device.c | 11 +++++++++++ dlls/ddraw/direct3d.c | 10 ++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 30f80ad..42e44d8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -306,6 +306,17 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) /* Restore the render targets */ if(This->OffScreenTarget) { + WINED3DVIEWPORT vp; + + vp.X = 0; + vp.Y = 0; + vp.Width = This->ddraw->d3d_target->surface_desc.dwWidth; + vp.Height = This->ddraw->d3d_target->surface_desc.dwHeight; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + IWineD3DDevice_SetViewport(This->wineD3DDevice, + &vp); + /* Set the device up to render to the front buffer since the back buffer will * vanish soon. */ diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 9f7e136..0ccb2c3 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -844,6 +844,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, if(!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && (This->d3d_target != target)) { + WINED3DVIEWPORT vp; TRACE("(%p) Using %p as front buffer, %p as back buffer\n", This, This->d3d_target, target); hr = IWineD3DDevice_SetFrontBackBuffers(This->wineD3DDevice, This->d3d_target->WineD3DSurface, @@ -855,6 +856,15 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, target->WineD3DSurface); + vp.X = 0; + vp.Y = 0; + vp.Width = target->surface_desc.dwWidth; + vp.Height = target->surface_desc.dwHeight; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + IWineD3DDevice_SetViewport(This->wineD3DDevice, + &vp); + object->OffScreenTarget = TRUE; } else

1 0

Stefan Dösinger : ddraw: Primary surfaces always have screen size.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 00e37a81b244a67771a4aef72a457027cfac73fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e37a81b244a67771a4aef72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 28 17:29:17 2007 +0200 ddraw: Primary surfaces always have screen size. --- dlls/ddraw/ddraw.c | 37 ++++------------- dlls/ddraw/tests/dsurface.c | 95 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 59d82b2..a3a9199 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2328,43 +2328,22 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, } } - /* No Width or no Height? Use the current window size or - * the original screen size + /* No Width or no Height? Use the original screen size */ if(!(desc2.dwFlags & DDSD_WIDTH) || !(desc2.dwFlags & DDSD_HEIGHT) ) { - HWND window; + /* Invalid for non-render targets */ + if(!(desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + { + WARN("Creating a non-Primary surface without Width or Height info, returning DDERR_INVALIDPARAMS\n"); + *Surf = NULL; + return DDERR_INVALIDPARAMS; + } - /* Fallback: From WineD3D / original mode */ desc2.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; desc2.dwWidth = Mode.Width; desc2.dwHeight = Mode.Height; - - hr = IWineD3DDevice_GetHWND(This->wineD3DDevice, - &window); - if( (hr == D3D_OK) && (window != 0) ) - { - RECT rect; - if(GetWindowRect(window, &rect) ) - { - /* This is a hack until I find a better solution */ - if( (rect.right - rect.left) <= 1 || - (rect.bottom - rect.top) <= 1 ) - { - FIXME("Wanted to get surface dimensions from window %p, but it has only " - "a size of %dx%d. Using full screen dimensions\n", - window, rect.right - rect.left, rect.bottom - rect.top); - } - else - { - /* Not sure if this is correct */ - desc2.dwWidth = rect.right - rect.left; - desc2.dwHeight = rect.bottom - rect.top; - TRACE("Using window %p's dimensions: %dx%d\n", window, desc2.dwWidth, desc2.dwHeight); - } - } - } } /* Mipmap count fixes */ diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c901f66..a2fd5d6 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4,6 +4,7 @@ * Copyright (C) 2005 Antoine Chavasse (a.chavasse(a)gmail.com) * Copyright (C) 2005 Christian Costa * Copyright 2005 Ivan Leo Puoti + * Copyright (C) 2007 Stefan D�singer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1724,6 +1725,99 @@ static void CompressedTest(void) IDirectDraw7_Release(dd7); } +static void SizeTest(void) +{ + LPDIRECTDRAWSURFACE dsurface = NULL; + DDSURFACEDESC desc; + HRESULT ret; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + /* Create an offscreen surface surface without a size */ + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without a size info returned %08x\n", ret); + if(dsurface) + { + trace("Surface at %p\n", dsurface); + IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + } + + /* Create an offscreen surface surface with only a width parameter */ + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH; + desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = 128; + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without hight info returned %08x\n", ret); + if(dsurface) + { + IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + } + + /* Create an offscreen surface surface with only a height parameter */ + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT; + desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + desc.dwHeight = 128; + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without width info returned %08x\n", ret); + if(dsurface) + { + IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + } + + /* Sanity check */ + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; + desc.dwHeight = 128; + desc.dwWidth = 128; + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DD_OK, "Creating an offscreen plain surface with width and height info returned %08x\n", ret); + if(dsurface) + { + IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + } + + /* Test a primary surface size */ + ret = IDirectDraw_SetCooperativeLevel(lpDD, window, DDSCL_NORMAL); + ok(ret == DD_OK, "SetCooperativeLevel failed with %08x\n", ret); + + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps |= DDSCAPS_PRIMARYSURFACE; + desc.dwHeight = 128; /* Keep them set to check what happens */ + desc.dwWidth = 128; /* Keep them set to check what happens */ + ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); + ok(ret == DD_OK, "Creating a primary surface without width and height info returned %08x\n", ret); + if(dsurface) + { + ret = IDirectDrawSurface_GetSurfaceDesc(dsurface, &desc); + ok(ret == DD_OK, "GetSurfaceDesc returned %x\n", ret); + + IDirectDrawSurface_Release(dsurface); + dsurface = NULL; + + ok(desc.dwFlags & DDSD_WIDTH, "Primary surface doesn't have width set\n"); + ok(desc.dwFlags & DDSD_HEIGHT, "Primary surface doesn't have hight set\n"); + ok(desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Surface Width differs from screen Width\n"); + ok(desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Surface Width differs from screen Width\n"); + } + ret = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + ok(ret == DD_OK, "SetCooperativeLevel failed with %08x\n", ret); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -1740,5 +1834,6 @@ START_TEST(dsurface) CubeMapTest(); test_lockrect_invalid(); CompressedTest(); + SizeTest(); ReleaseDirectDraw(); }

1 0

Alexandre Julliard : configure: Added rpath support for Solaris.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 46d82c56f02f85b154ca0257cd12817c1da19959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d82c56f02f85b154ca0257c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 20:50:12 2007 +0200 configure: Added rpath support for Solaris. --- configure | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++- 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/configure b/configure index c6481f8..1117a7b 100755 --- a/configure +++ b/configure @@ -13654,6 +13654,67 @@ ac_res=`eval echo '${'$as_ac_var'}'` echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" +else + as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5 +echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + LIBWINE_LDFLAGS="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" +fi + fi diff --git a/configure.ac b/configure.ac index 683e753..e65f812 100644 --- a/configure.ac +++ b/configure.ac @@ -1032,7 +1032,9 @@ case $host_os in [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], - [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) + [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"], + [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib], + [LIBWINE_LDFLAGS="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])]) case $host_cpu in *i[[3456789]]86* | x86_64)

1 0