February 2017 - Wine-commits

Piotr Caban : msvcrt: Add fesetenv implementation.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 98a0c3df2e640fba5312acbeb07fd527e9c24b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a0c3df2e640fba5312acbeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 7 17:42:43 2017 +0100 msvcrt: Add fesetenv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index db8e441..74685d4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1272,8 +1272,67 @@ void CDECL _fpreset(void) */ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) { - FIXME("(%p) stub\n", env); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + struct { + WORD control_word; + WORD unused1; + WORD status_word; + WORD unused2; + WORD tag_word; + WORD unused3; + DWORD instruction_pointer; + WORD code_segment; + WORD unused4; + DWORD operand_addr; + WORD data_segment; + WORD unused5; + } fenv; + + TRACE( "(%p)\n", env ); + + if (!env->control && !env->status) { + _fpreset(); + return 0; + } + + __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); + + fenv.control_word &= ~0x3d; + if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; + if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; + if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; + if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; + if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; + + fenv.status_word &= ~0x3d; + if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; + if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; + if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; + if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; + if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; + + __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", + "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); + + if (sse2_supported) + { + DWORD fpword; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + fpword &= ~0x1e80; + if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; + if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + } + return 0; +#else + FIXME( "not implemented\n" ); +#endif + return 1; } /*********************************************************************

1 0

Józef Kucia : wined3d: Group compute states together.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 5a093509d030d89f7a2980bb00bd02203550dc72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a093509d030d89f7a2980bb0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:15 2017 +0100 wined3d: Group compute states together. 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 | 4 ++-- dlls/wined3d/state.c | 14 ++++++++++++-- dlls/wined3d/utils.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 42 +++++++++++++++++++++++++++++++----------- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5ae1bdc..e8cc3fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1407,7 +1407,7 @@ static void context_enter(struct wined3d_context *context) void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) { - DWORD representative = context->state_table[state_id].representative; + DWORD representative = context->state_table[state_id].representative - STATE_COMPUTE_OFFSET; unsigned int index, shift; index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); @@ -3585,7 +3585,7 @@ void context_apply_compute_state(struct wined3d_context *context, context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - for (i = 0, state_id = 0; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) { for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e469414..540a1b3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3731,6 +3731,11 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } +static void state_compute_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_COMPUTE; +} + static void state_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { enum wined3d_shader_type shader_type = state_id - STATE_SHADER(0); @@ -4942,13 +4947,18 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state static void state_cb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - enum wined3d_shader_type shader_type = state_id - STATE_CONSTANT_BUFFER(0); const struct wined3d_gl_info *gl_info = context->gl_info; + enum wined3d_shader_type shader_type; struct wined3d_buffer *buffer; unsigned int i, base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + if (STATE_IS_GRAPHICS_CONSTANT_BUFFER(state_id)) + shader_type = state_id - STATE_GRAPHICS_CONSTANT_BUFFER(0); + else + shader_type = WINED3D_SHADER_TYPE_COMPUTE; + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { @@ -5188,7 +5198,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, - { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_shader }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_compute_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c40a339..30a80e5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4377,9 +4377,13 @@ const char *debug_d3dstate(DWORD state) } if (STATE_IS_SAMPLER(state)) return wine_dbg_sprintf("STATE_SAMPLER(%#x)", state - STATE_SAMPLER(0)); - if (STATE_IS_SHADER(state)) + if (STATE_IS_COMPUTE_SHADER(state)) + return wine_dbg_sprintf("STATE_SHADER(%s)", debug_shader_type(WINED3D_SHADER_TYPE_COMPUTE)); + if (STATE_IS_GRAPHICS_SHADER(state)) return wine_dbg_sprintf("STATE_SHADER(%s)", debug_shader_type(state - STATE_SHADER(0))); - if (STATE_IS_CONSTANT_BUFFER(state)) + if (STATE_IS_COMPUTE_CONSTANT_BUFFER(state)) + return wine_dbg_sprintf("STATE_CONSTANT_BUFFER(%s)", debug_shader_type(WINED3D_SHADER_TYPE_COMPUTE)); + if (STATE_IS_GRAPHICS_CONSTANT_BUFFER(state)) return wine_dbg_sprintf("STATE_CONSTANT_BUFFER(%s)", debug_shader_type(state - STATE_CONSTANT_BUFFER(0))); if (STATE_IS_SHADER_RESOURCE_BINDING(state)) return "STATE_SHADER_RESOURCE_BINDING"; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ead8847..ca992b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -806,7 +806,9 @@ enum wined3d_shader_type WINED3D_SHADER_TYPE_GEOMETRY, WINED3D_SHADER_TYPE_HULL, WINED3D_SHADER_TYPE_DOMAIN, - WINED3D_SHADER_TYPE_COMPUTE, + WINED3D_SHADER_TYPE_GRAPHICS_COUNT, + + WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, WINED3D_SHADER_TYPE_COUNT, }; @@ -1360,20 +1362,25 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_RENDER(a) (a) #define STATE_IS_RENDER(a) ((a) >= STATE_RENDER(1) && (a) <= STATE_RENDER(WINEHIGHEST_RENDER_STATE)) -#define STATE_TEXTURESTAGE(stage, num) (STATE_RENDER(WINEHIGHEST_RENDER_STATE) + 1 + (stage) * (WINED3D_HIGHEST_TEXTURE_STATE + 1) + (num)) -#define STATE_IS_TEXTURESTAGE(a) ((a) >= STATE_TEXTURESTAGE(0, 1) && (a) <= STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE)) +#define STATE_TEXTURESTAGE(stage, num) \ + (STATE_RENDER(WINEHIGHEST_RENDER_STATE) + 1 + (stage) * (WINED3D_HIGHEST_TEXTURE_STATE + 1) + (num)) +#define STATE_IS_TEXTURESTAGE(a) \ + ((a) >= STATE_TEXTURESTAGE(0, 1) && (a) <= STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE)) /* + 1 because samplers start with 0 */ #define STATE_SAMPLER(num) (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE) + 1 + (num)) #define STATE_IS_SAMPLER(num) ((num) >= STATE_SAMPLER(0) && (num) <= STATE_SAMPLER(MAX_COMBINED_SAMPLERS - 1)) -#define STATE_SHADER(a) (STATE_SAMPLER(MAX_COMBINED_SAMPLERS) + (a)) -#define STATE_IS_SHADER(a) ((a) >= STATE_SHADER(0) && (a) < STATE_SHADER(WINED3D_SHADER_TYPE_COUNT)) +#define STATE_GRAPHICS_SHADER(a) (STATE_SAMPLER(MAX_COMBINED_SAMPLERS) + (a)) +#define STATE_IS_GRAPHICS_SHADER(a) \ + ((a) >= STATE_GRAPHICS_SHADER(0) && (a) < STATE_GRAPHICS_SHADER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT)) -#define STATE_CONSTANT_BUFFER(a) (STATE_SHADER(WINED3D_SHADER_TYPE_COUNT) + (a)) -#define STATE_IS_CONSTANT_BUFFER(a) ((a) >= STATE_CONSTANT_BUFFER(0) && (a) < STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COUNT)) +#define STATE_GRAPHICS_CONSTANT_BUFFER(a) (STATE_GRAPHICS_SHADER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT) + (a)) +#define STATE_IS_GRAPHICS_CONSTANT_BUFFER(a) \ + ((a) >= STATE_GRAPHICS_CONSTANT_BUFFER(0) \ + && (a) < STATE_GRAPHICS_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT)) -#define STATE_SHADER_RESOURCE_BINDING (STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COUNT)) +#define STATE_SHADER_RESOURCE_BINDING (STATE_GRAPHICS_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT)) #define STATE_IS_SHADER_RESOURCE_BINDING(a) ((a) == STATE_SHADER_RESOURCE_BINDING) #define STATE_UNORDERED_ACCESS_VIEW_BINDING (STATE_SHADER_RESOURCE_BINDING + 1) @@ -1425,9 +1432,22 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_COLOR_KEY (STATE_POINT_ENABLE + 1) #define STATE_IS_COLOR_KEY(a) ((a) == STATE_COLOR_KEY) -#define STATE_HIGHEST (STATE_COLOR_KEY) +#define STATE_COMPUTE_OFFSET (STATE_COLOR_KEY + 1) + +#define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) +#define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) + +#define STATE_COMPUTE_CONSTANT_BUFFER (STATE_COMPUTE_SHADER + 1) +#define STATE_IS_COMPUTE_CONSTANT_BUFFER(a) ((a) == STATE_COMPUTE_CONSTANT_BUFFER) + +#define STATE_COMPUTE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) +#define STATE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) + +#define STATE_COMPUTE_COUNT (STATE_COMPUTE_HIGHEST - STATE_COMPUTE_OFFSET + 1) -#define STATE_COMPUTE_HIGHEST (STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)) +#define STATE_SHADER(a) ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_SHADER(a) : STATE_COMPUTE_SHADER) +#define STATE_CONSTANT_BUFFER(a) \ + ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_CONSTANT_BUFFER(a) : STATE_COMPUTE_CONSTANT_BUFFER) enum fogsource { FOGSOURCE_FFP, @@ -1532,7 +1552,7 @@ struct wined3d_context DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ DWORD numDirtyEntries; DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ - unsigned int dirty_compute_states[STATE_COMPUTE_HIGHEST / (sizeof(unsigned int) * CHAR_BIT) + 1]; + unsigned int dirty_compute_states[STATE_COMPUTE_COUNT / (sizeof(unsigned int) * CHAR_BIT) + 1]; struct wined3d_device *device; struct wined3d_swapchain *swapchain;

1 0

Józef Kucia : wined3d: Allow passing compute states to device_invalidate_state().
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 8ac7c1faf20208e2e71fac9e8e17c824fd1e8285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac7c1faf20208e2e71fac9e8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:16 2017 +0100 wined3d: Allow passing compute states to device_invalidate_state(). 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 | 13 ++----------- dlls/wined3d/device.c | 16 +++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d575159..422f3f1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -907,10 +907,7 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi if (prev) InterlockedDecrement(&prev->resource.bind_count); - if (op->type != WINED3D_SHADER_TYPE_COMPUTE) - device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); - else - device_invalidate_compute_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); } void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, @@ -1097,15 +1094,9 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_set_shader *op = data; cs->state.shader[op->type] = op->shader; + device_invalidate_state(cs->device, STATE_SHADER(op->type)); if (op->type != WINED3D_SHADER_TYPE_COMPUTE) - { - device_invalidate_state(cs->device, STATE_SHADER(op->type)); device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); - } - else - { - device_invalidate_compute_state(cs->device, STATE_SHADER(op->type)); - } } void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71bb929..03d4069 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5092,7 +5092,6 @@ err: return hr; } - void device_invalidate_state(const struct wined3d_device *device, DWORD state) { DWORD rep = device->StateTable[state].representative; @@ -5101,6 +5100,13 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) BYTE shift; UINT i; + if (STATE_IS_COMPUTE(state)) + { + for (i = 0; i < device->context_count; ++i) + context_invalidate_compute_state(device->contexts[i], state); + return; + } + for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; @@ -5113,14 +5119,6 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } -void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) -{ - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - context_invalidate_compute_state(device->contexts[i], state_id); -} - LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca992b9..3a0de2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1443,6 +1443,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_COMPUTE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) #define STATE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) +#define STATE_IS_COMPUTE(a) ((a) >= STATE_COMPUTE_OFFSET && (a) <= STATE_COMPUTE_HIGHEST) #define STATE_COMPUTE_COUNT (STATE_COMPUTE_HIGHEST - STATE_COMPUTE_OFFSET + 1) #define STATE_SHADER(a) ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_SHADER(a) : STATE_COMPUTE_SHADER) @@ -2651,7 +2652,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0

Huw Davies : user32/tests: Restore the mouse cursor to its original position.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 01112061c257cd77f6150dd1cde3468186e4e28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01112061c257cd77f6150dd1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 10:26:23 2017 +0000 user32/tests: Restore the mouse cursor to its original position. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index a42bc1c..03454fe 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2463,6 +2463,7 @@ static void test_menu_input(void) { HANDLE hThread, hWnd; DWORD tid; ATOM aclass; + POINT orig_pos; if (!pSendInput) { @@ -2507,6 +2508,8 @@ static void test_menu_input(void) { ShowWindow(hWnd, SW_SHOW); UpdateWindow(hWnd); + GetCursorPos(&orig_pos); + hThread = CreateThread(NULL, 0, test_menu_input_thread, hWnd, 0, &tid); while(1) { @@ -2514,6 +2517,7 @@ static void test_menu_input(void) { break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hWnd); }

1 0

Daniel Lehman : kernel32/tests: Don't call function in assert().
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 4310ebcd6ace34fca2c4f09f2972c083761882b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4310ebcd6ace34fca2c4f09f2… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:07:04 2017 -0800 kernel32/tests: Don't call function in assert(). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 82faf3f..759234c 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -365,8 +365,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) #endif ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); - assert(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox))); - assert(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox))); + ok(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox)), "failed to open: %s\n", childlog); + ok(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)), "failed to open: %s\n", dbglog); ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid);

1 0

Daniel Lehman : kernel32/tests: Don't call DeleteFile from assert().
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: d14456ceff621c95fe3201d51963f5c1d5e6d359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14456ceff621c95fe3201d51… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:07:05 2017 -0800 kernel32/tests: Don't call DeleteFile from assert(). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 12 ++++++------ dlls/kernel32/tests/process.c | 44 +++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 759234c..a85fe59 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -321,8 +321,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) TerminateProcess(info.hProcess, WAIT_TIMEOUT); WaitForSingleObject(info.hProcess, 5000); CloseHandle(info.hProcess); - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); win_skip("Giving up on child process\n"); return; } @@ -357,8 +357,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT); if (skip_crash_and_debug) { - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); win_skip("Giving up on debugger\n"); return; } @@ -375,8 +375,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err); - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); } static void crash_and_winedbg(HKEY hkey, const char* argv0) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f66ab45..68d6b64 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -632,7 +632,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -670,7 +670,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -708,7 +708,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -746,7 +746,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -786,7 +786,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -824,7 +824,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -862,7 +862,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* TODO: test for A/W and W/A and W/W */ } @@ -894,7 +894,7 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -917,7 +917,7 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA7", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ get_file_name(resfile); @@ -933,7 +933,7 @@ static void test_CommandLine(void) sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ @@ -948,8 +948,8 @@ static void test_CommandLine(void) sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); - + DeleteFileA(resfile); + get_file_name(resfile); GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); @@ -969,7 +969,7 @@ static void test_CommandLine(void) else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* Using AppName */ get_file_name(resfile); @@ -993,7 +993,7 @@ static void test_CommandLine(void) okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); if (0) /* Test crashes on NT-based Windows. */ { @@ -1088,7 +1088,7 @@ static void test_Directory(void) okChildIString("Misc", "CurrDirA", windir); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); @@ -1301,7 +1301,7 @@ static void test_Environment(void) env = GetEnvironmentStringsA(); cmpEnvironment(env); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1360,7 +1360,7 @@ static void test_Environment(void) HeapFree(GetProcessHeap(), 0, child_env); FreeEnvironmentStringsA(env); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_SuspendFlag(void) @@ -1408,7 +1408,7 @@ static void test_SuspendFlag(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_DebuggingFlag(void) @@ -1470,7 +1470,7 @@ static void test_DebuggingFlag(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static BOOL is_console(HANDLE h) @@ -1617,7 +1617,7 @@ static void test_Console(void) ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n"); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n"); ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(), @@ -1660,7 +1660,7 @@ static void test_Console(void) okChildString("StdHandle", "msg", msg); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_ExitCode(void) @@ -1689,7 +1689,7 @@ static void test_ExitCode(void) okChildInt("ExitCode", "value", code); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_OpenProcess(void)

1 0

Daniel Lehman : opengl32/tests: Fix leak in opengl test (valgrind).
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 55023fc0370611ac3c20c41c1639f0c441614c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55023fc0370611ac3c20c41c1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:03:24 2017 -0800 opengl32/tests: Fix leak in opengl test (valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7552d44..0593465 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -670,6 +670,9 @@ static void test_bitmap_rendering( BOOL use_dib ) glGetIntegerv( GL_VIEWPORT, viewport ); ok( viewport[0] == 0 && viewport[1] == 0 && viewport[2] == 12 && viewport[3] == 12, "wrong viewport %d,%d,%d,%d\n", viewport[0], viewport[1], viewport[2], viewport[3] ); + + wglDeleteContext(hglrc2); + wglDeleteContext(hglrc); } }

1 0

Bruno Jesus : winealsa.drv: Fix handling of system real time MIDI messages.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 53454ce9359f4ec485aa9411a0e9b14e3d1ed0fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=53454ce9359f4ec485aa9411a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 04:16:17 2017 -0200 winealsa.drv: Fix handling of system real time MIDI messages. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 6fc75ee..6ef1976 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -909,10 +909,15 @@ static DWORD modData(WORD wDevID, DWORD dwParam) case 0x0B: /* Continue */ case 0x0C: /* Stop */ case 0x0E: /* Active Sensing. */ - /* FIXME: Is this function suitable for these purposes - (and also Song Select and Song Position Pointer) */ - snd_seq_ev_set_sysex(&event, 1, &evt); + { + snd_midi_event_t *midi_event; + + snd_midi_event_new(1, &midi_event); + snd_midi_event_init(midi_event); + snd_midi_event_encode_byte(midi_event, evt, &event); + snd_midi_event_free(midi_event); break; + } case 0x0F: /* Reset */ /* snd_seq_ev_set_sysex(&event, 1, &evt); this other way may be better */

1 0

Alistair Leslie-Hughes : include: Add comsvcs.idl.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 32b227dbc3d0955b30c81f760bd32e25d53e76b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b227dbc3d0955b30c81f760… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 30 07:05:38 2017 +0000 include: Add comsvcs.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/comsvcs.idl | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9f615cd..80fa362 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -27,6 +27,7 @@ IDL_SRCS = \ colinf.idl \ comcat.idl \ commoncontrols.idl \ + comsvcs.idl \ control.idl \ cor.idl \ cordebug.idl \ diff --git a/include/comsvcs.idl b/include/comsvcs.idl new file mode 100644 index 0000000..2c510f8 --- /dev/null +++ b/include/comsvcs.idl @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +#ifndef __WIDL__ +#define threading(model) +#endif + +typedef DWORD_PTR INSTID; +typedef DWORD_PTR RESID; +typedef DWORD RESOURCERATING; +typedef DWORD_PTR RESTYPID; +typedef LPOLESTR SRESID; +typedef long TIMEINSECS; +typedef DWORD_PTR TRANSID; + +[ + uuid(2a005c00-a5de-11cf-9e66-00aa00a3f464), + version(1.0) +] +library COMSVCSLib +{ + [ + object, + hidden, + local, + uuid(bf6a1850-2b45-11cf-be10-00aa00a2fa25), + pointer_default(unique) + ] + interface IHolder : IUnknown + { + HRESULT AllocResource([in] const RESTYPID typeid, [out] RESID *resid); + HRESULT FreeResource([in] const RESID _resid); + HRESULT TrackResource([in] const RESID resid); + HRESULT TrackResourceS([in] const SRESID resid); + HRESULT UntrackResource([in] const RESID resid, [in] const BOOL value); + HRESULT UntrackResourceS([in] const SRESID resid, [in] const BOOL value); + HRESULT Close(void); + HRESULT RequestDestroyResource([in] const RESID resid); + }; + + [ + object, + hidden, + local, + uuid(208b3651-2b48-11cf-be10-00aa00a2fa25), + pointer_default(unique) + ] + interface IDispenserDriver : IUnknown + { + HRESULT CreateResource([in] const RESTYPID restypid, [out] RESID *resid, [out] TIMEINSECS *destroy); + HRESULT RateResource([in] const RESTYPID restypid, [in] const RESID resid, + [in] const BOOL requires, [out] RESOURCERATING *rating); + HRESULT EnlistResource([in] const RESID resid, [in] const TRANSID transid); + HRESULT ResetResource([in] const RESID resid); + HRESULT DestroyResource([in] const RESID resid); + HRESULT DestroyResourceS([in] const SRESID resid); + }; + + [ + object, + hidden, + local, + uuid(5cb31e10-2b5f-11cf-be10-00aa00a2fa25), + pointer_default(unique) + ] + interface IDispenserManager : IUnknown + { + HRESULT RegisterDispenser([in] IDispenserDriver *driver, [in] LPCOLESTR name, [out] IHolder **dispenser); + HRESULT GetContext([out] INSTID *id, [out] TRANSID *transid); + }; + + [ + uuid(ecabb0c0-7f19-11d2-978e-0000f8757e2a), + hidden, + threading(both) + ] + coclass DispenserManager + { + [default] interface IDispenserManager; + }; +};

1 0

Jacek Caban : winerror.h: Moved DXGI HRESULT defines to winerror.h and add a few missing ones.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 7a2b07e2a666cd9ec23cbc20842fb1f15c4997d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2b07e2a666cd9ec23cbc208… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 7 16:43:27 2017 +0100 winerror.h: Moved DXGI HRESULT defines to winerror.h and add a few missing ones. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 21 --------------------- include/winerror.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index c7ba584..b35c891 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -23,28 +23,7 @@ import "dxgitype.h"; const UINT _FACDXGI = 0x87a; cpp_quote("#define MAKE_DXGI_STATUS(x) MAKE_HRESULT(0, _FACDXGI, x)") -cpp_quote("#define DXGI_STATUS_OCCLUDED MAKE_DXGI_STATUS(1)") -cpp_quote("#define DXGI_STATUS_CLIPPED MAKE_DXGI_STATUS(2)") -cpp_quote("#define DXGI_STATUS_NO_REDIRECTION MAKE_DXGI_STATUS(4)") -cpp_quote("#define DXGI_STATUS_NO_DESKTOP_ACCESS MAKE_DXGI_STATUS(5)") -cpp_quote("#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)") -cpp_quote("#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7)") -cpp_quote("#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8)") - cpp_quote("#define MAKE_DXGI_HRESULT(x) MAKE_HRESULT(1, _FACDXGI, x)") -cpp_quote("#define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1)") -cpp_quote("#define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2)") -cpp_quote("#define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3)") -cpp_quote("#define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4)") -cpp_quote("#define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5)") -cpp_quote("#define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6)") -cpp_quote("#define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7)") -cpp_quote("#define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10)") -cpp_quote("#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11)") -cpp_quote("#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)") -cpp_quote("#define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32)") -cpp_quote("#define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33)") -cpp_quote("#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34)") cpp_quote("#if 0") typedef HANDLE HMONITOR; diff --git a/include/winerror.h b/include/winerror.h index 27b86b0..2c6ce20 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3116,6 +3116,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define D2DERR_PRINT_FORMAT_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x8899002c) #define D2DERR_TOO_MANY_TRANSFORM_INPUTS _HRESULT_TYPEDEF_(0x8899002d) +#define DXGI_STATUS_OCCLUDED _HRESULT_TYPEDEF_(0x087a0001) +#define DXGI_STATUS_CLIPPED _HRESULT_TYPEDEF_(0x087a0002) +#define DXGI_STATUS_NO_REDIRECTION _HRESULT_TYPEDEF_(0x087a0004) +#define DXGI_STATUS_NO_DESKTOP_ACCESS _HRESULT_TYPEDEF_(0x087a0005) +#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE _HRESULT_TYPEDEF_(0x087a0006) +#define DXGI_STATUS_MODE_CHANGED _HRESULT_TYPEDEF_(0x087a0007) +#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS _HRESULT_TYPEDEF_(0x087a0008) +#define DXGI_STATUS_UNOCCLUDED _HRESULT_TYPEDEF_(0x087a0009) +#define DXGI_STATUS_DDA_WAS_STILL_DRAWING _HRESULT_TYPEDEF_(0x087a000a) +#define DXGI_STATUS_PRESENT_REQUIRED _HRESULT_TYPEDEF_(0x087a002f) + +#define DXGI_ERROR_INVALID_CALL _HRESULT_TYPEDEF_(0x887a0001) +#define DXGI_ERROR_NOT_FOUND _HRESULT_TYPEDEF_(0x887a0002) +#define DXGI_ERROR_MORE_DATA _HRESULT_TYPEDEF_(0x887a0003) +#define DXGI_ERROR_UNSUPPORTED _HRESULT_TYPEDEF_(0x887a0004) +#define DXGI_ERROR_DEVICE_REMOVED _HRESULT_TYPEDEF_(0x887a0005) +#define DXGI_ERROR_DEVICE_HUNG _HRESULT_TYPEDEF_(0x887a0006) +#define DXGI_ERROR_DEVICE_RESET _HRESULT_TYPEDEF_(0x887a0007) +#define DXGI_ERROR_WAS_STILL_DRAWING _HRESULT_TYPEDEF_(0x887a000a) +#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT _HRESULT_TYPEDEF_(0x887a000b) +#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE _HRESULT_TYPEDEF_(0x887a000c) +#define DXGI_ERROR_DRIVER_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x887a0020) +#define DXGI_ERROR_NONEXCLUSIVE _HRESULT_TYPEDEF_(0x887a0021) +#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE _HRESULT_TYPEDEF_(0x887a0022) +#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED _HRESULT_TYPEDEF_(0x887a0023) +#define DXGI_ERROR_REMOTE_OUTOFMEMORY _HRESULT_TYPEDEF_(0x887a0024) +#define DXGI_ERROR_ACCESS_LOST _HRESULT_TYPEDEF_(0x887a0026) +#define DXGI_ERROR_WAIT_TIMEOUT _HRESULT_TYPEDEF_(0x887a0027) +#define DXGI_ERROR_SESSION_DISCONNECTED _HRESULT_TYPEDEF_(0x887a0028) +#define DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE _HRESULT_TYPEDEF_(0x887a0029) +#define DXGI_ERROR_CANNOT_PROTECT_CONTENT _HRESULT_TYPEDEF_(0x887a002a) +#define DXGI_ERROR_ACCESS_DENIED _HRESULT_TYPEDEF_(0x887a002b) +#define DXGI_ERROR_NAME_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x887a002c) +#define DXGI_ERROR_SDK_COMPONENT_MISSING _HRESULT_TYPEDEF_(0x887a002d) +#define DXGI_ERROR_NOT_CURRENT _HRESULT_TYPEDEF_(0x887a002e) +#define DXGI_ERROR_HW_PROTECTION_OUTOFMEMORY _HRESULT_TYPEDEF_(0x887a0030) +#define DXGI_ERROR_MODE_CHANGE_IN_PROGRESS _HRESULT_TYPEDEF_(0x887a0025) + #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002)

1 0