wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Zebediah Figura : winedbg/gdbproxy: Use the WINEDEBUG interface for debugging winedbg.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 6159431cd70b1925833f64a09ff4a0e120c59665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6159431cd70b1925833f64a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 30 14:47:53 2018 -0500 winedbg/gdbproxy: Use the WINEDEBUG interface for debugging winedbg. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 324 ++++++++++++++------------------------------ 1 file changed, 99 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6159431cd70b1925833f…

1 0

Dmitry Timoshkov : kernel32: Set environment variable %PUBLIC% at process start-up.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 2a28db37ab00540e5ea0c7fd434abfccf52e526f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a28db37ab00540e5ea0c7fd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 16 15:52:57 2018 +0800 kernel32: Set environment variable %PUBLIC% at process start-up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 643bc15..d615f06 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -517,12 +517,14 @@ static void set_additional_environment(void) 'P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR profiles_valueW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; + static const WCHAR public_valueW[] = {'P','u','b','l','i','c',0}; static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL; + WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL, *public_dir = NULL; WCHAR buf[MAX_COMPUTERNAME_LENGTH+1]; HANDLE hkey; DWORD len; @@ -546,6 +548,7 @@ static void set_additional_environment(void) profile_dir = get_reg_value( hkey, profiles_valueW ); all_users_dir = get_reg_value( hkey, all_users_valueW ); program_data_dir = get_reg_value( hkey, programdataW ); + public_dir = get_reg_value( hkey, public_valueW ); NtClose( hkey ); } @@ -568,9 +571,15 @@ static void set_additional_environment(void) SetEnvironmentVariableW( programdataW, program_data_dir ); } + if (public_dir) + { + SetEnvironmentVariableW( publicW, public_dir ); + } + HeapFree( GetProcessHeap(), 0, all_users_dir ); HeapFree( GetProcessHeap(), 0, profile_dir ); HeapFree( GetProcessHeap(), 0, program_data_dir ); + HeapFree( GetProcessHeap(), 0, public_dir ); } /***********************************************************************

1 0

Henri Verbeet : wined3d: Set a LUID for WINED3D_NO3D adapters as well.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 8e537aa709e45bd6d238ae41814721068ad4d626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e537aa709e45bd6d238ae41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:22 2018 +0430 wined3d: Set a LUID for WINED3D_NO3D adapters as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be03a1d..65a1bb1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6641,14 +6641,6 @@ static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD w glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter %p.\n", - adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) { ERR("Failed to get a GL context for adapter %p.\n", adapter); @@ -6752,6 +6744,14 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); + if (!AllocateLocallyUniqueId(&adapter->luid)) + { + ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); + return FALSE; + } + TRACE("Allocated LUID %08x:%08x for adapter %p.\n", + adapter->luid.HighPart, adapter->luid.LowPart, adapter); + if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags);

1 0

Henri Verbeet : wined3d: Share common code between wined3d_adapter_init() and wined3d_adapter_no3d_init().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: b96a6771a8805fab21c68258c19f16a5eecce04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96a6771a8805fab21c68258… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:21 2018 +0430 wined3d: Share common code between wined3d_adapter_init() and wined3d_adapter_no3d_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f9449f..be03a1d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6601,7 +6601,7 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) +static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -6611,13 +6611,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, }; struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - unsigned int i; - DISPLAY_DEVICEW display_device; DWORD max_gl_version; + unsigned int i; - TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); - - adapter->ordinal = ordinal; + TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL @@ -6716,11 +6713,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); @@ -6728,12 +6720,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { - DISPLAY_DEVICEW display_device; - - memset(adapter, 0, sizeof(*adapter)); - adapter->ordinal = ordinal; + TRACE("adapter %p.\n", adapter); adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; @@ -6749,12 +6738,23 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; + return TRUE; +} + +static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, DWORD wined3d_creation_flags) +{ + DISPLAY_DEVICEW display_device; + + adapter->ordinal = ordinal; + display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); - return TRUE; + if (wined3d_creation_flags & WINED3D_NO3D) + return wined3d_adapter_no3d_init(adapter); + return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -6766,20 +6766,14 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { - BOOL ret; - wined3d->ref = 1; wined3d->flags = flags; - TRACE("Initializing adapters.\n"); + TRACE("Initialising adapters.\n"); - if (flags & WINED3D_NO3D) - ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); - else - ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); - if (!ret) + if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) { - WARN("Failed to initialize adapter.\n"); + WARN("Failed to initialise adapter.\n"); return E_FAIL; } wined3d->adapter_count = 1;

1 0

Henri Verbeet : wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 8a6d3b3ea2dba8ad329accec63ffc2755566b641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a6d3b3ea2dba8ad329accec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:20 2018 +0430 wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init(). Matching WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d9a5e9..8f9449f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6728,7 +6728,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) { DISPLAY_DEVICEW display_device; @@ -6774,7 +6774,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) TRACE("Initializing adapters.\n"); if (flags & WINED3D_NO3D) - ret = wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); else ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); if (!ret)

1 0

Henri Verbeet : wined3d: Trace command stream opcodes.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 7591c8b6e414882066842dc84cdca4c2c6a47cba URL: https://source.winehq.org/git/wine.git/?a=commit;h=7591c8b6e414882066842dc8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:19 2018 +0430 wined3d: Trace command stream opcodes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3f1ca8c..d6bc739 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -443,6 +443,65 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static const char *debug_cs_op(enum wined3d_cs_op op) +{ + switch (op) + { +#define WINED3D_TO_STR(type) case type: return #type + WINED3D_TO_STR(WINED3D_CS_OP_NOP); + WINED3D_TO_STR(WINED3D_CS_OP_PRESENT); + WINED3D_TO_STR(WINED3D_CS_OP_CLEAR); + WINED3D_TO_STR(WINED3D_CS_OP_DISPATCH); + WINED3D_TO_STR(WINED3D_CS_OP_DRAW); + WINED3D_TO_STR(WINED3D_CS_OP_FLUSH); + WINED3D_TO_STR(WINED3D_CS_OP_SET_PREDICATION); + WINED3D_TO_STR(WINED3D_CS_OP_SET_VIEWPORTS); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SCISSOR_RECTS); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDERTARGET_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_VERTEX_DECLARATION); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_BLEND_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RASTERIZER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TRANSFORM); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CLIP_PLANE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_COLOR_KEY); + WINED3D_TO_STR(WINED3D_CS_OP_SET_MATERIAL); + WINED3D_TO_STR(WINED3D_CS_OP_SET_LIGHT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_LIGHT_ENABLE); + WINED3D_TO_STR(WINED3D_CS_OP_PUSH_CONSTANTS); + WINED3D_TO_STR(WINED3D_CS_OP_RESET_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_CALLBACK); + WINED3D_TO_STR(WINED3D_CS_OP_QUERY_ISSUE); + WINED3D_TO_STR(WINED3D_CS_OP_PRELOAD_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_UNLOAD_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_MAP); + WINED3D_TO_STR(WINED3D_CS_OP_UNMAP); + WINED3D_TO_STR(WINED3D_CS_OP_BLT_SUB_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_UPDATE_SUB_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION); + WINED3D_TO_STR(WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_COPY_UAV_COUNTER); + WINED3D_TO_STR(WINED3D_CS_OP_GENERATE_MIPMAPS); + WINED3D_TO_STR(WINED3D_CS_OP_STOP); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); + } +} + static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) { } @@ -2711,6 +2770,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; + TRACE("Executing %s.\n", debug_cs_op(opcode)); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -2719,6 +2779,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) } wined3d_cs_op_handlers[opcode](cs, packet->data); + TRACE("%s executed.\n", debug_cs_op(opcode)); } tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]);

1 0

Henri Verbeet : wined3d: Rename build_dxtn_alpha_table() to build_bc3_alpha_table().
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 43fc25b1fbb6b2221624e199591fc365ff4f996a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fc25b1fbb6b2221624e199… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 16 12:27:18 2018 +0430 wined3d: Rename build_dxtn_alpha_table() to build_bc3_alpha_table(). Since it's specific to BC3, as pointed out by Matteo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 491d888..800cdc4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -391,7 +391,7 @@ static void build_dxtn_colour_table(WORD colour0, WORD colour1, } } -static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +static void build_bc3_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) { unsigned int i; @@ -449,7 +449,7 @@ static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width alpha_bits = s[0]; if (format_id == WINED3DFMT_BC3_UNORM) { - build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + build_bc3_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); alpha_bits >>= 16; }

1 0

Fabian Maurer : kernel32: In UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: e215d070cfc5882fee5c2b4b6c3ce7ab71a18c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e215d070cfc5882fee5c2b4b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 16 07:01:11 2018 +0200 kernel32: In UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY. Needed for x32 win7 chrome and chromium. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45648 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 8 ++++++++ include/winbase.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e831576..643bc15 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4224,6 +4224,14 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } break; + case PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY: + if (size != sizeof(DWORD) && size != sizeof(DWORD64) && size != sizeof(DWORD64) * 2) + { + SetLastError(ERROR_BAD_LENGTH); + return FALSE; + } + break; + default: SetLastError(ERROR_NOT_SUPPORTED); FIXME("Unhandled attribute number %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER); diff --git a/include/winbase.h b/include/winbase.h index 667df96..aa57dae 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1683,7 +1683,7 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_GROUP_AFFINITY (ProcThreadAttributeGroupAffinity | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR (ProcThreadAttributeIdealProcessor | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_UMS_THREAD (ProcThreadAttributeUmsThread | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) -#define PROC_THREAD_ATTRIBUTE_MIGITATION_POLICY (ProcThreadAttributeMitigationPolicy | PROC_THREAD_ATTRIBUTE_INPUT) +#define PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY (ProcThreadAttributeMitigationPolicy | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_SECURITY_CAPABILITIES (ProcThreadAttributeSecurityCapabilities | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_PROTECTION_LEVEL (ProcThreadAttributeProtectionLevel | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_JOB_LIST (ProcThreadAttributeJobList | PROC_THREAD_ATTRIBUTE_INPUT)

1 0

Fabian Maurer : kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 2a82ddc2b95bb04e9bdab87744435ff1734bc4fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a82ddc2b95bb04e9bdab877… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 16 07:01:12 2018 +0200 kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY. This is needed by x64 chromium sandbox for >= win10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45644 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1a303c5..e831576 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4216,8 +4216,17 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } break; + case PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY: + if (size != sizeof(DWORD) && size != sizeof(DWORD64)) + { + SetLastError(ERROR_BAD_LENGTH); + return FALSE; + } + break; + default: SetLastError(ERROR_NOT_SUPPORTED); + FIXME("Unhandled attribute number %lu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER); return FALSE; }

1 0

Zhiyi Zhang : include: Fix a typo.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 632545162ad07ca0c0614c66bb3331a4bac0ebd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=632545162ad07ca0c0614c66… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 16 11:57:34 2018 +0800 include: Fix a typo. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index c01d7c2..455f8a4 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2792,7 +2792,7 @@ typedef struct tagTVITEMCHANGE UINT uStateNew; UINT uStateOld; LPARAM lParam; -} NVTVITEMCHANGE; +} NMTVITEMCHANGE; typedef struct tagNMTVASYNCDRAW {

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018