April 2019 - Wine-Devel - list.winehq.org

[PATCH 2/5] wined3d: Get rid of wined3d_device_uninit_gdi().
by Henri Verbeet April 12, 2019

April 12, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 27 ++++++--------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f4aabf4efab..cb7c12a1de1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -400,7 +400,7 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw) } else { - wined3d_device_uninit_gdi(ddraw->wined3d_device); + wined3d_device_uninit_3d(ddraw->wined3d_device); } ddraw_set_swapchain_window(ddraw, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1424ed4ab7e..a0c44b5d41c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1174,11 +1174,12 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { + BOOL no3d = device->wined3d->flags & WINED3D_NO3D; unsigned int i; TRACE("device %p.\n", device); - if (!device->d3d_initialized) + if (!device->d3d_initialized && !no3d) return WINED3DERR_INVALIDCALL; wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1192,7 +1193,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - wined3d_device_delete_opengl_contexts(device); + if (no3d) + device->blitter->ops->blitter_destroy(device->blitter, NULL); + else + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1239,25 +1243,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) -{ - unsigned int i; - - device->blitter->ops->blitter_destroy(device->blitter, NULL); - - for (i = 0; i < device->swapchain_count; ++i) - { - TRACE("Releasing the implicit swapchain %u.\n", i); - if (wined3d_swapchain_decref(device->swapchains[i])) - FIXME("Something's still holding the implicit swapchain.\n"); - } - - heap_free(device->swapchains); - device->swapchains = NULL; - device->swapchain_count = 0; - return WINED3D_OK; -} - /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw * from SetCooperativeLevel if DDSCL_MULTITHREADED is specified, and by d3d8/9 from * CreateDevice if D3DCREATE_MULTITHREADED is passed. diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1422c65245e..704e19db46b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -189,7 +189,6 @@ @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr) -@ cdecl wined3d_device_uninit_gdi(ptr) @ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e943e0d988c..8a29ef63999 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2481,7 +2481,6 @@ void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT i void __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); HRESULT __cdecl wined3d_device_uninit_3d(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags); -- 2.11.0

1 0

[PATCH 1/5] wined3d: get rid of wined3d_device_init_gdi().
by Henri Verbeet April 12, 2019

April 12, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 13 +++---- dlls/wined3d/device.c | 87 ++++++++++++++++------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8467fbf4ccc..f4aabf4efab 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -569,6 +569,9 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, TRACE("ddraw %p.\n", ddraw); + if (ddraw->flags & DDRAW_NO3D) + return wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); + if (!window || window == GetDesktopWindow()) { window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "Hidden D3D Window", @@ -594,8 +597,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->flags |= DDRAW_D3D_INITIALIZED; - hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; return hr; @@ -638,12 +640,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.windowed = windowed; swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (!(ddraw->flags & DDRAW_NO3D)) - hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc); - else - hr = wined3d_device_init_gdi(ddraw->wined3d_device, &swapchain_desc); - - if (FAILED(hr)) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1d870c0c201..1424ed4ab7e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1079,8 +1079,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (device->wined3d->flags & WINED3D_NO3D) - return WINED3DERR_INVALIDCALL; memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); @@ -1120,26 +1118,40 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) - goto err_out; - device_init_swapchain_state(device, swapchain); + if (device->wined3d->flags & WINED3D_NO3D) + { + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + heap_free(device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + } + else + { + if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) + goto err_out; + device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; + device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); + TRACE("All defaults now set up.\n"); - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + /* Clear the screen */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); - device->d3d_initialized = TRUE; + device->d3d_initialized = TRUE; + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); + } - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); return WINED3D_OK; err_out: @@ -1153,47 +1165,6 @@ err_out: return hr; } -HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, - struct wined3d_swapchain_desc *swapchain_desc) -{ - struct wined3d_swapchain *swapchain = NULL; - HRESULT hr; - - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); - - /* Setup the implicit swapchain */ - TRACE("Creating implicit swapchain\n"); - hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain); - if (FAILED(hr)) - { - WARN("Failed to create implicit swapchain\n"); - goto err_out; - } - - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Out of memory!\n"); - goto err_out; - } - device->swapchains[0] = swapchain; - - if (!(device->blitter = wined3d_cpu_blitter_create())) - { - ERR("Failed to create CPU blitter.\n"); - heap_free(device->swapchains); - device->swapchain_count = 0; - goto err_out; - } - - return WINED3D_OK; - -err_out: - wined3d_swapchain_decref(swapchain); - return hr; -} - static void device_free_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 75b9fe12c60..1422c65245e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -121,7 +121,6 @@ @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) -@ cdecl wined3d_device_init_gdi(ptr ptr) @ cdecl wined3d_device_multiply_transform(ptr long ptr) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 51fb7e6c8c9..e943e0d988c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,7 +2364,6 @@ struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wine struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); -HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); void __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, -- 2.11.0

1 0

[PATCH 1/4] shell32/autocomplete: Implement the listbox scrollbar manually
by Gabriel Ivăncescu April 12, 2019

April 12, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a no-op patch; its purpose is to keep the next patch smaller and focused only on implementing the resizing grip, because IMO it was a bit large before I split it. Note that to avoid more pointless changes in the next patch, names with "grip" have been used for the scrollbar, I hope that's not a problem. Some of the things are done purposefully to keep the next patch smaller, while they may not make sense by themselves. For example, the WM_WINDOWPOSCHANGED is also useful to that end. dlls/shell32/autocomplete.c | 132 ++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index f0777ff..38ca8ca 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -65,9 +65,11 @@ typedef struct HWND hwndEdit; HWND hwndListBox; HWND hwndListBoxOwner; + HWND hwndListBoxGrip; WNDPROC wpOrigEditProc; WNDPROC wpOrigLBoxProc; WNDPROC wpOrigLBoxOwnerProc; + WNDPROC wpOrigLBoxGripProc; WCHAR *txtbackup; WCHAR *quickComplete; IEnumString *enumstr; @@ -284,6 +286,41 @@ static void free_enum_strs(IAutoCompleteImpl *ac) } } +static void update_listbox_size(IAutoCompleteImpl *ac, UINT width, UINT height) +{ + UINT item_height, listbox_width, grip_sz, grip_height; + SCROLLINFO info; + + info.nMax = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0) - 1; + item_height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); + grip_sz = GetSystemMetrics(SM_CXVSCROLL); + width -= GetSystemMetrics(SM_CXBORDER) * 2; + height -= GetSystemMetrics(SM_CYBORDER) * 2; + info.nPage = max(height / item_height, 1); + + /* Set the scrollbar info if it's visible */ + listbox_width = width; + if (info.nMax >= info.nPage) + { + grip_height = height; + info.cbSize = sizeof(info); + info.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + info.nMin = 0; + info.nPos = SendMessageW(ac->hwndListBox, LB_GETTOPINDEX, 0, 0); + SetScrollInfo(ac->hwndListBoxGrip, SB_VERT, &info, FALSE); + + listbox_width -= grip_sz; + } + else + grip_height = 0; + + SetWindowPos(ac->hwndListBoxGrip, NULL, width - grip_sz, 0, grip_sz, grip_height, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSENDCHANGING | SWP_DEFERERASE); + + SetWindowPos(ac->hwndListBox, NULL, 0, 0, listbox_width, height, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSENDCHANGING | SWP_DEFERERASE); +} + static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) { ShowWindow(ac->hwndListBoxOwner, SW_HIDE); @@ -304,7 +341,12 @@ static void show_listbox(IAutoCompleteImpl *ac) width = r.right - r.left; SetWindowPos(ac->hwndListBoxOwner, HWND_TOP, r.left, r.bottom + 1, width, height, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOSENDCHANGING | SWP_DEFERERASE); + + /* Update the grip here (as we skip it during message processing), due + to the fact that the size itself might not always change, while the + count does and thus it possibly needs updating of the scrollbar */ + update_listbox_size(ac, width, height); } static void set_listbox_font(IAutoCompleteImpl *ac, HFONT font) @@ -863,6 +905,36 @@ static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, set_text_and_selection(This, This->hwndEdit, msg, 0, strlenW(msg)); hide_listbox(This, hwnd, TRUE); return 0; + case WM_VSCROLL: + /* Handle thumb tracking manually as the listbox doesn't have WS_VSCROLL */ + if (LOWORD(wParam) == SB_THUMBTRACK || LOWORD(wParam) == SB_THUMBPOSITION) + { + SCROLLINFO info; + info.cbSize = sizeof(info); + info.fMask = SIF_TRACKPOS; + if (!GetScrollInfo(This->hwndListBoxGrip, SB_VERT, &info)) + return 0; + uMsg = LB_SETTOPINDEX; + wParam = info.nTrackPos; + } + /* fall through */ + case WM_MOUSEWHEEL: + case LB_SETCURSEL: + case LB_SETITEMHEIGHT: + case LB_SETTOPINDEX: + { + LRESULT ret = CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); + SCROLLINFO info; + info.cbSize = sizeof(info); + info.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; + info.nMin = 0; + info.nMax = SendMessageW(hwnd, LB_GETCOUNT, 0, 0) - 1; + info.nPage = SendMessageW(hwnd, LB_GETLISTBOXINFO, 0, 0); + info.nPos = SendMessageW(hwnd, LB_GETTOPINDEX, 0, 0); + + SetScrollInfo(This->hwndListBoxGrip, SB_VERT, &info, TRUE); + return ret; + } } return CallWindowProcW(This->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); } @@ -879,16 +951,55 @@ static LRESULT APIENTRY ACLBoxOwnerSubclassProc(HWND hwnd, UINT uMsg, WPARAM wPa if (draw_listbox_item(This, (DRAWITEMSTRUCT*)lParam, wParam)) return TRUE; break; - case WM_SIZE: - SetWindowPos(This->hwndListBox, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_DEFERERASE); + case WM_WINDOWPOSCHANGED: + { + const WINDOWPOS *wp = (const WINDOWPOS*)lParam; + + if (!(wp->flags & SWP_NOSIZE)) + { + /* Only proceed with the update if the user resized it */ + if (wp->flags & SWP_NOSENDCHANGING) break; + + update_listbox_size(This, wp->cx, wp->cy); + } break; + } } return CallWindowProcW(This->wpOrigLBoxOwnerProc, hwnd, uMsg, wParam, lParam); } +static LRESULT APIENTRY ACLBoxGripSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + IAutoCompleteImpl *This = (IAutoCompleteImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + + switch (uMsg) + { + case WM_MOUSEACTIVATE: + return MA_NOACTIVATE; + case WM_VSCROLL: + return SendMessageW(This->hwndListBox, uMsg, wParam, lParam); + case WM_NCCALCSIZE: + { + NCCALCSIZE_PARAMS *p = (NCCALCSIZE_PARAMS*)lParam; + if (wParam == FALSE) return 0; + + p->rgrc[0].right = p->rgrc[0].left; + + return 0; + } + case WM_NCHITTEST: + return HTVSCROLL; + case WM_NCLBUTTONDOWN: + case WM_NCLBUTTONDBLCLK: + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + return CallWindowProcW(This->wpOrigLBoxGripProc, hwnd, uMsg, wParam, lParam); +} + static void create_listbox(IAutoCompleteImpl *This) { + UINT grip_sz = GetSystemMetrics(SM_CXVSCROLL); + This->hwndListBoxOwner = CreateWindowExW(WS_EX_NOACTIVATE, WC_STATICW, NULL, WS_BORDER | WS_POPUP | WS_CLIPCHILDREN, 0, 0, 0, 0, NULL, NULL, shell32_hInstance, NULL); @@ -899,8 +1010,15 @@ static void create_listbox(IAutoCompleteImpl *This) } /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ + This->hwndListBoxGrip = CreateWindowExW(WS_EX_NOACTIVATE, WC_STATICW, NULL, + WS_CHILD | WS_VISIBLE, 0, 0, grip_sz, grip_sz, + This->hwndListBoxOwner, NULL, shell32_hInstance, NULL); + if (!This->hwndListBoxGrip) goto fail; + + /* Create the listbox */ This->hwndListBox = CreateWindowExW(WS_EX_NOACTIVATE, WC_LISTBOXW, NULL, - WS_CHILD | WS_VISIBLE | WS_VSCROLL | LBS_NODATA | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + LBS_NODATA | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT, 0, 0, 0, 0, This->hwndListBoxOwner, NULL, shell32_hInstance, NULL); if (This->hwndListBox) { @@ -912,6 +1030,9 @@ static void create_listbox(IAutoCompleteImpl *This) This->wpOrigLBoxOwnerProc = (WNDPROC)SetWindowLongPtrW(This->hwndListBoxOwner, GWLP_WNDPROC, (LONG_PTR)ACLBoxOwnerSubclassProc); SetWindowLongPtrW(This->hwndListBoxOwner, GWLP_USERDATA, (LONG_PTR)This); + This->wpOrigLBoxGripProc = (WNDPROC)SetWindowLongPtrW(This->hwndListBoxGrip, GWLP_WNDPROC, (LONG_PTR)ACLBoxGripSubclassProc); + SetWindowLongPtrW(This->hwndListBoxGrip, GWLP_USERDATA, (LONG_PTR)This); + /* Use the same font as the edit control, as it gets destroyed before it anyway */ edit_font = (HFONT)SendMessageW(This->hwndEdit, WM_GETFONT, 0, 0); if (edit_font) @@ -919,6 +1040,7 @@ static void create_listbox(IAutoCompleteImpl *This) return; } +fail: DestroyWindow(This->hwndListBoxOwner); This->hwndListBoxOwner = NULL; This->options &= ~ACO_AUTOSUGGEST; -- 2.20.1

3 8

[PATCH 1/2] include: add missing includes, functions to qos2.h
by Vijay Kiran Kamuju April 12, 2019

April 12, 2019

Fix the definition of QOS_FLOWID Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/qos2.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/qos2.h b/include/qos2.h index ac486f71fd..0d0bc597c9 100644 --- a/include/qos2.h +++ b/include/qos2.h @@ -19,11 +19,14 @@ #ifndef __WINE_QOS2_H__ #define __WINE_QOS2_H__ +#include <ws2tcpip.h> +#include <mstcpip.h> + #ifdef __cplusplus extern "C" { #endif -typedef UINT32 QOS_FLOWID; +typedef ULONG QOS_FLOWID, *PQOS_FLOWID; typedef enum _QOS_SHAPING { QOSShapeOnly, @@ -93,6 +96,27 @@ typedef struct _QOS_VERSION { USHORT MinorVersion; } QOS_VERSION, *PQOS_VERSION; +#define QOS_OUTGOING_DEFAULT_MINIMUM_BANDWIDTH 0xFFFFFFFF + +#define QOS_QUERYFLOW_FRESH 0x00000001 +#define QOS_NON_ADAPTIVE_FLOW 0x00000002 + +BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle); +BOOL WINAPI QOSCloseHandle(HANDLE handle); +BOOL WINAPI QOSStartTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSStopTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSEnumerateFlows(HANDLE handle, PULONG size, PVOID buffer); +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid); +BOOL WINAPI QOSRemoveSocketFromFlow(HANDLE handle, SOCKET socket, QOS_FLOWID flowid, DWORD flags); +BOOL WINAPI QOSSetFlow(HANDLE handle, QOS_FLOWID flowid, QOS_SET_FLOW op, ULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSQueryFlow(HANDLE handle, QOS_FLOWID flowid, QOS_QUERY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSNotifyFlow(HANDLE handle, QOS_FLOWID flowid, QOS_NOTIFY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSCancel(HANDLE handle, LPOVERLAPPED overlap); + #ifdef __cplusplus } #endif -- 2.21.0

2 2

[PATCH] dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present().
by Andrey Gusev April 12, 2019

April 12, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 17f9a1e43d..0a121b9dc8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -317,7 +317,7 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } -static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); -- 2.20.1

2 1

[PATCH 1/2] ntdll/tests: Add some tests for thread suspend/resume.
by Nikolay Sivov April 12, 2019

April 12, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index accb5d8646..c79fb8eb8d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -53,6 +53,8 @@ static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtClose)(HANDLE); +static NTSTATUS (WINAPI *pNtSuspendThread)(HANDLE thread, ULONG *count); +static NTSTATUS (WINAPI *pNtResumeThread)(HANDLE thread, ULONG *count); #if defined(__x86_64__) typedef struct @@ -3135,6 +3137,61 @@ static void test_vectored_continue_handler(void) } #endif /* defined(__i386__) || defined(__x86_64__) */ +static DWORD WINAPI suspend_thread_test( void *arg ) +{ + HANDLE event = arg; + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_suspend_thread(void) +{ + HANDLE thread, event; + NTSTATUS status; + ULONG count; + DWORD ret; + + status = NtSuspendThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + status = NtResumeThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, suspend_thread_test, event, 0, NULL); + ok(thread != NULL, "Failed to create a thread.\n"); + + ret = WaitForSingleObject(thread, 0); + ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + + status = NtResumeThread(thread, NULL); + ok(!status, "Unexpected status %#x.\n", status); + + status = NtResumeThread(thread, &count); + ok(!status, "Unexpected status %#x.\n", status); + ok(count == 0, "Unexpected suspended count %u.\n", count); + + status = NtSuspendThread(thread, NULL); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + + status = NtSuspendThread(thread, &count); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(count == 1, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, &count); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(count == 2, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, NULL); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3169,6 +3226,8 @@ START_TEST(exception) pNtSetInformationProcess = (void*)GetProcAddress( hntdll, "NtSetInformationProcess" ); pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + pNtSuspendThread = (void *)GetProcAddress( hntdll, "NtSuspendThread" ); + pNtResumeThread = (void *)GetProcAddress( hntdll, "NtResumeThread" ); #ifdef __i386__ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3253,6 +3312,7 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); + test_suspend_thread(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -3294,6 +3354,7 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); + test_suspend_thread(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); -- 2.20.1

2 2

[PATCH] pdh: Support the 'Processor' object string.
by Vijay Kiran Kamuju April 12, 2019

April 12, 2019

From: Erich Hoover <ehoover(a)mines.edu> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33018 From: Erich Hoover <ehoover(a)mines.edu> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/pdh/pdh_main.c | 3 +++ dlls/pdh/tests/pdh.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7ef91f1a7fb..ef69e45fca4 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -178,6 +178,8 @@ struct source static const WCHAR path_processor_time[] = {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; +static const WCHAR path_processor[] = + {'\\','P','r','o','c','e','s','s','o','r',0}; static const WCHAR path_uptime[] = {'\\','S','y','s','t','e','m', '\\', 'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; @@ -204,6 +206,7 @@ static void CALLBACK collect_uptime( struct counter *counter ) static const struct source counter_sources[] = { { 6, path_processor_time, collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 }, + { 238, path_processor, NULL, 0, 0, 0 }, { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } }; diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 0a17906afbd..a9613e22b02 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -673,6 +673,13 @@ static void test_PdhLookupPerfNameByIndexA( void ) "PdhLookupPerfNameByIndexA failed, got %s expected \'%% Processor Time\'\n", buffer); ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size); + size = sizeof(buffer); + ret = PdhLookupPerfNameByIndexA( NULL, 238, buffer, &size ); + ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret); + ok(!lstrcmpA( buffer, "Processor" ), + "PdhLookupPerfNameByIndexA failed, got %s expected \'Processor\'\n", buffer); + ok(size == sizeof("Processor"), "PdhLookupPerfNameByIndexA failed %d\n", size); + size = sizeof(buffer); ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || -- 2.17.0

1 0

[PATCH 1/6] qcap/tests: Remove some unnecessary workarounds.
by Zebediah Figura April 12, 2019

April 12, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/smartteefilter.c | 42 ++++++++++---------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f62a88fb79..0c79ea7056 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1,5 +1,5 @@ /* - * SmartTeeFilter tests + * Smart tee filter unit tests * * Copyright 2015 Damjan Jovanovic * @@ -18,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #define COBJMACROS -#include <dshow.h> -#include <guiddef.h> -#include <devguid.h> -#include <stdio.h> - -#include "wine/strmbase.h" +#include "dshow.h" #include "wine/test.h" static HANDLE event; @@ -2022,25 +2012,19 @@ end: START_TEST(smartteefilter) { - if (SUCCEEDED(CoInitialize(NULL))) - { - event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (event) { - test_smart_tee_filter_aggregation(); - test_smart_tee_filter(); + CoInitialize(NULL); - test_audio_smart_tee_filter_auto_insertion(test_audio_preview); - test_audio_smart_tee_filter_auto_insertion(test_audio_capture); + event = CreateEventW(NULL, FALSE, FALSE, NULL); - test_video_smart_tee_filter_auto_insertion(test_video_preview); - test_video_smart_tee_filter_auto_insertion(test_video_capture); + test_smart_tee_filter_aggregation(); + test_smart_tee_filter(); - CloseHandle(event); - } else - skip("CreateEvent failed, error=%u\n", GetLastError()); + test_audio_smart_tee_filter_auto_insertion(test_audio_preview); + test_audio_smart_tee_filter_auto_insertion(test_audio_capture); - CoUninitialize(); - } - else - skip("CoInitialize failed\n"); + test_video_smart_tee_filter_auto_insertion(test_video_preview); + test_video_smart_tee_filter_auto_insertion(test_video_capture); + + CloseHandle(event); + CoUninitialize(); } -- 2.21.0

2 6

[PATCH v2 1/2] include: add missing includes, functions to qos2.h
by Vijay Kiran Kamuju April 11, 2019

April 11, 2019

Fix the definition of QOS_FLOWID Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/qos2.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/include/qos2.h b/include/qos2.h index ac486f71fd..0d0bc597c9 100644 --- a/include/qos2.h +++ b/include/qos2.h @@ -19,11 +19,14 @@ #ifndef __WINE_QOS2_H__ #define __WINE_QOS2_H__ +#include <ws2tcpip.h> +#include <mstcpip.h> + #ifdef __cplusplus extern "C" { #endif -typedef UINT32 QOS_FLOWID; +typedef ULONG QOS_FLOWID, *PQOS_FLOWID; typedef enum _QOS_SHAPING { QOSShapeOnly, @@ -93,6 +96,27 @@ typedef struct _QOS_VERSION { USHORT MinorVersion; } QOS_VERSION, *PQOS_VERSION; +#define QOS_OUTGOING_DEFAULT_MINIMUM_BANDWIDTH 0xFFFFFFFF + +#define QOS_QUERYFLOW_FRESH 0x00000001 +#define QOS_NON_ADAPTIVE_FLOW 0x00000002 + +BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle); +BOOL WINAPI QOSCloseHandle(HANDLE handle); +BOOL WINAPI QOSStartTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSStopTrackingClient(HANDLE handle, PSOCKADDR addr, DWORD flags); +BOOL WINAPI QOSEnumerateFlows(HANDLE handle, PULONG size, PVOID buffer); +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid); +BOOL WINAPI QOSRemoveSocketFromFlow(HANDLE handle, SOCKET socket, QOS_FLOWID flowid, DWORD flags); +BOOL WINAPI QOSSetFlow(HANDLE handle, QOS_FLOWID flowid, QOS_SET_FLOW op, ULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSQueryFlow(HANDLE handle, QOS_FLOWID flowid, QOS_QUERY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSNotifyFlow(HANDLE handle, QOS_FLOWID flowid, QOS_NOTIFY_FLOW op, PULONG size, + PVOID buffer, DWORD flags, LPOVERLAPPED overlap); +BOOL WINAPI QOSCancel(HANDLE handle, LPOVERLAPPED overlap); + #ifdef __cplusplus } #endif -- 2.21.0

1 1

[PATCH v3 01/11] ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Derek Lesho April 11, 2019

April 11, 2019

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- v3: Added a test and header definition. dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 17 +++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f5dee07e2f..770bdfd4fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3245,6 +3245,26 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE threadid, PETHREAD *thread) +{ + NTSTATUS status; + HANDLE hThread = OpenThread( THREAD_ALL_ACCESS, FALSE, HandleToUlong(threadid) ); + + if (!hThread) + return STATUS_INVALID_PARAMETER; + + status = kernel_object_from_handle( hThread, PsThreadType, (void**)thread ); + + ObReferenceObject( *thread ); + + NtClose( hThread ); + return status; +} + + /***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 43f47470a9..601506246e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -913,7 +913,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 66465bb5ae..70831adede 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -826,6 +826,22 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "ZwClose failed: %#x\n", status); } +static void test_lookup_thread(void) +{ + NTSTATUS status; + PETHREAD thread = NULL; + + status = PsLookupThreadByThreadId(PsGetCurrentThreadId(), &thread); + ok(!status, "PsLookupThreadByThreadId failed: %#x\n", status); + ok((PKTHREAD)thread == KeGetCurrentThread(), "thread != KeGetCurrentThread\n"); + + if (thread) + ObDereferenceObject(thread); + + status = PsLookupThreadByThreadId(NULL, &thread); + ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -868,6 +884,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_stack_callout(); test_lookaside_list(); test_ob_reference(test_input->path); + test_lookup_thread(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index abe357fbc9..9b57ae7ad7 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); #endif -- 2.20.1

3 51