January 2016 - Wine-commits

Alex Henrie : server: Fix duplicate, incorrect comment describing is_fd_signaled.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: df59b040577d7b9bc093968223dcc4de5571efba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df59b040577d7b9bc09396822… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 20 21:02:27 2016 -0700 server: Fix duplicate, incorrect comment describing is_fd_signaled. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index e3fe292..559a737 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1952,7 +1952,7 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } -/* set or clear the fd signaled state */ +/* check if fd is signaled */ int is_fd_signaled( struct fd *fd ) { return fd->signaled;

1 0

Austin English : winspool.drv: Add EnumPrinterKeyA/W stubs.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 110b53affcd00e375e1232b9ce0755defed1a631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110b53affcd00e375e1232b9c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 19 13:10:10 2016 -0600 winspool.drv: Add EnumPrinterKeyA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ include/winspool.h | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 04def86..cebf6f7 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7527,6 +7527,26 @@ DWORD WINAPI EnumPrinterDataW( HANDLE hPrinter, DWORD dwIndex, LPWSTR pValueName } /***************************************************************************** + * EnumPrinterKeyA [WINSPOOL.@] + * + */ +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, CHAR *subkey, DWORD size, DWORD *needed) +{ + FIXME("%p %s %p %x %p\n", printer, debugstr_a(key), subkey, size, needed); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/***************************************************************************** + * EnumPrinterKeyW [WINSPOOL.@] + * + */ +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, WCHAR *subkey, DWORD size, DWORD *needed) +{ + FIXME("%p %s %p %x %p\n", printer, debugstr_w(key), subkey, size, needed); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/***************************************************************************** * EnumPrintProcessorDatatypesA [WINSPOOL.@] * */ diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index b0d30b8..9b8062c 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -124,6 +124,8 @@ @ stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) @ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) @ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stdcall EnumPrinterKeyA(long str ptr long ptr) +@ stdcall EnumPrinterKeyW(long wstr ptr long ptr) @ stdcall ExtDeviceMode(long long ptr str str ptr str long) @ stdcall FindClosePrinterChangeNotification(long) @ stdcall FindFirstPrinterChangeNotification(long long long ptr) diff --git a/include/winspool.h b/include/winspool.h index 42097fb..b11438f 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1789,6 +1789,12 @@ BOOL WINAPI DeletePrintProvidorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPrintProvidorName); #define DeletePrintProvidor WINELIB_NAME_AW(DeletePrintProvidor) +DWORD WINAPI EnumPrinterKeyA(HANDLE printer, const CHAR *key, + CHAR *subkey, DWORD size, DWORD *needed); +DWORD WINAPI EnumPrinterKeyW(HANDLE printer, const WCHAR *key, + WCHAR *subkey, DWORD size, DWORD *needed); +#define EnumPrinterKey WINELIB_NAME_AW(EnumPrinterKey) + DWORD WINAPI EnumPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPBYTE pEnumValues, DWORD cbEnumValues, LPDWORD pcbEnumValues, LPDWORD pnEnumValues);

1 0

Alexandre Julliard : server: Always print the full path of objects when dumping them.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: d15f47412effbcb20105d87e94f3a114e0e26449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15f47412effbcb20105d87e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 21:08:56 2016 +0900 server: Always print the full path of objects when dumping them. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 4 +--- server/device.c | 6 +----- server/directory.c | 12 ++---------- server/event.c | 10 ++-------- server/handle.c | 1 + server/mailslot.c | 3 +-- server/mapping.c | 4 +--- server/mutex.c | 4 +--- server/named_pipe.c | 9 ++------- server/object.c | 24 +++++++++++++++++------- server/semaphore.c | 4 +--- server/symlink.c | 6 ++---- server/timer.c | 4 +--- server/winstation.c | 8 ++------ 14 files changed, 35 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15f47412effbcb20105d…

1 0

Huw Davies : oleaut32: Use the helper to access bstr_t.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 13bc86c03422d381ae7bf19a6132d370e93a7675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13bc86c03422d381ae7bf19a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 10:29:49 2016 +0000 oleaut32: Use the helper to access bstr_t. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 214421c..8a22c2e 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -360,7 +360,8 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) if (*old!=NULL) { BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); - bstr_t *bstr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen)); + bstr_t *old_bstr = bstr_from_str(*old); + bstr_t *bstr = HeapReAlloc(GetProcessHeap(), 0, old_bstr, bstr_alloc_size(newbytelen)); *old = bstr->u.str; bstr->size = newbytelen; /* Subtle hidden feature: The old string data is still there

1 0

Huw Davies : oleaut32: BSTRs should have 8 byte alignment on 64 bits.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 36f454cda0dc1fd5fbd1521ad8d1883be6995375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f454cda0dc1fd5fbd1521ad… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 10:29:50 2016 +0000 oleaut32: BSTRs should have 8 byte alignment on 64 bits. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 3 +++ dlls/oleaut32/tests/vartype.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 8a22c2e..07db9ff 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -84,6 +84,9 @@ static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; typedef struct { +#ifdef _WIN64 + DWORD pad; +#endif DWORD size; union { char ptr[1]; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d905d37..f7df9c5 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5398,9 +5398,12 @@ static void test_SysAllocString(void) if (str) { LPINTERNAL_BSTR bstr = Get(str); + DWORD_PTR p = (DWORD_PTR)str; + int align = sizeof(void *); ok (bstr->dwLen == 8, "Expected 8, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szTest), "String different\n"); + ok ((p & ~(align-1)) == p, "Not aligned to %d\n", align); SysFreeString(str); } }

1 0

Huw Davies : oleaut32: Use IMalloc_GetSize to determine the cache bucket.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 924cad5f3b7d7d3a2574ed6ff5396bcbd2f422ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=924cad5f3b7d7d3a2574ed6ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 10:29:51 2016 +0000 oleaut32: Use IMalloc_GetSize to determine the cache bucket. This also has the effect of ignoring non-allocated memory blocks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 36 +++++++++++++++++++++++++++++++++--- dlls/oleaut32/tests/vartype.c | 10 ++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 07db9ff..00e6daf 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -120,14 +120,27 @@ static inline bstr_t *bstr_from_str(BSTR str) return CONTAINING_RECORD(str, bstr_t, u.str); } -static inline bstr_cache_entry_t *get_cache_entry(size_t size) +static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx) { - unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)-1])/BUCKET_SIZE; return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) ? bstr_cache + cache_idx : NULL; } +static inline bstr_cache_entry_t *get_cache_entry(size_t size) +{ + unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)-1])/BUCKET_SIZE; + return get_cache_entry_from_idx(cache_idx); +} + +static inline bstr_cache_entry_t *get_cache_entry_from_alloc_size(SIZE_T alloc_size) +{ + unsigned cache_idx; + if (alloc_size < BUCKET_SIZE) return NULL; + cache_idx = (alloc_size - BUCKET_SIZE) / BUCKET_SIZE; + return get_cache_entry_from_idx(cache_idx); +} + static bstr_t *alloc_bstr(size_t size) { bstr_cache_entry_t *cache_entry = get_cache_entry(size); @@ -234,6 +247,16 @@ BSTR WINAPI SysAllocString(LPCOLESTR str) return SysAllocStringLen(str, lstrlenW(str)); } +static inline IMalloc *get_malloc(void) +{ + static IMalloc *malloc; + + if (!malloc) + CoGetMalloc(1, &malloc); + + return malloc; +} + /****************************************************************************** * SysFreeString [OLEAUT32.6] * @@ -253,12 +276,19 @@ void WINAPI SysFreeString(BSTR str) { bstr_cache_entry_t *cache_entry; bstr_t *bstr; + IMalloc *malloc = get_malloc(); + SIZE_T alloc_size; if(!str) return; bstr = bstr_from_str(str); - cache_entry = get_cache_entry(bstr->size); + + alloc_size = IMalloc_GetSize(malloc, bstr); + if (alloc_size == ~0UL) + return; + + cache_entry = get_cache_entry_from_alloc_size(alloc_size); if(cache_entry) { unsigned i; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index f7df9c5..03f43ec 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6369,9 +6369,15 @@ static void test_bstr_cache(void) ok(str == str2, "str != str2\n"); SysFreeString(str2); - /* Fill the bucket with cached entries. */ + /* Fill the bucket with cached entries. + We roll our own, to show that the cache doesn't use + the bstr length field to determine bucket allocation. */ for(i=0; i < sizeof(strs)/sizeof(*strs); i++) - strs[i] = SysAllocStringLen(NULL, 24); + { + DWORD_PTR *ptr = CoTaskMemAlloc(64); + ptr[0] = 0; + strs[i] = (BSTR)(ptr + 1); + } for(i=0; i < sizeof(strs)/sizeof(*strs); i++) SysFreeString(strs[i]);

1 0

Aaryaman Vasishta : d3drm: Fix QueryInterface for IDirect3DRMTexture*.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 47913f1c1c58bd62756c54910865c7cedcfc8501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47913f1c1c58bd62756c54910… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Jan 20 20:54:14 2016 +0530 d3drm: Fix QueryInterface for IDirect3DRMTexture*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/texture.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 46d968a..080c6f8 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -679,21 +679,26 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface, TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2) - || IsEqualGUID(riid, &IID_IDirect3DRMTexture) + if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { + *out = &texture->IDirect3DRMTexture3_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2)) + { *out = &texture->IDirect3DRMTexture2_iface; } - else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture)) { - *out = &texture->IDirect3DRMTexture3_iface; + *out = &texture->IDirect3DRMTexture_iface; } else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Aaryaman Vasishta : d3drm/tests: Add QueryInterface tests for IDirect3DRMTexture*.
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 858ea7a76efc912040a5612b7d021d83e0b7e123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858ea7a76efc912040a5612b7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Jan 19 20:17:14 2016 +0530 d3drm/tests: Add QueryInterface tests for IDirect3DRMTexture*. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 60fe0b4..4a1c180 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3967,6 +3967,131 @@ static void test_load_texture(void) IDirect3DRM_Release(d3drm1); } +static void test_texture_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRM3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMWinDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObject, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMViewport, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisual, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMMesh, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLight, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMTexture2, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMTexture3, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMWrap, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimation, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimation2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObjectArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDeviceArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewportArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrameArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisualArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLightArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPickedArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFaceArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMUserVisual, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMInterpolator, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPicked2Array, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMClippedVisual, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawClipper, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface4, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw4, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DLight, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IUnknown, &IID_IUnknown, S_OK, }, + }; + HRESULT hr; + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + IUnknown *unknown; + char *filename; + BOOL check; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr); + filename = create_bitmap(1, 1, TRUE); + hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr); + IDirect3DRMTexture_Release(texture1); + test_qi("texture1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr); + IDirect3DRMTexture2_Release(texture2); + test_qi("texture2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr); + IDirect3DRMTexture3_Release(texture3); + test_qi("texture3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + check = DeleteFileA(filename); + ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError()); + HeapFree(GetProcessHeap(), 0, filename); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -3995,4 +4120,5 @@ START_TEST(d3drm) test_create_device_from_d3d2(); test_create_device_from_d3d3(); test_load_texture(); + test_texture_qi(); }

1 0

Nikolay Sivov : d2d1: Support different measuring modes in DrawText().
by Alexandre Julliard 21 Jan '16

21 Jan '16

Module: wine Branch: master Commit: 7dd7500327f62864fdfa3124bf24f529adccedec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd7500327f62864fdfa3124b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 21:31:56 2016 +0300 d2d1: Support different measuring modes in DrawText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fba1738..091954c 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -888,6 +888,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); IDWriteTextLayout *text_layout; IDWriteFactory *dwrite_factory; D2D1_POINT_2F origin; @@ -898,9 +899,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * iface, debugstr_wn(string, string_len), string_len, text_format, layout_rect, brush, options, measuring_mode); - if (measuring_mode != DWRITE_MEASURING_MODE_NATURAL) - FIXME("Ignoring measuring mode %#x.\n", measuring_mode); - if (FAILED(hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown **)&dwrite_factory))) { @@ -908,8 +906,13 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * return; } - hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format, - layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout); + if (measuring_mode == DWRITE_MEASURING_MODE_NATURAL) + hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format, + layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout); + else + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(dwrite_factory, string, string_len, text_format, + layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, render_target->dpi_x / 96.0f, + (DWRITE_MATRIX*)&render_target->drawing_state.transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, &text_layout); IDWriteFactory_Release(dwrite_factory); if (FAILED(hr)) {

1 0

Jeremy Newman : switch wiki logo to mediawiki
by Jeremy Newman 21 Jan '16

21 Jan '16

Module: website Branch: master Commit: 14bdcd4254c559b288e70a30ae2d32cb7ec52585 URL: http://source.winehq.org/git/website.git/?a=commit;h=14bdcd4254c559b288e70a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 21 09:21:00 2016 -0600 switch wiki logo to mediawiki --- images/mediawiki.png | Bin 0 -> 4877 bytes images/moinmoin.png | Bin 2198 -> 0 bytes templates/de/help.template | 2 +- templates/en/help.template | 2 +- templates/fr/help.template | 2 +- templates/pl/help.template | 2 +- templates/pt/help.template | 2 +- templates/tr/help.template | 2 +- templates/uk/help.template | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) diff --git a/images/mediawiki.png b/images/mediawiki.png new file mode 100644 index 0000000..ce6531a Binary files /dev/null and b/images/mediawiki.png differ diff --git a/images/moinmoin.png b/images/moinmoin.png deleted file mode 100644 index 7d830bb..0000000 Binary files a/images/moinmoin.png and /dev/null differ diff --git a/templates/de/help.template b/templates/de/help.template index 936fc3c..38287e1 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -47,7 +47,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Du kannst auch in unserem <a href="https://wiki.winehq.org/">Wiki</a> nachschauen, ob du diff --git a/templates/en/help.template b/templates/en/help.template index 58e1905..1358d98 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -45,7 +45,7 @@ <div class="row padding-md"> <div class="col-xs-2 col-md-1 center"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </div> <div class="col-xs-10 col-md-11"> You can also see our <a href="https://wiki.winehq.org/">Wiki</a> to diff --git a/templates/fr/help.template b/templates/fr/help.template index 5f4d627..a02f44d 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -47,7 +47,7 @@ payant pour Wine. <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Notre <a href="https://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. diff --git a/templates/pl/help.template b/templates/pl/help.template index e88fc56..b071f1b 100644 --- a/templates/pl/help.template +++ b/templates/pl/help.template @@ -46,7 +46,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Szukaj odpowiedzi na swoje pytania na naszej <a href="https://wiki.winehq.org/Polish">Wiki</a>. diff --git a/templates/pt/help.template b/templates/pt/help.template index 1f59d40..1da308d 100644 --- a/templates/pt/help.template +++ b/templates/pt/help.template @@ -46,7 +46,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Você também pode ler a nossa <a href="https://wiki.winehq.org/">Wiki</a> para tentar diff --git a/templates/tr/help.template b/templates/tr/help.template index 0c7abc7..bf4addd 100644 --- a/templates/tr/help.template +++ b/templates/tr/help.template @@ -44,7 +44,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Viki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Viki</a> </td> <td valign="top"> Sorunuza yanıt bulup bulamayacağınızı görmeniz için ayrıca <a href="https://wiki.winehq.org/">Viki</a> sayfamıza da bakabilirsiniz. diff --git a/templates/uk/help.template b/templates/uk/help.template index 5a2fa2a..0c3d5e6 100644 --- a/templates/uk/help.template +++ b/templates/uk/help.template @@ -41,7 +41,7 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="https://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"><br>Wiki</a> + <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> </td> <td valign="top"> Подивіться нашу <a href="https://wiki.winehq.org/">Wiki</a>, щоб знайти відповідь на своє питання.

1 0