December 2016 - Wine-Commits

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

Dec. 12, 2016

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

Andrew Eikum : msacm32: Fix copy-paste error.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

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

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

Dec. 12, 2016

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

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

Dec. 12, 2016

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: Recognize SM5 atomic_imax opcode.
by Alexandre Julliard Dec. 12, 2016

Dec. 12, 2016

Module: wine Branch: master Commit: 5763e7f98c8ab606b4e66e15348842c8fe2bbc58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5763e7f98c8ab606b4e66e153… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:52 2016 +0100 wined3d: Recognize SM5 atomic_imax opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54abcb8..cab03b9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5205,6 +5205,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, + /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d1c0a95..1f9f5dd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8929,6 +8929,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index feaa6b9..3c11fea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -46,6 +46,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_AND */ "atomic_and", /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", + /* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index aa6aead..1fffbc7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -264,6 +264,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, + WINED3D_SM5_OP_ATOMIC_IMAX = 0xae, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, @@ -970,6 +971,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, + {WINED3D_SM5_OP_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d632d42..6597300 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -577,6 +577,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_AND, WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_IADD, + WINED3DSIH_ATOMIC_IMAX, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMIN,

1 0

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

Dec. 12, 2016

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

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

Dec. 12, 2016

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

André Hentschel : Add WWN 404
by Jeremy Newman Dec. 12, 2016

Dec. 12, 2016

Module: website Branch: master Commit: 83fe8b72d7d1c7ff1af834254c1475423e160a34 URL: http://source.winehq.org/git/website.git/?a=commit;h=83fe8b72d7d1c7ff1af834… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 12 17:30:21 2016 +0100 Add WWN 404 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/wwn404-overwatch.png | Bin 0 -> 1381888 bytes news/de/2016121201.xml | 16 + news/en/2016121201.xml | 16 + wwn/en/wn20161212_404.xml | 734 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 766 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=83fe8b72d7d1c7ff1a…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Dec. 12, 2016

Dec. 12, 2016

Module: website Branch: master Commit: e0d90211303241f9c389ebe223247d40f9775bab URL: http://source.winehq.org/git/website.git/?a=commit;h=e0d90211303241f9c389eb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 12 10:37:59 2016 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 2.0-rc1
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: website Branch: master Commit: d23b38d321cb94743f387a5c7ea596ff667f8c3f URL: http://source.winehq.org/git/website.git/?a=commit;h=d23b38d321cb94743f387a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:37:44 2016 +0100 Wine release 2.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016120901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016120901.xml b/news/en/2016120901.xml new file mode 100644 index 0000000..87ff471 --- /dev/null +++ b/news/en/2016120901.xml @@ -0,0 +1,17 @@ +<news> +<date>December 9, 2016</date> +<title>Wine 2.0-rc1 Released</title> +<body> + The Wine development release 2.0-rc1 is now available. + This is the first release candidate for the upcoming Wine 2.0. It marks the beginning of the code freeze period. Please give this release a good testing to help us make 2.0 as good as possible. + <a href="{$root}/announce/2.0-rc1">What's new</a> in this release: +<ul> + <li>Bug fix update of the Mono engine.</li> + <li>Support for IDN name resolution.</li> + <li>Many more Shader Model 5 operations.</li> + <li>Still more fixes in the regression tests.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0-rc1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hans Leidekker : dpnet/tests: Merge peer.c into client.c.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: a24b8b2b3dc1efac35a52d0c0334f1974a485742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24b8b2b3dc1efac35a52d0c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:03 2016 +0100 dpnet/tests: Merge peer.c into client.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 1 - dlls/dpnet/tests/client.c | 269 ++++++++++++++++++++++++++++++++++++- dlls/dpnet/tests/peer.c | 312 ------------------------------------------- 3 files changed, 268 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a24b8b2b3dc1efac35a52…

1 0

Nikolay Sivov : xmllite: Fix setting local name when parsing QName.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 9b98d69e06709aaa6f0bae816b5207ce646ce05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b98d69e06709aaa6f0bae816… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:31 2016 +0300 xmllite: Fix setting local name when parsing QName. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 47649f5..ef535e6 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1916,8 +1916,6 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc } } - reader_init_strvalue(start, reader_get_cur(reader)-start, local); - if (prefix->len) TRACE("qname %s:%s\n", debug_strval(reader, prefix), debug_strval(reader, local)); else

1 0

Nikolay Sivov : xmllite: Use a helper to move to first attribute to avoid extra traces.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 0575a4b2bb28318eb763088bddb159fc03775418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0575a4b2bb28318eb763088bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:26 2016 +0300 xmllite: Use a helper to move to first attribute to avoid extra traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 351f872..874de75 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2790,18 +2790,26 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static HRESULT reader_move_to_first_attribute(xmlreader *reader) +{ + if (!reader->attr_count) + return S_FALSE; + + reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); + reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); + reader_set_strvalue(reader, StringValue_LocalName, &reader->attr->localname); + reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); + + return S_OK; +} + static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)\n", This); - if (!This->attr_count) return S_FALSE; - This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); - reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - - return S_OK; + return reader_move_to_first_attribute(This); } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) @@ -2814,7 +2822,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) if (!This->attr_count) return S_FALSE; if (!This->attr) - return IXmlReader_MoveToFirstAttribute(iface); + return reader_move_to_first_attribute(This); next = list_next(&This->attrs, &This->attr->entry); if (next)

1 0

Nikolay Sivov : xmllite: Store prefix for elements.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 635c40912601589224e2c60be714c5b5a27597f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635c40912601589224e2c60be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:23 2016 +0300 xmllite: Store prefix for elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 68 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c3b68d2..8978d97 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -228,8 +228,9 @@ struct attribute struct element { struct list entry; - strval qname; + strval prefix; strval localname; + strval qname; }; typedef struct @@ -282,6 +283,14 @@ static inline void *reader_alloc(xmlreader *reader, size_t len) return m_alloc(reader->imalloc, len); } +static inline void *reader_alloc_zero(xmlreader *reader, size_t len) +{ + void *ret = reader_alloc(reader, len); + if (ret) + memset(ret, 0, len); + return ret; +} + static inline void reader_free(xmlreader *reader, void *mem) { m_free(reader->imalloc, mem); @@ -448,39 +457,44 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } -static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) +static void reader_free_element(xmlreader *reader, struct element *element) { - struct element *elem; - HRESULT hr; - - elem = reader_alloc(reader, sizeof(*elem)); - if (!elem) return E_OUTOFMEMORY; - - hr = reader_strvaldup(reader, qname, &elem->qname); - if (FAILED(hr)) { - reader_free(reader, elem); - return hr; - } + reader_free_strvalued(reader, &element->prefix); + reader_free_strvalued(reader, &element->localname); + reader_free_strvalued(reader, &element->qname); + reader_free(reader, element); +} - hr = reader_strvaldup(reader, localname, &elem->localname); - if (FAILED(hr)) - { - reader_free_strvalued(reader, &elem->qname); - reader_free(reader, elem); - return hr; - } +static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *localname, + strval *qname) +{ + struct element *element; + HRESULT hr; if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); - if (FAILED(hr)) { - reader_free(reader, elem); + if (FAILED(hr)) return hr; - } } - list_add_head(&reader->elements, &elem->entry); + element = reader_alloc_zero(reader, sizeof(*element)); + if (!element) + goto failed; + + if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || + (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK || + (hr = reader_strvaldup(reader, qname, &element->qname)) != S_OK) + { + reader_free_element(reader, element); + goto failed; + } + + list_add_head(&reader->elements, &element->entry); reader->is_empty_element = FALSE; + +failed: + reader_dec_depth(reader); return hr; } @@ -2077,6 +2091,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* skip '/>' */ reader_skipn(reader, 2); reader->is_empty_element = TRUE; + reader->empty_element.prefix = *prefix; reader->empty_element.localname = *local; reader->empty_element.qname = *qname; return S_OK; @@ -2087,7 +2102,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '>' */ reader_skipn(reader, 1); - return reader_push_element(reader, qname, local); + return reader_push_element(reader, prefix, local, qname); } hr = reader_parse_attribute(reader); @@ -2134,8 +2149,8 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_Prefix, &prefix); + reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -2178,6 +2193,7 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader->instate = XmlReadInState_MiscEnd; reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname);

1 0

Tag wine-2.0-rc1 : Alexandre Julliard : Release 2.0-rc1
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: refs/tags/wine-2.0-rc1 Tag: bdcc805088ebcf676e16c83fb163c2dd80936ce5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=bdcc805088ebcf676e16c83fb163… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:35:07 2016 +0100 Release 2.0-rc1

1 0

Alexandre Julliard : Release 2.0-rc1.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 4c7f3f8af856888f5ab020b2a32d0b01db0c82f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f3f8af856888f5ab020b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 20:35:07 2016 +0100 Release 2.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 578 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 340 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7f3f8af856888f5ab02…

1 0

Hans Leidekker : dpnet/tests: Register firewall exceptions for the server test.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 0aaf1d9f6c9c6fa859cfac33645d27816909e669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aaf1d9f6c9c6fa859cfac336… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:06 2016 +0100 dpnet/tests: Register firewall exceptions for the server test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/server.c | 182 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 307167f..bfc21b0 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -20,6 +20,8 @@ #include <stdio.h> #include <dplay8.h> +#define COBJMACROS +#include <netfw.h> #include "wine/test.h" /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ @@ -180,6 +182,164 @@ static void test_server_info(void) } } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR dpnsvrW[] = + {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', + 'd','p','n','s','v','r','.','e','x','e',0}; + static const WCHAR dpnsvr_wow64W[] = + {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\', + 'd','p','n','s','v','r','.','e','x','e',0}; + static const WCHAR clientW[] = + {'d','p','n','e','t','_','c','l','i','e','n','t',0}; + static const WCHAR serverW[] = + {'d','p','n','e','t','_','s','e','r','v','e','r',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + BOOL is_wow64; + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( clientW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + if (hr != S_OK) goto done; + + INetFwAuthorizedApplication_Release( app ); + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + SysFreeString( image ); + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + image = is_wow64 ? SysAllocString( dpnsvr_wow64W ) : SysAllocString( dpnsvrW ); + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( serverW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + /* taken from programs/winetest/main.c */ static BOOL is_stub_dll(const char *filename) { @@ -209,6 +369,7 @@ static BOOL is_stub_dll(const char *filename) START_TEST(server) { HRESULT hr; + BOOL firewall_enabled; if (!winetest_interactive && (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || @@ -218,13 +379,32 @@ START_TEST(server) return; } + if ((firewall_enabled = is_firewall_enabled()) && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + hr = CoInitialize(0); ok( hr == S_OK, "failed to init com\n"); if (hr != S_OK) - return; + goto done; create_server(); test_server_info(); CoUninitialize(); + +done: + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Hans Leidekker : dpnet/tests: Register a firewall exception for the client test.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 7e7ad5a79d0833ebdadc3b10bf9c3b3ef1ea7383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ad5a79d0833ebdadc3b10b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:05 2016 +0100 dpnet/tests: Register a firewall exception for the client test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/client.c | 146 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index d7f6d71..4b8cacd 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dxguid uuid dpnet ole32 version +IMPORTS = dxguid uuid dpnet ole32 oleaut32 version advapi32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index db08f73..a1817a4 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -22,6 +22,9 @@ #include <dplay8.h> #include <dplobby8.h> +#include <winver.h> +#define COBJMACROS +#include <netfw.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; @@ -606,6 +609,127 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'d','p','n','e','t','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + /* taken from programs/winetest/main.c */ static BOOL is_stub_dll(const char *filename) { @@ -634,6 +758,8 @@ static BOOL is_stub_dll(const char *filename) START_TEST(client) { + BOOL firewall_enabled; + if (!winetest_interactive && (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) @@ -642,8 +768,23 @@ START_TEST(client) return; } - if(!test_init_dp()) + if ((firewall_enabled = is_firewall_enabled()) && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); return; + } + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + + if (!test_init_dp()) goto done; test_enum_service_providers(); test_enum_hosts(); @@ -659,4 +800,7 @@ START_TEST(client) test_get_sp_caps_peer(); test_player_info_peer(); test_cleanup_dp_peer(); + +done: + if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Brock York : msctf: Remove incorrect dereference of double pointer.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: d7662881a52305045aa01e6dff8275331a67f70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7662881a52305045aa01e6df… Author: Brock York <twunknown(a)gmail.com> Date: Sat Dec 10 01:05:48 2016 +1100 msctf: Remove incorrect dereference of double pointer. Signed-off-by: Brock York <twunknown(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e1f56f1..62ddfd2 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1187,7 +1187,7 @@ static HRESULT WINAPI UIElementMgr_QueryInterface(ITfUIElementMgr *iface, REFIID { ThreadMgr *This = impl_from_ITfUIElementMgr(iface); - return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, *ppvOut); + return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, ppvOut); } static ULONG WINAPI UIElementMgr_AddRef(ITfUIElementMgr *iface)

1 0

Nikolay Sivov : xmllite/tests: Some tests for returned namespace prefixes and uris.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: dec0e471490758d2c79adaa89ea716ff89146498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec0e471490758d2c79adaa89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:33 2016 +0300 xmllite/tests: Some tests for returned namespace prefixes and uris. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f9d4821..8e50b13 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1906,6 +1906,139 @@ static void test_reader_properties(void) IXmlReader_Release(reader); } +static void test_prefix(void) +{ + static const struct + { + const char *xml; + const char *prefix1; + const char *prefix2; + const char *prefix3; + } prefix_tests[] = + { + { "", "", "", "xml" }, + }; + IXmlReader *reader; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { + const WCHAR *prefix; + XmlNodeType type; + WCHAR *expected; + IStream *stream; + + stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "Read() failed, %#x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix1); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); + + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix2); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "MoveToNextAttribute() failed, %#x.\n", hr); + + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); + ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); + + expected = a2w(prefix_tests[i].prefix3); + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); + ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), + wine_dbgstr_w(expected)); + free_str(expected); + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + +static void test_namespaceuri(void) +{ + struct uri_test + { + const char *xml; + const char *uri[5]; + } uri_tests[] = + { + { "<a xmlns=\"defns a\"><c xmlns=\"defns c\"/></a>", + { "defns a", "defns b", "defns c", "defns b", "defns a" }}, + { "<r:a xmlns=\"defns a\" xmlns:r=\"ns r\"/>", + { "ns r" }}, + { "<r:a xmlns=\"defns a\" xmlns:r=\"ns r\"></r:a>", + { "ns r", "defns a", "ns r" }}, + { "<a xmlns=\"defns a\" xmlns:r=\"ns r\"><r:b/></a>", + { "defns a", "ns r", "defns a" }}, + { "<a><c/></a>", + { "", "", "", "", "" }}, + }; + IXmlReader *reader; + XmlNodeType type; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { + IStream *stream = create_stream_on_data(uri_tests[i].xml, strlen(uri_tests[i].xml) + 1); + unsigned int j = 0; + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + while (IXmlReader_Read(reader, &type) == S_OK) { + const WCHAR *uri, *local; + WCHAR *uriW; + + ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement, "Unexpected node type %d.\n", type); + + hr = IXmlReader_GetLocalName(reader, &local, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + uriW = a2w(uri_tests[i].uri[j]); + ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri)); + free_str(uriW); + + j++; + } + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -1925,4 +2058,6 @@ START_TEST(reader) test_readvaluechunk(); test_read_xmldeclaration(); test_reader_properties(); + test_prefix(); + test_namespaceuri(); }

1 0

Nikolay Sivov : xmllite: Allow prefixed element names.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 682d4f147ccb2f7b2e77f09ed4e85deaa6c45d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=682d4f147ccb2f7b2e77f09ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:32 2016 +0300 xmllite: Allow prefixed element names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +--- dlls/xmllite/tests/reader.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ef535e6..2dadfa2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2233,9 +2233,7 @@ static HRESULT reader_parse_element(xmlreader *reader) hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); if (FAILED(hr)) return hr; - /* FIXME: need to check for defined namespace to reject invalid prefix, - currently reject all prefixes */ - if (prefix.len) return NC_E_UNDECLAREDPREFIX; + /* FIXME: need to check for defined namespace to reject invalid prefix */ /* if we got empty element and stack is empty go straight to Misc */ if (empty && list_empty(&reader->elements)) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 3658d52..f9d4821 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1362,7 +1362,8 @@ static void test_read_element(void) if (test->hr_broken) ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + todo_wine_if(test->hr == NC_E_UNDECLAREDPREFIX) + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str;

1 0

Nikolay Sivov : xmllite: Implement GetNamespaceUri().
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 13afa65fb11845a72905c43012ed54e4814244e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13afa65fb11845a72905c4301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:29 2016 +0300 xmllite: Implement GetNamespaceUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 09c8e30..24a061c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -216,8 +216,10 @@ typedef struct } strval; static WCHAR emptyW[] = {0}; +static WCHAR xmlW[] = {'x','m','l',0}; static WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const strval strval_empty = { emptyW }; +static const strval strval_xml = { xmlW, 3 }; static const strval strval_xmlns = { xmlnsW, 5 }; struct attribute @@ -2881,12 +2883,103 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam return S_OK; } -static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, - LPCWSTR *namespaceUri, - UINT *namespaceUri_length) +static struct ns *reader_lookup_ns(xmlreader *reader, const strval *prefix) { - FIXME("(%p %p %p): stub\n", iface, namespaceUri, namespaceUri_length); - return E_NOTIMPL; + struct list *nslist = prefix ? &reader->ns : &reader->nsdef; + struct ns *ns; + + LIST_FOR_EACH_ENTRY_REV(ns, nslist, struct ns, entry) { + if (strval_eq(reader, prefix, &ns->prefix)) + return ns; + } + + return NULL; +} + +static struct ns *reader_lookup_nsdef(xmlreader *reader) +{ + if (list_empty(&reader->nsdef)) + return NULL; + + return LIST_ENTRY(list_head(&reader->nsdef), struct ns, entry); +} + +static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR **uri, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + const strval *prefix = &This->strvalues[StringValue_Prefix]; + XmlNodeType nodetype; + struct ns *ns; + UINT length; + + TRACE("(%p %p %p)\n", iface, uri, len); + + if (!len) + len = &length; + + *uri = NULL; + *len = 0; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Attribute: + { + static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + '2','0','0','0','/','x','m','l','n','s','/',0}; + static const WCHAR xml_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + 'X','M','L','/','1','9','9','8','/','n','a','m','e','s','p','a','c','e',0}; + const strval *local = &This->strvalues[StringValue_LocalName]; + + /* check for reserved prefixes first */ + if ((strval_eq(This, prefix, &strval_empty) && strval_eq(This, local, &strval_xmlns)) || + strval_eq(This, prefix, &strval_xmlns)) + { + *uri = xmlns_uriW; + *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + } + else if (strval_eq(This, prefix, &strval_xml)) { + *uri = xml_uriW; + *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + } + + if (!*uri) { + ns = reader_lookup_ns(This, prefix); + if (ns) { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else { + *uri = emptyW; + *len = 0; + } + } + } + break; + case XmlNodeType_Element: + case XmlNodeType_EndElement: + { + ns = reader_lookup_ns(This, prefix); + + /* pick top default ns if any */ + if (!ns) + ns = reader_lookup_nsdef(This); + + if (ns) { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else { + *uri = emptyW; + *len = 0; + } + } + break; + default: + FIXME("Unhandled node type %d\n", nodetype); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len)

1 0

Nikolay Sivov : xmllite: Free prefix and local name too when clearing element list.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 249b7a99a73fd43ae1642c93d34c0b10dae1779c URL: http://source.winehq.org/git/wine.git/?a=commit;h=249b7a99a73fd43ae1642c93d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:28 2016 +0300 xmllite: Free prefix and local name too when clearing element list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d8d031d..09c8e30 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -456,6 +456,8 @@ static void reader_clear_elements(xmlreader *reader) struct element *elem, *elem2; LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) { + reader_free_strvalued(reader, &elem->prefix); + reader_free_strvalued(reader, &elem->localname); reader_free_strvalued(reader, &elem->qname); reader_free(reader, elem); }

1 0

Nikolay Sivov : xmllite: Update prefix when moving to first attribute.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 585735a0daf9f6b8b38b9b64fa88e85d96832883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585735a0daf9f6b8b38b9b64f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:27 2016 +0300 xmllite: Update prefix when moving to first attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 874de75..d8d031d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2828,6 +2828,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) if (next) { This->attr = LIST_ENTRY(next, struct attribute, entry); + reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); reader_set_strvalue(This, StringValue_Value, &This->attr->value); }

1 0

Nikolay Sivov : xmllite: Keep namespace list updated when going through document tree.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 65ee2b734a35f45688486e27a4329a1ea81e3f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ee2b734a35f45688486e27a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:25 2016 +0300 xmllite: Keep namespace list updated when going through document tree. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 80 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 500db62..351f872 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -512,6 +512,23 @@ static void reader_free_element(xmlreader *reader, struct element *element) reader_free(reader, element); } +static void reader_mark_ns_nodes(xmlreader *reader, struct element *element) +{ + struct ns *ns; + + LIST_FOR_EACH_ENTRY(ns, &reader->ns, struct ns, entry) { + if (ns->element) + break; + ns->element = element; + } + + LIST_FOR_EACH_ENTRY(ns, &reader->nsdef, struct ns, entry) { + if (ns->element) + break; + ns->element = element; + } +} + static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *localname, strval *qname) { @@ -538,6 +555,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *lo } list_add_head(&reader->elements, &element->entry); + reader_mark_ns_nodes(reader, element); reader->is_empty_element = FALSE; failed: @@ -545,18 +563,48 @@ failed: return hr; } -static void reader_pop_element(xmlreader *reader) +static void reader_pop_ns_nodes(xmlreader *reader, struct element *element) { - struct element *elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + struct ns *ns, *ns2; - if (elem) - { - list_remove(&elem->entry); - reader_free_strvalued(reader, &elem->qname); - reader_free_strvalued(reader, &elem->localname); - reader_free(reader, elem); - reader_dec_depth(reader); + LIST_FOR_EACH_ENTRY_SAFE_REV(ns, ns2, &reader->ns, struct ns, entry) { + if (ns->element != element) + break; + + list_remove(&ns->entry); + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); } + + if (!list_empty(&reader->nsdef)) { + ns = LIST_ENTRY(list_head(&reader->nsdef), struct ns, entry); + if (ns->element == element) { + list_remove(&ns->entry); + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + } +} + +static void reader_pop_element(xmlreader *reader) +{ + struct element *element; + + if (list_empty(&reader->elements)) + return; + + element = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + list_remove(&element->entry); + + reader_pop_ns_nodes(reader, element); + reader_free_element(reader, element); + reader_dec_depth(reader); + + /* It was a root element, the rest is expected as Misc */ + if (list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; } /* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' @@ -2139,6 +2187,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader->empty_element.prefix = *prefix; reader->empty_element.localname = *local; reader->empty_element.qname = *qname; + reader_mark_ns_nodes(reader, &reader->empty_element); return S_OK; } @@ -2231,12 +2280,6 @@ static HRESULT reader_parse_endtag(xmlreader *reader) elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); if (!strval_eq(reader, &elem->qname, &qname)) return WC_E_ELEMENTMATCH; - reader_pop_element(reader); - - /* It was a root element, the rest is expected as Misc */ - if (list_empty(&reader->elements)) - reader->instate = XmlReadInState_MiscEnd; - reader->nodetype = XmlNodeType_EndElement; reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); @@ -2415,11 +2458,18 @@ static HRESULT reader_parse_content(xmlreader *reader) static HRESULT reader_parse_nextnode(xmlreader *reader) { + XmlNodeType nodetype = reader_get_nodetype(reader); HRESULT hr; if (!is_reader_pending(reader)) reader_clear_attrs(reader); + /* When moving from EndElement or empty element, pop its own namespace defitions */ + if (nodetype == XmlNodeType_Element && reader->is_empty_element) + reader_pop_ns_nodes(reader, &reader->empty_element); + else if (nodetype == XmlNodeType_EndElement) + reader_pop_element(reader); + while (1) { switch (reader->instate)

1 0

Nikolay Sivov : xmllite: Keep a list of namespace definitions.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 18d6deff6d844d841844d2d7c63405742d74b7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d6deff6d844d841844d2d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:24 2016 +0300 xmllite: Keep a list of namespace definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 102 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8978d97..500db62 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -216,11 +216,14 @@ typedef struct } strval; static WCHAR emptyW[] = {0}; +static WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const strval strval_empty = { emptyW }; +static const strval strval_xmlns = { xmlnsW, 5 }; struct attribute { struct list entry; + strval prefix; strval localname; strval value; }; @@ -233,6 +236,14 @@ struct element strval qname; }; +struct ns +{ + struct list entry; + strval prefix; + strval uri; + struct element *element; +}; + typedef struct { IXmlReader IXmlReader_iface; @@ -250,6 +261,8 @@ typedef struct struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list nsdef; + struct list ns; struct list elements; strval strvalues[StringValue_Last]; UINT depth; @@ -369,13 +382,17 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ -static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *value) { struct attribute *attr; attr = reader_alloc(reader, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; + if (prefix) + attr->prefix = *prefix; + else + memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->localname = *localname; attr->value = *value; list_add_tail(&reader->attrs, &attr->entry); @@ -457,6 +474,36 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } +static HRESULT reader_push_ns(xmlreader *reader, const strval *prefix, const strval *uri, BOOL def) +{ + struct ns *ns; + HRESULT hr; + + ns = reader_alloc(reader, sizeof(*ns)); + if (!ns) return E_OUTOFMEMORY; + + if (def) + memset(&ns->prefix, 0, sizeof(ns->prefix)); + else { + hr = reader_strvaldup(reader, prefix, &ns->prefix); + if (FAILED(hr)) { + reader_free(reader, ns); + return hr; + } + } + + hr = reader_strvaldup(reader, uri, &ns->uri); + if (FAILED(hr)) { + reader_free_strvalued(reader, &ns->prefix); + reader_free(reader, ns); + return hr; + } + + ns->element = NULL; + list_add_head(def ? &reader->nsdef : &reader->ns, &ns->entry); + return hr; +} + static void reader_free_element(xmlreader *reader, struct element *element) { reader_free_strvalued(reader, &element->prefix); @@ -1056,7 +1103,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -1132,7 +1179,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1174,7 +1221,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1644,7 +1691,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, &name, &pub); + hr = reader_add_attr(reader, NULL, &name, &pub); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1655,7 +1702,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, &name, &sys); + hr = reader_add_attr(reader, NULL, &name, &sys); if (FAILED(hr)) return hr; return S_OK; @@ -1669,7 +1716,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, &name, &sys); + return reader_add_attr(reader, NULL, &name, &sys); } return S_FALSE; @@ -2042,23 +2089,18 @@ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) [15 NS] Attribute ::= NSAttName Eq AttValue | QName Eq AttValue */ static HRESULT reader_parse_attribute(xmlreader *reader) { - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; - strval prefix, local, qname, xmlns, value; + strval prefix, local, qname, value; + BOOL ns = FALSE, nsdef = FALSE; HRESULT hr; hr = reader_parse_qname(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; - reader_init_cstrvalue((WCHAR*)xmlnsW, 5, &xmlns); - - if (strval_eq(reader, &prefix, &xmlns)) - { - FIXME("namespace definitions not supported\n"); - return E_NOTIMPL; - } + if (strval_eq(reader, &prefix, &strval_xmlns)) + ns = TRUE; - if (strval_eq(reader, &qname, &xmlns)) - FIXME("default namespace definitions not supported\n"); + if (strval_eq(reader, &qname, &strval_xmlns)) + ns = nsdef = TRUE; hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -2066,8 +2108,11 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; + if (ns) + reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); + TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &local, &value); + return reader_add_attr(reader, &prefix, &local, &value); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2487,6 +2532,22 @@ static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) return ref; } +static void reader_clear_ns(xmlreader *reader) +{ + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->ns, struct ns, entry) { + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->nsdef, struct ns, entry) { + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } +} + static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); @@ -2501,6 +2562,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (This->resolver) IXmlResolver_Release(This->resolver); if (This->mlang) IUnknown_Release(This->mlang); reader_clear_attrs(This); + reader_clear_ns(This); reader_clear_elements(This); reader_free_strvalues(This); reader_free(This, This); @@ -3044,6 +3106,8 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->nsdef); + list_init(&reader->ns); list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256;

1 0

Nikolay Sivov : xmllite: Improve writer methods tracing.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: a39251b09634db16d48c1da079e51dfb2d5dc644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39251b09634db16d48c1da07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:21 2016 +0300 xmllite: Improve writer methods tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index bcc0e85..f7f2604 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -447,7 +447,7 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlWriter)) @@ -463,23 +463,23 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->>(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { struct element *element, *element2; IMalloc *imalloc = This->imalloc; - IXmlWriter_Flush(iface); + writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); /* element stack */

1 0

Nikolay Sivov : xmllite: Store empty element fields separately.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: f185dd51fdb4c1afeb2771445e3db304790f1eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185dd51fdb4c1afeb2771445… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:22 2016 +0300 xmllite: Store empty element fields separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9484173..c3b68d2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -253,7 +253,8 @@ typedef struct strval strvalues[StringValue_Last]; UINT depth; UINT max_depth; - BOOL empty_element; + BOOL is_empty_element; + struct element empty_element; UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -433,7 +434,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; } static HRESULT reader_inc_depth(xmlreader *reader) @@ -479,7 +480,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *loc } list_add_head(&reader->elements, &elem->entry); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; return hr; } @@ -2075,7 +2076,9 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '/>' */ reader_skipn(reader, 2); - reader->empty_element = TRUE; + reader->is_empty_element = TRUE; + reader->empty_element.localname = *local; + reader->empty_element.qname = *qname; return S_OK; } @@ -2707,7 +2710,6 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - struct element *elem; TRACE("(%p)\n", This); @@ -2715,11 +2717,16 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) This->attr = NULL; /* FIXME: support other node types with 'attributes' like DTD */ - elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (elem) - { - reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); - reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + if (This->is_empty_element) { + reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); + reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); + } + else { + struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + if (element) { + reader_set_strvalue(This, StringValue_LocalName, &element->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); + } } return S_OK; @@ -2841,7 +2848,7 @@ static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) TRACE("(%p)\n", This); /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense when current node is start tag of an element */ - return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->is_empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -3024,7 +3031,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256; - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++)

1 0

Hans Leidekker : dpnet/tests: Skip tests if dpnet is a stub dll.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: e017d9bcd4b34a45854ed43642b65b98c7cd920c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e017d9bcd4b34a45854ed4364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 18:03:04 2016 +0100 dpnet/tests: Skip tests if dpnet is a stub dll. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 2 +- dlls/dpnet/tests/address.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dpnet/tests/client.c | 34 ++++++++++++++++++++++++++++++++++ dlls/dpnet/tests/server.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in index 13eae44..d7f6d71 100644 --- a/dlls/dpnet/tests/Makefile.in +++ b/dlls/dpnet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dpnet.dll -IMPORTS = dxguid uuid dpnet ole32 +IMPORTS = dxguid uuid dpnet ole32 version C_SRCS = \ address.c \ diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index dd0ef23..16ba6a7 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -353,10 +353,44 @@ static void address_duplicate(void) } } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(address) { HRESULT hr; + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + hr = CoInitialize(0); ok(hr == S_OK, "failed to init com\n"); if(hr != S_OK) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 68b3832..db08f73 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -606,8 +606,42 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(client) { + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + if(!test_init_dp()) return; diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 928c6a0..307167f 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -180,10 +180,44 @@ static void test_server_info(void) } } +/* taken from programs/winetest/main.c */ +static BOOL is_stub_dll(const char *filename) +{ + DWORD size, ver; + BOOL isstub = FALSE; + char *p, *data; + + size = GetFileVersionInfoSizeA(filename, &ver); + if (!size) return FALSE; + + data = HeapAlloc(GetProcessHeap(), 0, size); + if (!data) return FALSE; + + if (GetFileVersionInfoA(filename, ver, size, data)) + { + char buf[256]; + + sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); + if (VerQueryValueA(data, buf, (void**)&p, &size)) + isstub = !lstrcmpiA("wcodstub.dll", p); + } + HeapFree(GetProcessHeap(), 0, data); + + return isstub; +} + START_TEST(server) { HRESULT hr; + if (!winetest_interactive && + (is_stub_dll("c:\\windows\\system32\\dpnet.dll") || + is_stub_dll("c:\\windows\\syswow64\\dpnet.dll"))) + { + win_skip("dpnet is a stub dll, skipping tests\n"); + return; + } + hr = CoInitialize(0); ok( hr == S_OK, "failed to init com\n"); if (hr != S_OK)

1 0

Michael Stefaniuc : dsound: Avoid casts from COM object to interface.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 48b32c78d29950443ee6f279f49b099a3960b979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b32c78d29950443ee6f279f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 9 16:10:05 2016 +0100 dsound: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 43b252d..e8c10a7 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -452,8 +452,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( if (device->primary) { WARN("Primary Buffer already created\n"); - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); - *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); + IDirectSoundBuffer8_AddRef(&device->primary->IDirectSoundBuffer8_iface); + *ppdsb = (IDirectSoundBuffer *)&device->primary->IDirectSoundBuffer8_iface; } else { hres = primarybuffer_create(device, &device->primary, dsbd); if (device->primary) {

1 0

Nikolay Sivov : xmllite: Add maintainer entry.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 831c202c38e97730c5446b95c8a542714febd99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=831c202c38e97730c5446b95c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:34 2016 +0300 xmllite: Add maintainer entry. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + dlls/xmllite/reader.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 55a7834..cec6cdb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -265,6 +265,7 @@ F: dlls/winex11.drv/ XML parsing M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/msxml*/ +F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2dadfa2..0fedd91 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Nikolay Sivov : xmllite: Improve GetValue() for namespace definition nodes.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 20c575e81fdf2038a37eae2ac9bdb809a2542de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c575e81fdf2038a37eae2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:30 2016 +0300 xmllite: Improve GetValue() for namespace definition nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 24a061c..47649f5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3002,6 +3002,18 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UI return S_OK; } +static BOOL is_namespace_definition(xmlreader *reader) +{ + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; + + if (reader_get_nodetype(reader) != XmlNodeType_Attribute) + return FALSE; + + return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns)); +} + static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); @@ -3032,6 +3044,18 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, val->str = ptr; } + /* For namespace definition attributes return values from namespace list */ + if (is_namespace_definition(reader)) { + const strval *local = &reader->strvalues[StringValue_LocalName]; + struct ns *ns; + + ns = reader_lookup_ns(reader, local); + if (!ns) + ns = reader_lookup_nsdef(reader); + + val = &ns->uri; + } + *value = val->str; if (len) *len = val->len; return S_OK;

1 0

Józef Kucia : wined3d: Do not try to create texture views for depth slices.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: b76f39936f8ae3da33c29424477ca0ba817822c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f39936f8ae3da33c294244… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:44 2016 +0100 wined3d: Do not try to create texture views for depth slices. 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/view.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 237122d..27ee9d2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,6 +65,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target const struct wined3d_format *view_format) { const struct wined3d_gl_info *gl_info; + unsigned int layer_idx, layer_count; struct wined3d_context *context; struct gl_texture *gl_texture; @@ -83,10 +84,19 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target wined3d_texture_prepare_texture(texture, context, FALSE); gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + layer_idx = desc->u.texture.layer_idx; + layer_count = desc->u.texture.layer_count; + if (view_target == GL_TEXTURE_3D && (layer_idx || layer_count != 1)) + { + FIXME("Depth slice (%u-%u) not supported.\n", layer_idx, layer_count); + layer_idx = 0; + layer_count = 1; + } + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); + layer_idx, layer_count)); checkGLcall("Create texture view"); if (is_stencil_view_format(view_format))

1 0

Józef Kucia : wined3d: Generate declaration for typed buffer UAVs.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: bdccf5e1e0930e8354426af5cd36cb5a716d68d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdccf5e1e0930e8354426af5c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:38 2016 +0100 wined3d: Generate declaration for typed buffer 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 627832c..a800939 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2123,6 +2123,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont switch (reg_maps->uav_resource_info[i].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + image_type = "imageBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: image_type = "image2D"; break;

1 0

Józef Kucia : wined3d: Allow creating raw shader resource views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: c5719b4fc4bb6a2b3e0985eb2c153d3dddf67388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5719b4fc4bb6a2b3e0985eb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:37 2016 +0100 wined3d: Allow creating raw shader resource views. 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/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ef602de..adbd159 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -375,7 +375,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_format *view_format; view_format = wined3d_get_format(gl_info, desc->format_id); - if (wined3d_format_is_typeless(view_format)) + if (wined3d_format_is_typeless(view_format) + && !(view_format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG;

1 0

Lauri Kenttä : user32/tests: Add tests for LockWindowUpdate.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 26be29138f71fe6a937ef35b0d77be7630d2f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26be29138f71fe6a937ef35b0… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 8 20:49:18 2016 +0200 user32/tests: Add tests for LockWindowUpdate. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 428a88f..375d387 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9325,6 +9325,76 @@ todo_wine ok(ret, "got %d\n", ret); } +static void test_LockWindowUpdate(HWND parent) +{ + typedef struct + { + HWND hwnd_lock, hwnd_draw; + BOOL allow_drawing; + BOOL expect_valid; + } TEST; + + int i; + HWND child = CreateWindowA("static", 0, WS_CHILD | WS_VISIBLE, 0, 0, 20, 20, parent, 0, 0, 0); + + TEST tests[] = { + {child, child, 0, 0}, + {child, child, 1, 1}, + {child, parent, 0, 1}, + {child, parent, 1, 1}, + {parent, child, 0, 0}, + {parent, child, 1, 1}, + {parent, parent, 0, 0}, + {parent, parent, 1, 1} + }; + + if (!child) + { + skip("CreateWindow failed, skipping LockWindowUpdate tests\n"); + return; + } + + ShowWindow(parent, SW_SHOW); + UpdateWindow(parent); + flush_events(TRUE); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + HDC hdc; + POINT p = {10, 10}; + BOOL ret; + const DWORD dc_flags = DCX_USESTYLE | (tests[i].allow_drawing ? DCX_LOCKWINDOWUPDATE : 0); + const COLORREF c1 = 0x111100, c2 = 0x222200; + + trace("hwnd_lock = %s, hwnd_draw = %s, allow_drawing = %d\n", + tests[i].hwnd_lock == parent ? "parent" : "child", + tests[i].hwnd_draw == parent ? "parent" : "child", + tests[i].allow_drawing); + + hdc = GetDCEx(tests[i].hwnd_draw, 0, dc_flags); + +#define TEST_PIXEL(c_valid, c_invalid) \ + do { \ + COLORREF c = GetPixel(hdc, p.x, p.y); \ + COLORREF e = tests[i].expect_valid ? (c_valid) : (c_invalid); \ + todo_wine_if(!tests[i].expect_valid) \ + ok(c == e, "GetPixel: got %08x, expected %08x\n", c, e); \ + } while (0) + + SetPixel(hdc, p.x, p.y, c1); + ret = LockWindowUpdate(tests[i].hwnd_lock); + ok(ret, "LockWindowUpdate failed\n"); + TEST_PIXEL(c1, CLR_INVALID); + SetPixel(hdc, p.x, p.y, c2); + TEST_PIXEL(c2, CLR_INVALID); + LockWindowUpdate(0); + TEST_PIXEL(c2, c1); + ReleaseDC(tests[i].hwnd_draw, hdc); +#undef TEST_PIXEL + } + DestroyWindow(child); +} + START_TEST(win) { char **argv; @@ -9470,6 +9540,7 @@ START_TEST(win) test_activateapp(hwndMain); test_winproc_handles(argv[0]); test_deferwindowpos(); + test_LockWindowUpdate(hwndMain); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Bruno Jesus : xinput9_1_0: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: c0f77b4a4a2a389f54c3572156883eec6d6314d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f77b4a4a2a389f54c357215… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:06 2016 -0200 xinput9_1_0: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput9_1_0/Makefile.in | 3 --- dlls/xinput9_1_0/xinput9_1_0_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index df8a574..0c4b7e7 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput9_1_0.dll -C_SRCS = \ - xinput9_1_0_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput9_1_0/xinput9_1_0_main.c b/dlls/xinput9_1_0/xinput9_1_0_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput9_1_0/xinput9_1_0_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Bruno Jesus : xinput1_2: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 07258c7d4b5143b0a33db933d71882bfbcfc3e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07258c7d4b5143b0a33db933d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:04 2016 -0200 xinput1_2: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_2/Makefile.in | 3 --- dlls/xinput1_2/xinput1_2_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 3eaec14..16fed94 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_2.dll -C_SRCS = \ - xinput1_2_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_2/xinput1_2_main.c b/dlls/xinput1_2/xinput1_2_main.c deleted file mode 100644 index 2de4317..0000000 --- a/dlls/xinput1_2/xinput1_2_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2008 Andrew Fenn - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Nikolay Sivov : ws2_32: Fix build failure on Mac.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 24dbd9de9374e26721ddfb0e2cfedb504189e1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dbd9de9374e26721ddfb0e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 08:11:49 2016 +0300 ws2_32: Fix build failure on Mac. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3cdeade..6bf3c9d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1230,7 +1230,7 @@ static BOOL get_dont_fragment(SOCKET s, int level, BOOL *out) static int once; if (!once++) FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE /* fake success */ + return TRUE; /* fake success */ #endif }

1 0

Huw Davies : windowscodecs: Fix typo in 2 bpp conversion.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: a531ade2fdaa21571b0adeb01c9b17b67ed92850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a531ade2fdaa21571b0adeb01… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:38:04 2016 +0000 windowscodecs: Fix typo in 2 bpp conversion. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5bce44..e5d61e1 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -257,7 +257,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe *dstpixel++ = colors[srcval>>6]; if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; - if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + if (x+3 < prc->Width) *dstpixel++ = colors[srcval&0x3]; } srcrow += srcstride; dstrow += cbStride;

1 0

Huw Davies : user32/tests: Add a test to show that released cache DCs are disabled.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 78983d9fcd9f9e84748df68b8ce4e4981f678e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78983d9fcd9f9e84748df68b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 14:17:31 2016 +0000 user32/tests: Add a test to show that released cache DCs are disabled. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 6ba234e..b5f9722 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -110,6 +110,12 @@ static void test_dc_attributes(void) } while (i > 0) ReleaseDC( hwnd_cache, hdcs[--i] ); + /* Released cache DCs are 'disabled' */ + rop = SetROP2( old_hdc, R2_BLACK ); + todo_wine ok( rop == 0, "got %d\n", rop ); + rop = GetROP2( old_hdc ); + todo_wine ok( rop == 0, "got %d\n", rop ); + /* test own DC */ hdc = GetDC( hwnd_owndc );

1 0

Józef Kucia : wined3d: Create texture views for unordered access views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 2dcfd128e1d172b477748f4dc9cbdeb3a9bc5896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcfd128e1d172b477748f4dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:45 2016 +0100 wined3d: Create texture views for unordered access views. 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/context.c | 17 ++++++++++++++--- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2ce99cb..61a9f61 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3406,8 +3406,9 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, struct wined3d_unordered_access_view *view; struct wined3d_texture *texture; struct wined3d_shader *shader; - struct gl_texture *gl_texture; + GLuint texture_name; unsigned int i; + GLint level; context->uses_uavs = 0; @@ -3438,8 +3439,18 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, wined3d_texture_load(texture, context, FALSE); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); - GL_EXTCALL(glBindImageTexture(i, gl_texture->name, view->level_idx, GL_TRUE, 0, GL_READ_WRITE, + if (view->gl_view.name) + { + texture_name = view->gl_view.name; + level = 0; + } + else + { + texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; + level = view->level_idx; + } + + GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); } checkGLcall("Bind unordered access views"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 27ee9d2..a57e890 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -610,8 +610,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - FIXME("Unordered access view unsupported yet (layers %u-%u).\n", - desc->u.texture.layer_idx, desc->u.texture.layer_count); + create_texture_view(&view->gl_view, get_texture_view_target(desc, texture), + desc, texture, view->format); } view->layer_idx = desc->u.texture.layer_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29143be..69ba146 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3321,7 +3321,7 @@ struct wined3d_unordered_access_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; - + struct wined3d_gl_view gl_view; unsigned int layer_idx; unsigned int layer_count; unsigned int level_idx;

1 0

Józef Kucia : d3d11/tests: Add test showing that depth/stencil UAVs are not allowed.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: f7bc122e007c82c45e3e46c9d540492d82c06ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bc122e007c82c45e3e46c9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:42 2016 +0100 d3d11/tests: Add test showing that depth/stencil UAVs are not allowed. 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 | 136 ++++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7bc122e007c82c45e3e4…

1 0

Józef Kucia : wined3d: Extract create_texture_view() function from shader resource views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 7d2bfe78518bbfaf3c2a2f48c43d5b85a3454af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bfe78518bbfaf3c2a2f48c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:41 2016 +0100 wined3d: Extract create_texture_view() function from shader resource views. 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/view.c | 120 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 9 +++- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index adbd159..036edf3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -30,6 +30,57 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } +static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, + const struct wined3d_view_desc *desc, struct wined3d_texture *texture, + const struct wined3d_format *view_format) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct gl_texture *gl_texture; + + view->target = view_target; + + context = context_acquire(texture->resource.device, NULL); + gl_info = context->gl_info; + + if (!gl_info->supported[ARB_TEXTURE_VIEW]) + { + context_release(context); + FIXME("OpenGL implementation does not support texture views.\n"); + return; + } + + wined3d_texture_prepare_texture(texture, context, FALSE); + gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); + + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + GL_EXTCALL(glTextureView(view->name, view->target, gl_texture->name, view_format->glInternal, + desc->u.texture.level_idx, desc->u.texture.level_count, + desc->u.texture.layer_idx, desc->u.texture.layer_count)); + checkGLcall("Create texture view"); + + if (is_stencil_view_format(view_format)) + { + static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; + + if (!gl_info->supported[ARB_STENCIL_TEXTURING]) + { + context_release(context); + FIXME("OpenGL implementation does not support stencil texturing.\n"); + return; + } + + context_bind_texture(context, view->target, view->name); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); + checkGLcall("Initialize stencil view"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + } + + context_release(context); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -259,14 +310,14 @@ static void wined3d_shader_resource_view_destroy_object(void *object) { struct wined3d_shader_resource_view *view = object; - if (view->object) + if (view->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(view->resource->device, NULL); gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } @@ -302,55 +353,6 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shader_resource_view *view, - const struct wined3d_view_desc *desc, struct wined3d_texture *texture, - const struct wined3d_format *view_format) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - struct gl_texture *gl_texture; - - context = context_acquire(texture->resource.device, NULL); - gl_info = context->gl_info; - - if (!gl_info->supported[ARB_TEXTURE_VIEW]) - { - context_release(context); - FIXME("OpenGL implementation does not support texture views.\n"); - return; - } - - wined3d_texture_prepare_texture(texture, context, FALSE); - gl_texture = wined3d_texture_get_gl_texture(texture, FALSE); - - gl_info->gl_ops.gl.p_glGenTextures(1, &view->object); - GL_EXTCALL(glTextureView(view->object, view->target, gl_texture->name, view_format->glInternal, - desc->u.texture.level_idx, desc->u.texture.level_count, - desc->u.texture.layer_idx, desc->u.texture.layer_count)); - checkGLcall("Create texture view"); - - if (is_stencil_view_format(view_format)) - { - static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; - - if (!gl_info->supported[ARB_STENCIL_TEXTURING]) - { - context_release(context); - FIXME("OpenGL implementation does not support stencil texturing.\n"); - return; - } - - context_bind_texture(context, view->target, view->object); - gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); - gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); - checkGLcall("Initialize stencil view"); - - context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); - } - - context_release(context); -} - static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -373,6 +375,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; + GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id); if (wined3d_format_is_typeless(view_format) @@ -386,9 +389,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; - view->target = GL_NONE; - view->object = 0; - if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Buffer shader resource views not supported.\n"); @@ -406,19 +406,19 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view->target = texture->target; + view_target = texture->target; for (i = 0; i < ARRAY_SIZE(view_types); ++i) { if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) { - view->target = view_types[i].view_target; + view_target = view_types[i].view_target; break; } } if (i == ARRAY_SIZE(view_types)) FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); - if (resource->format->id == view_format->id && texture->target == view->target + if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count && !is_stencil_view_format(view_format)) @@ -432,7 +432,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ else if (resource->format->typeless_id == view_format->typeless_id && resource->format->gl_view_class == view_format->gl_view_class) { - wined3d_shader_resource_view_create_texture_view(view, desc, texture, view_format); + create_texture_view(&view->gl_view, view_target, desc, texture, view_format); } else { @@ -476,9 +476,9 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view { struct wined3d_texture *texture; - if (view->object) + if (view->gl_view.name) { - context_bind_texture(context, view->target, view->object); + context_bind_texture(context, view->gl_view.target, view->gl_view.name); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2754b..29143be 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3292,6 +3292,12 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + struct wined3d_shader_resource_view { LONG refcount; @@ -3300,8 +3306,7 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; - GLenum target; - GLuint object; + struct wined3d_gl_view gl_view; }; void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view,

1 0

Józef Kucia : d3d10core/tests: Add more tests for bind flags.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 24989883384847cfa2afa7307462457f075b9c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24989883384847cfa2afa7307… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:40 2016 +0100 d3d10core/tests: Add more tests for bind flags. 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/d3d10core/tests/device.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 784a086..009442f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1236,8 +1236,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL, 0, + TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET | D3D10_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, @@ -1259,8 +1264,13 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL, 0, + FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, }; if (!(device = create_device())) @@ -1373,7 +1383,8 @@ static void test_create_texture2d(void) hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); todo_wine_if(tests[i].todo) - ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), + "Test %u: Got unexpected hr %#x (format %#x).\n", i, hr, desc.Format); if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture);

1 0

Józef Kucia : d3d11/tests: Add test for SM5 bufinfo instruction.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: b3602e4c7eafdc72d2e28b2d7b012c7f6eb590d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3602e4c7eafdc72d2e28b2d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:39 2016 +0100 d3d11/tests: Add test for SM5 bufinfo instruction. 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 | 296 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 296 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3602e4c7eafdc72d2e28…

1 0

Józef Kucia : wined3d: Allow creating raw unordered access views.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 9d5eb9a2409514ec3aae0401d851e4d6324d1503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5eb9a2409514ec3aae0401d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:36 2016 +0100 wined3d: Allow creating raw unordered access views. 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/view.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 50c43f4..ef602de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -566,13 +566,18 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->format = wined3d_get_format(gl_info, desc->format_id); - if (wined3d_format_is_typeless(view->format)) + if (wined3d_format_is_typeless(view->format) + && !(view->format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); return E_INVALIDARG; } - if (resource->type != WINED3D_RTYPE_BUFFER) + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer unordered access views not supported.\n"); + } + else { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int depth_or_layer_count;

1 0

Bruno Jesus : xinput1_3/tests: Improve vibration tests.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 4989d8727f91c6b730c8be94fc5341d198c179cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4989d8727f91c6b730c8be94f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 05:26:08 2016 -0200 xinput1_3/tests: Improve vibration tests. Specially the part to disable the vibration after the test. Manually tested on Windows 8. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index eb0bab3..0deab26 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -54,22 +54,35 @@ static void test_set_state(void) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); + vibrator.wLeftMotorSpeed = 32767; + vibrator.wRightMotorSpeed = 32767; + result = pXInputSetState(controllerNum, &vibrator); + if (result == ERROR_DEVICE_NOT_CONNECTED) continue; + + Sleep(250); vibrator.wLeftMotorSpeed = 0; vibrator.wRightMotorSpeed = 0; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); /* Disabling XInput here, queueing a vibration and then re-enabling XInput * is used to prove that vibrations are auto enabled when resuming XInput. - * If XInputEnable is removed the vibration will never play. */ + * If XInputEnable(1) is removed below the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); + Sleep(250); vibrator.wLeftMotorSpeed = 65535; vibrator.wRightMotorSpeed = 65535; result = pXInputSetState(controllerNum, &vibrator); - ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); if (pXInputEnable) pXInputEnable(1); + Sleep(250); + + vibrator.wLeftMotorSpeed = 0; + vibrator.wRightMotorSpeed = 0; + result = pXInputSetState(controllerNum, &vibrator); + ok(result == ERROR_SUCCESS, "XInputSetState failed with (%d)\n", result); } result = pXInputSetState(XUSER_MAX_COUNT+1, &vibrator);

1 0

Józef Kucia : wined3d: Extract get_texture_view_target() from wined3d_shader_resource_view_init( ).
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: dc4042653d37abab813c871f4eab4ed17ee3c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4042653d37abab813c871f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:43 2016 +0100 wined3d: Extract get_texture_view_target() from wined3d_shader_resource_view_init(). 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/view.c | 59 ++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 036edf3..237122d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -30,6 +30,36 @@ static BOOL is_stencil_view_format(const struct wined3d_format *format) || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; } +static GLenum get_texture_view_target(const struct wined3d_view_desc *desc, + const struct wined3d_texture *texture) +{ + static const struct + { + GLenum texture_target; + unsigned int view_flags; + GLenum view_target; + } + view_types[] = + { + {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(view_types); ++i) + { + if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) + return view_types[i].view_target; + } + + FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); + return texture->target; +} + static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target, const struct wined3d_view_desc *desc, struct wined3d_texture *texture, const struct wined3d_format *view_format) @@ -357,22 +387,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - static const struct - { - GLenum texture_target; - unsigned int view_flags; - GLenum view_target; - } - view_types[] = - { - {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, - }; - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; GLenum view_target; @@ -396,7 +410,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ else { struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int i; if (!desc->u.texture.level_count || desc->u.texture.level_idx >= texture->level_count @@ -406,17 +419,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - view_target = texture->target; - for (i = 0; i < ARRAY_SIZE(view_types); ++i) - { - if (view_types[i].texture_target == texture->target && view_types[i].view_flags == desc->flags) - { - view_target = view_types[i].view_target; - break; - } - } - if (i == ARRAY_SIZE(view_types)) - FIXME("Unhandled view flags %#x for texture target %#x.\n", desc->flags, texture->target); + view_target = get_texture_view_target(desc, texture); if (resource->format->id == view_format->id && texture->target == view_target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count

1 0

Bruno Jesus : xinput1_4: Prefer builtin DLL.
by Alexandre Julliard Dec. 9, 2016

Dec. 9, 2016

Module: wine Branch: master Commit: 2d7e13503cafa3356a66a582cbdb478a0146aeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7e13503cafa3356a66a582c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 9 06:49:05 2016 -0200 xinput1_4: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_4/Makefile.in | 3 --- dlls/xinput1_4/xinput1_4_main.c | 37 ------------------------------------- 2 files changed, 40 deletions(-) diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 43d1812..f881d19 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,3 @@ MODULE = xinput1_4.dll -C_SRCS = \ - xinput1_4_main.c - RC_SRCS = version.rc diff --git a/dlls/xinput1_4/xinput1_4_main.c b/dlls/xinput1_4/xinput1_4_main.c deleted file mode 100644 index f91a3c5..0000000 --- a/dlls/xinput1_4/xinput1_4_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Wine project - Xinput Joystick Library - * Copyright 2013 André Hentschel - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0