December 2016 - Wine-commits

Hugh McMaster : kernel32: Check for a valid pointer before yanking the line.
by Alexandre Julliard 13 Dec '16

13 Dec '16

Module: wine Branch: master Commit: 8cacba5ff942ee91124895bb10fec026556cdf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cacba5ff942ee91124895bb1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 12:00:03 2016 +0000 kernel32: Check for a valid pointer before yanking the line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 415f28e..6c0b8eb 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -636,7 +636,8 @@ static void WCEL_CapitalizeWord(WCEL_Context* ctx) static void WCEL_Yank(WCEL_Context* ctx) { - WCEL_InsertString(ctx, ctx->yanked); + if (ctx->yanked) + WCEL_InsertString(ctx, ctx->yanked); } static void WCEL_KillToEndOfLine(WCEL_Context* ctx)

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: cd8c09b3e359b9f05bb19ca508d7d409f7263310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8c09b3e359b9f05bb19ca50… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Sat Dec 10 10:12:05 2016 -0600 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 586 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 326 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd8c09b3e359b9f05bb19…

1 0

Ken Thomases : winemac: Update the clipboard when the process activates.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: e5a9055dacf0a3dc7d232016f953131a2e867f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a9055dacf0a3dc7d232016f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Dec 9 16:25:08 2016 -0600 winemac: Update the clipboard when the process activates. If another app grabbed the clipboard, that most likely happened while it was active and the Wine process was inactive. Our process being made active again is a good opportunity to check for that. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 13 +++++++++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv.h | 2 ++ dlls/winemac.drv/macdrv_cocoa.h | 3 ++- dlls/winemac.drv/window.c | 12 ++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 09c95d0..27ebdc4 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2314,6 +2314,19 @@ static NSString* WineLocalizedString(unsigned int stringID) return ret; } + - (void)applicationWillBecomeActive:(NSNotification *)notification + { + macdrv_event* event = macdrv_create_event(APP_ACTIVATED, nil); + event->deliver = 1; + + [eventQueuesLock lock]; + for (WineEventQueue* queue in eventQueues) + [queue postEvent:event]; + [eventQueuesLock unlock]; + + macdrv_release_event(event); + } + - (void)applicationWillResignActive:(NSNotification *)notification { [self adjustWindowLevels:NO]; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 7d3aab3..26d2b64 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); static const char *dbgstr_event(int type) { static const char * const event_names[] = { + "APP_ACTIVATED", "APP_DEACTIVATED", "APP_QUIT_REQUESTED", "DISPLAYS_CHANGED", @@ -104,6 +105,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_POSTMESSAGE) { + event_mask |= event_mask_for_type(APP_ACTIVATED); event_mask |= event_mask_for_type(APP_DEACTIVATED); event_mask |= event_mask_for_type(APP_QUIT_REQUESTED); event_mask |= event_mask_for_type(DISPLAYS_CHANGED); @@ -210,6 +212,9 @@ void macdrv_handle_event(const macdrv_event *event) switch (event->type) { + case APP_ACTIVATED: + macdrv_app_activated(); + break; case APP_DEACTIVATED: macdrv_app_deactivated(); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index a3ded73..bffd555 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -165,6 +165,7 @@ extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_app_activated(void) DECLSPEC_HIDDEN; extern void macdrv_app_deactivated(void) DECLSPEC_HIDDEN; extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_maximize_requested(HWND hwnd) DECLSPEC_HIDDEN; @@ -194,6 +195,7 @@ extern HKL macdrv_get_hkl_from_source(TISInputSourceRef input_source) DECLSPEC_H extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; +extern void CDECL macdrv_UpdateClipboard(void) DECLSPEC_HIDDEN; extern void macdrv_init_clipboard(void) DECLSPEC_HIDDEN; extern BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) DECLSPEC_HIDDEN; extern void macdrv_lost_pasteboard_ownership(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 21e9565..e016b3e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -259,6 +259,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, /* event */ enum { + APP_ACTIVATED, APP_DEACTIVATED, APP_QUIT_REQUESTED, DISPLAYS_CHANGED, @@ -301,7 +302,7 @@ enum { QUIT_REASON_SHUTDOWN, }; -typedef uint32_t macdrv_event_mask; +typedef uint64_t macdrv_event_mask; typedef struct macdrv_event { int refs; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 40aa439..9824d99 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2279,6 +2279,18 @@ void macdrv_window_lost_focus(HWND hwnd, const macdrv_event *event) /*********************************************************************** + * macdrv_app_activated + * + * Handler for APP_ACTIVATED events. + */ +void macdrv_app_activated(void) +{ + TRACE("\n"); + macdrv_UpdateClipboard(); +} + + +/*********************************************************************** * macdrv_app_deactivated * * Handler for APP_DEACTIVATED events.

1 0

Andrew Eikum : msacm32: Fix copy-paste error.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 55fdb039420f89af71275fdb21ce894db6c21ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fdb039420f89af71275fdb2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 12 07:42:56 2016 -0600 msacm32: Fix copy-paste error. Spotted by Nikolay via Coverity. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index 47861d8..70ec62f 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -1154,7 +1154,7 @@ static LRESULT PCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) idx += 4; break; case 24: - if (adsi->pwfxDst->nBlockAlign != 3 * adsi->pwfxSrc->nChannels) { + if (adsi->pwfxDst->nBlockAlign != 3 * adsi->pwfxDst->nChannels) { FIXME("Destination: 24-bit samples must be packed\n"); return MMSYSERR_NOTSUPPORTED; }

1 0

Nikolay Sivov : scrrun/tests: Test to query for IUnknown from IProvideClassInfo.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 2c2b50a4ed5143fea37b3c3c572c9d09069a60df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2b50a4ed5143fea37b3c3c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 08:13:51 2016 +0300 scrrun/tests: Test to query for IUnknown from IProvideClassInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 6 ++++++ dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 78922b7..658dd66 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -36,6 +36,7 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) IProvideClassInfo *classinfo; TYPEATTR *attr; ITypeInfo *ti; + IUnknown *unk; HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); @@ -50,6 +51,11 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); + hr = IProvideClassInfo_QueryInterface(classinfo, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to QI for IUnknown.\n"); + ok(unk == (IUnknown *)disp, "Got unk %p, original %p\n", unk, disp); + IUnknown_Release(unk); + IProvideClassInfo_Release(classinfo); ITypeInfo_ReleaseTypeAttr(ti, attr); ITypeInfo_Release(ti); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5516099..57aacf6 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -106,6 +106,7 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) IProvideClassInfo *classinfo; TYPEATTR *attr; ITypeInfo *ti; + IUnknown *unk; HRESULT hr; hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); @@ -120,6 +121,11 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), wine_dbgstr_guid(guid)); + hr = IProvideClassInfo_QueryInterface(classinfo, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to QI for IUnknown.\n"); + ok(unk == (IUnknown *)disp, "Got unk %p, original %p.\n", unk, disp); + IUnknown_Release(unk); + IProvideClassInfo_Release(classinfo); ITypeInfo_ReleaseTypeAttr(ti, attr); ITypeInfo_Release(ti);

1 0

Nikolay Sivov : dwrite: Fix a typo in assertion condition (Coverity).
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 93829e4b2bc1a1289235817b764536df99d4d4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93829e4b2bc1a1289235817b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 08:17:17 2016 +0300 dwrite: Fix a typo in assertion condition (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ba97025..d9ddce0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1691,7 +1691,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace { if (!iface) return NULL; - assert(iface->lpVtbl = (IDWriteFontFaceVtbl*)&dwritefontfacevtbl); + assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl); return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface); }

1 0

Nikolay Sivov : msi: Fix handling of NULL buffer in MsiGetProductPropertyW () (Coverity).
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: f5e4dad68cd32e5b9a3cfc1cea284c5bf7c276f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e4dad68cd32e5b9a3cfc1ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 14:46:16 2016 +0300 msi: Fix handling of NULL buffer in MsiGetProductPropertyW() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 8 ++-- dlls/msi/tests/package.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 892c756..ce29c26 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2714,17 +2714,17 @@ UINT WINAPI MsiGetProductPropertyW(MSIHANDLE hProduct, LPCWSTR szProperty, if (lstrlenW(val) >= *pccbValue) { - lstrcpynW(szValue, val, *pccbValue); - *pccbValue = lstrlenW(val); + if (szValue) lstrcpynW(szValue, val, *pccbValue); r = ERROR_MORE_DATA; } else { - lstrcpyW(szValue, val); - *pccbValue = lstrlenW(val); + if (szValue) lstrcpyW(szValue, val); r = ERROR_SUCCESS; } + *pccbValue = lstrlenW(val); + done: if (view) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6bdacd7..748d25f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8293,13 +8293,21 @@ static void test_emptypackage(void) static void test_MsiGetProductProperty(void) { + static const WCHAR prodcode_propW[] = {'P','r','o','d','u','c','t','C','o','d','e',0}; + static const WCHAR nonexistantW[] = {'I','D','o','n','t','E','x','i','s','t',0}; + static const WCHAR newpropW[] = {'N','e','w','P','r','o','p','e','r','t','y',0}; + static const WCHAR appleW[] = {'a','p','p','l','e',0}; + static const WCHAR emptyW[] = {0}; + WCHAR valW[MAX_PATH]; MSIHANDLE hprod, hdb; CHAR val[MAX_PATH]; CHAR path[MAX_PATH]; CHAR query[MAX_PATH]; CHAR keypath[MAX_PATH*2]; CHAR prodcode[MAX_PATH]; + WCHAR prodcodeW[MAX_PATH]; CHAR prod_squashed[MAX_PATH]; + WCHAR prod_squashedW[MAX_PATH]; HKEY prodkey, userkey, props; DWORD size; LONG res; @@ -8310,6 +8318,8 @@ static void test_MsiGetProductProperty(void) lstrcatA(path, "\\"); create_test_guid(prodcode, prod_squashed); + MultiByteToWideChar(CP_ACP, 0, prodcode, -1, prodcodeW, MAX_PATH); + squash_guid(prodcodeW, prod_squashedW); if (is_wow64) access |= KEY_WOW64_64KEY; @@ -8400,6 +8410,15 @@ static void test_MsiGetProductProperty(void) "Expected val to be unchanged, got \"%s\"\n", val); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(0xdeadbeef, prodcode_propW, valW, &size); + ok(r == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", r); + ok(!lstrcmpW(valW, appleW), + "Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW)); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + /* szProperty is NULL */ size = MAX_PATH; lstrcpyA(val, "apple"); @@ -8410,6 +8429,15 @@ static void test_MsiGetProductProperty(void) "Expected val to be unchanged, got \"%s\"\n", val); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, NULL, valW, &size); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpW(valW, appleW), + "Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW)); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + /* szProperty is empty */ size = MAX_PATH; lstrcpyA(val, "apple"); @@ -8418,6 +8446,13 @@ static void test_MsiGetProductProperty(void) ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); ok(size == 0, "Expected 0, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, emptyW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(*valW == 0, "Expected \"\", got %s\n", wine_dbgstr_w(valW)); + ok(size == 0, "Expected 0, got %d\n", size); + /* get the property */ size = MAX_PATH; lstrcpyA(val, "apple"); @@ -8428,6 +8463,15 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, prodcodeW), + "Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* lpValueBuf is NULL */ size = MAX_PATH; r = MsiGetProductPropertyA(hprod, "ProductCode", NULL, &size); @@ -8435,6 +8479,12 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = MAX_PATH; + r = MsiGetProductPropertyW(hprod, prodcode_propW, NULL, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf is NULL */ lstrcpyA(val, "apple"); r = MsiGetProductPropertyA(hprod, "ProductCode", val, NULL); @@ -8445,6 +8495,15 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, NULL); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpW(valW, appleW), + "Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf is too small */ size = 4; lstrcpyA(val, "apple"); @@ -8455,6 +8514,15 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = 4; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!memcmp(valW, prodcodeW, 3 * sizeof(WCHAR)), + "Expected first 3 chars of %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf does not leave room for NULL terminator */ size = lstrlenA(prodcode); lstrcpyA(val, "apple"); @@ -8465,6 +8533,15 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = lstrlenW(prodcodeW); + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!memcmp(valW, prodcodeW, lstrlenW(prodcodeW) - 1), + "Expected first 37 chars of %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf has enough room for NULL terminator */ size = lstrlenA(prodcode) + 1; lstrcpyA(val, "apple"); @@ -8475,6 +8552,15 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = lstrlenW(prodcodeW) + 1; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, prodcodeW), + "Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* nonexistent property */ size = MAX_PATH; lstrcpyA(val, "apple"); @@ -8483,6 +8569,13 @@ static void test_MsiGetProductProperty(void) ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); ok(size == 0, "Expected 0, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, nonexistantW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, emptyW), "Expected \"\", got %s\n", wine_dbgstr_w(valW)); + ok(size == 0, "Expected 0, got %d\n", size); + r = MsiSetPropertyA(hprod, "NewProperty", "value"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8494,6 +8587,13 @@ static void test_MsiGetProductProperty(void) ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); ok(size == 0, "Expected 0, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, newpropW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, emptyW), "Expected \"\", got %s\n", wine_dbgstr_w(valW)); + ok(size == 0, "Expected 0, got %d\n", size); + r = MsiSetPropertyA(hprod, "ProductCode", "value"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8507,6 +8607,15 @@ static void test_MsiGetProductProperty(void) ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, prodcodeW), + "Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + MsiCloseHandle(hprod); RegDeleteValueA(props, "LocalPackage");

1 0

Józef Kucia : wined3d: Add suport for 2D array texture UAVs.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 26aa82416f48ae4e220af8b35c43ad0c850e8254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26aa82416f48ae4e220af8b35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:46 2016 +0100 wined3d: Add suport for 2D array texture UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a800939..d1c0a95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2135,6 +2135,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont image_type = "image3D"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: + image_type = "image2DArray"; + break; + default: image_type = "unsupported_image"; FIXME("Unhandled resource type %#x.\n", reg_maps->uav_resource_info[i].type);

1 0

Józef Kucia : d3d11/tests: Add test for 2D array texture UAVs.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 0f08eddb15aa0981e2a0045acfb65999cda4aefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f08eddb15aa0981e2a0045ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:47 2016 +0100 d3d11/tests: Add test for 2D array texture UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 82 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6f413c5..be34166 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11403,7 +11403,7 @@ static void test_uav_load(void) UINT miplevel_count; UINT array_size; DXGI_FORMAT format; - D3D11_SUBRESOURCE_DATA data[1]; + D3D11_SUBRESOURCE_DATA data[3]; }; /* FIXME: Use a single R32_TYPELESS RT with multiple RTVs. */ @@ -11421,6 +11421,7 @@ static void test_uav_load(void) ID3D11PixelShader *ps; ID3D11Device *device; unsigned int i, x, y; + ID3D11Buffer *cb; HRESULT hr; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -11506,6 +11507,37 @@ static void test_uav_load(void) 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, }; static const struct shader ps_ld_2d_int = {ps_ld_2d_int_code, sizeof(ps_ld_2d_int_code)}; + static const DWORD ps_ld_2d_uint_arr_code[] = + { +#if 0 + RWTexture2DArray<uint> u; + + uint layer; + + uint main(float4 position : SV_Position) : SV_Target + { + float3 s; + u.GetDimensions(s.x, s.y, s.z); + s.z = layer; + return u[s * float3(position.x / 640.0f, position.y / 480.0f, 1.0f)]; + } +#endif + 0x43425844, 0xa7630358, 0xd7e7228f, 0xa9f1be03, 0x838554f1, 0x00000001, 0x000001bc, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000120, 0x00000050, + 0x00000048, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400409c, 0x0011e000, + 0x00000001, 0x00004444, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x00102012, + 0x00000000, 0x02000068, 0x00000001, 0x8900003d, 0x80000202, 0x00111103, 0x00100032, 0x00000000, + 0x00004001, 0x00000000, 0x0011ee46, 0x00000001, 0x07000038, 0x00100032, 0x00000000, 0x00100046, + 0x00000000, 0x00101046, 0x00000000, 0x06000056, 0x001000c2, 0x00000000, 0x00208006, 0x00000000, + 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x3f800000, 0x3f800000, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x890000a3, 0x80000202, 0x00111103, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const struct shader ps_ld_2d_uint_arr = {ps_ld_2d_uint_arr_code, sizeof(ps_ld_2d_uint_arr_code)}; static const float float_data[] = { 0.50f, 0.25f, 1.00f, 0.00f, @@ -11520,6 +11552,20 @@ static void test_uav_load(void) 0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, }; + static const unsigned int uint_data2[] = + { + 0xffff, 0xffff, 0xffff, 0xffff, + 0xffff, 0xc000, 0xc000, 0xffff, + 0xffff, 0xc000, 0xc000, 0xffff, + 0xffff, 0xffff, 0xffff, 0xffff, + }; + static const unsigned int uint_data3[] = + { + 0xaa, 0xaa, 0xcc, 0xcc, + 0xaa, 0xaa, 0xdd, 0xdd, + 0xbb, 0xbb, 0xee, 0xee, + 0xbb, 0xbb, 0xff, 0xff, + }; static const int int_data[] = { -1, 0x10, 0x20, 0x30, @@ -11531,6 +11577,10 @@ static void test_uav_load(void) {{float_data, 4 * sizeof(*float_data), 0}}}; static const struct texture uint_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_UINT, {{uint_data, 4 * sizeof(*uint_data), 0}}}; + static const struct texture uint2d_arr = {4, 4, 1, 3, DXGI_FORMAT_R32_UINT, + {{uint_data, 4 * sizeof(*uint_data), 0}, + {uint_data2, 4 * sizeof(*uint_data2), 0}, + {uint_data3, 4 * sizeof(*uint_data3), 0}}}; static const struct texture int_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_SINT, {{int_data, 4 * sizeof(*int_data), 0}}}; @@ -11539,18 +11589,27 @@ static void test_uav_load(void) const struct shader *ps; const struct texture *texture; struct uav_desc uav_desc; + struct uvec4 constant; const DWORD *expected_colors; } tests[] = { -#define TEX_2D D3D11_UAV_DIMENSION_TEXTURE2D -#define R32_FLOAT DXGI_FORMAT_R32_FLOAT -#define R32_UINT DXGI_FORMAT_R32_UINT -#define R32_SINT DXGI_FORMAT_R32_SINT - {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, (const DWORD *)float_data}, - {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, (const DWORD *)uint_data}, - {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, (const DWORD *)int_data}, +#define TEX_2D D3D11_UAV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_UAV_DIMENSION_TEXTURE2DARRAY +#define R32_FLOAT DXGI_FORMAT_R32_FLOAT +#define R32_UINT DXGI_FORMAT_R32_UINT +#define R32_SINT DXGI_FORMAT_R32_SINT + {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, {}, (const DWORD *)float_data}, + {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, {}, (const DWORD *)uint_data}, + {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, {}, (const DWORD *)int_data}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {0}, (const DWORD *)uint_data}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {1}, (const DWORD *)uint_data2}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {2}, (const DWORD *)uint_data3}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 1, ~0u}, {0}, (const DWORD *)uint_data2}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 1, ~0u}, {1}, (const DWORD *)uint_data3}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 2, ~0u}, {0}, (const DWORD *)uint_data3}, #undef TEX_2D +#undef TEX_2D_ARRAY #undef R32_FLOAT #undef R32_UINT #undef R32_SINT @@ -11593,6 +11652,9 @@ static void test_uav_load(void) texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(struct uvec4), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + ps = NULL; uav = NULL; texture = NULL; @@ -11604,6 +11666,9 @@ static void test_uav_load(void) ID3D11RenderTargetView *current_rtv; ID3D11Texture2D *current_rt; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, + NULL, &test->constant, 0, 0); + if (current_ps != test->ps) { if (ps) @@ -11687,6 +11752,7 @@ static void test_uav_load(void) ID3D11Texture2D_Release(texture); ID3D11UnorderedAccessView_Release(uav); + ID3D11Buffer_Release(cb); ID3D11RenderTargetView_Release(rtv_float); ID3D11RenderTargetView_Release(rtv_sint); ID3D11RenderTargetView_Release(rtv_uint);

1 0

Józef Kucia : wined3d: Use depth/ stencil formats for typeless resources only when WINED3DUSAGE_DEPTHSTENCIL is set.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: a02fd72965602eb93fa1fc14a8fc8e022a0dbce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02fd72965602eb93fa1fc14a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:48 2016 +0100 wined3d: Use depth/stencil formats for typeless resources only when WINED3DUSAGE_DEPTHSTENCIL is set. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 12 ++++--- dlls/wined3d/directx.c | 19 +++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/texture.c | 13 ++++--- dlls/wined3d/utils.c | 76 ++++++++++++++++++++++++++++++---------- dlls/wined3d/vertexdeclaration.c | 4 +-- dlls/wined3d/view.c | 6 ++-- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 92 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a02fd72965602eb93fa1f…

1 0