November 2017 - Wine-Commits

Zebediah Figura : user32: Use the given string length when converting strings in WM_GETTEXT.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 9b7f9f2d08f39aa41b8a4b10331b9d0ba20beb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7f9f2d08f39aa41b8a4b103… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 4 17:48:11 2017 -0500 user32: Use the given string length when converting strings in WM_GETTEXT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 4 ---- dlls/user32/winproc.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5806f81..feca2be 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6932,10 +6932,8 @@ static void test_gettext(void) memset( bufW, 0x1c, sizeof(bufW) ); g_wm_gettext_override.dont_terminate = TRUE; buf_len = GetWindowTextW( hwnd, bufW, sizeof(bufW)/sizeof(bufW[0]) ); -todo_wine ok( buf_len == 4, "Unexpected text length, %d\n", buf_len ); ok( !memcmp(bufW, textW, 4 * sizeof(WCHAR)), "Unexpected window text, %s\n", wine_dbgstr_w(bufW) ); -todo_wine ok( bufW[4] == 0, "Unexpected buffer contents, %#x\n", bufW[4] ); g_wm_gettext_override.dont_terminate = FALSE; @@ -6945,10 +6943,8 @@ todo_wine memset( buf, 0x1c, sizeof(buf) ); g_wm_gettext_override.dont_terminate = TRUE; buf_len = GetWindowTextA( hwnd2, buf, sizeof(buf) ); -todo_wine ok( buf_len == 4, "Unexpected text length, %d\n", buf_len ); ok( !memcmp(buf, "text", 4), "Unexpected window text, '%s'\n", buf ); -todo_wine ok( buf[4] == 0, "Unexpected buffer contents, %#x\n", buf[4] ); g_wm_gettext_override.dont_terminate = FALSE; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index aa71c8e..904a350 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -460,7 +460,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, { len = 0; if (*result) - RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, strlenW(ptr) * sizeof(WCHAR) ); + RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, ret * sizeof(WCHAR) ); str[len] = 0; *result = len; } @@ -682,7 +682,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { if (*result) { - RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, strlen(ptr)+1 ); + RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, ret + 1 ); *result = len/sizeof(WCHAR) - 1; /* do not count terminating null */ } ((LPWSTR)lParam)[*result] = 0;

1 0

Donna Whisnant : oleaut32: Fix DispCallFunc() stdcall test to be ABI not x64 specific.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: c4ac2d285dd3c0c4aa3282eb70dc51d5ab4d5fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ac2d285dd3c0c4aa3282eb7… Author: Donna Whisnant <dewhisna(a)dewtronics.com> Date: Sat Nov 4 11:04:15 2017 -0500 oleaut32: Fix DispCallFunc() stdcall test to be ABI not x64 specific. The tests checking callee stack cleaning for stdcall vs. cdecl should be a function of the calling ABI of the platform, not whether it is 64-bit or not. This fixes the check for platforms like ARM that may be 32-bit but that do not use the stdcall convention of callee stack cleaning. Signed-off-by: Donna Whisnant <dewhisna(a)dewtronics.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d8ff310..bb70164 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -92,6 +92,12 @@ static WCHAR wszguid[] = {'g','u','i','d',0}; static const BOOL is_win64 = sizeof(void *) > sizeof(int); +#ifdef __i386__ +static const BOOL abi_supports_stdcall = TRUE; +#else +static const BOOL abi_supports_stdcall = FALSE; +#endif + static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -1115,7 +1121,7 @@ static void test_DispCallFunc(void) ok( V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result) ); /* the function checks the argument sizes for stdcall */ - if (!is_win64) /* no stdcall on 64-bit */ + if (abi_supports_stdcall) { res = DispCallFunc( NULL, (ULONG_PTR)stdcall_func, CC_STDCALL, VT_UI4, 0, types, pargs, &result ); ok( res == DISP_E_BADCALLEE, "DispCallFunc wrong error %x\n", res );

1 0

Zebediah Figura : quartz/tests: Avoid Sleep().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 7074b411df28bd872e65ee756ec0e0e6f26584ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7074b411df28bd872e65ee756… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 4 00:20:15 2017 -0500 quartz/tests: Avoid Sleep(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 13e6988..f9c95ae 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -330,8 +330,7 @@ static void rungraph(void) hr = IMediaEvent_GetEventHandle(pme, (OAEVENT*)&hEvent); ok(hr==S_OK, "Cannot get event handle returned: %x\n", hr); - /* WaitForSingleObject(hEvent, INFINITE); */ - Sleep(20000); + ok(WaitForSingleObject(hEvent, 2000) == WAIT_OBJECT_0, "Wait failed\n"); hr = IMediaEvent_Release(pme); ok(hr==2, "Releasing mediaevent returned: %x\n", hr);

1 0

Zebediah Figura : dinput/tests: Don't pump messages in test_acquire().
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 51895145fd67d3dd055888caaba7af413e4753f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51895145fd67d3dd055888caa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:59 2017 -0500 dinput/tests: Don't pump messages in test_acquire(). This causes intermittent failures due to implementation of our window drivers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index a6c981c..dac7d8d 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -93,7 +93,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; - MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -132,7 +131,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Zebediah Figura : quartz/tests: GetDestinationPosition() returns the actual window width.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 64c6761761334d91082e9846c015dcbb68f1d172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c6761761334d91082e9846c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 4 00:20:14 2017 -0500 quartz/tests: GetDestinationPosition() returns the actual window width. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/filtergraph.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 572b729..ebded4b 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = oleaut32 ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 user32 C_SRCS = \ avisplitter.c \ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6d5f8d1..13e6988 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -53,7 +53,7 @@ static int createfiltergraph(void) static void test_basic_video(void) { IBasicVideo* pbv; - LONG video_width, video_height; + LONG video_width, video_height, window_width; LONG left, top, width, height; HRESULT hr; @@ -158,6 +158,8 @@ static void test_basic_video(void) ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); /* test destination rectangle */ + window_width = max(video_width, GetSystemMetrics(SM_CXMIN) - 2 * GetSystemMetrics(SM_CXFRAME)); + hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, NULL, NULL); ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, NULL, NULL); @@ -168,7 +170,7 @@ static void test_basic_video(void) ok(hr == S_OK, "Cannot get destination position returned: %x\n", hr); ok(left == 0, "expected 0, got %d\n", left); ok(top == 0, "expected 0, got %d\n", top); - todo_wine ok(width == video_width, "expected %d, got %d\n", video_width, width); + todo_wine ok(width == window_width, "expected %d, got %d\n", window_width, width); todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0);

1 0

Zebediah Figura : dinput/tests: Remove a no longer needed workaround.
by Alexandre Julliard Nov. 6, 2017

Nov. 6, 2017

Module: wine Branch: master Commit: 58abb3518cc8fdff261c33e237d1ae5e0130ec40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58abb3518cc8fdff261c33e23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:58 2017 -0500 dinput/tests: Remove a no longer needed workaround. This was fixed by 41ce4a01583d552a976cb921d2991a043e0363e4. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 262ed0e..a6c981c 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -136,8 +136,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr); - /* Workaround so we can test other things. Remove when Wine is fixed */ - IDirectInputDevice_Unacquire(pMouse); hr = IDirectInputDevice_Acquire(pMouse); ok(hr == DIERR_OTHERAPPHASPRIO, "Acquire() should have failed: %08x\n", hr);

1 0

Józef Kucia : wined3d: Add FIXME() for unimplemented index buffer offsets.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 7d7d3a8db6f9d05ccf3871159f25222617d95e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7d3a8db6f9d05ccf3871159… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:16 2017 +0100 wined3d: Add FIXME() for unimplemented index buffer offsets. We do not support index buffer offsets for indirect draws. 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/drawprim.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a7ca748..f1d57dc 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -654,6 +654,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (idx_size) { GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + if (state->index_offset) + FIXME("Ignoring index offset %u.\n", state->index_offset); GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, (void *)(GLintptr)parameters->u.indirect.offset)); }

1 0

Józef Kucia : wined3d: Disable ARB_draw_indirect if ARB_base_instance is not available.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 2c51fc1bfc1d551aebb47616c19d3329c5e0f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c51fc1bfc1d551aebb47616c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:20 2017 +0100 wined3d: Disable ARB_draw_indirect if ARB_base_instance is not available. Avoids undefined behavior. 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/directx.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c89d556..ee04b12 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4211,9 +4211,17 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (gl_info->supported[ARB_TEXTURE_STORAGE] && gl_info->supported[APPLE_YCBCR_422]) { /* AFAIK APPLE_ycbcr_422 is only available in legacy contexts so we shouldn't ever hit this. */ - FIXME("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); + ERR("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); gl_info->supported[APPLE_YCBCR_422] = FALSE; } + if (gl_info->supported[ARB_DRAW_INDIRECT] && !gl_info->supported[ARB_BASE_INSTANCE]) + { + /* If ARB_base_instance is not supported the baseInstance field + * in indirect draw parameters must be 0 or behavior is undefined. + */ + WARN("Disabling ARB_draw_indirect because ARB_base_instance is not supported.\n"); + gl_info->supported[ARB_DRAW_INDIRECT] = FALSE; + } wined3d_adapter_init_limits(gl_info);

1 0

Józef Kucia : wined3d: Bail out when ARB_draw_indirect is not supported.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: a46a599af14879f6984925014adf0b752bc75c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46a599af14879f6984925014… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:18 2017 +0100 wined3d: Bail out when ARB_draw_indirect is not supported. 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/drawprim.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6900578..99f3ce2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -401,6 +401,12 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_buffer *buffer = parameters->buffer; + if (!gl_info->supported[ARB_DRAW_INDIRECT]) + { + FIXME("OpenGL implementation does not support indirect draws.\n"); + return; + } + wined3d_buffer_load(buffer, context, state); GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object));

1 0

Józef Kucia : wined3d: Factor out draw_indirect() function.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 7f1f586f5df2d67745029b49656ecbc97016974b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1f586f5df2d67745029b496… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:17 2017 +0100 wined3d: Factor out draw_indirect() function. 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/drawprim.c | 55 ++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f1d57dc..6900578 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -395,6 +395,34 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const checkGLcall("glEnd and previous calls"); } +static void draw_indirect(struct wined3d_context *context, const struct wined3d_state *state, + const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_buffer *buffer = parameters->buffer; + + wined3d_buffer_load(buffer, context, state); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); + + if (idx_size) + { + GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + if (state->index_offset) + FIXME("Ignoring index offset %u.\n", state->index_offset); + GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, + (void *)(GLintptr)parameters->offset)); + } + else + { + GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, + (void *)(GLintptr)parameters->offset)); + } + + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); + + checkGLcall("draw indirect"); +} + static void remove_vbos(struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_stream_info *s) { @@ -645,34 +673,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) - { - struct wined3d_buffer *buffer = parameters->u.indirect.buffer; - - wined3d_buffer_load(buffer, context, state); - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); - - if (idx_size) - { - GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - if (state->index_offset) - FIXME("Ignoring index offset %u.\n", state->index_offset); - GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, - (void *)(GLintptr)parameters->u.indirect.offset)); - } - else - { - GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, - (void *)(GLintptr)parameters->u.indirect.offset)); - } - - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); - - checkGLcall("draw indirect"); - } + draw_indirect(context, state, &parameters->u.indirect, idx_size); else - { FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); - } } else {

1 0

Józef Kucia : wined3d: Require ARB_draw_indirect for SM5.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: dbea9b3ef499b27d36314eb17a67331db36fc85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbea9b3ef499b27d36314eb17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:19 2017 +0100 wined3d: Require ARB_draw_indirect for SM5. In order to disable feature level 11_0 when indirect draws are not supported. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 108bd18..6f75a7a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10704,6 +10704,7 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g if (shader_model_4 && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] + && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]

1 0

Józef Kucia : d3d11/tests: Add test for indirect draws with index buffer offset.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 6d624b3d0fb0a3c4e64caf216b683002cebd11eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d624b3d0fb0a3c4e64caf216… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 3 14:35:15 2017 +0100 d3d11/tests: Add test for indirect draws with index buffer offset. 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 | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0d16cc3..900f489 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9737,7 +9737,7 @@ static void test_instance_id(void) ID3D11DeviceContext_DrawInstanced(context, 4, 4, 0, 4); args_buffer = create_buffer_misc(device, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, - sizeof(argument_data), &argument_data); + sizeof(argument_data), argument_data); ID3D11DeviceContext_DrawInstancedIndirect(context, args_buffer, 0); ID3D11DeviceContext_DrawInstancedIndirect(context, args_buffer, sizeof(*argument_data)); @@ -14436,8 +14436,8 @@ static void test_uint_shader_instructions(void) static void test_index_buffer_offset(void) { + ID3D11Buffer *vb, *ib, *so_buffer, *args_buffer; struct d3d11_test_context test_context; - ID3D11Buffer *vb, *ib, *so_buffer; ID3D11InputLayout *input_layout; ID3D11DeviceContext *context; struct resource_readback rb; @@ -14547,6 +14547,10 @@ static void test_index_buffer_offset(void) {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, }; static const struct vec4 broken_result = {0.0f, 0.0f, 0.0f, 1.0f}; + static const D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS argument_data[] = + { + {4, 1, 0, 0, 0}, + }; if (!init_test_context(&test_context, &feature_level)) return; @@ -14603,7 +14607,36 @@ static void test_index_buffer_offset(void) } release_resource_readback(&rb); + /* indirect draws */ + args_buffer = create_buffer_misc(device, 0, D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS, + sizeof(argument_data), argument_data); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 0); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 4 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + ID3D11DeviceContext_IASetIndexBuffer(context, ib, DXGI_FORMAT_R32_UINT, 8 * sizeof(*indices)); + ID3D11DeviceContext_DrawIndexedInstancedIndirect(context, args_buffer, 0); + + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(expected_data); ++i) + { + data = get_readback_vec4(&rb, i, 0); + todo_wine_if(i >= 8 && i != 20 && i != 21) + ok(compare_vec4(data, &expected_data[i], 0) + || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", + data->x, data->y, data->z, data->w, i); + } + release_resource_readback(&rb); + ID3D11Buffer_Release(so_buffer); + ID3D11Buffer_Release(args_buffer); ID3D11Buffer_Release(ib); ID3D11Buffer_Release(vb); ID3D11VertexShader_Release(vs);

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillEllipse.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: f75b57ad81c4f352b68d2fc821383786d29f409c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75b57ad81c4f352b68d2fc82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:13 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillEllipse. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 614fc43..051f33e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -465,6 +465,17 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFillEllipse +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusFillEllipse; + typedef struct EmfPlusFont { DWORD Version; @@ -2867,6 +2878,45 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillEllipse: + { + EmfPlusFillEllipse *fill = (EmfPlusFillEllipse *)header; + GpSolidFill *solidfill = NULL; + GpBrush *brush; + + if (dataSize <= FIELD_OFFSET(EmfPlusFillEllipse, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusFillEllipse, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x8000) + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & 0x4000) + stat = GdipFillEllipseI(real_metafile->playback_graphics, brush, fill->RectData.rect.X, + fill->RectData.rect.Y, fill->RectData.rect.Width, fill->RectData.rect.Height); + else + stat = GdipFillEllipse(real_metafile->playback_graphics, brush, fill->RectData.rectF.X, + fill->RectData.rectF.Y, fill->RectData.rectF.Width, fill->RectData.rectF.Height); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeDrawPath: { EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawRects.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: e934c4c06fee9de9cca8d053632cc5301e496f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e934c4c06fee9de9cca8d0536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:12 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawRects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c5c72e2..614fc43 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -444,6 +444,17 @@ typedef struct EmfPlusDrawPie } RectData; } EmfPlusDrawPie; +typedef struct EmfPlusDrawRects +{ + EmfPlusRecordHeader Header; + DWORD Count; + union + { + EmfPlusRect rect[1]; + EmfPlusRectF rectF[1]; + } RectData; +} EmfPlusDrawRects; + typedef struct EmfPlusFillPath { EmfPlusRecordHeader Header; @@ -2895,6 +2906,44 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); } + case EmfPlusRecordTypeDrawRects: + { + EmfPlusDrawRects *draw = (EmfPlusDrawRects *)header; + BYTE pen = flags & 0xff; + GpRectF *rects = NULL; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize <= FIELD_OFFSET(EmfPlusDrawRects, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusDrawRects, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != draw->Count * (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) + { + DWORD i; + + rects = GdipAlloc(draw->Count * sizeof(*rects)); + if (!rects) + return OutOfMemory; + + for (i = 0; i < draw->Count; i++) + { + rects[i].X = draw->RectData.rect[i].X; + rects[i].Y = draw->RectData.rect[i].Y; + rects[i].Width = draw->RectData.rect[i].Width; + rects[i].Height = draw->RectData.rect[i].Height; + } + } + + stat = GdipDrawRectangles(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + rects ? rects : (GpRectF *)draw->RectData.rectF, draw->Count); + GdipFree(rects); + return stat; + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Michael Müller : advapi32: Added a stub for LsaLookupPrivilegeDisplayName().
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: badcabc18855efac19ad3a08d3b4fae22486bbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=badcabc18855efac19ad3a08d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Nov 2 23:56:20 2017 +0300 advapi32: Added a stub for LsaLookupPrivilegeDisplayName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 18 ++++++++++++++++++ include/ntlsa.h | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 709a385..359efc9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -468,7 +468,7 @@ # @ stub LsaICLookupSidsWithCreds @ stdcall LsaLookupNames(long long ptr ptr ptr) @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) -@ stub LsaLookupPrivilegeDisplayName +@ stdcall LsaLookupPrivilegeDisplayName(long ptr ptr ptr) @ stdcall LsaLookupPrivilegeName(long ptr ptr) # @ stub LsaLookupPrivilegeValue @ stdcall LsaLookupSids(ptr long ptr ptr ptr) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 42da4b4..bfd879b 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -44,6 +44,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); return FailureCode; \ } +static LPCSTR debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "(null)"; + return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR)); +} + static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa) { if (oa) @@ -1006,3 +1012,15 @@ NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE handle, LUID *luid, LSA_UNICOD return STATUS_SUCCESS; } + +/****************************************************************************** + * LsaLookupPrivilegeDisplayName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE handle, LSA_UNICODE_STRING *name, + LSA_UNICODE_STRING **display_name, SHORT *language) +{ + FIXME("(%p, %s, %p, %p)\n", handle, debugstr_us(name), display_name, language); + + return STATUS_NO_SUCH_PRIVILEGE; +} diff --git a/include/ntlsa.h b/include/ntlsa.h index 468c14e..ca864f6 100644 --- a/include/ntlsa.h +++ b/include/ntlsa.h @@ -16,4 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE policy, LSA_UNICODE_STRING *name, + LSA_UNICODE_STRING **display_name, SHORT *language); NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Nikolay Sivov : advapi32: Partially implement LsaLookupPrivilegeName().
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 2c8427e0dc59edcbafc3d664d92f04063c69c30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8427e0dc59edcbafc3d664d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:19 2017 +0300 advapi32: Partially implement LsaLookupPrivilegeName(). Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 1 + dlls/advapi32/lsa.c | 32 ++++++++++++++++++++++++++------ dlls/advapi32/security.c | 9 +++++++++ dlls/advapi32/tests/lsa.c | 36 ++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntlsa.h | 19 +++++++++++++++++++ 6 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index d116ecb..7fc02a4 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -34,6 +34,7 @@ WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; +const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index a9ec9e4..42da4b4 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -978,11 +978,31 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification( * LsaLookupPrivilegeName [ADVAPI32.@] * */ -NTSTATUS WINAPI LsaLookupPrivilegeName( - LSA_HANDLE handle, - LUID *luid, - UNICODE_STRING **name) +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE handle, LUID *luid, LSA_UNICODE_STRING **name) { - FIXME("(%p,%p,%p) stub\n", handle, luid, name); - return STATUS_NO_SUCH_PRIVILEGE; + const WCHAR *privnameW; + DWORD length; + WCHAR *strW; + + TRACE("(%p,%p,%p)\n", handle, luid, name); + + if (!luid || !handle) + return STATUS_INVALID_PARAMETER; + + *name = NULL; + + if (!(privnameW = get_wellknown_privilege_name(luid))) + return STATUS_NO_SUCH_PRIVILEGE; + + length = strlenW(privnameW); + *name = heap_alloc(sizeof(**name) + (length + 1) * sizeof(WCHAR)); + if (!*name) + return STATUS_NO_MEMORY; + + strW = (WCHAR *)(*name + 1); + memcpy(strW, privnameW, length * sizeof(WCHAR)); + strW[length] = 0; + RtlInitUnicodeString(*name, strW); + + return STATUS_SUCCESS; } diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e36792c..c9d5cfa 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1875,6 +1875,15 @@ static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = SE_CREATE_GLOBAL_NAME_W, }; +const WCHAR *get_wellknown_privilege_name(const LUID *luid) +{ + if (luid->HighPart || luid->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || + luid->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE || !WellKnownPrivNames[luid->LowPart]) + return NULL; + + return WellKnownPrivNames[luid->LowPart]; +} + /****************************************************************************** * LookupPrivilegeValueW [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index a06c8af..861fea0 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -32,6 +32,8 @@ #include "objbase.h" #include "initguid.h" #include "wine/test.h" +#include "winternl.h" +#include "ntlsa.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -391,9 +393,43 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupPrivilegeName(void) +{ + LSA_OBJECT_ATTRIBUTES attrs; + LSA_UNICODE_STRING *name; + LSA_HANDLE policy; + NTSTATUS status; + LUID luid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "Failed to open policy, %#x.\n", status); + + name = (void *)0xdeadbeef; + status = LsaLookupPrivilegeName(policy, NULL, &name); + ok(status != STATUS_SUCCESS, "Unexpected status %#x.\n", status); + ok(name == (void *)0xdeadbeef, "Unexpected name pointer.\n"); + + name = (void *)0xdeadbeef; + luid.HighPart = 1; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == STATUS_NO_SUCH_PRIVILEGE, "Unexpected status %#x.\n", status); + ok(name == NULL, "Unexpected name pointer.\n"); + + luid.HighPart = 0; + luid.LowPart = SE_CREATE_TOKEN_PRIVILEGE; + status = LsaLookupPrivilegeName(policy, &luid, &name); + ok(status == 0, "got %#x.\n", status); + LsaFreeMemory(name); +} + START_TEST(lsa) { test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupPrivilegeName(); } diff --git a/include/Makefile.in b/include/Makefile.in index 025fe77..cc42f66 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -550,6 +550,7 @@ HEADER_SRCS = \ ntddstor.h \ ntdef.h \ ntdsapi.h \ + ntlsa.h \ ntquery.h \ ntsecapi.h \ ntsecpkg.h \ diff --git a/include/ntlsa.h b/include/ntlsa.h new file mode 100644 index 0000000..468c14e --- /dev/null +++ b/include/ntlsa.h @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +NTSTATUS WINAPI LsaLookupPrivilegeName(LSA_HANDLE policy, LUID *value, LSA_UNICODE_STRING **name);

1 0

Andrey Gusev : usp10: Remove worthless check.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: f6ad192cd220278a17fa840ba4e062ff1e39f02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ad192cd220278a17fa840ba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 2 18:22:36 2017 +0200 usp10: Remove worthless check. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 59abbad..5d257b2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3028,9 +3028,6 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) for (i = 0; i < len; i+=consumed) { - if (i >= len) - break; - if ((flag & SIC_ASCIIDIGIT) && chars[i] >= 0x30 && chars[i] <= 0x39) return S_OK;

1 0

Nikolay Sivov : gdiplus/metafile: Add brush object if needed in FillRectangles().
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: fd8185132ee15873bb15404d8fcfcc699dd32879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8185132ee15873bb15404d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:15 2017 +0300 gdiplus/metafile: Add brush object if needed in FillRectangles(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 141 ++++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3a9c8a8..f923a9b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -931,6 +931,74 @@ static BOOL is_integer_rect(const GpRectF *rect) return TRUE; } +static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) +{ + switch (brush->bt) + { + case BrushTypeSolidColor: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); + break; + case BrushTypeHatchFill: + *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); + break; + default: + FIXME("unsupported brush type: %d\n", brush->bt); + return NotImplemented; + } + + return Ok; +} + +static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) +{ + data->Version = VERSION_MAGIC2; + data->Type = brush->bt; + + switch (brush->bt) + { + case BrushTypeSolidColor: + { + GpSolidFill *solid = (GpSolidFill *)brush; + data->BrushData.solid.SolidColor = solid->color; + break; + } + case BrushTypeHatchFill: + { + GpHatch *hatch = (GpHatch *)brush; + data->BrushData.hatch.HatchStyle = hatch->hatchstyle; + data->BrushData.hatch.ForeColor = hatch->forecol; + data->BrushData.hatch.BackColor = hatch->backcol; + break; + } + default: + FIXME("unsupported brush type: %d\n", brush->bt); + } +} + +static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) +{ + EmfPlusObject *object_record; + GpStatus stat; + DWORD size; + + *id = -1; + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + stat = METAFILE_PrepareBrushData(brush, &size); + if (stat != Ok) return stat; + + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); + if (stat != Ok) return stat; + + *id = METAFILE_AddObjectId(metafile); + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeBrush << 8; + METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); + return Ok; +} + GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) { @@ -950,8 +1018,9 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, } else { - FIXME("brush serialization not implemented\n"); - return NotImplemented; + stat = METAFILE_AddBrushObject(metafile, brush, &brushid); + if (stat != Ok) + return stat; } for (i=0; i<count; i++) @@ -3989,50 +4058,6 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; } -static GpStatus METAFILE_PrepareBrushData(GpBrush *brush, DWORD *size) -{ - switch (brush->bt) - { - case BrushTypeSolidColor: - *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusSolidBrushData); - break; - case BrushTypeHatchFill: - *size = FIELD_OFFSET(EmfPlusBrush, BrushData) + sizeof(EmfPlusHatchBrushData); - break; - default: - FIXME("unsupported brush type: %d\n", brush->bt); - return NotImplemented; - } - - return Ok; -} - -static void METAFILE_FillBrushData(GpBrush *brush, EmfPlusBrush *data) -{ - data->Version = VERSION_MAGIC2; - data->Type = brush->bt; - - switch (brush->bt) - { - case BrushTypeSolidColor: - { - GpSolidFill *solid = (GpSolidFill *)brush; - data->BrushData.solid.SolidColor = solid->color; - break; - } - case BrushTypeHatchFill: - { - GpHatch *hatch = (GpHatch *)brush; - data->BrushData.hatch.HatchStyle = hatch->hatchstyle; - data->BrushData.hatch.ForeColor = hatch->forecol; - data->BrushData.hatch.BackColor = hatch->backcol; - break; - } - default: - FIXME("unsupported brush type: %d\n", brush->bt); - } -} - static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *id) { DWORD i, data_flags, pen_data_size, brush_size; @@ -4228,30 +4253,6 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) return Ok; } -static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GpBrush *brush, DWORD *id) -{ - EmfPlusObject *object_record; - GpStatus stat; - DWORD size; - - *id = -1; - if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) - return Ok; - - stat = METAFILE_PrepareBrushData(brush, &size); - if (stat != Ok) return stat; - - stat = METAFILE_AllocateRecord(metafile, - FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); - if (stat != Ok) return stat; - - *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; - object_record->Header.Flags = *id | ObjectTypeBrush << 8; - METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); - return Ok; -} - GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) { EmfPlusFillPath *fill_path_record;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPie.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 9c47baa3fcf132203eb87832cfe92cf48270ece1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c47baa3fcf132203eb87832c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:14 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillPie. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 051f33e..3a9c8a8 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -476,6 +476,19 @@ typedef struct EmfPlusFillEllipse } RectData; } EmfPlusFillEllipse; +typedef struct EmfPlusFillPie +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusFillPie; + typedef struct EmfPlusFont { DWORD Version; @@ -2917,6 +2930,47 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillPie: + { + EmfPlusFillPie *fill = (EmfPlusFillPie *)header; + GpSolidFill *solidfill = NULL; + GpBrush *brush; + + if (dataSize <= FIELD_OFFSET(EmfPlusFillPie, RectData) - sizeof(EmfPlusRecordHeader)) + return InvalidParameter; + dataSize -= FIELD_OFFSET(EmfPlusFillPie, RectData) - sizeof(EmfPlusRecordHeader); + + if (dataSize != (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x8000) /* S */ + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & 0x4000) /* C */ + stat = GdipFillPieI(real_metafile->playback_graphics, brush, fill->RectData.rect.X, + fill->RectData.rect.Y, fill->RectData.rect.Width, fill->RectData.rect.Height, + fill->StartAngle, fill->SweepAngle); + else + stat = GdipFillPie(real_metafile->playback_graphics, brush, fill->RectData.rectF.X, + fill->RectData.rectF.Y, fill->RectData.rectF.Width, fill->RectData.rectF.Height, + fill->StartAngle, fill->SweepAngle); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeDrawPath: { EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header;

1 0

Andrey Gusev : iphlpapi: Change variable type.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 62b5d6b110786aac2692fe096b8b995ecec29ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b5d6b110786aac2692fe096… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 2 19:34:48 2017 +0200 iphlpapi: Change variable type. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 47df7eb..327a601 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2051,11 +2051,11 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri #elif defined(HAVE_PROC_PIDINFO) struct proc_fdinfo *fds; struct socket_fdinfo sock; - unsigned int i, j, n, fd_len; + unsigned int i, j, n; for (i = 0; i < num_entries; i++) { - fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); + int fd_len = proc_pidinfo( map[i].unix_pid, PROC_PIDLISTFDS, 0, NULL, 0 ); if (fd_len <= 0) continue; fds = HeapAlloc( GetProcessHeap(), 0, fd_len );

1 0

Piotr Caban : hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: ace66d3540d7d3d93344545a91143e02fcbda91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace66d3540d7d3d93344545a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 2 19:39:05 2017 +0100 hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/help.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5fd7634..c7a2a7a 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1603,7 +1603,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA static BOOL HH_CreateHelpWindow(HHInfo *info) { - HWND hWnd, parent = 0; + HWND hWnd; RECT winPos = info->WinType.rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; @@ -1677,11 +1677,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) caption = info->WinType.pszCaption; if (!*caption) caption = info->pCHMInfo->defTitle; - if (info->WinType.dwStyles & WS_CHILD) - parent = info->WinType.hwndCaller; - - hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, - dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL); + hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, dwStyles, x, y, width, height, + info->WinType.hwndCaller, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE;

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeDrawPie playback.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 6931e629cd0624daaa0a103307cd7390c1c95a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6931e629cd0624daaa0a10330… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 3 09:49:11 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeDrawPie playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 9beb3a3..c5c72e2 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -432,6 +432,18 @@ typedef struct EmfPlusDrawPath DWORD PenId; } EmfPlusDrawPath; +typedef struct EmfPlusDrawPie +{ + EmfPlusRecordHeader Header; + float StartAngle; + float SweepAngle; + union + { + EmfPlusRect rect; + EmfPlusRectF rectF; + } RectData; +} EmfPlusDrawPie; + typedef struct EmfPlusFillPath { EmfPlusRecordHeader Header; @@ -2862,6 +2874,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return GdipDrawPath(real_metafile->playback_graphics, real_metafile->objtable[draw->PenId].u.pen, real_metafile->objtable[path].u.path); } + case EmfPlusRecordTypeDrawPie: + { + EmfPlusDrawPie *draw = (EmfPlusDrawPie *)header; + BYTE pen = flags & 0xff; + + if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen) + return InvalidParameter; + + if (dataSize != FIELD_OFFSET(EmfPlusDrawPie, RectData) - sizeof(EmfPlusRecordHeader) + + (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF))) + return InvalidParameter; + + if (flags & 0x4000) /* C */ + return GdipDrawPieI(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rect.X, draw->RectData.rect.Y, draw->RectData.rect.Width, + draw->RectData.rect.Height, draw->StartAngle, draw->SweepAngle); + else + return GdipDrawPie(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen, + draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width, + draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : advapi32/tests: Remove dynamic function binding from LSA tests.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 90f94eae1d004550bdb1b39540f149976c847a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f94eae1d004550bdb1b3954… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:17 2017 +0300 advapi32/tests: Remove dynamic function binding from LSA tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 136 +++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90f94eae1d004550bdb1b…

1 0

Nikolay Sivov : advapi32/tests: Merge some test code.
by Alexandre Julliard Nov. 3, 2017

Nov. 3, 2017

Module: wine Branch: master Commit: 7112b60c833391680e4f90f685ea90d322c4eeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7112b60c833391680e4f90f68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 2 23:56:18 2017 +0300 advapi32/tests: Merge some test code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 81bcf21..a06c8af 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -328,6 +328,7 @@ static void test_LsaLookupSids(void) HANDLE token; DWORD size; BOOL ret; + PSID sid; memset(&attrs, 0, sizeof(attrs)); attrs.Length = sizeof(attrs); @@ -364,26 +365,6 @@ static void test_LsaLookupSids(void) CloseHandle(token); - status = LsaClose(policy); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); -} - -static void test_LsaLookupSids_NullBuffers(void) -{ - LSA_REFERENCED_DOMAIN_LIST *list; - LSA_OBJECT_ATTRIBUTES attrs; - LSA_TRANSLATED_NAME *names; - LSA_HANDLE policy; - NTSTATUS status; - BOOL ret; - PSID sid; - - memset(&attrs, 0, sizeof(attrs)); - attrs.Length = sizeof(attrs); - - status = LsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); - ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ret = ConvertStringSidToSidA("S-1-1-0", &sid); ok(ret == TRUE, "ConvertStringSidToSidA returned false\n"); @@ -415,5 +396,4 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); - test_LsaLookupSids_NullBuffers(); }

1 0

Jacek Caban : mshtml: Added IDocumentSelector:: querySelector implementation.
by Alexandre Julliard Nov. 2, 2017

Nov. 2, 2017

Module: wine Branch: master Commit: 3d505b12e352fd837246890656905b11d3b36699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d505b12e352fd83724689065… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 16:48:07 2017 +0100 mshtml: Added IDocumentSelector::querySelector implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 22 +++++++++++++++++++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index fbb70c1..55d55f7 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4262,8 +4262,32 @@ static HRESULT WINAPI DocumentSelector_Invoke(IDocumentSelector *iface, DISPID d static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, BSTR v, IHTMLElement **pel) { HTMLDocument *This = impl_from_IDocumentSelector(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); - return E_NOTIMPL; + nsIDOMElement *nselem; + HTMLElement *elem; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_QuerySelector(This->doc_node->nsdoc, &nsstr, &nselem); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelector failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nselem) { + *pel = NULL; + return S_OK; + } + + hres = get_elem(This->doc_node, nselem, &elem); + nsIDOMElement_Release(nselem); + if(SUCCEEDED(hres)) + *pel = &elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index f0498d5..3912e9a 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -129,10 +129,30 @@ function test_getElementsByClassName() { next_test(); } +function test_query_selector() { + document.body.innerHTML = '<div class="class1">' + + '<div class="class1"></div>' + + '<a id="class1" class="class2"></a>' + + '</div>' + + '<script class="class1"></script>'; + + var e = document.querySelector("nomatch"); + ok(e === null, "e = " + e); + + e = document.querySelector(".class1"); + ok(e.tagName === "DIV", "e.tagName = " + e.tagName); + + e = document.querySelector("a"); + ok(e.tagName === "A", "e.tagName = " + e.tagName); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, test_ElementTraversal, test_getElementsByClassName, - test_head + test_head, + test_query_selector ];

1 0