November 2018 - Wine-Commits

Józef Kucia : wined3d: Fix mapping of SV_VertexID to gl_VertexID.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 60d9211f0f2862c503fdb1fe229bc96f2cc06be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d9211f0f2862c503fdb1fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 22 17:49:04 2018 +0100 wined3d: Fix mapping of SV_VertexID to gl_VertexID. Based on a patch by Andrew Wesie. In Direct3D, SV_VertexID generally starts from zero. In OpenGL, gl_VertexID starts from "first" parameter passed to glDrawArrays(), or from "baseVertex" parameter for indexed draw calls. The GL_ARB_shader_draw_parameters extension doesn't help us much because gl_BaseVertexARB is zero for non-indexed draw calls [1]. If gl_BaseVertexARB would be equal to "first" for non-indexed draw calls, we could simply use gl_VertexID - gl_BaseVertexARB. After this commit, SV_VertexID is still wrong for indirect draw calls because we cannot easily access the "first" field from struct DrawArraysIndirectCommand in a vertex shader. [1] - The ARB_shader_draw_parameters spec says that "In the case where the command has no <baseVertex> parameter, the value of <gl_BaseVertexARB> is zero." 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/cs.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 29 +++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ca79b71..c7c0c0b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -845,6 +845,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; + struct wined3d_device *device = cs->device; int base_vertex_idx, load_base_vertex_idx; struct wined3d_state *state = &cs->state; const struct wined3d_cs_draw *op = data; @@ -867,7 +868,13 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) else load_base_vertex_idx = 0; - state->base_vertex_index = base_vertex_idx; + if (state->base_vertex_index != base_vertex_idx) + { + state->base_vertex_index = base_vertex_idx; + for (i = 0; i < device->context_count; ++i) + device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; + } + if (state->load_base_vertex_index != load_base_vertex_idx) { state->load_base_vertex_index = load_base_vertex_idx; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 545e1bf..ad59e97 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -155,6 +155,7 @@ struct glsl_vs_program GLint uniform_i_locations[WINED3D_MAX_CONSTS_I]; GLint uniform_b_locations[WINED3D_MAX_CONSTS_B]; GLint pos_fixup_location; + GLint base_vertex_id_location; GLint modelview_matrix_location[MAX_VERTEX_BLENDS]; GLint projection_matrix_location; @@ -1775,22 +1776,21 @@ static void shader_glsl_load_color_key_constant(const struct glsl_ps_program *ps static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { - const struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; + const struct glsl_context_data *ctx_data = context->shader_backend_data; + struct glsl_shader_prog_link *prog = ctx_data->glsl_program; const struct wined3d_gl_info *gl_info = context->gl_info; - struct shader_glsl_priv *priv = shader_priv; float position_fixup[4 * WINED3D_MAX_VIEWPORTS]; + struct shader_glsl_priv *priv = shader_priv; + unsigned int constant_version; DWORD update_mask; - - struct glsl_shader_prog_link *prog = ctx_data->glsl_program; - UINT constant_version; int i; - if (!prog) { - /* No GLSL program set - nothing to do. */ + /* No GLSL program set - nothing to do. */ + if (!prog) return; - } + constant_version = prog->constant_version; update_mask = context->constant_update_mask & prog->constant_update_mask; @@ -1829,6 +1829,12 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context checkGLcall("glUniform4fv"); } + if (update_mask & WINED3D_SHADER_CONST_BASE_VERTEX_ID) + { + GL_EXTCALL(glUniform1i(prog->vs.base_vertex_id_location, state->base_vertex_index)); + checkGLcall("base vertex id"); + } + if (update_mask & WINED3D_SHADER_CONST_FFP_MODELVIEW) { struct wined3d_matrix mat; @@ -2359,8 +2365,8 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) { - shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", - index); + shader_addline(buffer, "uniform int base_vertex_id;\n"); + shader_addline(buffer, "vec4 vs_in%u = vec4(intBitsToFloat(gl_VertexID - base_vertex_id), 0.0, 0.0, 0.0);\n", index); return; } if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) @@ -10123,6 +10129,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * } vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "pos_fixup")); + vs->base_vertex_id_location = GL_EXTCALL(glGetUniformLocation(program_id, "base_vertex_id")); for (i = 0; i < MAX_VERTEX_BLENDS; ++i) { @@ -10694,6 +10701,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_VS_B; if (entry->vs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; + if (entry->vs.base_vertex_id_location != -1) + entry->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; shader_glsl_load_program_resources(context, priv, program_id, vshader); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f908ff7..4e80cc7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -445,6 +445,7 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_FFP_LIGHTS 0x00080000 #define WINED3D_SHADER_CONST_FFP_PS 0x00100000 #define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00200000 +#define WINED3D_SHADER_CONST_BASE_VERTEX_ID 0x00400000 enum wined3d_shader_register_type {

1 0

Piotr Caban : msvcp90: Add time_get<wchar> implementation.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: e6ec3cbd62c9e098f8a78ce5a0cc1f2bbaa8e42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ec3cbd62c9e098f8a78ce5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 23 15:11:50 2018 +0100 msvcp90: Add time_get<wchar> implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 88 +-- dlls/msvcp110/msvcp110.spec | 168 ++--- dlls/msvcp120/msvcp120.spec | 168 ++--- dlls/msvcp120_app/msvcp120_app.spec | 168 ++--- dlls/msvcp140/msvcp140.spec | 172 ++--- dlls/msvcp70/msvcp70.spec | 76 +-- dlls/msvcp71/msvcp71.spec | 80 +-- dlls/msvcp80/msvcp80.spec | 84 +-- dlls/msvcp90/locale.c | 1274 ++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 88 +-- 10 files changed, 1654 insertions(+), 712 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6ec3cbd62c9e098f8a7…

1 0

Gabriel Ivăncescu : comctl32/tests: Confirm that emptying the listbox sends LB_RESETCONTENT to itself.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 084eb528c1116d3aeba058bb5ae2161c4b04cae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=084eb528c1116d3aeba058bb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 23 10:16:11 2018 +0300 comctl32/tests: Confirm that emptying the listbox sends LB_RESETCONTENT to itself. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 91 +++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..362447e 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -34,6 +34,7 @@ enum seq_index { + LB_SEQ_INDEX, PARENT_SEQ_INDEX, NUM_MSG_SEQUENCES }; @@ -90,9 +91,47 @@ static const char BAD_EXTENSION[] = "*.badtxt"; #define ID_LISTBOX 1 +static LRESULT WINAPI listbox_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + struct message msg = { 0 }; + LRESULT ret; + + switch (message) + { + case WM_SIZE: + case WM_GETTEXT: + case WM_PAINT: + case WM_ERASEBKGND: + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + case WM_NCCALCSIZE: + case WM_NCPAINT: + case WM_NCHITTEST: + case WM_DEVICECHANGE: + break; + + default: + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, LB_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + static HWND create_listbox(DWORD add_style, HWND parent) { INT_PTR ctl_id = 0; + WNDPROC oldproc; HWND handle; if (parent) @@ -107,6 +146,9 @@ static HWND create_listbox(DWORD add_style, HWND parent) SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[2]); SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[3]); + oldproc = (WNDPROC)SetWindowLongPtrA(handle, GWLP_WNDPROC, (LONG_PTR)listbox_wnd_proc); + SetWindowLongPtrA(handle, GWLP_USERDATA, (LONG_PTR)oldproc); + return handle; } @@ -167,9 +209,18 @@ static void keypress(HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) static void run_test(DWORD style, const struct listbox_test test) { + static const struct message delete_seq[] = + { + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_RESETCONTENT, sent|wparam|lparam|defwinproc, 0, 0 }, + { 0 } + }; struct listbox_stat answer; + int i, res, count; RECT second_item; - int i, res; HWND hLB; hLB = create_listbox (style, 0); @@ -224,8 +275,17 @@ static void run_test(DWORD style, const struct listbox_test test) ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); res = SendMessageA(hLB, LB_DELETESTRING, 4, 0); ok(res == LB_ERR, "Expected LB_ERR items, got %d\n", res); - res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); - ok(res == 4, "Expected 4 items, got %d\n", res); + count = SendMessageA(hLB, LB_GETCOUNT, 0, 0); + ok(count == 4, "Unexpected item count %d.\n", count); + + /* Emptying listbox sends a LB_RESETCONTENT to itself. */ + flush_sequence(sequences, LB_SEQ_INDEX); + for (i = count; i--;) + { + res = SendMessageA(hLB, LB_DELETESTRING, 0, 0); + ok(res == i, "Unexpected return value %d.\n", res); + } + ok_sequence(sequences, LB_SEQ_INDEX, delete_seq, "Emptying listbox", FALSE); DestroyWindow(hLB); } @@ -1815,34 +1875,23 @@ static void test_set_count( void ) DestroyWindow( parent ); } -static int lb_getlistboxinfo; - -static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - - if (message == LB_GETLISTBOXINFO) - lb_getlistboxinfo++; - - return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); -} - static void test_GetListBoxInfo(void) { + static const struct message getlistboxinfo_seq[] = + { + { LB_GETLISTBOXINFO, sent }, + { 0 } + }; HWND listbox, parent; - WNDPROC oldproc; DWORD ret; parent = create_parent(); listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); - oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); - SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); - - lb_getlistboxinfo = 0; + flush_sequences(sequences, NUM_MSG_SEQUENCES); ret = GetListBoxInfo(listbox); ok(ret > 0, "got %d\n", ret); - ok(lb_getlistboxinfo == 1, "got %d\n", lb_getlistboxinfo); + ok_sequence(sequences, LB_SEQ_INDEX, getlistboxinfo_seq, "GetListBoxInfo()", FALSE); DestroyWindow(listbox); DestroyWindow(parent);

1 0

Hans Leidekker : winhttp: Use the thread pool for asynchronous tasks.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: bdfa9d82211b187f8d455c5cd8bf68371864772c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdfa9d82211b187f8d455c5c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 23 11:35:26 2018 +0100 winhttp: Use the thread pool for asynchronous tasks. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 12 ++++++------ dlls/winhttp/session.c | 9 +++------ dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 27628c3..9817287 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -191,9 +191,9 @@ static struct task_header *dequeue_task( struct request *request ) return task; } -static DWORD CALLBACK task_proc( LPVOID param ) +static void CALLBACK task_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct request *request = param; + struct request *request = ctx; HANDLE handles[2]; handles[0] = request->task_wait; @@ -221,21 +221,20 @@ static DWORD CALLBACK task_proc( LPVOID param ) request->task_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->task_cs ); request->hdr.vtbl->destroy( &request->hdr ); - return 0; + return; default: ERR("wait failed %u (%u)\n", err, GetLastError()); break; } } - return 0; } static BOOL queue_task( struct task_header *task ) { struct request *request = task->request; - if (!request->task_thread) + if (!request->task_wait) { if (!(request->task_wait = CreateEventW( NULL, FALSE, FALSE, NULL ))) return FALSE; if (!(request->task_cancel = CreateEventW( NULL, FALSE, FALSE, NULL ))) @@ -244,7 +243,7 @@ static BOOL queue_task( struct task_header *task ) request->task_wait = NULL; return FALSE; } - if (!(request->task_thread = CreateThread( NULL, 0, task_proc, request, 0, NULL ))) + if (!TrySubmitThreadpoolCallback( task_proc, request, NULL )) { CloseHandle( request->task_wait ); request->task_wait = NULL; @@ -252,6 +251,7 @@ static BOOL queue_task( struct task_header *task ) request->task_cancel = NULL; return FALSE; } + request->task_proc_running = TRUE; InitializeCriticalSection( &request->task_cs ); request->task_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": request.task_cs"); } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2051d42..f8d98d0 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -601,14 +601,11 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->task_thread) + if (request->task_proc_running) { - /* Signal to the task proc to quit. It will call - this again when it does. */ - HANDLE thread = request->task_thread; - request->task_thread = 0; + /* Signal to the task proc to quit. It will call this again when it does. */ + request->task_proc_running = FALSE; SetEvent( request->task_cancel ); - CloseHandle( thread ); return; } release_object( &request->connect->hdr ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2ee868c..14cee44 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -204,7 +204,7 @@ struct request struct authinfo *proxy_authinfo; HANDLE task_wait; HANDLE task_cancel; - HANDLE task_thread; + BOOL task_proc_running; struct list task_queue; CRITICAL_SECTION task_cs; struct

1 0

Nikolay Sivov : shcore: Implement method wrapper functions.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: d1443c3a5056ad7ec3831de52f2a14cc29aa4489 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1443c3a5056ad7ec3831de5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 22 15:12:07 2018 +0300 shcore: Implement method wrapper functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 18 +++--- 2 files changed, 169 insertions(+), 9 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 07918bc..aa513ee 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -19,10 +19,14 @@ #include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "initguid.h" +#include "ocidl.h" #include "shellscalingapi.h" #include "wine/debug.h" @@ -61,3 +65,159 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); } + +HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) +{ + ULONG read; + HRESULT hr; + + TRACE("(%p, %p, %u)\n", stream, dest, size); + + hr = IStream_Read(stream, dest, size, &read); + if (SUCCEEDED(hr) && read != size) + hr = E_FAIL; + return hr; +} + +HRESULT WINAPI IStream_Reset(IStream *stream) +{ + static const LARGE_INTEGER zero; + + TRACE("(%p)\n", stream); + + return IStream_Seek(stream, zero, 0, NULL); +} + +HRESULT WINAPI IStream_Size(IStream *stream, ULARGE_INTEGER *size) +{ + STATSTG statstg; + HRESULT hr; + + TRACE("(%p, %p)\n", stream, size); + + memset(&statstg, 0, sizeof(statstg)); + + hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + + if (SUCCEEDED(hr) && size) + *size = statstg.cbSize; + return hr; +} + +HRESULT WINAPI _IStream_Write(IStream *stream, const void *src, ULONG size) +{ + ULONG written; + HRESULT hr; + + TRACE("(%p, %p, %u)\n", stream, src, size); + + hr = IStream_Write(stream, src, size, &written); + if (SUCCEEDED(hr) && written != size) + hr = E_FAIL; + + return hr; +} + +void WINAPI IUnknown_AtomicRelease(IUnknown **obj) +{ + TRACE("(%p)\n", obj); + + if (!obj || !*obj) + return; + + IUnknown_Release(*obj); + *obj = NULL; +} + +HRESULT WINAPI IUnknown_GetSite(IUnknown *unk, REFIID iid, void **site) +{ + IObjectWithSite *obj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE("(%p, %s, %p)\n", unk, debugstr_guid(iid), site); + + if (unk && iid && site) + { + hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&obj); + if (SUCCEEDED(hr) && obj) + { + hr = IObjectWithSite_GetSite(obj, iid, site); + IObjectWithSite_Release(obj); + } + } + + return hr; +} + +HRESULT WINAPI IUnknown_QueryService(IUnknown *obj, REFGUID sid, REFIID iid, void **out) +{ + IServiceProvider *provider = NULL; + HRESULT hr; + + if (!out) + return E_FAIL; + + *out = NULL; + + if (!obj) + return E_FAIL; + + hr = IUnknown_QueryInterface(obj, &IID_IServiceProvider, (void **)&provider); + if (hr == S_OK && provider) + { + TRACE("Using provider %p.\n", provider); + + hr = IServiceProvider_QueryService(provider, sid, iid, out); + + TRACE("Provider %p returned %p.\n", provider, *out); + + IServiceProvider_Release(provider); + } + + return hr; +} + +void WINAPI IUnknown_Set(IUnknown **dest, IUnknown *src) +{ + TRACE("(%p, %p)\n", dest, src); + + IUnknown_AtomicRelease(dest); + + if (src) + { + IUnknown_AddRef(src); + *dest = src; + } +} + +HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) +{ + IInternetSecurityManager *sec_manager; + IObjectWithSite *objwithsite; + HRESULT hr; + + if (!obj) + return E_FAIL; + + hr = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void **)&objwithsite); + TRACE("ObjectWithSite %p, hr %#x.\n", objwithsite, hr); + if (SUCCEEDED(hr)) + { + hr = IObjectWithSite_SetSite(objwithsite, site); + TRACE("SetSite() hr %#x.\n", hr); + IObjectWithSite_Release(objwithsite); + } + else + { + hr = IUnknown_QueryInterface(obj, &IID_IInternetSecurityManager, (void **)&sec_manager); + TRACE("InternetSecurityManager %p, hr %#x.\n", sec_manager, hr); + if (FAILED(hr)) + return hr; + + hr = IInternetSecurityManager_SetSecuritySite(sec_manager, (IInternetSecurityMgrSite *)site); + TRACE("SetSecuritySite() hr %#x.\n", hr); + IInternetSecurityManager_Release(sec_manager); + } + + return hr; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index a9a6f31..0b20781 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -14,17 +14,17 @@ @ stub GetScaleFactorForDevice @ stub GetScaleFactorForMonitor @ stub IStream_Copy -@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr -@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset -@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size -@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stdcall IStream_Reset(ptr) +@ stdcall IStream_Size(ptr ptr) +@ stdcall IStream_Write(ptr ptr long) _IStream_Write @ stub IStream_WriteStr -@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease -@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite -@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService -@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set -@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite +@ stdcall IUnknown_AtomicRelease(long) +@ stdcall IUnknown_GetSite(ptr ptr ptr) +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) +@ stdcall IUnknown_Set(ptr ptr) +@ stdcall IUnknown_SetSite(ptr ptr) @ stdcall IsOS(long) shlwapi.IsOS @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications

1 0

Józef Kucia : wined3d: Do not crash when trying to draw to buffer render target.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 8890ece54cf258906c41b4dd63c6b7b8bf48fab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8890ece54cf258906c41b4dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 23 14:41:14 2018 +0100 wined3d: Do not crash when trying to draw to buffer render target. 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4cd46c6..4096673 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4840,6 +4840,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!(rtv = fb->render_targets[0])) rtv = fb->depth_stencil; + + if (rtv && rtv->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer render targets not implemented.\n"); + return; + } + if (rtv) context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); else

1 0

Nikolay Sivov : comctl32/listbox: Use helper to test for selected state on painting.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: a27db5169ca0b0990ce8a3cfd0e2814bbaae9329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a27db5169ca0b0990ce8a3cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 23 10:16:13 2018 +0300 comctl32/listbox: Use helper to test for selected state on painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a2085ed..51f6115 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -491,7 +491,13 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { LB_ITEMDATA *item = NULL; - if (index < descr->nb_items) item = &descr->items[index]; + BOOL selected = FALSE; + + if (index < descr->nb_items) + { + item = &descr->items[index]; + selected = is_item_selected(descr, index); + } if (IS_OWNERDRAW(descr)) { @@ -522,7 +528,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item->selected) dis.itemState |= ODS_SELECTED; + if (selected) + dis.itemState |= ODS_SELECTED; if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; @@ -545,7 +552,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, DrawFocusRect( hdc, rect ); return; } - if (item && item->selected) + if (selected) { oldBk = SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -570,7 +577,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, item->str, strlenW(item->str), descr->nb_tabs, descr->tabs, 0); } - if (item && item->selected) + if (selected) { SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText );

1 0

Nikolay Sivov : comctl32/listbox: Remove duplicated condition.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 656f3f5b29e8f0e0a41361b0a37c67cf7e705565 URL: https://source.winehq.org/git/wine.git/?a=commit;h=656f3f5b29e8f0e0a41361b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 23 10:16:14 2018 +0300 comctl32/listbox: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 51f6115..71a9c18 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -490,8 +490,8 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { + BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; - BOOL selected = FALSE; if (index < descr->nb_items) { @@ -499,6 +499,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, selected = is_item_selected(descr, index); } + focused = !ignoreFocus && descr->focus_item == index && descr->caret_on && descr->in_focus; + if (IS_OWNERDRAW(descr)) { DRAWITEMSTRUCT dis; @@ -530,9 +532,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemState = 0; if (selected) dis.itemState |= ODS_SELECTED; - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) dis.itemState |= ODS_FOCUS; + if (focused) + dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; @@ -582,9 +583,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText ); } - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) DrawFocusRect( hdc, rect ); + if (focused) + DrawFocusRect( hdc, rect ); } }

1 0

Józef Kucia : dxgi/tests: Add missing ok() call.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 650abc567acca1593d64396137123d19474ba6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=650abc567acca1593d643961… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 23 14:41:15 2018 +0100 dxgi/tests: Add missing ok() call. 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/dxgi/tests/dxgi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 9073a03..b3a4705 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2433,10 +2433,11 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, } ret = MoveWindow(window, 0, 0, 0, 0, TRUE); - ok(ret, "MoveWindow failed.\n"); + ok(ret, "Failed to move window.\n"); GetWindowRect(window, &e->window_rect); GetClientRect(window, &e->client_rect); ret = MoveWindow(window, 0, 0, 200, 200, TRUE); + ok(ret, "Failed to move window.\n"); memset(&mode, 0, sizeof(mode)); hr = IDXGISwapChain_ResizeTarget(swapchain, &mode);

1 0

Gabriel Ivăncescu : comctl32/listbox: Account for NULL item when painting ownerdrawn list.
by Alexandre Julliard Nov. 23, 2018

Nov. 23, 2018

Module: wine Branch: master Commit: 79bb84d20d042e5259215136f967d97275334aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=79bb84d20d042e5259215136… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 23 10:16:15 2018 +0300 comctl32/listbox: Account for NULL item when painting ownerdrawn list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 71a9c18..7525e7f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -535,10 +535,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = item ? item->data : 0; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, + descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn );

1 0