February 2020 - Wine-Devel - list.winehq.org

[PATCH] wined3d: Fix the spelling of a comment.
by Zebediah Figura Feb. 6, 2020

Feb. 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bc220f0cf4..fe8e239dea 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1031,7 +1031,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit DWORD location; /* If we would need to copy from a renderbuffer or drawable, we'd probably - * be better of using the FBO blitter directly, since we'd need to use it + * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. */ if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_texture->resource.format->id == dst_texture->resource.format->id -- 2.25.0

3 2

[PATCH 1/3] ddraw: Apply the device state before executing a draw call.
by Zebediah Figura Feb. 6, 2020

Feb. 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/device.c | 12 ++++++++++-- dlls/ddraw/executebuffer.c | 4 ++++ dlls/ddraw/surface.c | 2 ++ dlls/ddraw/vertexbuffer.c | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 725a935022..6cd8948f56 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3520,6 +3520,7 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, size = vertex_count * stride; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3713,6 +3714,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -4057,6 +4059,7 @@ static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIM } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, dst_size); if (FAILED(hr)) goto done; @@ -4173,6 +4176,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d_device_prepare_vertex_buffer(device, vtx_dst_size); if (FAILED(hr)) goto done; @@ -4330,6 +4334,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE } wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb_impl->wined3d_buffer, 0, stride))) @@ -4452,6 +4457,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); hr = d3d_device_prepare_index_buffer(device, index_count * sizeof(WORD)); @@ -5251,6 +5257,7 @@ static HRESULT d3d_device7_ValidateDevice(IDirect3DDevice7 *iface, DWORD *pass_c TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -5313,7 +5320,7 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, (color & 0xff) / 255.0f, ((color >> 24) & 0xff) / 255.0f, }; - struct d3d_device *This = impl_from_IDirect3DDevice7(iface); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); HRESULT hr; TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n", @@ -5326,7 +5333,8 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, } wined3d_mutex_lock(); - hr = wined3d_device_clear(This->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + hr = wined3d_device_clear(device->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 9f0fdb85e5..0d1726ed7f 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -74,6 +74,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DOP_POINT: { const D3DPOINT *p = (D3DPOINT *)instr; + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_POINTLIST, 0); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->dst_vertex_buffer, 0, sizeof(D3DTLVERTEX)); @@ -106,6 +107,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d primitive_size = 3; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + index_count = count * primitive_size; if (buffer->index_size < index_count) { @@ -300,6 +303,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d { case D3DPROCESSVERTICES_TRANSFORMLIGHT: case D3DPROCESSVERTICES_TRANSFORM: + wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos * sizeof(D3DVERTEX), sizeof(D3DVERTEX)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fda42f2982..03546e17f1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1472,6 +1472,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, &colour, 0.0f, 0); @@ -1487,6 +1488,7 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; + wined3d_device_apply_stateblock(wined3d_device, dst_surface->ddraw->state); return wined3d_device_clear_rendertarget_view(wined3d_device, ddraw_surface_get_rendertarget_view(dst_surface), dst_rect, wined3d_flags, NULL, colour.r, 0); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 9df386d1a0..1e3d25f6cb 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -277,6 +277,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to -- 2.25.0

2 5

[PATCH 1/3] rtworkq: Add RtwqSetLongRunning().
by Nikolay Sivov Feb. 6, 2020

Feb. 6, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index a6aac6abda..13bce0836a 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1071,3 +1071,24 @@ HRESULT WINAPI RtwqUnlockWorkQueue(DWORD queue) return unlock_user_queue(queue); } + +HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) +{ + struct queue *queue; + HRESULT hr; + int i; + + TRACE("%#x, %d.\n", queue_id, enable); + + lock_user_queue(queue_id); + + if (SUCCEEDED(hr = grab_queue(queue_id, &queue))) + { + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + queue->envs[i].u.s.LongFunction = !!enable; + } + + unlock_user_queue(queue_id); + + return hr; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 48bc17cbfc..2d0d3b40e6 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -27,7 +27,7 @@ @ stdcall RtwqScheduleWorkItem(ptr int64 ptr) @ stub RtwqSetDeadline @ stub RtwqSetDeadline2 -@ stub RtwqSetLongRunning +@ stdcall RtwqSetLongRunning(long long) @ stdcall RtwqShutdown() @ stdcall RtwqStartup() @ stub RtwqUnjoinWorkQueue diff --git a/include/rtworkq.idl b/include/rtworkq.idl index 001cf2c3e9..6ddb232fbd 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -88,6 +88,7 @@ cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IR cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);") cpp_quote("HRESULT WINAPI RtwqUnlockPlatform(void);") -- 2.24.1

1 2

[PATCH] winevulkan: handle bitmask pointers for spec generation
by Liam Middlebrook Feb. 6, 2020

Feb. 6, 2020

Fixes a bug where pointer types for the following functions would be marked as long: vkGetDeviceGroupPeerMemoryFeatures vkGetDeviceGroupSurfacePresentModesKHR vkGetPhysicalDeviceSurfacePresentModesKHR Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5eebc0f3b2..52ef25948c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1491,12 +1491,12 @@ class VkParam(object): def spec(self): """ Generate spec file entry for this parameter. """ - if self.type_info["category"] in ["bitmask", "enum"]: - return "long" if self.is_pointer() and self.type == "char": return "str" if self.is_dispatchable() or self.is_pointer() or self.is_static_array(): return "ptr" + if self.type_info["category"] in ["bitmask", "enum"]: + return "long" if self.is_handle() and not self.is_dispatchable(): return "int64" if self.type == "float": -- 2.17.2

1 0

[PATCH] oledb32: Add Advanced page to datalink dialog
by Alistair Leslie-Hughes Feb. 6, 2020

Feb. 6, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 63 +++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 16 ++++++++++ dlls/oledb32/version.rc | 26 +++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 556390fdf8..d33d637264 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -380,11 +380,67 @@ static LRESULT CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARA return 0; } +static void advanced_fill_permission_list(HWND parent) +{ + LVITEMW item; + LVCOLUMNW column; + RECT rc; + int resources[] = {IDS_PERM_READ, IDS_PERM_READWRITE, IDS_PERM_SHAREDENYNONE, + IDS_PERM_SHAREDENYREAD, IDS_PERM_SHAREDENYWRITE, IDS_PERM_SHAREEXCLUSIVE, + IDS_PERM_WRITE}; + int i; + WCHAR buf[256]; + HWND lv = GetDlgItem(parent, IDC_LST_PERMISSIONS); + if (!lv) + return; + + SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_CHECKBOXES); + GetWindowRect(lv, &rc); + column.mask = LVCF_WIDTH | LVCF_FMT; + column.fmt = LVCFMT_FIXED_WIDTH; + column.cx = (rc.right - rc.left) - 25; + column.pszText = buf; + SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + + for(i =0; i < ARRAY_SIZE(resources); i++) + { + item.mask = LVIF_TEXT; + item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); + item.iSubItem = 0; + LoadStringW(instance, resources[i], buf, ARRAY_SIZE(buf)); + item.pszText = buf; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); + } +} + +static LRESULT CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + + switch (msg) + { + case WM_INITDIALOG: + { + EnableWindow(GetDlgItem(hwnd, IDC_LBL_LEVEL), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_CBO_LEVEL), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_LBL_PROTECTION), FALSE); + EnableWindow(GetDlgItem(hwnd, IDC_CBO_PROTECTION), FALSE); + + advanced_fill_permission_list(hwnd); + + break; + } + default: + break; + } + return 0; +} + static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **connection) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); PROPSHEETHEADERW hdr; - PROPSHEETPAGEW pages[2]; + PROPSHEETPAGEW pages[3]; INT_PTR ret; FIXME("(%p, %p) Semi-stub\n", iface, connection); @@ -406,6 +462,11 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); pages[1].pfnDlgProc = data_link_connection_dlg_proc; + pages[2].dwSize = sizeof(PROPSHEETPAGEW); + pages[2].hInstance = instance; + pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); + pages[2].pfnDlgProc = data_link_advanced_dlg_proc; + memset(&hdr, 0, sizeof(hdr)); hdr.dwSize = sizeof(hdr); hdr.hwndParent = This->hwnd; diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index 57e7d5496a..99d3595d4a 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -22,6 +22,13 @@ #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 +#define IDS_PERM_READ 2002 +#define IDS_PERM_READWRITE 2003 +#define IDS_PERM_SHAREDENYNONE 2004 +#define IDS_PERM_SHAREDENYREAD 2005 +#define IDS_PERM_SHAREDENYWRITE 2006 +#define IDS_PERM_SHAREEXCLUSIVE 2007 +#define IDS_PERM_WRITE 2008 #define IDD_CONNECTION 3000 #define IDC_BTN_EDIT 3001 @@ -41,3 +48,12 @@ #define IDC_LBL_LOGIN 3015 #define IDC_LBL_INITIAL 3016 #define IDC_LBL_CONNECTION 3017 + +#define IDD_ADVANCED 4000 +#define IDC_CBO_LEVEL 4001 +#define IDC_CBO_PROTECTION 4002 +#define IDC_EDT_TIMEOUT 4003 +#define IDC_LST_PERMISSIONS 4004 +#define IDC_GRP_NETWORK 4005 +#define IDC_LBL_LEVEL 4006 +#define IDC_LBL_PROTECTION 4007 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 63d1d6c002..bb5266d92c 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -35,6 +35,14 @@ STRINGTABLE { IDS_PROPSHEET_TITLE "Data Link Properties" IDS_COL_PROVIDER "OLE DB Provider(s)" + + IDS_PERM_READ "Read" + IDS_PERM_READWRITE "ReadWrite" + IDS_PERM_SHAREDENYNONE "Share Deny None" + IDS_PERM_SHAREDENYREAD "Share Deny Read" + IDS_PERM_SHAREDENYWRITE "Share Deny Write" + IDS_PERM_SHAREEXCLUSIVE "Share Exclusive" + IDS_PERM_WRITE "Write" } IDD_PROVIDER DIALOG 0, 0, 227, 225 @@ -72,3 +80,21 @@ BEGIN COMBOBOX IDC_CBO_INITIAL,29,170,191,64,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Test Connection",IDC_BTN_TEST,140,194,81,14,WS_GROUP END + +IDD_ADVANCED DIALOG 0, 0, 227, 225 +STYLE DS_SETFONT | WS_CHILD | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Network settings",IDC_GRP_NETWORK,7,7,213,51 + LTEXT "&Impersonation level:",IDC_LBL_LEVEL,14,22,66,8 + COMBOBOX IDC_CBO_LEVEL,83,20,131,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "P&rotection level:",IDC_LBL_PROTECTION,14,39,54,8 + COMBOBOX IDC_CBO_PROTECTION,83,37,131,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Other",-1,7,62,213,92 + LTEXT "Connect:",-1,14,76,100,8 + EDITTEXT IDC_EDT_TIMEOUT,83,74,48,12,ES_RIGHT | ES_NUMBER + LTEXT "seconds.",-1,133,75,28,8 + LTEXT "A&ccess:",-1,14,91,100,8 + CONTROL "List1",IDC_LST_PERMISSIONS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOLABELWRAP | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,83,91,131,55 +END -- 2.17.1

1 0

[PATCH 1/5] strmbase: Rename the "pFuncsTable" member of struct strmbase_pin to "ops".
by Zebediah Figura Feb. 6, 2020

Feb. 6, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 19 +++++++++---------- include/wine/strmbase.h | 25 +++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 6b84c9d1f18..3df9e3e333c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -57,7 +57,7 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes object->pin = pin; IPin_AddRef(&pin->IPin_iface); - while (pin->pFuncsTable->pin_get_media_type(pin, object->count, &mt) == S_OK) + while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) { FreeMediaType(&mt); ++object->count; @@ -124,7 +124,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, for (i = 0; i < count; ++i) { if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) - hr = enummt->pin->pFuncsTable->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); + hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); else hr = E_OUTOFMEMORY; if (FAILED(hr)) @@ -169,7 +169,7 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface) TRACE("enummt %p.\n", enummt); enummt->count = 0; - while (enummt->pin->pFuncsTable->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) { FreeMediaType(&mt); ++enummt->count; @@ -267,8 +267,7 @@ static HRESULT WINAPI pin_QueryInterface(IPin *iface, REFIID iid, void **out) *out = NULL; - if (pin->pFuncsTable->pin_query_interface - && SUCCEEDED(hr = pin->pFuncsTable->pin_query_interface(pin, iid, out))) + if (pin->ops->pin_query_interface && SUCCEEDED(hr = pin->ops->pin_query_interface(pin, iid, out))) return hr; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPin)) @@ -392,7 +391,7 @@ static HRESULT WINAPI pin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) TRACE("pin %p %s:%s, mt %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), mt); strmbase_dump_media_type(mt); - return (pin->pFuncsTable->pin_query_accept(pin, mt) == S_OK ? S_OK : S_FALSE); + return (pin->ops->pin_query_accept(pin, mt) == S_OK ? S_OK : S_FALSE); } static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) @@ -404,7 +403,7 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), enum_media_types); - if (FAILED(hr = pin->pFuncsTable->pin_get_media_type(pin, 0, &mt))) + if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) return hr; if (hr == S_OK) FreeMediaType(&mt); @@ -791,7 +790,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); - pin->pin.pFuncsTable = &func_table->base; + pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -844,7 +843,7 @@ static HRESULT WINAPI sink_ReceiveConnection(IPin *iface, IPin *pReceivePin, con if (This->pin.peer) hr = VFW_E_ALREADY_CONNECTED; - if (SUCCEEDED(hr) && This->pin.pFuncsTable->pin_query_accept(&This->pin, pmt) != S_OK) + if (SUCCEEDED(hr) && This->pin.ops->pin_query_accept(&This->pin, pmt) != S_OK) hr = VFW_E_TYPE_NOT_ACCEPTED; /* FIXME: shouldn't we just map common errors onto * VFW_E_TYPE_NOT_ACCEPTED and pass the value on otherwise? */ @@ -1171,7 +1170,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); - pin->pin.pFuncsTable = &func_table->base; + pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator; if (pin->preferred_allocator) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 965f6be401a..57ff0247084 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -39,16 +39,17 @@ struct strmbase_pin IPin *peer; AM_MEDIA_TYPE mt; - const struct BasePinFuncTable* pFuncsTable; + const struct strmbase_pin_ops *ops; }; -typedef struct BasePinFuncTable { +struct strmbase_pin_ops +{ /* Required for QueryAccept(), Connect(), ReceiveConnection(). */ HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); /* Required for EnumMediaTypes(). */ HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, unsigned int index, AM_MEDIA_TYPE *mt); HRESULT (*pin_query_interface)(struct strmbase_pin *pin, REFIID iid, void **out); -} BasePinFuncTable; +}; struct strmbase_source { @@ -65,14 +66,14 @@ typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(struct strmbase_source * struct strmbase_source_ops { - BasePinFuncTable base; - - /* Required for Connect(). */ - BaseOutputPin_AttemptConnection pfnAttemptConnection; - /* Required for BaseOutputPinImpl_DecideAllocator */ - BaseOutputPin_DecideBufferSize pfnDecideBufferSize; - /* Required for BaseOutputPinImpl_AttemptConnection */ - BaseOutputPin_DecideAllocator pfnDecideAllocator; + struct strmbase_pin_ops base; + + /* Required for Connect(). */ + BaseOutputPin_AttemptConnection pfnAttemptConnection; + /* Required for BaseOutputPinImpl_DecideAllocator */ + BaseOutputPin_DecideBufferSize pfnDecideBufferSize; + /* Required for BaseOutputPinImpl_AttemptConnection */ + BaseOutputPin_DecideAllocator pfnDecideAllocator; }; struct strmbase_sink @@ -91,7 +92,7 @@ typedef HRESULT (WINAPI *BaseInputPin_Receive)(struct strmbase_sink *This, IMedi struct strmbase_sink_ops { - BasePinFuncTable base; + struct strmbase_pin_ops base; BaseInputPin_Receive pfnReceive; HRESULT (*sink_connect)(struct strmbase_sink *pin, IPin *peer, const AM_MEDIA_TYPE *mt); void (*sink_disconnect)(struct strmbase_sink *pin); -- 2.25.0

1 4

[PATCH] include: Add X3DAUDIO_CALCULATE_* defines.
by Alistair Leslie-Hughes Feb. 5, 2020

Feb. 5, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/x3daudio.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index a503507a40..0fd9a30092 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -87,6 +87,16 @@ typedef struct X3DAUDIO_DSP_SETTINGS { float ListenerVelocityComponent; } X3DAUDIO_DSP_SETTINGS; +#define X3DAUDIO_CALCULATE_MATRIX 0x00000001 +#define X3DAUDIO_CALCULATE_DELAY 0x00000002 +#define X3DAUDIO_CALCULATE_LPF_DIRECT 0x00000004 +#define X3DAUDIO_CALCULATE_LPF_REVERB 0x00000008 +#define X3DAUDIO_CALCULATE_REVERB 0x00000010 +#define X3DAUDIO_CALCULATE_DOPPLER 0x00000020 +#define X3DAUDIO_CALCULATE_EMITTER_ANGLE 0x00000040 +#define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 +#define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE]; -- 2.17.1

1 0

po: Update Lithuanian translation
by Aurimas Fišeras Feb. 5, 2020

Feb. 5, 2020

1 0

[PATCH v3] wldap32: Define a debug channel only when we are using it.
by Gerald Pfeifer Feb. 5, 2020

Feb. 5, 2020

We only need a debug channel when we're later using it - and all uses in these files are guarded by #ifdef HAVE_LDAP, so use the same guard around the definition of the debug channel as well. Thanks to Nikolay for this hint based on an earlier patch, and Alexandre for encouraging to go for the whole set of files. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wldap32/add.c | 2 +- dlls/wldap32/bind.c | 2 ++ dlls/wldap32/compare.c | 2 ++ dlls/wldap32/control.c | 2 ++ dlls/wldap32/delete.c | 2 ++ dlls/wldap32/dn.c | 2 ++ dlls/wldap32/modify.c | 2 +- dlls/wldap32/modrdn.c | 2 ++ dlls/wldap32/option.c | 2 ++ dlls/wldap32/parse.c | 2 ++ dlls/wldap32/rename.c | 2 ++ dlls/wldap32/search.c | 2 ++ 12 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/add.c b/dlls/wldap32/add.c index 0a24d95f32..270311e561 100644 --- a/dlls/wldap32/add.c +++ b/dlls/wldap32/add.c @@ -34,9 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#ifdef HAVE_LDAP static LDAPMod *nullattrs[] = { NULL }; #endif diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 0e9404ec50..27fb286f50 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_bindA (WLDAP32.@) diff --git a/dlls/wldap32/compare.c b/dlls/wldap32/compare.c index 7cadc2a970..a7eab26d96 100644 --- a/dlls/wldap32/compare.c +++ b/dlls/wldap32/compare.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_compareA (WLDAP32.@) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index 1ec8641847..ffbf41ef68 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_control_freeA (WLDAP32.@) diff --git a/dlls/wldap32/delete.c b/dlls/wldap32/delete.c index 47e1cb4f2c..7d62edc8ac 100644 --- a/dlls/wldap32/delete.c +++ b/dlls/wldap32/delete.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_deleteA (WLDAP32.@) diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c index fbe1a0c091..1303eb5057 100644 --- a/dlls/wldap32/dn.c +++ b/dlls/wldap32/dn.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_dn2ufnA (WLDAP32.@) diff --git a/dlls/wldap32/modify.c b/dlls/wldap32/modify.c index 292fa831a8..defc32af9c 100644 --- a/dlls/wldap32/modify.c +++ b/dlls/wldap32/modify.c @@ -34,9 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#ifdef HAVE_LDAP static LDAPMod *nullmods[] = { NULL }; #endif diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index 3e2c867956..97ab0a9258 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_modrdnA (WLDAP32.@) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index ddc5ca4933..4b7ec36c38 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_get_optionA (WLDAP32.@) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index e83e6d2351..88464a3b13 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_parse_extended_resultA (WLDAP32.@) diff --git a/dlls/wldap32/rename.c b/dlls/wldap32/rename.c index 2de50818b7..f8cac439a9 100644 --- a/dlls/wldap32/rename.c +++ b/dlls/wldap32/rename.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_rename_extA (WLDAP32.@) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index 7e774f6894..f3d3eb48d4 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -34,7 +34,9 @@ #include "wldap32.h" #include "wine/debug.h" +#ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#endif /*********************************************************************** * ldap_searchA (WLDAP32.@) -- 2.25.0

1 0

[PATCH v2 1/4] d3dcompiler: Get rid of the "node" field from struct hlsl_ir_function_decl.
by Zebediah Figura Feb. 5, 2020

Feb. 5, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 20 ++++++++++---------- dlls/d3dcompiler_43/utils.c | 4 +--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1ab343de2d8..01f6ce0e60a 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -712,7 +712,6 @@ enum hlsl_ir_node_type HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_EXPR, - HLSL_IR_FUNCTION_DECL, HLSL_IR_IF, HLSL_IR_LOOP, HLSL_IR_JUMP, @@ -776,7 +775,8 @@ struct hlsl_ir_function struct hlsl_ir_function_decl { - struct hlsl_ir_node node; + struct hlsl_type *return_type; + struct source_location loc; struct wine_rb_entry entry; struct hlsl_ir_function *func; const char *semantic; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5585b899463..7c14ad0091c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1084,28 +1084,28 @@ hlsl_prog: /* empty */ { if (decl->body && $2.decl->body) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefinition of function %s", debugstr_a($2.name)); YYABORT; } - else if (!compare_hlsl_types(decl->node.data_type, $2.decl->node.data_type)) + else if (!compare_hlsl_types(decl->return_type, $2.decl->return_type)) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefining function %s with a different return type", debugstr_a($2.name)); - hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_NOTE, + hlsl_report_message(decl->loc.file, decl->loc.line, decl->loc.col, HLSL_LEVEL_NOTE, "%s previously declared here", debugstr_a($2.name)); YYABORT; } } - if ($2.decl->node.data_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) + if ($2.decl->return_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "void function with a semantic"); } @@ -1280,7 +1280,7 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c } $$.name = $3; $$.decl->semantic = $7.semantic; - set_location(&$$.decl->node.loc, &@3); + set_location(&$$.decl->loc, &@3); } compound_statement: '{' '}' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5ecbbc9dc1d..ad2d02e1452 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1577,8 +1577,7 @@ struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, struc ERR("Out of memory.\n"); return NULL; } - decl->node.type = HLSL_IR_FUNCTION_DECL; - decl->node.data_type = return_type; + decl->return_type = return_type; decl->parameters = parameters; return decl; @@ -1775,7 +1774,6 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_EXPR", - "HLSL_IR_FUNCTION_DECL", "HLSL_IR_IF", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE", -- 2.20.1

2 5