wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Hans Leidekker : msi: Make sure target paths are normalized.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 9336c10619075d26dc8e6da5b0fb50bcfcd77bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9336c10619075d26dc8e6da5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 18 12:58:15 2012 +0100 msi: Make sure target paths are normalized. Fix for the Lotus Notes 6.5.1 installer. --- dlls/msi/action.c | 47 +++++++++++++++++++-------------------------- dlls/msi/install.c | 17 ++------------- dlls/msi/msipriv.h | 2 +- dlls/msi/tests/package.c | 16 +++++++++++++++ 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5444dfc..baebdc2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2214,11 +2214,15 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) return ERROR_SUCCESS; } -void msi_clean_path( WCHAR *p ) +WCHAR *msi_normalize_path( const WCHAR *in ) { - WCHAR *q = p; - int n, len = 0; + const WCHAR *p = in; + WCHAR *q, *ret; + int n, len = strlenW( in ) + 2; + if (!(q = ret = msi_alloc( len * sizeof(WCHAR) ))) return NULL; + + len = 0; while (1) { /* copy until the end of the string or a space */ @@ -2245,32 +2249,20 @@ void msi_clean_path( WCHAR *p ) else /* copy n spaces */ while (n && (*q++ = *p++)) n--; } -} - -static WCHAR *get_target_dir_property( MSIDATABASE *db ) -{ - int len; - WCHAR *path, *target_dir = msi_dup_property( db, szTargetDir ); - - if (!target_dir) return NULL; - - len = strlenW( target_dir ); - if (target_dir[len - 1] == '\\') return target_dir; - if ((path = msi_alloc( (len + 2) * sizeof(WCHAR) ))) + while (q - ret > 0 && q[-1] == ' ') q--; + if (q - ret > 0 && q[-1] != '\\') { - strcpyW( path, target_dir ); - path[len] = '\\'; - path[len + 1] = 0; + q[0] = '\\'; + q[1] = 0; } - msi_free( target_dir ); - return path; + return ret; } void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL load_prop ) { FolderList *fl; MSIFOLDER *folder, *parent, *child; - WCHAR *path; + WCHAR *path, *normalized_path; TRACE("resolving %s\n", debugstr_w(name)); @@ -2278,7 +2270,7 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa if (!strcmpW( folder->Directory, szTargetDir )) /* special resolving for target root dir */ { - if (!load_prop || !(path = get_target_dir_property( package->db ))) + if (!load_prop || !(path = msi_dup_property( package->db, szTargetDir ))) { path = msi_dup_property( package->db, szRootDrive ); } @@ -2293,16 +2285,17 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa else path = msi_build_directory_name( 2, folder->TargetDefault, NULL ); } - msi_clean_path( path ); - if (folder->ResolvedTarget && !strcmpiW( path, folder->ResolvedTarget )) + normalized_path = msi_normalize_path( path ); + msi_free( path ); + if (folder->ResolvedTarget && !strcmpiW( normalized_path, folder->ResolvedTarget )) { TRACE("%s already resolved to %s\n", debugstr_w(name), debugstr_w(folder->ResolvedTarget)); - msi_free( path ); + msi_free( normalized_path ); return; } - msi_set_property( package->db, folder->Directory, path ); + msi_set_property( package->db, folder->Directory, normalized_path ); msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = path; + folder->ResolvedTarget = normalized_path; LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry ) { diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 2428ef5..83b8b7d 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -553,8 +553,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFOLDER *folder, const WCHAR MSIFOLDER *child; WCHAR *target_path; - if (!(target_path = strdupW( path ))) return; - msi_clean_path( target_path ); + if (!(target_path = msi_normalize_path( path ))) return; if (strcmpW( target_path, folder->ResolvedTarget )) { msi_free( folder->ResolvedTarget ); @@ -572,7 +571,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFOLDER *folder, const WCHAR UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolderPath ) { - DWORD attrib, len; + DWORD attrib; MSIFOLDER *folder; MSIFILE *file; @@ -587,17 +586,7 @@ UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolder } if (!(folder = msi_get_loaded_folder( package, szFolder ))) return ERROR_DIRECTORY; - len = strlenW( szFolderPath ); - if (len && szFolderPath[len - 1] != '\\') - { - WCHAR *path = msi_alloc( (len + 2) * sizeof(WCHAR) ); - memcpy( path, szFolderPath, len * sizeof(WCHAR) ); - path[len] = '\\'; - path[len + 1] = 0; - set_target_path( package, folder, path ); - msi_free( path ); - } - else set_target_path( package, folder, szFolderPath ); + set_target_path( package, folder, szFolderPath ); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 589e4a1..2c9385a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -998,7 +998,7 @@ extern UINT msi_get_property( MSIDATABASE *, LPCWSTR, LPWSTR, LPDWORD ) DECLSPEC extern int msi_get_property_int( MSIDATABASE *package, LPCWSTR prop, int def ) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_source_folder(MSIPACKAGE *package, const WCHAR *name, MSIFOLDER **folder) DECLSPEC_HIDDEN; extern void msi_resolve_target_folder(MSIPACKAGE *package, const WCHAR *name, BOOL load_prop) DECLSPEC_HIDDEN; -extern void msi_clean_path( WCHAR *p ) DECLSPEC_HIDDEN; +extern WCHAR *msi_normalize_path(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_resolve_file_source(MSIPACKAGE *package, MSIFILE *file) DECLSPEC_HIDDEN; extern const WCHAR *msi_get_target_folder(MSIPACKAGE *package, const WCHAR *name) DECLSPEC_HIDDEN; extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 34d5eff..9808dfa 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1134,6 +1134,7 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath on subsubdir returned %d\n", r ); + buffer[0] = 0; sz = sizeof buffer - 1; lstrcat( tempdir, "\\" ); r = MsiGetTargetPath( hpkg, "TARGETDIR", buffer, &sz ); @@ -1144,6 +1145,7 @@ static void test_settargetpath(void) query_file_path( hpkg, "[#RootFile]", buffer ); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); + buffer[0] = 0; sz = sizeof(buffer); r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); @@ -1153,16 +1155,19 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + buffer[0] = 0; sz = sizeof(buffer); r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); ok( lstrcmpi(buffer, "C:\\one\\two\\TestDir\\"), "Expected \"C:\\one\\two\\TestDir\\\", got \"%s\"\n", buffer ); + buffer[0] = 0; query_file_path( hpkg, "[#TestFile]", buffer ); ok( !lstrcmpi(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer ); + buffer[0] = 0; sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); @@ -1171,6 +1176,7 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two\\three" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + buffer[0] = 0; sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); @@ -1179,11 +1185,21 @@ static void test_settargetpath(void) r = MsiSetTargetPath( hpkg, "TestParent", "C:\\\\one\\\\two " ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + buffer[0] = 0; sz = sizeof buffer - 1; r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); ok( !lstrcmpi(buffer, "C:\\one\\two\\"), "Expected \"C:\\one\\two\\\", got %s\n", buffer); + r = MsiSetTargetPath( hpkg, "TestParent", "C:\\\\ Program Files \\\\ " ); + ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + + buffer[0] = 0; + sz = sizeof buffer - 1; + r = MsiGetTargetPath( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); + ok( !lstrcmpi(buffer, "C:\\Program Files\\"), "Expected \"C:\\Program Files\\\", got %s\n", buffer); + MsiCloseHandle( hpkg ); }

1 0

Nikolay Sivov : msxml3: Implemented IXMLHttpRequest::get_statusText().
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 95d8f6fc2c879947e68ea14e76d69822403c56b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d8f6fc2c879947e68ea14e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 18 03:04:22 2012 +0300 msxml3: Implemented IXMLHttpRequest::get_statusText(). --- dlls/msxml3/httprequest.c | 32 +++++++++++++++++++++++++++----- dlls/msxml3/tests/domdoc.c | 11 +++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index f2e8b5e..99b7672 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -98,6 +98,7 @@ typedef struct /* bind callback */ BindStatusCallback *bsc; LONG status; + BSTR status_text; /* IObjectWithSite*/ IUnknown *site; @@ -517,8 +518,10 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c debugstr_w(req_headers), add_reqheaders); This->request->status = code; - /* store headers */ + /* store headers and status text */ free_response_headers(This->request); + SysFreeString(This->request->status_text); + This->request->status_text = NULL; if (resp_headers) { const WCHAR *ptr, *line; @@ -530,7 +533,19 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c { if (*ptr == '\r' && *(ptr+1) == '\n') { - line = ++ptr+1; + const WCHAR *end = ptr-1; + line = ptr + 2; + /* scan back to get status phrase */ + while (ptr > resp_headers) + { + if (*ptr == ' ') + { + This->request->status_text = SysAllocStringLen(ptr+1, end-ptr); + TRACE("status text %s\n", debugstr_w(This->request->status_text)); + break; + } + ptr--; + } break; } ptr++; @@ -789,6 +804,7 @@ static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) } /* response headers */ free_response_headers(This); + SysFreeString(This->status_text); /* detach callback object */ BindStatusCallback_Detach(This->bsc); @@ -1093,13 +1109,18 @@ static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *statu return S_OK; } -static HRESULT WINAPI httprequest_get_statusText(IXMLHTTPRequest *iface, BSTR *pbstrStatus) +static HRESULT WINAPI httprequest_get_statusText(IXMLHTTPRequest *iface, BSTR *status) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub %p %p\n", This, pbstrStatus); + TRACE("(%p)->(%p)\n", This, status); - return E_NOTIMPL; + if (!status) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + *status = SysAllocString(This->status_text); + + return S_OK; } static HRESULT WINAPI httprequest_get_responseXML(IXMLHTTPRequest *iface, IDispatch **body) @@ -1475,6 +1496,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->bsc = NULL; req->status = 0; + req->status_text = NULL; req->reqheader_size = 0; req->raw_respheaders = NULL; req->use_utf8_content = FALSE; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0041763..21809f8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4744,6 +4744,9 @@ static void test_XMLHTTP(void) ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win2k */, "got 0x%08x\n", hr); ok(status == 0xdeadbeef, "got %d\n", status); + hr = IXMLHttpRequest_get_statusText(xhr, &str); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + /* invalid parameters */ hr = IXMLHttpRequest_open(xhr, NULL, NULL, async, dummy, dummy); EXPECT_HR(hr, E_INVALIDARG); @@ -4862,6 +4865,14 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); ok(status == 200, "got %d\n", status); + hr = IXMLHttpRequest_get_statusText(xhr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLHttpRequest_get_statusText(xhr, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("OK")), "got status %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* another ::send() after completed request */ V_VT(&varbody) = VT_BSTR; V_BSTR(&varbody) = _bstr_(bodyA);

1 0

André Hentschel : d3drm: Add IDirect3DRMViewport2 interface.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 3935124d4443d615e25e9c51336c0b35d73af0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3935124d4443d615e25e9c513… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 23:00:50 2012 +0100 d3drm: Add IDirect3DRMViewport2 interface. --- dlls/d3drm/d3drm.c | 10 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/viewport.c | 482 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 481 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3935124d4443d615e25e9…

1 0

André Hentschel : d3drm: Reorder viewport creation function to avoid forward declarations.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: c6bd4424465c8650638e36a26be3e2223245fddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bd4424465c8650638e36a26… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 23:00:17 2012 +0100 d3drm: Reorder viewport creation function to avoid forward declarations. --- dlls/d3drm/viewport.c | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 4bfc5cc..2847069 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -37,34 +37,11 @@ typedef struct { LONG ref; } IDirect3DRMViewportImpl; -static const struct IDirect3DRMViewportVtbl Direct3DRMViewport_Vtbl; - static inline IDirect3DRMViewportImpl *impl_from_IDirect3DRMViewport(IDirect3DRMViewport *iface) { return CONTAINING_RECORD(iface, IDirect3DRMViewportImpl, IDirect3DRMViewport_iface); } -HRESULT Direct3DRMViewport_create(IUnknown** ppObj) -{ - IDirect3DRMViewportImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; - object->ref = 1; - - *ppObj = (IUnknown*)object; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMViewportImpl_QueryInterface(IDirect3DRMViewport* iface, REFIID riid, void** object) @@ -506,3 +483,24 @@ static const struct IDirect3DRMViewportVtbl Direct3DRMViewport_Vtbl = IDirect3DRMViewportImpl_GetProjection, IDirect3DRMViewportImpl_GetDirect3DViewport }; + +HRESULT Direct3DRMViewport_create(IUnknown** ppObj) +{ + IDirect3DRMViewportImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; + object->ref = 1; + + *ppObj = (IUnknown*)object; + + return S_OK; +}

1 0

André Hentschel : d3drm: Forward all IUnknown methods from IDirect3DRMDevice3.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: d05f3e06c850b32285ebc94282aa36106d0f2abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f3e06c850b32285ebc9428… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:58:58 2012 +0100 d3drm: Forward all IUnknown methods from IDirect3DRMDevice3. --- dlls/d3drm/device.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 8be92e6..559128e 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -524,23 +524,13 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_QueryInterface(IDirect3DRMDevice3* static ULONG WINAPI IDirect3DRMDevice3Impl_AddRef(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - TRACE("(%p)\n", This); - - return InterlockedIncrement(&This->ref); + return IDirect3DRMDevice2_AddRef(&This->IDirect3DRMDevice2_iface); } static ULONG WINAPI IDirect3DRMDevice3Impl_Release(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p)\n", This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IDirect3DRMDevice2_Release(&This->IDirect3DRMDevice2_iface); } /*** IDirect3DRMObject methods ***/

1 0

André Hentschel : d3drm: Add IDirect3DRMWinDevice interface.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: e1c00d32ed2414aa1981ae63357ea7f77b76a1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c00d32ed2414aa1981ae633… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:56:24 2012 +0100 d3drm: Add IDirect3DRMWinDevice interface. --- dlls/d3drm/device.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index a203b0c..8be92e6 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -29,12 +29,15 @@ #include "wingdi.h" #include "d3drm_private.h" +#include "initguid.h" +#include "d3drmwin.h" WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { IDirect3DRMDevice2 IDirect3DRMDevice2_iface; IDirect3DRMDevice3 IDirect3DRMDevice3_iface; + IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; LONG ref; } IDirect3DRMDeviceImpl; @@ -48,6 +51,11 @@ static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice3(IDirect3DRMDev return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice3_iface); } +static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMWinDevice(IDirect3DRMWinDevice *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMWinDevice_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* iface, REFIID riid, void** object) @@ -68,6 +76,10 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* { *object = &This->IDirect3DRMDevice3_iface; } + else if(IsEqualGUID(riid, &IID_IDirect3DRMWinDevice)) + { + *object = &This->IDirect3DRMWinDevice_iface; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -994,6 +1006,148 @@ static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl = IDirect3DRMDevice3Impl_SetStateChangeOptions }; + +/*** IUnknown methods ***/ +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_QueryInterface(IDirect3DRMWinDevice* iface, + REFIID riid, void** object) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + return IDirect3DRMDevice2_QueryInterface(&This->IDirect3DRMDevice2_iface, riid, object); +} + +static ULONG WINAPI IDirect3DRMWinDeviceImpl_AddRef(IDirect3DRMWinDevice* iface) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + return IDirect3DRMDevice2_AddRef(&This->IDirect3DRMDevice2_iface); +} + +static ULONG WINAPI IDirect3DRMWinDeviceImpl_Release(IDirect3DRMWinDevice* iface) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + return IDirect3DRMDevice2_Release(&This->IDirect3DRMDevice2_iface); +} + +/*** IDirect3DRMObject methods ***/ +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_Clone(IDirect3DRMWinDevice* iface, + LPUNKNOWN unkwn, REFIID riid, + LPVOID* object) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_AddDestroyCallback(IDirect3DRMWinDevice* iface, + D3DRMOBJECTCALLBACK cb, + LPVOID argument) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_DeleteDestroyCallback(IDirect3DRMWinDevice* iface, + D3DRMOBJECTCALLBACK cb, + LPVOID argument) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetAppData(IDirect3DRMWinDevice* iface, + DWORD data) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%u): stub\n", iface, This, data); + + return E_NOTIMPL; +} + +static DWORD WINAPI IDirect3DRMWinDeviceImpl_GetAppData(IDirect3DRMWinDevice* iface) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(): stub\n", iface, This); + + return 0; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_SetName(IDirect3DRMWinDevice* iface, LPCSTR name) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%s): stub\n", iface, This, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetName(IDirect3DRMWinDevice* iface, + LPDWORD size, LPSTR name) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_GetClassName(IDirect3DRMWinDevice* iface, + LPDWORD size, LPSTR name) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + + return E_NOTIMPL; +} + +/*** IDirect3DRMWinDevice methods ***/ +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandlePaint(IDirect3DRMWinDevice* iface, HDC hdc) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%p): stub\n", iface, This, hdc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandleActivate(IDirect3DRMWinDevice* iface, WORD wparam) +{ + IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMWinDevice(iface); + + FIXME("(%p/%p)->(%u): stub\n", iface, This, wparam); + + return E_NOTIMPL; +} + +static const struct IDirect3DRMWinDeviceVtbl Direct3DRMWinDevice_Vtbl = +{ + /*** IUnknown methods ***/ + IDirect3DRMWinDeviceImpl_QueryInterface, + IDirect3DRMWinDeviceImpl_AddRef, + IDirect3DRMWinDeviceImpl_Release, + /*** IDirect3DRMObject methods ***/ + IDirect3DRMWinDeviceImpl_Clone, + IDirect3DRMWinDeviceImpl_AddDestroyCallback, + IDirect3DRMWinDeviceImpl_DeleteDestroyCallback, + IDirect3DRMWinDeviceImpl_SetAppData, + IDirect3DRMWinDeviceImpl_GetAppData, + IDirect3DRMWinDeviceImpl_SetName, + IDirect3DRMWinDeviceImpl_GetName, + IDirect3DRMWinDeviceImpl_GetClassName, + /*** IDirect3DRMWinDevice methods ***/ + IDirect3DRMWinDeviceImpl_HandlePaint, + IDirect3DRMWinDeviceImpl_HandleActivate +}; + HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) { IDirect3DRMDeviceImpl* object; @@ -1009,6 +1163,7 @@ HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; + object->IDirect3DRMWinDevice_iface.lpVtbl = &Direct3DRMWinDevice_Vtbl; object->ref = 1; if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3))

1 0

André Hentschel : d3drm: Reorder device creation function to avoid forward declarations.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 2e963df91121d4b05e3e1b5f334f0f8d22a3a7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e963df91121d4b05e3e1b5f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 17 22:56:13 2012 +0100 d3drm: Reorder device creation function to avoid forward declarations. --- dlls/d3drm/device.c | 53 ++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index f02ce33..a203b0c 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -38,9 +38,6 @@ typedef struct { LONG ref; } IDirect3DRMDeviceImpl; -static const struct IDirect3DRMDevice2Vtbl Direct3DRMDevice2_Vtbl; -static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl; - static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) { return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice2_iface); @@ -51,31 +48,6 @@ static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice3(IDirect3DRMDev return CONTAINING_RECORD(iface, IDirect3DRMDeviceImpl, IDirect3DRMDevice3_iface); } -HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) -{ - IDirect3DRMDeviceImpl* object; - - TRACE("(%p)\n", ppObj); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; - object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; - object->ref = 1; - - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - *ppObj = (IUnknown*)&object->IDirect3DRMDevice3_iface; - else - *ppObj = (IUnknown*)&object->IDirect3DRMDevice2_iface; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI IDirect3DRMDevice2Impl_QueryInterface(IDirect3DRMDevice2* iface, REFIID riid, void** object) @@ -1021,3 +993,28 @@ static const struct IDirect3DRMDevice3Vtbl Direct3DRMDevice3_Vtbl = IDirect3DRMDevice3Impl_GetStateChangeOptions, IDirect3DRMDevice3Impl_SetStateChangeOptions }; + +HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) +{ + IDirect3DRMDeviceImpl* object; + + TRACE("(%p)\n", ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; + object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; + object->ref = 1; + + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + *ppObj = (IUnknown*)&object->IDirect3DRMDevice3_iface; + else + *ppObj = (IUnknown*)&object->IDirect3DRMDevice2_iface; + + return S_OK; +}

1 0

Alexandre Julliard : gdi32: Negative destination sizes are allowed after coordinate mapping in GdiAlphaBlend .
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 7e9d5a17710cf36e9fb67ba7639ee89539e17db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9d5a17710cf36e9fb67ba76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 14:40:12 2012 +0100 gdi32: Negative destination sizes are allowed after coordinate mapping in GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 6 +++- dlls/gdi32/tests/bitmap.c | 52 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 80a42ea..71b8e8f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -932,6 +932,7 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig blendFunction.SourceConstantAlpha, blendFunction.AlphaFormat ); if (src.x < 0 || src.y < 0 || src.width < 0 || src.height < 0 || + src.log_width < 0 || src.log_height < 0 || (dcSrc->header.type == OBJ_MEMDC && (src.width > dcSrc->vis_rect.right - dcSrc->vis_rect.left - src.x || src.height > dcSrc->vis_rect.bottom - dcSrc->vis_rect.top - src.y))) @@ -940,9 +941,10 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig SetLastError( ERROR_INVALID_PARAMETER ); ret = FALSE; } - else if (dst.width < 0 || dst.height < 0) + else if (dst.log_width < 0 || dst.log_height < 0) { - WARN( "Invalid dst coords: (%d,%d), size %dx%d\n", dst.x, dst.y, dst.width, dst.height ); + WARN( "Invalid dst coords: (%d,%d), size %dx%d\n", + dst.log_x, dst.log_y, dst.log_width, dst.log_height ); SetLastError( ERROR_INVALID_PARAMETER ); ret = FALSE; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7f609f2..d28b74f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2747,7 +2747,6 @@ static void check_BitBlt_pixel(HDC hdcDst, HDC hdcSrc, UINT32 *dstBuffer, UINT32 { *srcBuffer = 0xFEDCBA98; *dstBuffer = 0x89ABCDEF; - Rectangle(hdcSrc, 0, 0, 1, 1); /* A null operation to ensure dibs are coerced to X11 */ BitBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, dwRop); ok(expected == *dstBuffer, "BitBlt with dwRop %06X. Expected 0x%08X, got 0x%08X from line %d\n", @@ -2781,7 +2780,7 @@ static void test_BitBlt(void) NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); - hBrush = CreateSolidBrush(0x012345678); + hBrush = CreateSolidBrush(0x12345678); hOldBrush = SelectObject(hdcDst, hBrush); /* Setup the source dib section */ @@ -3394,6 +3393,55 @@ static void test_GdiAlphaBlend(void) ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend); ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetMapMode(hdcDst, MM_ANISOTROPIC); + SetViewportExtEx(hdcDst, -1, -1, NULL); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, -20, -20, -20, -20, hdcSrc, 0, -1, 50, 50, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, -20, 0, -20, 20, hdcSrc, 0, -1, 50, 50, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, -20, 20, -20, hdcSrc, 0, -1, 50, 50, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetMapMode(hdcDst, MM_TEXT); + + SetViewportExtEx(hdcSrc, -1, -1, NULL); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, -30, -30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, 30, -30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, -30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -20, -20, 30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 20, 20, 30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -60, -60, 30, 30, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetViewportExtEx(hdcSrc, 1, 1, NULL); + SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, NULL, 0, 0, 20, 20, blend); ok( !ret, "GdiAlphaBlend succeeded\n" );

1 0

Alexandre Julliard : winex11: Move handling of negative width/ height into the XRender blit helper functions.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 0e3bfb8951ccba1e023a2be56a8f3358ee5e284b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3bfb8951ccba1e023a2be56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 14:39:18 2012 +0100 winex11: Move handling of negative width/height into the XRender blit helper functions. --- dlls/winex11.drv/xrender.c | 117 +++++++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e3bfb8951ccba1e023a2…

1 0

Alexandre Julliard : winedbg: Display the crash details dialog from a separate thread so that it appears right away .
by Alexandre Julliard 18 Jan '12

18 Jan '12

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
98
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 January 2012