- wine-devel - winehq.org

[PATCH 1/3] wined3d: Don't shift geometry for d3d10/11.
by Stefan Dösinger 12 Aug '21

12 Aug '21

This fixes stay lines in World of Tanks' GameFace UI parts. The Metal backend doesn't have an offset like this either. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Other than fixing the todo_wine in test_fractional_viewport, this also fixes a failure in d3d11's test_depth_bias that happens when viewport_array is not supported. I am not entirely sure what the -1 / 64 in get_projection_matrix was meant for. AFAIU get_projection_matrix isn't called for d3d10+, so the path will be entered for d3d9 when we have ARB_CLIP_CONTROL. In this case we don't need to account for the half pixel offset (hence not setting it to 63/64), and I also don't see a reason to nudge for filling rules in the proj matrix and not by adjusting the values in viewport_miscpart_cc. --- dlls/d3d11/tests/d3d11.c | 1 - dlls/wined3d/state.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6073fae26d9..1f797da1646 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28153,7 +28153,6 @@ static void test_fractional_viewports(void) ok(compare_float(v->x, expected.x, 0) && compare_float(v->y, expected.y, 0), "Got fragcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", v->x, v->y, expected.x, expected.y, x, y, viewport_offsets[i]); - todo_wine ok(compare_float(v->z, expected.z, 2) && compare_float(v->w, expected.w, 2), "Got texcoord {%.8e, %.8e}, expected {%.8e, %.8e} at (%u, %u), offset %.8e.\n", v->z, v->w, expected.z, expected.w, x, y, viewport_offsets[i]); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8316269afcf..b94c04a79b4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4233,7 +4233,7 @@ static void viewport_miscpart_cc(struct wined3d_context *context, const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; /* See get_projection_matrix() in utils.c for a discussion about those values. */ float pixel_center_offset = context->d3d_info->wined3d_creation_flags - & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; + & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : 0.0f; struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS]; GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS]; GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS]; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4019dd4d812..69c6f073e96 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5555,7 +5555,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; if (context->last_was_rhw) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86eae149306..0bf9e01ba42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5662,7 +5662,7 @@ static inline void shader_get_position_fixup(const struct wined3d_context *conte if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; for (i = 0; i < fixup_count; ++i) { -- 2.31.1

5 18

[PATCH v2 1/5] wined3d: Don't consider texture rectangles for buffers.
by Matteo Bruni 12 Aug '21

12 Aug '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Flip around the WINED3D_RTYPE_BUFFER check. dlls/wined3d/resource.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f37c313e023..6215da8ce0f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -121,26 +121,26 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (base_type == WINED3D_GL_RES_TYPE_COUNT) base_type = gl_type; - if (type != WINED3D_RTYPE_BUFFER) + if (type == WINED3D_RTYPE_BUFFER) + break; + + if ((bind_flags & WINED3D_BIND_RENDER_TARGET) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) { - if ((bind_flags & WINED3D_BIND_RENDER_TARGET) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) - { - WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); - continue; - } - if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) - { - WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); - continue; - } - if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) - { - WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); - continue; - } + WARN("Format %s cannot be used for render targets.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) + { + WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); + continue; + } + if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) + { + WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); + continue; } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot -- 2.26.3

2 6

[PATCH v2 1/2] oleacc: Check proper UI thread for window focus.
by Connor McAdams 12 Aug '21

12 Aug '21

From: Connor McAdams <conmanx360(a)gmail.com> When RPC is done in a multi-threaded apartment environment, this method may be called in a thread other than the one that the object was created in. To account for this, make sure to check the UI thread the HWND belongs to rather than the one belonging to the current thread. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/oleacc/client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..a726c607109 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,10 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(GetWindowThreadProcessId(This->hwnd, NULL), &info) && + info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

1 1

[PATCH 1/2] user32: Don't fire EVENT_OBJECT_CREATE for dialog and popup windows upon creation.
by Connor McAdams 12 Aug '21

12 Aug '21

Popup menu and dialog window classes don't have EVENT_OBJECT_CREATE winevents associated with their creation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/win.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c2471d2746..2148c3969d8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1794,7 +1794,13 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (!USER_Driver->pCreateWindow( hwnd )) goto failed; - NotifyWinEvent(EVENT_OBJECT_CREATE, hwnd, OBJID_WINDOW, 0); + /* + * Popup menus and dialog windows don't get an EVENT_OBJECT_CREATE + * WinEvent on their creation. + */ + if (GetClassLongW(hwnd, GCW_ATOM) != POPUPMENU_CLASS_ATOM && + GetClassLongW(hwnd, GCW_ATOM) != DIALOG_CLASS_ATOM) + NotifyWinEvent(EVENT_OBJECT_CREATE, hwnd, OBJID_WINDOW, 0); /* send the size messages */ -- 2.25.1

2 4

[PATCH vkd3d v2 5/5] vkd3d-shader: Make some FIXME messages into proper compiler errors.
by Zebediah Figura 12 Aug '21

12 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Alternate approach I came up with, that I think I like better. At least I'd like to keep printing messages to the console via FIXME; they're not going to show up otherwise. libs/vkd3d-shader/hlsl.c | 24 +++++++++++++++--- libs/vkd3d-shader/hlsl.h | 9 +++++++ libs/vkd3d-shader/hlsl.y | 32 +++++++++++++----------- libs/vkd3d-shader/hlsl_sm1.c | 10 +++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7f12dd20..6d130358 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -55,6 +55,24 @@ void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, va_end(args); } +void hlsl_fixme_(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, const char *fmt, ...) +{ + struct vkd3d_string_buffer *string; + va_list args; + + va_start(args, fmt); + string = hlsl_get_string_buffer(ctx); + vkd3d_string_buffer_printf(string, "Aborting due to not yet implemented feature: "); + vkd3d_string_buffer_vprintf(string, fmt, args); + string->buffer[--string->content_size] = 0; + vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "%s", string->buffer); + hlsl_release_string_buffer(ctx, string); + va_end(args); + + if (!ctx->result) + ctx->result = VKD3D_ERROR_NOT_IMPLEMENTED; +} + bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) { struct hlsl_scope *scope = ctx->cur_scope; @@ -1031,7 +1049,7 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl vkd3d_string_buffer_printf(buffer, "}"); } -static const char *debug_expr_op(const struct hlsl_ir_expr *expr) +const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) { static const char *const op_names[] = { @@ -1082,14 +1100,14 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) [HLSL_OP3_LERP] = "lerp", }; - return op_names[expr->op]; + return op_names[op]; } static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) { unsigned int i; - vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); + vkd3d_string_buffer_printf(buffer, "%s (", debug_hlsl_expr_op(expr->op)); for (i = 0; i < 3 && expr->operands[i].node; ++i) { dump_src(buffer, &expr->operands[i]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4a4af5d1..1405bef3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -590,6 +590,7 @@ static inline void hlsl_release_string_buffer(struct hlsl_ctx *ctx, struct vkd3d vkd3d_string_buffer_release(&ctx->string_buffers, buffer); } +const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); @@ -651,11 +652,19 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +void hlsl_fixme_(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, + const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); void hlsl_warning(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); void hlsl_note(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_log_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5); +#define hlsl_fixme(ctx, loc, ...) \ + do { \ + FIXME(__VA_ARGS__); \ + hlsl_fixme_(ctx, loc, __VA_ARGS__); \ + } while (0) + void hlsl_push_scope(struct hlsl_ctx *ctx); void hlsl_pop_scope(struct hlsl_ctx *ctx); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ade78da6..73fc846c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1213,7 +1213,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in { if (lhs->type == HLSL_IR_EXPR && hlsl_ir_expr(lhs)->op == HLSL_OP1_CAST) { - FIXME("Cast on the lhs.\n"); + hlsl_fixme(ctx, lhs->loc, "Cast on the LHS.\n"); vkd3d_free(store); return NULL; } @@ -1223,7 +1223,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in unsigned int width, s = swizzle->swizzle; if (lhs->data_type->type == HLSL_CLASS_MATRIX) - FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + hlsl_fixme(ctx, lhs->loc, "Matrix assignment with a writemask.\n"); if (!invert_swizzle(&s, &writemask, &width)) { @@ -1338,7 +1338,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru list_add_tail(list, &store->node.entry); } else - FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); + { + hlsl_fixme(ctx, node->loc, "Implicit cast in structure initializer.\n"); + } } vkd3d_free(initializer->args); @@ -1502,14 +1504,14 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } if (v->arrays.count) { - FIXME("Initializing arrays is not supported yet.\n"); + hlsl_fixme(ctx, v->loc, "Array initializer.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } if (v->initializer.args_count > 1) { - FIXME("Complex initializers are not supported yet.\n"); + hlsl_fixme(ctx, v->loc, "Complex initializer.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; @@ -1786,7 +1788,7 @@ hlsl_prog: | hlsl_prog declaration_statement { if (!list_empty($2)) - FIXME("Uniform initializer.\n"); + hlsl_fixme(ctx, @2, "Uniform initializer.\n"); hlsl_free_instr_list($2); } | hlsl_prog preproc_directive @@ -2769,7 +2771,7 @@ postfix_expr: } if ($2->type == HLSL_CLASS_MATRIX) - FIXME("Matrix constructors are not supported yet.\n"); + hlsl_fixme(ctx, @2, "Matrix constructor.\n"); sprintf(name, "<constructor-%x>", counter++); if (!(var = hlsl_new_synthetic_var(ctx, name, $2, @2))) @@ -2931,11 +2933,11 @@ shift_expr: add_expr | shift_expr OP_LEFTSHIFT add_expr { - FIXME("Left shift.\n"); + hlsl_fixme(ctx, @$, "Left shift.\n"); } | shift_expr OP_RIGHTSHIFT add_expr { - FIXME("Right shift.\n"); + hlsl_fixme(ctx, @$, "Right shift.\n"); } relational_expr: @@ -2972,42 +2974,42 @@ bitand_expr: equality_expr | bitand_expr '&' equality_expr { - FIXME("Bitwise AND.\n"); + hlsl_fixme(ctx, @$, "Bitwise AND.\n"); } bitxor_expr: bitand_expr | bitxor_expr '^' bitand_expr { - FIXME("Bitwise XOR.\n"); + hlsl_fixme(ctx, @$, "Bitwise XOR.\n"); } bitor_expr: bitxor_expr | bitor_expr '|' bitxor_expr { - FIXME("Bitwise OR.\n"); + hlsl_fixme(ctx, @$, "Bitwise OR.\n"); } logicand_expr: bitor_expr | logicand_expr OP_AND bitor_expr { - FIXME("Logical AND.\n"); + hlsl_fixme(ctx, @$, "Logical AND.\n"); } logicor_expr: logicand_expr | logicor_expr OP_OR logicand_expr { - FIXME("Logical OR.\n"); + hlsl_fixme(ctx, @$, "Logical OR.\n"); } conditional_expr: logicor_expr | logicor_expr '?' expr ':' assignment_expr { - FIXME("Ternary operator.\n"); + hlsl_fixme(ctx, @$, "Ternary operator.\n"); } assignment_expr: diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 85d54ac2..48a504da 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -606,7 +606,8 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b if (instr->data_type->base_type != HLSL_TYPE_FLOAT) { - FIXME("Non-float operations need to be lowered.\n"); + /* These need to be lowered. */ + hlsl_fixme(ctx, instr->loc, "SM1 non-float expression.\n"); return; } @@ -636,7 +637,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; default: - FIXME("Unhandled op %u.\n", expr->op); + hlsl_fixme(ctx, instr->loc, "SM1 \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break; } } @@ -765,8 +766,9 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { if (instr->data_type->type == HLSL_CLASS_MATRIX) { - FIXME("Matrix operations need to be lowered.\n"); - break; + /* These need to be lowered. */ + hlsl_fixme(ctx, instr->loc, "SM1 matrix expression.\n"); + continue; } assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9948045e..63fe9fc5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -112,6 +112,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN = 5014, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS = 5015, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, + VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5299, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, }; -- 2.32.0

3 2

[PATCH v14] ntdll: Allow renaming a file/directory to a different case of itself.
by Gabriel Ivăncescu 12 Aug '21

12 Aug '21

Renaming a file or directory from e.g. foobar to FooBar (or any other case change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v14: Rebased. Please let me know if there's other changes it needs. dlls/kernel32/tests/file.c | 4 +- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/unix/file.c | 58 ++++++++++++++++++++- server/fd.c | 100 +++++++++++++++++++++++++------------ server/protocol.def | 2 + 5 files changed, 130 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f..15bfc13 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2040,7 +2040,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); } CloseHandle(hfile); @@ -2085,7 +2085,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); } CloseHandle(hfile); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2..c6178d3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2315,7 +2315,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } @@ -2900,7 +2900,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 712f94e..9bc0905 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3591,6 +3591,52 @@ NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULON } +/*********************************************************************** + * get_filename_case + * + * Get the unix filename, with the case from NT name's last component. + */ +static char *get_filename_case( const OBJECT_ATTRIBUTES *attr ) +{ + const WCHAR *p, *nt_filename = attr->ObjectName->Buffer; + int len = attr->ObjectName->Length / sizeof(WCHAR); + char *file_case; + + /* skip the device and prefix (allow slashes for unix namespace) */ + if (!attr->RootDirectory) + { + int pos = get_dos_prefix_len( attr->ObjectName ); + while (pos < len) + { + WCHAR c = nt_filename[pos++]; + if (c == '\\' || c == '/') break; + } + nt_filename += pos; + len -= pos; + } + + /* strip off trailing backslashes */ + for (; len; len--) + if (nt_filename[len - 1] != '\\' && nt_filename[len - 1] != '/') + break; + + /* get the last component */ + for (p = nt_filename + len; p != nt_filename; p--) + if (p[-1] == '\\' || p[-1] == '/') + break; + len -= p - nt_filename; + nt_filename = p; + + if ((file_case = malloc( len * 3 + 1 ))) + { + len = ntdll_wcstoumbs( nt_filename, len, file_case, len * 3, TRUE ); + if (len < 0 || len > MAX_DIR_ENTRY_LEN) len = 0; + file_case[len] = 0; + } + return file_case; +} + + /*********************************************************************** * get_full_path * @@ -4530,8 +4576,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4542,20 +4588,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = FALSE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } @@ -4567,8 +4617,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_LINK_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4579,20 +4629,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = TRUE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } diff --git a/server/fd.c b/server/fd.c index b953da2..0cb7729 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2502,11 +2502,14 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *file_case, data_size_t caselen, struct unicode_str nt_name, + int create_link, int replace ) { + size_t pathlen = 0, filenamelen; struct inode *inode; struct stat st, st2; - char *name; + int different_case; + char *name, *p; if (!fd->inode || !fd->unix_name) { @@ -2540,6 +2543,22 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da name = combined_name; } + for (p = name; *p;) if (*p++ == '/' && *p) pathlen = p - name; + filenamelen = p - name - pathlen; + for (p = name + pathlen; filenamelen && p[filenamelen - 1] == '/'; filenamelen--) { } + different_case = caselen && (filenamelen != caselen || memcmp( p, file_case, caselen )); + + if (filenamelen < caselen) + { + p = realloc( name, pathlen + caselen + 1 ); + if (!p) + { + set_error( STATUS_NO_MEMORY ); + goto failed; + } + name = p; + } + /* when creating a hard link, source cannot be a dir */ if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { @@ -2552,47 +2571,61 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } + if (!different_case) + { + free( name ); + return; + } - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + /* creating a link with a different case on itself renames the file */ + create_link = 0; } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } - } - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) - { - if (unlink( name )) + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) { - file_set_error(); - goto failed; + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + if (create_link || S_ISDIR( st2.st_mode ) || different_case) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } } } } + if (different_case) + { + memcpy( name + pathlen, file_case, caselen ); + name[pathlen + caselen] = 0; + } + if (create_link) { if (link( fd->unix_name, name )) @@ -2929,16 +2962,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *fullname, *file_case; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->caselen) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + file_case = (const char *)get_req_data() + req->namelen; + fullname = file_case + req->caselen; if (req->rootdir) { @@ -2952,8 +2988,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, fullname, (const char *)get_req_data() + get_req_data_size() - fullname, + file_case, req->caselen, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 133d6ad..b7de62f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3537,9 +3537,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t caselen; /* length of the actual case filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(actual_case,string,caselen); /* new file name's actual case (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.31.1

1 0

[PATCH vkd3d v2 1/6] vkd3d-shader: Implement FTOD instruction.
by Conor McCarthy 12 Aug '21

12 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Handle via vkd3d_dxbc_compiler_emit_alu_instruction(). --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index fab19046..0c590563 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -807,6 +807,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DNE, VKD3DSIH_DNE, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_DMOVC, VKD3DSIH_DMOVC, "d", "udd"}, + {VKD3D_SM5_OP_FTOD, VKD3DSIH_FTOD, "d", "f"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 335f0161..5f4f22db 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -327,6 +327,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DNE = 0xc6, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_DMOVC = 0xc8, + VKD3D_SM5_OP_FTOD = 0xca, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4e67af49..a50a3099 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6776,6 +6776,7 @@ static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_i {VKD3DSIH_DDIV, SpvOpFDiv}, {VKD3DSIH_DIV, SpvOpFDiv}, {VKD3DSIH_DMUL, SpvOpFMul}, + {VKD3DSIH_FTOD, SpvOpFConvert}, {VKD3DSIH_FTOI, SpvOpConvertFToS}, {VKD3DSIH_FTOU, SpvOpConvertFToU}, {VKD3DSIH_IADD, SpvOpIAdd}, @@ -9528,6 +9529,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DDIV: case VKD3DSIH_DIV: case VKD3DSIH_DMUL: + case VKD3DSIH_FTOD: case VKD3DSIH_FTOI: case VKD3DSIH_FTOU: case VKD3DSIH_IADD: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 830a5fc7..8f93e1bd 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -147,6 +147,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_FIRSTBIT_LO */ "firstbit_lo", /* VKD3DSIH_FIRSTBIT_SHI */ "firstbit_shi", /* VKD3DSIH_FRC */ "frc", + /* VKD3DSIH_FTOD */ "ftod", /* VKD3DSIH_FTOI */ "ftoi", /* VKD3DSIH_FTOU */ "ftou", /* VKD3DSIH_GATHER4 */ "gather4", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9948045e..7400be51 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -236,6 +236,7 @@ enum vkd3d_shader_opcode VKD3DSIH_FIRSTBIT_LO, VKD3DSIH_FIRSTBIT_SHI, VKD3DSIH_FRC, + VKD3DSIH_FTOD, VKD3DSIH_FTOI, VKD3DSIH_FTOU, VKD3DSIH_GATHER4, diff --git a/tests/d3d12.c b/tests/d3d12.c index 2b1830bd..4c03b81e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10032,7 +10032,7 @@ static void test_shader_instructions(void) {&ps_dtof, {.d = {{ 1.5}}}, {.f = {1.5f, -1.5f}}, true, true}, {&ps_utod, {.u = {{3, 0xffffffff}}}, {.d = {3.0, 4294967295.0}}, true, true}, {&ps_itod, {.u = {{3, INT_MIN}}}, {.d = {3.0, -2147483648.0}}, true, true}, - {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true, true}, + {&ps_ftod, {.f = {{-2.5f, -2.5f}}}, {.d = {-2.5, 2.5}}, true}, {&ps_dmul, {.d = {{ 1.5, 3.0}}}, {.d = { 4.5, -4.5}}, true}, {&ps_ddiv, {.d = {{ 2.0, 4.0}}}, {.d = { 0.5, 2.0}}, true}, {&ps_ddiv, {.d = {{ 2.0, -4.0}}}, {.d = {-0.5, -2.0}}, true}, -- 2.32.0

2 11

[PATCH v2] user32: Don't set maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 12 Aug '21

12 Aug '21

The game "Imperiums: Greek Wars" depends on this to display its window properly. It also fixes the todo_wine in test_window_placement, along with a few new tests that show exactly the threshold at which the "transition" happens. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++--------- dlls/user32/winpos.c | 39 ++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..e23ab81 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..f08d6df 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -916,6 +916,42 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static POINT get_maximized_pos( WND *wnd, POINT pos ) +{ + MONITORINFO mon_info; + HMONITOR monitor; + RECT rc_work; + + /* top level windows covering the working area are not set, + to avoid situations where the border style changes and + the window is in the wrong position outside the screen */ + if (!wnd->parent || wnd->parent == GetDesktopWindow()) + { + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + { + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + rc_work = mon_info.rcMonitor; + + if ((wnd->dwStyle & WS_CAPTION) == WS_CAPTION || !(wnd->dwStyle & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + pos.x = pos.y = -1; + } + else + pos.x = pos.y = -1; + } + + return pos; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1373,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + pWnd->max_pos = get_maximized_pos( pWnd, pWnd->max_pos ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1462,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) pWnd->max_pos = get_maximized_pos( pWnd, point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ) ); if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

2 1

[PATCH resend] user32: Don't set maximized position placement for toplevel windows covering the entire work area.
by Gabriel Ivăncescu 12 Aug '21

12 Aug '21

The game "Imperiums: Greek Wars" depends on this to display its window properly. It also fixes the todo_wine in test_window_placement, along with a few new tests that show exactly the threshold at which the "transition" happens. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++--------- dlls/user32/winpos.c | 39 ++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e..dc3ac71 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11643,6 +11648,42 @@ static void test_window_placement(void) ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11675,7 +11716,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..f08d6df 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -916,6 +916,42 @@ static POINT get_minimized_pos( HWND hwnd, POINT pt ) return pt; } +static POINT get_maximized_pos( WND *wnd, POINT pos ) +{ + MONITORINFO mon_info; + HMONITOR monitor; + RECT rc_work; + + /* top level windows covering the working area are not set, + to avoid situations where the border style changes and + the window is in the wrong position outside the screen */ + if (!wnd->parent || wnd->parent == GetDesktopWindow()) + { + if (wnd->dwStyle & WS_MAXIMIZE) + { + if ((monitor = MonitorFromWindow( wnd->obj.handle, MONITOR_DEFAULTTOPRIMARY ))) + { + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + rc_work = mon_info.rcMonitor; + + if ((wnd->dwStyle & WS_CAPTION) == WS_CAPTION || !(wnd->dwStyle & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + else + SetRect( &rc_work, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN ) ); + + if (wnd->window_rect.left <= rc_work.left && wnd->window_rect.top <= rc_work.top && + wnd->window_rect.right >= rc_work.right && wnd->window_rect.bottom >= rc_work.bottom) + pos.x = pos.y = -1; + } + else + pos.x = pos.y = -1; + } + + return pos; +} + /*********************************************************************** * WINPOS_MinMaximize @@ -1337,6 +1373,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + pWnd->max_pos = get_maximized_pos( pWnd, pWnd->max_pos ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1425,7 +1462,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) pWnd->max_pos = get_maximized_pos( pWnd, point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ) ); if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.31.1

2 1

[PATCH 2/4] user32/listbox: Fix redraw after LB_SETCOUNT message.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

3ef790b9680cbf38fc93b4902e3ca6c9f57c5422 accidentally dropped updating LBS_DISPLAYCHANGED flag that had been done in LISTBOX_InvalidateItems() if the count value was changed. In fact, the newly added test shows LB_SETCOUNT message always causes WM_DRAWITEM requests regardless of the count value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51591 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/listbox.c | 2 ++ dlls/user32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

2 1

[PATCH 4/4] comctl32/listbox: Fix redraw after LB_SETCOUNT message.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/listbox.c | 2 ++ dlls/comctl32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] comctl32/tests: Test pending redraw state with owner-drawn list box.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 50 ++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] user32/tests: Test pending redraw state with owner-drawn list box.
by Akihiro Sagawa 12 Aug '21

12 Aug '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/listbox.c | 51 ++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-)

1 0

[PATCH v3 7/7] gdi32/tests: Add more metafile blitting tests.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 299 ++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+)

2 1

[PATCH v3 6/7] gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 13 ++++++++++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-)

2 1

[PATCH v3 5/7] gdi32: Use NtGdiBitBlt for BitBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 12 +++++++---- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 42 +++++++++++++++++++++++------------- include/ntgdi.h | 2 ++ 6 files changed, 63 insertions(+), 24 deletions(-)

2 1

[PATCH v3 4/7] gdi32: Use NtGdiStretchBlt for StretchBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 +++++---- dlls/gdi32/enhmfdrv/bitblt.c | 25 ++++++++++++++++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 12 ++++++------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 -- include/ntgdi.h | 3 +++ 10 files changed, 60 insertions(+), 25 deletions(-)

2 1

[PATCH v3 3/7] gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/bitblt.c | 130 +++++++++++++++----------------------- 1 file changed, 52 insertions(+), 78 deletions(-)

2 1

[PATCH v3 2/7] gdi32: Don't use bitblt_coords in emfdrv_stretchblt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 46 ++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 20 deletions(-)

2 1

[PATCH v3 1/7] gdi32: Use GetDIBits in emfdrv_stretchblt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 133 ++++++++++++++++++++++------------- 1 file changed, 84 insertions(+), 49 deletions(-)

2 1

[PATCH 1/5] hid: Return HIDP_STATUS_SUCCESS even if no usages are found.
by Rémi Bernon 12 Aug '21

12 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series should not conflict with the other winebus.sys patches. dlls/hid/hidp.c | 2 -- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++++ dlls/xinput1_3/tests/xinput.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2690b9b0f27..31f1b85f14a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -328,7 +328,6 @@ NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, *usages_len = params.usages - usages; if (status != HIDP_STATUS_SUCCESS) return status; - if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; return status; } @@ -672,7 +671,6 @@ NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collectio *usages_len = params.usages - usages; if (status != HIDP_STATUS_SUCCESS) return status; - if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; return status; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40f9b8622e3..50e381c8983 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2220,6 +2220,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + value = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(value == 0, "got usage count %d, expected %d\n", value, 2); + usages[0] = 0x9; usages[1] = 0xb; usages[2] = 0xa; diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 41769e23ec9..0c94bfed982 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -678,7 +678,6 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre length = ARRAY_SIZE(usages); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); ok(length == 0, "got length %u\n", length); -- 2.32.0

2 6

[PATCH v2 5/7] gdi32: Use NtGdiBitBlt for BitBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 12 +++++++---- dlls/gdi32/gdi_private.h | 4 ++++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 42 +++++++++++++++++++++++------------- include/ntgdi.h | 2 ++ 6 files changed, 63 insertions(+), 24 deletions(-)

2 2

[PATCH] nsiproxy.sys: Only use SIN_ROUTER when available
by Gerald Pfeifer 12 Aug '21

12 Aug '21

FreeBSD (and others) fall into the non-Linux case that is guarded by HAVE_SYS_SYSCTL_H. Alas not all such systems feature SIN_ROUTER which is used there, so tighten the guard. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/ip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 19272861cef..04f5ff3fda5 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -649,7 +649,7 @@ static NTSTATUS ipv4_neighbour_enumerate_all( void *key_data, DWORD key_size, vo } fclose( fp ); } -#elif defined(HAVE_SYS_SYSCTL_H) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(SIN_ROUTER) { int mib[] = { CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO }, sinarp_len; size_t needed; -- 2.31.1

2 2

[PATCH 6/6] nsiproxy: Don't use the key size to determine the address family as it can be zero.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index ae3e23960de..c5d98fa93f2 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -722,7 +722,7 @@ static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_ if (stat) stat->creation_time = get_boot_time(); } -static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, +static NTSTATUS ip_unicast_enumerate_all( int family, void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD_PTR *count ) { @@ -730,7 +730,6 @@ static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void * NTSTATUS status = STATUS_SUCCESS; BOOL want_data = key_size || rw_size || dynamic_size || static_size; struct ifaddrs *addrs, *entry; - int family = (key_size == sizeof(struct nsi_ipv4_unicast_key)) ? AF_INET : AF_INET6; TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); @@ -760,6 +759,22 @@ static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void * return status; } +static NTSTATUS ipv4_unicast_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + return ip_unicast_enumerate_all( AF_INET, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + +static NTSTATUS ipv6_unicast_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + return ip_unicast_enumerate_all( AF_INET6, key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); +} + static NTSTATUS ip_unicast_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) @@ -1263,7 +1278,7 @@ static struct module_table ipv4_tables[] = sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ip_unicast_rw), sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, - ip_unicast_enumerate_all, + ipv4_unicast_enumerate_all, ip_unicast_get_all_parameters, }, { @@ -1328,7 +1343,7 @@ static struct module_table ipv6_tables[] = sizeof(struct nsi_ipv6_unicast_key), sizeof(struct nsi_ip_unicast_rw), sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, - ip_unicast_enumerate_all, + ipv6_unicast_enumerate_all, ip_unicast_get_all_parameters, }, { -- 2.23.0

1 0

[PATCH 5/6] iphlpapi: Implement GetIcmpStatistics() on top of GetIcmpStatisticsEx().
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 41 ++++++++ dlls/iphlpapi/ipstats.c | 170 ---------------------------------- 2 files changed, 41 insertions(+), 170 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9e484b7e4c2..14a2c719b95 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1495,6 +1495,47 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } +static void icmp_stats_ex_to_icmp_stats( MIBICMPSTATS_EX *stats_ex, MIBICMPSTATS *stats ) +{ + stats->dwMsgs = stats_ex->dwMsgs; + stats->dwErrors = stats_ex->dwErrors; + stats->dwDestUnreachs = stats_ex->rgdwTypeCount[ICMP4_DST_UNREACH]; + stats->dwTimeExcds = stats_ex->rgdwTypeCount[ICMP4_TIME_EXCEEDED]; + stats->dwParmProbs = stats_ex->rgdwTypeCount[ICMP4_PARAM_PROB]; + stats->dwSrcQuenchs = stats_ex->rgdwTypeCount[ICMP4_SOURCE_QUENCH]; + stats->dwRedirects = stats_ex->rgdwTypeCount[ICMP4_REDIRECT]; + stats->dwEchos = stats_ex->rgdwTypeCount[ICMP4_ECHO_REQUEST]; + stats->dwEchoReps = stats_ex->rgdwTypeCount[ICMP4_ECHO_REPLY]; + stats->dwTimestamps = stats_ex->rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST]; + stats->dwTimestampReps = stats_ex->rgdwTypeCount[ICMP4_TIMESTAMP_REPLY]; + stats->dwAddrMasks = stats_ex->rgdwTypeCount[ICMP4_MASK_REQUEST]; + stats->dwAddrMaskReps = stats_ex->rgdwTypeCount[ICMP4_MASK_REPLY]; +} + +/****************************************************************** + * GetIcmpStatistics (IPHLPAPI.@) + * + * Get the ICMP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for ICMP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIcmpStatistics( MIB_ICMP *stats ) +{ + MIB_ICMP_EX stats_ex; + DWORD err = GetIcmpStatisticsEx( &stats_ex, WS_AF_INET ); + + if (err) return err; + + icmp_stats_ex_to_icmp_stats( &stats_ex.icmpInStats, &stats->stats.icmpInStats ); + icmp_stats_ex_to_icmp_stats( &stats_ex.icmpOutStats, &stats->stats.icmpOutStats ); + return err; +} + /****************************************************************** * GetIcmpStatisticsEx (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index ff33ed42777..c5621b52dd7 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -276,176 +276,6 @@ static void *read_mib_entry( int fd, int level, int name, int *len ) } #endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ -/****************************************************************** - * GetIcmpStatistics (IPHLPAPI.@) - * - * Get the ICMP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for ICMP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!stats) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(MIB_ICMP) ); - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Icmp:"; - char buf[512], *ptr; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; - /* last line was a header, get another */ - if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", - &stats->stats.icmpInStats.dwMsgs, - &stats->stats.icmpInStats.dwErrors, - &stats->stats.icmpInStats.dwDestUnreachs, - &stats->stats.icmpInStats.dwTimeExcds, - &stats->stats.icmpInStats.dwParmProbs, - &stats->stats.icmpInStats.dwSrcQuenchs, - &stats->stats.icmpInStats.dwRedirects, - &stats->stats.icmpInStats.dwEchos, - &stats->stats.icmpInStats.dwEchoReps, - &stats->stats.icmpInStats.dwTimestamps, - &stats->stats.icmpInStats.dwTimestampReps, - &stats->stats.icmpInStats.dwAddrMasks, - &stats->stats.icmpInStats.dwAddrMaskReps, - &stats->stats.icmpOutStats.dwMsgs, - &stats->stats.icmpOutStats.dwErrors, - &stats->stats.icmpOutStats.dwDestUnreachs, - &stats->stats.icmpOutStats.dwTimeExcds, - &stats->stats.icmpOutStats.dwParmProbs, - &stats->stats.icmpOutStats.dwSrcQuenchs, - &stats->stats.icmpOutStats.dwRedirects, - &stats->stats.icmpOutStats.dwEchos, - &stats->stats.icmpOutStats.dwEchoReps, - &stats->stats.icmpOutStats.dwTimestamps, - &stats->stats.icmpOutStats.dwTimestampReps, - &stats->stats.icmpOutStats.dwAddrMasks, - &stats->stats.icmpOutStats.dwAddrMaskReps ); - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char ip[] = "ip", icmp[] = "icmp"; - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, ip, 0, icmp )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->stats.icmpInStats.dwMsgs = kstat_get_ui32( ksp, "inMsgs" ); - stats->stats.icmpInStats.dwErrors = kstat_get_ui32( ksp, "inErrors" ); - stats->stats.icmpInStats.dwDestUnreachs = kstat_get_ui32( ksp, "inDestUnreachs" ); - stats->stats.icmpInStats.dwTimeExcds = kstat_get_ui32( ksp, "inTimeExcds" ); - stats->stats.icmpInStats.dwParmProbs = kstat_get_ui32( ksp, "inParmProbs" ); - stats->stats.icmpInStats.dwSrcQuenchs = kstat_get_ui32( ksp, "inSrcQuenchs" ); - stats->stats.icmpInStats.dwRedirects = kstat_get_ui32( ksp, "inRedirects" ); - stats->stats.icmpInStats.dwEchos = kstat_get_ui32( ksp, "inEchos" ); - stats->stats.icmpInStats.dwEchoReps = kstat_get_ui32( ksp, "inEchoReps" ); - stats->stats.icmpInStats.dwTimestamps = kstat_get_ui32( ksp, "inTimestamps" ); - stats->stats.icmpInStats.dwTimestampReps = kstat_get_ui32( ksp, "inTimestampReps" ); - stats->stats.icmpInStats.dwAddrMasks = kstat_get_ui32( ksp, "inAddrMasks" ); - stats->stats.icmpInStats.dwAddrMaskReps = kstat_get_ui32( ksp, "inAddrMaskReps" ); - stats->stats.icmpOutStats.dwMsgs = kstat_get_ui32( ksp, "outMsgs" ); - stats->stats.icmpOutStats.dwErrors = kstat_get_ui32( ksp, "outErrors" ); - stats->stats.icmpOutStats.dwDestUnreachs = kstat_get_ui32( ksp, "outDestUnreachs" ); - stats->stats.icmpOutStats.dwTimeExcds = kstat_get_ui32( ksp, "outTimeExcds" ); - stats->stats.icmpOutStats.dwParmProbs = kstat_get_ui32( ksp, "outParmProbs" ); - stats->stats.icmpOutStats.dwSrcQuenchs = kstat_get_ui32( ksp, "outSrcQuenchs" ); - stats->stats.icmpOutStats.dwRedirects = kstat_get_ui32( ksp, "outRedirects" ); - stats->stats.icmpOutStats.dwEchos = kstat_get_ui32( ksp, "outEchos" ); - stats->stats.icmpOutStats.dwEchoReps = kstat_get_ui32( ksp, "outEchoReps" ); - stats->stats.icmpOutStats.dwTimestamps = kstat_get_ui32( ksp, "outTimestamps" ); - stats->stats.icmpOutStats.dwTimestampReps = kstat_get_ui32( ksp, "outTimestampReps" ); - stats->stats.icmpOutStats.dwAddrMasks = kstat_get_ui32( ksp, "outAddrMasks" ); - stats->stats.icmpOutStats.dwAddrMaskReps = kstat_get_ui32( ksp, "outAddrMaskReps" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && (defined(HAVE_STRUCT_ICMPSTAT_ICPS_INHIST) || defined(HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST)) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; - struct icmpstat icmp_stat; - size_t needed = sizeof(icmp_stat); - int i; - - if(sysctl(mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0) != -1) - { -#ifdef HAVE_STRUCT_ICMPSTAT_ICPS_INHIST - /*in stats */ - stats->stats.icmpInStats.dwMsgs = icmp_stat.icps_badcode + icmp_stat.icps_checksum + icmp_stat.icps_tooshort + icmp_stat.icps_badlen; - for(i = 0; i <= ICMP_MAXTYPE; i++) - stats->stats.icmpInStats.dwMsgs += icmp_stat.icps_inhist[i]; - - stats->stats.icmpInStats.dwErrors = icmp_stat.icps_badcode + icmp_stat.icps_tooshort + icmp_stat.icps_checksum + icmp_stat.icps_badlen; - - stats->stats.icmpInStats.dwDestUnreachs = icmp_stat.icps_inhist[ICMP_UNREACH]; - stats->stats.icmpInStats.dwTimeExcds = icmp_stat.icps_inhist[ICMP_TIMXCEED]; - stats->stats.icmpInStats.dwParmProbs = icmp_stat.icps_inhist[ICMP_PARAMPROB]; - stats->stats.icmpInStats.dwSrcQuenchs = icmp_stat.icps_inhist[ICMP_SOURCEQUENCH]; - stats->stats.icmpInStats.dwRedirects = icmp_stat.icps_inhist[ICMP_REDIRECT]; - stats->stats.icmpInStats.dwEchos = icmp_stat.icps_inhist[ICMP_ECHO]; - stats->stats.icmpInStats.dwEchoReps = icmp_stat.icps_inhist[ICMP_ECHOREPLY]; - stats->stats.icmpInStats.dwTimestamps = icmp_stat.icps_inhist[ICMP_TSTAMP]; - stats->stats.icmpInStats.dwTimestampReps = icmp_stat.icps_inhist[ICMP_TSTAMPREPLY]; - stats->stats.icmpInStats.dwAddrMasks = icmp_stat.icps_inhist[ICMP_MASKREQ]; - stats->stats.icmpInStats.dwAddrMaskReps = icmp_stat.icps_inhist[ICMP_MASKREPLY]; -#endif - -#ifdef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST - /* out stats */ - stats->stats.icmpOutStats.dwMsgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; - for(i = 0; i <= ICMP_MAXTYPE; i++) - stats->stats.icmpOutStats.dwMsgs += icmp_stat.icps_outhist[i]; - - stats->stats.icmpOutStats.dwErrors = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; - - stats->stats.icmpOutStats.dwDestUnreachs = icmp_stat.icps_outhist[ICMP_UNREACH]; - stats->stats.icmpOutStats.dwTimeExcds = icmp_stat.icps_outhist[ICMP_TIMXCEED]; - stats->stats.icmpOutStats.dwParmProbs = icmp_stat.icps_outhist[ICMP_PARAMPROB]; - stats->stats.icmpOutStats.dwSrcQuenchs = icmp_stat.icps_outhist[ICMP_SOURCEQUENCH]; - stats->stats.icmpOutStats.dwRedirects = icmp_stat.icps_outhist[ICMP_REDIRECT]; - stats->stats.icmpOutStats.dwEchos = icmp_stat.icps_outhist[ICMP_ECHO]; - stats->stats.icmpOutStats.dwEchoReps = icmp_stat.icps_outhist[ICMP_ECHOREPLY]; - stats->stats.icmpOutStats.dwTimestamps = icmp_stat.icps_outhist[ICMP_TSTAMP]; - stats->stats.icmpOutStats.dwTimestampReps = icmp_stat.icps_outhist[ICMP_TSTAMPREPLY]; - stats->stats.icmpOutStats.dwAddrMasks = icmp_stat.icps_outhist[ICMP_MASKREQ]; - stats->stats.icmpOutStats.dwAddrMaskReps = icmp_stat.icps_outhist[ICMP_MASKREPLY]; -#endif /* HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST */ - ret = NO_ERROR; - } - } -#else /* ICMPCTL_STATS */ - FIXME( "unimplemented\n" ); -#endif - return ret; -} - /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * -- 2.23.0

1 0

[PATCH 4/6] iphlpapi: Implement GetIcmpStatisticsEx() on top of nsi.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 36 +++++++ dlls/iphlpapi/ipstats.c | 175 ---------------------------------- 2 files changed, 36 insertions(+), 175 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 78f4c582e1a..9e484b7e4c2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1495,6 +1495,42 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } +/****************************************************************** + * GetIcmpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 ICMP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for ICMP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) +{ + const NPI_MODULEID *mod = ip_module_id( family ); + struct nsi_ip_icmpstats_dynamic dyn; + DWORD err; + + if (!stats || !mod) return ERROR_INVALID_PARAMETER; + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, + &dyn, sizeof(dyn), NULL, 0 ); + if (err) return err; + + stats->icmpInStats.dwMsgs = dyn.in_msgs; + stats->icmpInStats.dwErrors = dyn.in_errors; + memcpy( stats->icmpInStats.rgdwTypeCount, dyn.in_type_counts, sizeof( dyn.in_type_counts ) ); + stats->icmpOutStats.dwMsgs = dyn.out_msgs; + stats->icmpOutStats.dwErrors = dyn.out_errors; + memcpy( stats->icmpOutStats.rgdwTypeCount, dyn.out_type_counts, sizeof( dyn.out_type_counts ) ); + + return ERROR_SUCCESS; +} + static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 7d0011a1231..ff33ed42777 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -446,181 +446,6 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) return ret; } -/****************************************************************** - * GetIcmpStatisticsEx (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 ICMP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for ICMP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - MIB_ICMP ipv4stats; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(MIB_ICMP_EX) ); - - if (family == WS_AF_INET6) - { -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp6", "r"))) - { - struct icmpstatstruct{ - const char *name; - DWORD pos; - }; - static const struct icmpstatstruct icmpinstatlist[] = { - { "Icmp6InDestUnreachs", ICMP6_DST_UNREACH }, - { "Icmp6InPktTooBigs", ICMP6_PACKET_TOO_BIG }, - { "Icmp6InTimeExcds", ICMP6_TIME_EXCEEDED }, - { "Icmp6InParmProblems", ICMP6_PARAM_PROB }, - { "Icmp6InEchos", ICMP6_ECHO_REQUEST }, - { "Icmp6InEchoReplies", ICMP6_ECHO_REPLY }, - { "Icmp6InGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, - { "Icmp6InGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, - { "Icmp6InGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, - { "Icmp6InRouterSolicits", ND_ROUTER_SOLICIT }, - { "Icmp6InRouterAdvertisements", ND_ROUTER_ADVERT }, - { "Icmp6InNeighborSolicits", ND_NEIGHBOR_SOLICIT }, - { "Icmp6InNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, - { "Icmp6InRedirects", ND_REDIRECT }, - { "Icmp6InMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, - }; - static const struct icmpstatstruct icmpoutstatlist[] = { - { "Icmp6OutDestUnreachs", ICMP6_DST_UNREACH }, - { "Icmp6OutPktTooBigs", ICMP6_PACKET_TOO_BIG }, - { "Icmp6OutTimeExcds", ICMP6_TIME_EXCEEDED }, - { "Icmp6OutParmProblems", ICMP6_PARAM_PROB }, - { "Icmp6OutEchos", ICMP6_ECHO_REQUEST }, - { "Icmp6OutEchoReplies", ICMP6_ECHO_REPLY }, - { "Icmp6OutGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, - { "Icmp6OutGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, - { "Icmp6OutGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, - { "Icmp6OutRouterSolicits", ND_ROUTER_SOLICIT }, - { "Icmp6OutRouterAdvertisements", ND_ROUTER_ADVERT }, - { "Icmp6OutNeighborSolicits", ND_NEIGHBOR_SOLICIT }, - { "Icmp6OutNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, - { "Icmp6OutRedirects", ND_REDIRECT }, - { "Icmp6OutMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, - }; - char buf[512], *ptr, *value; - DWORD res, i; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (!(value = strchr(buf, ' '))) - continue; - - /* terminate the valuename */ - ptr = value - 1; - *(ptr + 1) = '\0'; - - /* and strip leading spaces from value */ - value += 1; - while (*value==' ') value++; - if ((ptr = strchr(value, '\n'))) - *ptr='\0'; - - if (!_strnicmp(buf, "Icmp6InMsgs", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpInStats.dwMsgs = res; - continue; - } - - if (!_strnicmp(buf, "Icmp6InErrors", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpInStats.dwErrors = res; - continue; - } - - for (i = 0; i < ARRAY_SIZE(icmpinstatlist); i++) - { - if (!_strnicmp(buf, icmpinstatlist[i].name, -1)) - { - if (sscanf(value, "%d", &res)) - stats->icmpInStats.rgdwTypeCount[icmpinstatlist[i].pos] = res; - break; - } - } - - if (!_strnicmp(buf, "Icmp6OutMsgs", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwMsgs = res; - continue; - } - - if (!_strnicmp(buf, "Icmp6OutErrors", -1)) - { - if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwErrors = res; - continue; - } - - for (i = 0; i < ARRAY_SIZE(icmpoutstatlist); i++) - { - if (!_strnicmp(buf, icmpoutstatlist[i].name, -1)) - { - if (sscanf(value, "%d", &res)) - stats->icmpOutStats.rgdwTypeCount[icmpoutstatlist[i].pos] = res; - break; - } - } - - } - fclose(fp); - ret = NO_ERROR; - } - } -#else - FIXME( "unimplemented for IPv6\n" ); -#endif - return ret; - } - - ret = GetIcmpStatistics(&ipv4stats); - if (!ret) - { - stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; - stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors; - stats->icmpInStats.rgdwTypeCount[ICMP4_DST_UNREACH] = ipv4stats.stats.icmpInStats.dwDestUnreachs; - stats->icmpInStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpInStats.dwSrcQuenchs; - stats->icmpInStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpInStats.dwRedirects; - stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpInStats.dwEchos; - stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpInStats.dwEchoReps; - stats->icmpInStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpInStats.dwTimeExcds; - stats->icmpInStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpInStats.dwParmProbs; - stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpInStats.dwTimestamps; - stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REPLY] = ipv4stats.stats.icmpInStats.dwTimestampReps; - stats->icmpInStats.rgdwTypeCount[ICMP4_MASK_REQUEST] = ipv4stats.stats.icmpInStats.dwAddrMasks; - stats->icmpInStats.rgdwTypeCount[ICMP4_MASK_REPLY] = ipv4stats.stats.icmpInStats.dwAddrMaskReps; - - stats->icmpOutStats.dwMsgs = ipv4stats.stats.icmpOutStats.dwMsgs; - stats->icmpOutStats.dwErrors = ipv4stats.stats.icmpOutStats.dwErrors; - stats->icmpOutStats.rgdwTypeCount[ICMP4_DST_UNREACH] = ipv4stats.stats.icmpOutStats.dwDestUnreachs; - stats->icmpOutStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpOutStats.dwSrcQuenchs; - stats->icmpOutStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpOutStats.dwRedirects; - stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpOutStats.dwEchos; - stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpOutStats.dwEchoReps; - stats->icmpOutStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpOutStats.dwTimeExcds; - stats->icmpOutStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpOutStats.dwParmProbs; - stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpOutStats.dwTimestamps; - stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REPLY] = ipv4stats.stats.icmpOutStats.dwTimestampReps; - stats->icmpOutStats.rgdwTypeCount[ICMP4_MASK_REQUEST] = ipv4stats.stats.icmpOutStats.dwAddrMasks; - stats->icmpOutStats.rgdwTypeCount[ICMP4_MASK_REPLY] = ipv4stats.stats.icmpOutStats.dwAddrMaskReps; - } - return ret; -} - /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * -- 2.23.0

1 0

[PATCH 3/6] nsiproxy: Implement IPv6 icmpstats get_all_parameters on linux.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 1 - dlls/nsiproxy.sys/ip.c | 135 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 3b1e757fa23..a21ac897e2c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -456,7 +456,6 @@ static void test_ip_icmpstats( int family ) winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats, sizeof(nsi_stats), NULL, 0 ); -todo_wine_if( family == AF_INET6) ok( !err, "got %d\n", err ); if (err) goto err; diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 8b7b41a291c..ae3e23960de 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -355,6 +355,132 @@ static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_si #endif } +static NTSTATUS ipv6_icmpstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_icmpstats_dynamic dyn; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + memset( &dyn, 0, sizeof(dyn) ); + +#ifdef __linux__ + { + struct data + { + const char *name; + DWORD pos; + }; + static const struct data in_list[] = + { + { "Icmp6InDestUnreachs", ICMP6_DST_UNREACH }, + { "Icmp6InPktTooBigs", ICMP6_PACKET_TOO_BIG }, + { "Icmp6InTimeExcds", ICMP6_TIME_EXCEEDED }, + { "Icmp6InParmProblems", ICMP6_PARAM_PROB }, + { "Icmp6InEchos", ICMP6_ECHO_REQUEST }, + { "Icmp6InEchoReplies", ICMP6_ECHO_REPLY }, + { "Icmp6InGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, + { "Icmp6InGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, + { "Icmp6InGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, + { "Icmp6InRouterSolicits", ND_ROUTER_SOLICIT }, + { "Icmp6InRouterAdvertisements", ND_ROUTER_ADVERT }, + { "Icmp6InNeighborSolicits", ND_NEIGHBOR_SOLICIT }, + { "Icmp6InNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, + { "Icmp6InRedirects", ND_REDIRECT }, + { "Icmp6InMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, + }; + static const struct data out_list[] = + { + { "Icmp6OutDestUnreachs", ICMP6_DST_UNREACH }, + { "Icmp6OutPktTooBigs", ICMP6_PACKET_TOO_BIG }, + { "Icmp6OutTimeExcds", ICMP6_TIME_EXCEEDED }, + { "Icmp6OutParmProblems", ICMP6_PARAM_PROB }, + { "Icmp6OutEchos", ICMP6_ECHO_REQUEST }, + { "Icmp6OutEchoReplies", ICMP6_ECHO_REPLY }, + { "Icmp6OutGroupMembQueries", ICMP6_MEMBERSHIP_QUERY }, + { "Icmp6OutGroupMembResponses", ICMP6_MEMBERSHIP_REPORT }, + { "Icmp6OutGroupMembReductions", ICMP6_MEMBERSHIP_REDUCTION }, + { "Icmp6OutRouterSolicits", ND_ROUTER_SOLICIT }, + { "Icmp6OutRouterAdvertisements", ND_ROUTER_ADVERT }, + { "Icmp6OutNeighborSolicits", ND_NEIGHBOR_SOLICIT }, + { "Icmp6OutNeighborAdvertisements", ND_NEIGHBOR_ADVERT }, + { "Icmp6OutRedirects", ND_REDIRECT }, + { "Icmp6OutMLDv2Reports", ICMP6_V2_MEMBERSHIP_REPORT }, + }; + char buf[512], *ptr, *value; + DWORD res, i; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp6", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (!(value = strchr( buf, ' ' ))) continue; + + /* terminate the valuename */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value == ' ') value++; + if ((ptr = strchr( value, '\n' ))) *ptr='\0'; + + if (!_strnicmp( buf, "Icmp6InMsgs", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.in_msgs = res; + continue; + } + + if (!_strnicmp( buf, "Icmp6InErrors", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.in_errors = res; + continue; + } + + for (i = 0; i < ARRAY_SIZE(in_list); i++) + { + if (!_strnicmp( buf, in_list[i].name, -1 )) + { + if (sscanf( value, "%d", &res )) + dyn.in_type_counts[in_list[i].pos] = res; + break; + } + } + + if (!_strnicmp( buf, "Icmp6OutMsgs", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.out_msgs = res; + continue; + } + + if (!_strnicmp( buf, "Icmp6OutErrors", -1 )) + { + if (sscanf( value, "%d", &res )) dyn.out_errors = res; + continue; + } + + for (i = 0; i < ARRAY_SIZE(out_list); i++) + { + if (!_strnicmp( buf, out_list[i].name, -1 )) + { + if (sscanf( value, "%d", &res )) + dyn.out_type_counts[out_list[i].pos] = res; + break; + } + } + } + fclose( fp ); + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { @@ -1178,6 +1304,15 @@ static struct module_table ipv6_tables[] = NULL, ipv6_cmpt_get_all_parameters, }, + { + NSI_IP_ICMPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_icmpstats_dynamic), 0 + }, + NULL, + ipv6_icmpstats_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { -- 2.23.0

1 0

[PATCH 2/6] nsiproxy: Implement IPv4 icmpstats get_all_parameters.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 44 +++++++++++++ dlls/nsiproxy.sys/ip.c | 141 +++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 11 ++++ 3 files changed, 196 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 7d9d8e12bac..3b1e757fa23 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -446,6 +446,48 @@ err: winetest_pop_context(); } +static void test_ip_icmpstats( int family ) +{ + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + struct nsi_ip_icmpstats_dynamic nsi_stats, nsi_stats2; + MIB_ICMP_EX table; + DWORD err, i; + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats, sizeof(nsi_stats), NULL, 0 ); +todo_wine_if( family == AF_INET6) + ok( !err, "got %d\n", err ); + if (err) goto err; + + err = GetIcmpStatisticsEx( &table, family ); + ok( !err, "got %d\n", err ); + if (err) goto err; + + err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats2, sizeof(nsi_stats2), NULL, 0 ); + ok( !err, "got %d\n", err ); + + ok( bounded( table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ), + "%d vs [%d %d]\n", table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ); + ok( bounded( table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ), + "%d vs [%d %d]\n", table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ); + ok( bounded( table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ), + "%d vs [%d %d]\n", table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ); + ok( bounded( table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ), + "%d vs [%d %d]\n", table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ); + for (i = 0; i < ARRAY_SIZE(nsi_stats.in_type_counts); i++) + { + winetest_push_context( "%d", i ); + ok( bounded( table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ), + "%d vs [%d %d]\n", table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ); + ok( bounded( table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ), + "%d vs [%d %d]\n", table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ); + winetest_pop_context(); + } +err: + winetest_pop_context(); +} + static void test_ip_ipstats( int family ) { @@ -763,6 +805,8 @@ START_TEST( nsi ) test_ip_cmpt( AF_INET ); test_ip_cmpt( AF_INET6 ); + test_ip_icmpstats( AF_INET ); + test_ip_icmpstats( AF_INET6 ); test_ip_ipstats( AF_INET ); test_ip_ipstats( AF_INET6 ); test_ip_unicast( AF_INET ); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index 19272861cef..8b7b41a291c 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -41,10 +41,26 @@ #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif + +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif + +#ifdef HAVE_NETINET_IP_ICMP_H +#include <netinet/ip_icmp.h> +#endif + #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif +#ifdef HAVE_NETINET_ICMP_VAR_H +#include <netinet/icmp_var.h> +#endif + #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif @@ -76,6 +92,7 @@ #include "ws2ipdef.h" #include "nldef.h" #include "ifdef.h" +#include "ipmib.h" #include "netiodef.h" #include "wine/heap.h" #include "wine/nsi.h" @@ -223,6 +240,121 @@ static NTSTATUS ipv6_cmpt_get_all_parameters( const void *key, DWORD key_size, v dynamic_data, dynamic_size, static_data, static_size ); } +static NTSTATUS ipv4_icmpstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) +{ + struct nsi_ip_icmpstats_dynamic dyn; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + memset( &dyn, 0, sizeof(dyn) ); + +#ifdef __linux__ + { + NTSTATUS status = STATUS_NOT_SUPPORTED; + static const char hdr[] = "Icmp:"; + char buf[512], *ptr; + FILE *fp; + + if (!(fp = fopen( "/proc/net/snmp", "r" ))) return STATUS_NOT_SUPPORTED; + + while ((ptr = fgets( buf, sizeof(buf), fp ))) + { + if (_strnicmp( buf, hdr, sizeof(hdr) - 1 )) continue; + /* last line was a header, get another */ + if (!(ptr = fgets( buf, sizeof(buf), fp ))) break; + if (!_strnicmp( buf, hdr, sizeof(hdr) - 1 )) + { + ptr += sizeof(hdr); + sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + &dyn.in_msgs, + &dyn.in_errors, + &dyn.in_type_counts[ICMP4_DST_UNREACH], + &dyn.in_type_counts[ICMP4_TIME_EXCEEDED], + &dyn.in_type_counts[ICMP4_PARAM_PROB], + &dyn.in_type_counts[ICMP4_SOURCE_QUENCH], + &dyn.in_type_counts[ICMP4_REDIRECT], + &dyn.in_type_counts[ICMP4_ECHO_REQUEST], + &dyn.in_type_counts[ICMP4_ECHO_REPLY], + &dyn.in_type_counts[ICMP4_TIMESTAMP_REQUEST], + &dyn.in_type_counts[ICMP4_TIMESTAMP_REPLY], + &dyn.in_type_counts[ICMP4_MASK_REQUEST], + &dyn.in_type_counts[ICMP4_MASK_REPLY], + &dyn.out_msgs, + &dyn.out_errors, + &dyn.out_type_counts[ICMP4_DST_UNREACH], + &dyn.out_type_counts[ICMP4_TIME_EXCEEDED], + &dyn.out_type_counts[ICMP4_PARAM_PROB], + &dyn.out_type_counts[ICMP4_SOURCE_QUENCH], + &dyn.out_type_counts[ICMP4_REDIRECT], + &dyn.out_type_counts[ICMP4_ECHO_REQUEST], + &dyn.out_type_counts[ICMP4_ECHO_REPLY], + &dyn.out_type_counts[ICMP4_TIMESTAMP_REQUEST], + &dyn.out_type_counts[ICMP4_TIMESTAMP_REPLY], + &dyn.out_type_counts[ICMP4_MASK_REQUEST], + &dyn.out_type_counts[ICMP4_MASK_REPLY] ); + status = STATUS_SUCCESS; + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + break; + } + } + fclose( fp ); + return status; + } +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) + { + int mib[] = { CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS }; + struct icmpstat icmp_stat; + size_t needed = sizeof(icmp_stat); + int i; + + if (sysctl( mib, ARRAY_SIZE(mib), &icmp_stat, &needed, NULL, 0 ) == -1) return STATUS_NOT_SUPPORTED; + + dyn.in_msgs = icmp_stat.icps_badcode + icmp_stat.icps_checksum + icmp_stat.icps_tooshort + icmp_stat.icps_badlen; + for (i = 0; i <= ICMP_MAXTYPE; i++) + dyn.in_msgs += icmp_stat.icps_inhist[i]; + + dyn.in_errors = icmp_stat.icps_badcode + icmp_stat.icps_tooshort + icmp_stat.icps_checksum + icmp_stat.icps_badlen; + + dyn.in_type_counts[ICMP4_DST_UNREACH] = icmp_stat.icps_inhist[ICMP_UNREACH]; + dyn.in_type_counts[ICMP4_TIME_EXCEEDED] = icmp_stat.icps_inhist[ICMP_TIMXCEED]; + dyn.in_type_counts[ICMP4_PARAM_PROB] = icmp_stat.icps_inhist[ICMP_PARAMPROB]; + dyn.in_type_counts[ICMP4_SOURCE_QUENCH] = icmp_stat.icps_inhist[ICMP_SOURCEQUENCH]; + dyn.in_type_counts[ICMP4_REDIRECT] = icmp_stat.icps_inhist[ICMP_REDIRECT]; + dyn.in_type_counts[ICMP4_ECHO_REQUEST] = icmp_stat.icps_inhist[ICMP_ECHO]; + dyn.in_type_counts[ICMP4_ECHO_REPLY] = icmp_stat.icps_inhist[ICMP_ECHOREPLY]; + dyn.in_type_counts[ICMP4_TIMESTAMP_REQUEST] = icmp_stat.icps_inhist[ICMP_TSTAMP]; + dyn.in_type_counts[ICMP4_TIMESTAMP_REPLY] = icmp_stat.icps_inhist[ICMP_TSTAMPREPLY]; + dyn.in_type_counts[ICMP4_MASK_REQUEST] = icmp_stat.icps_inhist[ICMP_MASKREQ]; + dyn.in_type_counts[ICMP4_MASK_REPLY] = icmp_stat.icps_inhist[ICMP_MASKREPLY]; + + dyn.out_msgs = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; + for (i = 0; i <= ICMP_MAXTYPE; i++) + dyn.out_msgs += icmp_stat.icps_outhist[i]; + + dyn.out_errors = icmp_stat.icps_oldshort + icmp_stat.icps_oldicmp; + + dyn.out_type_counts[ICMP4_DST_UNREACH] = icmp_stat.icps_outhist[ICMP_UNREACH]; + dyn.out_type_counts[ICMP4_TIME_EXCEEDED] = icmp_stat.icps_outhist[ICMP_TIMXCEED]; + dyn.out_type_counts[ICMP4_PARAM_PROB] = icmp_stat.icps_outhist[ICMP_PARAMPROB]; + dyn.out_type_counts[ICMP4_SOURCE_QUENCH] = icmp_stat.icps_outhist[ICMP_SOURCEQUENCH]; + dyn.out_type_counts[ICMP4_REDIRECT] = icmp_stat.icps_outhist[ICMP_REDIRECT]; + dyn.out_type_counts[ICMP4_ECHO_REQUEST] = icmp_stat.icps_outhist[ICMP_ECHO]; + dyn.out_type_counts[ICMP4_ECHO_REPLY] = icmp_stat.icps_outhist[ICMP_ECHOREPLY]; + dyn.out_type_counts[ICMP4_TIMESTAMP_REQUEST] = icmp_stat.icps_outhist[ICMP_TSTAMP]; + dyn.out_type_counts[ICMP4_TIMESTAMP_REPLY] = icmp_stat.icps_outhist[ICMP_TSTAMPREPLY]; + dyn.out_type_counts[ICMP4_MASK_REQUEST] = icmp_stat.icps_outhist[ICMP_MASKREQ]; + dyn.out_type_counts[ICMP4_MASK_REPLY] = icmp_stat.icps_outhist[ICMP_MASKREPLY]; + if (dynamic_data) *(struct nsi_ip_icmpstats_dynamic *)dynamic_data = dyn; + return STATUS_SUCCESS; + } +#else + FIXME( "not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; +#endif +} + static NTSTATUS ipv4_ipstats_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { @@ -981,6 +1113,15 @@ static struct module_table ipv4_tables[] = NULL, ipv4_cmpt_get_all_parameters, }, + { + NSI_IP_ICMPSTATS_TABLE, + { + 0, 0, + sizeof(struct nsi_ip_icmpstats_dynamic), 0 + }, + NULL, + ipv4_icmpstats_get_all_parameters, + }, { NSI_IP_IPSTATS_TABLE, { diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 6a90f5f1203..2c72c16aedc 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,7 @@ struct nsi_ndis_ifinfo_static /* Undocumented NSI IP tables */ #define NSI_IP_COMPARTMENT_TABLE 2 +#define NSI_IP_ICMPSTATS_TABLE 3 #define NSI_IP_IPSTATS_TABLE 6 #define NSI_IP_UNICAST_TABLE 10 #define NSI_IP_NEIGHBOUR_TABLE 11 @@ -119,6 +120,16 @@ struct nsi_ip_cmpt_dynamic DWORD num_addrs; }; +struct nsi_ip_icmpstats_dynamic +{ + DWORD in_msgs; + DWORD in_errors; + DWORD in_type_counts[256]; + DWORD out_msgs; + DWORD out_errors; + DWORD out_type_counts[256]; +}; + struct nsi_ip_ipstats_dynamic { DWORD unk[4]; -- 2.23.0

1 0

[PATCH 1/6] iphlpapi: Update the echo request and reply counts.
by Huw Davies 12 Aug '21

12 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8335e4871c1..7d0011a1231 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -312,7 +312,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", + sscanf( ptr, "%u %u %*u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", &stats->stats.icmpInStats.dwMsgs, &stats->stats.icmpInStats.dwErrors, &stats->stats.icmpInStats.dwDestUnreachs, @@ -320,6 +320,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) &stats->stats.icmpInStats.dwParmProbs, &stats->stats.icmpInStats.dwSrcQuenchs, &stats->stats.icmpInStats.dwRedirects, + &stats->stats.icmpInStats.dwEchos, &stats->stats.icmpInStats.dwEchoReps, &stats->stats.icmpInStats.dwTimestamps, &stats->stats.icmpInStats.dwTimestampReps, @@ -332,6 +333,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) &stats->stats.icmpOutStats.dwParmProbs, &stats->stats.icmpOutStats.dwSrcQuenchs, &stats->stats.icmpOutStats.dwRedirects, + &stats->stats.icmpOutStats.dwEchos, &stats->stats.icmpOutStats.dwEchoReps, &stats->stats.icmpOutStats.dwTimestamps, &stats->stats.icmpOutStats.dwTimestampReps, @@ -594,6 +596,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) stats->icmpInStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpInStats.dwSrcQuenchs; stats->icmpInStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpInStats.dwRedirects; stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpInStats.dwEchos; + stats->icmpInStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpInStats.dwEchoReps; stats->icmpInStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpInStats.dwTimeExcds; stats->icmpInStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpInStats.dwParmProbs; stats->icmpInStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpInStats.dwTimestamps; @@ -607,6 +610,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) stats->icmpOutStats.rgdwTypeCount[ICMP4_SOURCE_QUENCH] = ipv4stats.stats.icmpOutStats.dwSrcQuenchs; stats->icmpOutStats.rgdwTypeCount[ICMP4_REDIRECT] = ipv4stats.stats.icmpOutStats.dwRedirects; stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REQUEST] = ipv4stats.stats.icmpOutStats.dwEchos; + stats->icmpOutStats.rgdwTypeCount[ICMP4_ECHO_REPLY] = ipv4stats.stats.icmpOutStats.dwEchoReps; stats->icmpOutStats.rgdwTypeCount[ICMP4_TIME_EXCEEDED] = ipv4stats.stats.icmpOutStats.dwTimeExcds; stats->icmpOutStats.rgdwTypeCount[ICMP4_PARAM_PROB] = ipv4stats.stats.icmpOutStats.dwParmProbs; stats->icmpOutStats.rgdwTypeCount[ICMP4_TIMESTAMP_REQUEST] = ipv4stats.stats.icmpOutStats.dwTimestamps; -- 2.23.0

1 0

[PATCH v2 7/7] gdi32/tests: Add more metafile blitting tests.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 299 ++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+)

1 0

[PATCH v2 6/7] gdi32: Use NtGdiAlphaBlend for GdiAlphaBlend.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/enhmfdrv/bitblt.c | 13 ++++++++++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++++ include/ntgdi.h | 3 +++ 5 files changed, 39 insertions(+), 7 deletions(-)

1 0

[PATCH v2 4/7] gdi32: Use NtGdiStretchBlt for StretchBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 +++++---- dlls/gdi32/enhmfdrv/bitblt.c | 25 ++++++++++++++++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 6 ++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 12 ++++++------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 -- include/ntgdi.h | 3 +++ 10 files changed, 60 insertions(+), 25 deletions(-)

1 0

[PATCH v2 3/7] gdi32: Use GetDIBits instead of GetObject in MFDRV_StretchBlt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/bitblt.c | 130 +++++++++++++++----------------------- 1 file changed, 52 insertions(+), 78 deletions(-)

1 0

[PATCH v2 2/7] gdi32: Don't use bitblt_coords in emfdrv_stretchblt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 46 ++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 20 deletions(-)

1 0

[PATCH v2 1/7] gdi32: Use GetDIBits in emfdrv_stretchblt.
by Jacek Caban 12 Aug '21

12 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 135 ++++++++++++++++++++++------------- 1 file changed, 85 insertions(+), 50 deletions(-)

1 0

[PATCH 1/2] d3d10/effect: Get rid of unnecessary cast in ID3D10EffectPass::GetDesc().
by Nikolay Sivov 12 Aug '21

12 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 15b71aab1b7..64dd9ac9312 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3559,33 +3559,33 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); struct d3d10_effect_shader_variable *s; FIXME("iface %p, desc %p partial stub!\n", iface, desc); - if(This == &null_pass) + if (pass == &null_pass) { WARN("Null pass specified\n"); return E_FAIL; } - if(!desc) + if (!desc) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } + s = &impl_from_ID3D10EffectShaderVariable(pass->vs.pShaderVariable)->u.shader; + memset(desc, 0, sizeof(*desc)); - desc->Name = This->name; - s = &impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)This->vs.pShaderVariable)->u.shader; + desc->Name = pass->name; desc->pIAInputSignature = (BYTE *)s->input_signature.signature; desc->IAInputSignatureSize = s->input_signature.signature_size; - - desc->StencilRef = This->stencil_ref; - desc->SampleMask = This->sample_mask; - memcpy(desc->BlendFactor, This->blend_factor, 4 * sizeof(float)); + desc->StencilRef = pass->stencil_ref; + desc->SampleMask = pass->sample_mask; + memcpy(desc->BlendFactor, pass->blend_factor, 4 * sizeof(float)); return S_OK; } -- 2.30.2

1 1

[PATCH v2] msxml3: use XSD regex quantifier format S{0, m} instead of S{, m}
by Damjan Jovanovic 12 Aug '21

12 Aug '21

S{,m} is invalid in libxml2 2.9.11 and later, and was never valid in the XSD specification or any XML implementation tested. We should only use S{0,m} for our internal XSD schema used in XDR validation. Try 2 adds a test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51358 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/datatypes.xsd | 4 ++-- dlls/msxml3/tests/schema.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-)

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Use a designated initializer in debug_expr_op().
by Zebediah Figura 11 Aug '21

11 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e4070572..9f50d2fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op]; -- 2.32.0

1 4

[PATCH] oleacc: Check proper UI thread for window focus.
by Connor McAdams 11 Aug '21

11 Aug '21

From: Connor McAdams <conmanx360(a)gmail.com> When RPC is done in a multi-threaded apartment environment, this method may be called in a thread other than the one that the object was created in. To account for this, make sure to check the UI thread the HWND belongs to rather than the one belonging to the current thread. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/oleacc/client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..a726c607109 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,10 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(GetWindowThreadProcessId(This->hwnd, NULL), &info) && + info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

2 2

[PATCH 1/5] wined3d: Added wined3d_view_load_location() helper.
by Jan Sikorski 11 Aug '21

11 Aug '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..665661e39b1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); -- 2.30.2

2 14

[PATCH v2 vkd3d] vkd3d-shader: Skip generating SM1 array operations.
by Matteo Bruni 11 Aug '21

11 Aug '21

Eventually they will be split or otherwise transformed before getting here. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Report a compiler error (and fail compilation). libs/vkd3d-shader/hlsl_sm1.c | 6 ++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 8ea663dc..c13f0a2e 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -768,6 +768,12 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b FIXME("Matrix operations need to be lowered.\n"); break; } + if (instr->data_type->type == HLSL_CLASS_ARRAY) + { + hlsl_error(ctx, instr->loc, VKD3D_SHADER_ERROR_HLSL_COMPILER_ERROR, + "Compiler error, array operations need to be lowered."); + break; + } assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b64c4b10..4ea6f88d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -112,6 +112,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_RETURN = 5014, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS = 5015, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION = 5016, + VKD3D_SHADER_ERROR_HLSL_COMPILER_ERROR = 5299, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, }; -- 2.26.3

3 2

[PATCH 1/2] d3dcompiler: Improve d3d10_shader_reflection_GetDesc() to return missing stats.
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index bd064793587..8b893fe76db 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -124,6 +124,7 @@ struct d3dcompiler_shader_reflection UINT gs_max_output_vertex_count; D3D_PRIMITIVE input_primitive; UINT cut_instruction_count; + UINT def_count; UINT dcl_count; UINT static_flow_control_count; UINT float_instruction_count; @@ -138,6 +139,7 @@ struct d3dcompiler_shader_reflection UINT texture_bias_instructions; UINT texture_gradient_instructions; UINT dynamic_flow_control_count; + UINT macro_instruction_count; UINT c_control_points; D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; @@ -1098,7 +1100,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->temp_register_count = read_dword(&ptr); TRACE("TempRegisterCount: %u\n", r->temp_register_count); - skip_dword_unknown(&ptr, 1); + r->def_count = read_dword(&ptr); + TRACE("DefCount: %u\n", r->def_count); r->dcl_count = read_dword(&ptr); TRACE("DclCount: %u\n", r->dcl_count); @@ -1118,7 +1121,8 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c r->dynamic_flow_control_count = read_dword(&ptr); TRACE("DynamicFlowControlCount: %u\n", r->dynamic_flow_control_count); - skip_dword_unknown(&ptr, 1); + r->macro_instruction_count = read_dword(&ptr); + TRACE("MacroInstructionCount: %u\n", r->macro_instruction_count); r->temp_array_count = read_dword(&ptr); TRACE("TempArrayCount: %u\n", r->temp_array_count); @@ -1917,7 +1921,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef { struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) { @@ -1935,7 +1939,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->InstructionCount = reflection->instruction_count; desc->TempRegisterCount = reflection->temp_register_count; desc->TempArrayCount = reflection->temp_array_count; - desc->DefCount = 0; + desc->DefCount = reflection->def_count; desc->DclCount = reflection->dcl_count; desc->TextureNormalInstructions = reflection->texture_normal_instructions; desc->TextureLoadInstructions = reflection->texture_load_instructions; @@ -1947,7 +1951,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_GetDesc(ID3D10ShaderRef desc->UintInstructionCount = reflection->uint_instruction_count; desc->StaticFlowControlCount = reflection->static_flow_control_count; desc->DynamicFlowControlCount = reflection->dynamic_flow_control_count; - desc->MacroInstructionCount = 0; + desc->MacroInstructionCount = reflection->macro_instruction_count; desc->ArrayInstructionCount = reflection->array_instruction_count; desc->CutInstructionCount = reflection->cut_instruction_count; desc->EmitInstructionCount = reflection->emit_instruction_count; -- 2.30.2

2 4

[PATCH 1/4] d3dx10: Add a stub sprite object.
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/Makefile.in | 3 +- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/sprite.c | 202 ++++++++++++++++++++++++++++++++++ include/d3dx10core.h | 1 + 4 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 dlls/d3dx10_43/sprite.c diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 1fae34191ee..6d74f586841 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 d3dcompiler dxguid +IMPORTS = d3d10_1 d3dcompiler dxguid uuid DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native @@ -9,6 +9,7 @@ C_SRCS = \ async.c \ compiler.c \ d3dx10_43_main.c \ + sprite.c \ texture.c RC_SRCS = version.rc diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index a00b3402a5a..99b142f34d5 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -41,7 +41,7 @@ @ stub D3DX10CreateShaderResourceViewFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateShaderResourceViewFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10CreateSkinInfo(ptr) -@ stub D3DX10CreateSprite(ptr long ptr) +@ stdcall D3DX10CreateSprite(ptr long ptr) @ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c new file mode 100644 index 00000000000..6c1ef732ec0 --- /dev/null +++ b/dlls/d3dx10_43/sprite.c @@ -0,0 +1,202 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * 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 + * + */ + +#define COBJMACROS +#include "d3dx10.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +#define D3DERR_INVALIDCALL 0x8876086c + +struct d3dx10_sprite +{ + ID3DX10Sprite ID3DX10Sprite_iface; + LONG refcount; + + ID3D10Device *device; +}; + +static inline struct d3dx10_sprite *impl_from_ID3DX10Sprite(ID3DX10Sprite *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx10_sprite, ID3DX10Sprite_iface); +} + +static HRESULT WINAPI d3dx10_sprite_QueryInterface(ID3DX10Sprite *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DX10Sprite) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + ULONG refcount = InterlockedIncrement(&sprite->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + ULONG refcount = InterlockedDecrement(&sprite->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID3D10Device_Release(sprite->device); + heap_free(sprite); + } + + return refcount; +} + +static HRESULT WINAPI d3dx10_sprite_Begin(ID3DX10Sprite *iface, UINT flags) +{ + FIXME("%p, %#x.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_DrawSpritesBuffered(ID3DX10Sprite *iface, D3DX10_SPRITE *sprites, UINT count) +{ + FIXME("%p, %p, %u.\n", iface, sprites, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_Flush(ID3DX10Sprite *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_DrawSpritesImmediate(ID3DX10Sprite *iface, D3DX10_SPRITE *sprites, + UINT count, UINT size, UINT flags) +{ + FIXME("%p, %p, %u, %u, %#x.\n", iface, sprites, count, size, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_End(ID3DX10Sprite *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetViewTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_SetViewTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_SetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) +{ + FIXME("%p, %p.\n", iface, transform); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx10_sprite_GetDevice(ID3DX10Sprite *iface, ID3D10Device **device) +{ + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); + + TRACE("%p, %p.\n", iface, device); + + *device = sprite->device; + ID3D10Device_AddRef(*device); + + return S_OK; +} + +static const ID3DX10SpriteVtbl d3dx10_sprite_vtbl = +{ + d3dx10_sprite_QueryInterface, + d3dx10_sprite_AddRef, + d3dx10_sprite_Release, + d3dx10_sprite_Begin, + d3dx10_sprite_DrawSpritesBuffered, + d3dx10_sprite_Flush, + d3dx10_sprite_DrawSpritesImmediate, + d3dx10_sprite_End, + d3dx10_sprite_GetViewTransform, + d3dx10_sprite_SetViewTransform, + d3dx10_sprite_GetProjectionTransform, + d3dx10_sprite_SetProjectionTransform, + d3dx10_sprite_GetDevice, +}; + +HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite) +{ + struct d3dx10_sprite *object; + + TRACE("device %p, size %u, sprite %p.\n", device, size, sprite); + + if (!device || !sprite) + return D3DERR_INVALIDCALL; + + *sprite = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID3DX10Sprite_iface.lpVtbl = &d3dx10_sprite_vtbl; + object->refcount = 1; + object->device = device; + ID3D10Device_AddRef(device); + + *sprite = &object->ID3DX10Sprite_iface; + + return S_OK; +} diff --git a/include/d3dx10core.h b/include/d3dx10core.h index d794fa028d7..dbbe4b02e10 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -289,3 +289,4 @@ HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVE ID3D10Device **device); typedef interface ID3D10Device1 ID3D10Device1; HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite **sprite); -- 2.30.2

3 5

[PATCH] d3dx11/tests: Add some tests for D3DX11GetImageInfoFromMemory().
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Duplicates existing tests from d3dx9. dlls/d3dx11_43/tests/d3dx11.c | 595 ++++++++++++++++++++++++++++++++++ 1 file changed, 595 insertions(+) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index 06924877da4..fe33089a541 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -23,6 +23,233 @@ #include "wine/test.h" #include "wine/heap.h" +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif + +/* 1x1 bmp (1 bpp) */ +static const unsigned char bmp_1bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 1x1 bmp (2 bpp) */ +static const unsigned char bmp_2bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 1x1 bmp (4 bpp) */ +static const unsigned char bmp_4bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 1x1 bmp (8 bpp) */ +static const unsigned char bmp_8bpp[] = +{ + 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x08,0x00,0x00,0x00, + 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0xf1,0xf2,0xf3,0x80,0xf4,0xf5,0xf6,0x81,0x00,0x00, + 0x00,0x00 +}; + +/* 2x2 bmp (32 bpp XRGB) */ +static const unsigned char bmp_32bpp_xrgb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x00 +}; + +/* 2x2 bmp (32 bpp ARGB) */ +static const unsigned char bmp_32bpp_argb[] = +{ + 0x42,0x4d,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00, + 0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00, + 0x00,0x00,0x10,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0xa0,0xb0,0xc0,0x00,0xa1,0xb1,0xc1,0x00,0xa2,0xb2, + 0xc2,0x00,0xa3,0xb3,0xc3,0x01 +}; + +static const unsigned char png_grayscale[] = +{ + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, + 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, + 0x00, 0x00, 0x00, 0x3a, 0x7e, 0x9b, 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, + 0x41, 0x54, 0x08, 0xd7, 0x63, 0xf8, 0x0f, 0x00, 0x01, 0x01, 0x01, 0x00, 0x1b, + 0xb6, 0xee, 0x56, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82 +}; + +/* 2x2 24-bit dds, 2 mipmaps */ +static const unsigned char dds_24bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x0a,0x00,0x02,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0xff,0x00, + 0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff +}; + +/* 2x2 16-bit dds, no mipmaps */ +static const unsigned char dds_16bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, + 0x02,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x7c,0x00,0x00, + 0xe0,0x03,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0x7f,0xff,0x7f,0xff,0x7f,0xff,0x7f +}; + +/* 16x4 8-bit dds */ +static const unsigned char dds_8bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x0f,0x10,0x00,0x00,0x04,0x00,0x00,0x00, + 0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x47,0x49,0x4d,0x50,0x2d,0x44,0x44,0x53,0x5a,0x09,0x03,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0x8c,0xcd,0x12,0xff, + 0x78,0x01,0x14,0xff,0x50,0xcd,0x12,0xff,0x00,0x3d,0x8c,0xff,0x02,0x00,0x00,0xff, + 0x47,0x00,0x00,0xff,0xda,0x07,0x02,0xff,0x50,0xce,0x12,0xff,0xea,0x11,0x01,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x08,0x3d,0x8c,0xff,0x08,0x01,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x60,0xcc,0x12,0xff, + 0xa1,0xb2,0xd4,0xff,0xda,0x07,0x02,0xff,0x47,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x50,0xce,0x12,0xff,0x00,0x00,0x14,0xff,0xa8,0xcc,0x12,0xff,0x3c,0xb2,0xd4,0xff, + 0xda,0x07,0x02,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x01,0xff, + 0x21,0x00,0x00,0xff,0xd8,0xcb,0x12,0xff,0x54,0xcd,0x12,0xff,0x8b,0x4f,0xd5,0xff, + 0x00,0x04,0xda,0xff,0x00,0x00,0x00,0xff,0x3d,0x04,0x91,0xff,0x70,0xce,0x18,0xff, + 0xb4,0xcc,0x12,0xff,0x6b,0x4e,0xd5,0xff,0xb0,0xcc,0x12,0xff,0x00,0x00,0x00,0xff, + 0xc8,0x05,0x91,0xff,0x98,0xc7,0xcc,0xff,0x7c,0xcd,0x12,0xff,0x51,0x05,0x91,0xff, + 0x48,0x07,0x14,0xff,0x6d,0x05,0x91,0xff,0x00,0x07,0xda,0xff,0xa0,0xc7,0xcc,0xff, + 0x00,0x07,0xda,0xff,0x3a,0x77,0xd5,0xff,0xda,0x07,0x02,0xff,0x7c,0x94,0xd4,0xff, + 0xe0,0xce,0xd6,0xff,0x0a,0x80,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x78,0x9a,0xab,0xff,0xde,0x08,0x18,0xff,0xda,0x07,0x02,0xff,0x30,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x50,0xce,0x12,0xff,0x8c,0xcd,0x12,0xff,0xd0,0xb7,0xd8,0xff, + 0x00,0x00,0x00,0xff,0x60,0x32,0xd9,0xff,0x30,0xc1,0x1a,0xff,0xa8,0xcd,0x12,0xff, + 0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff,0x46,0x71,0x0e,0xff,0xc0,0x1d,0x4b,0xff, + 0x09,0x87,0xd4,0xff,0x00,0x00,0x00,0xff,0xf6,0x22,0x00,0xff,0x64,0xcd,0x12,0xff, + 0x00,0x00,0x00,0xff,0xca,0x1d,0x4b,0xff,0x09,0x87,0xd4,0xff,0xaa,0x02,0x05,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0xc0,0x1d,0x4b,0xff, + 0xcd,0xab,0xba,0xff,0x00,0x00,0x00,0xff,0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff, + 0xd4,0xcd,0x12,0xff,0xa6,0x4c,0xd5,0xff,0x00,0xf0,0xfd,0xff,0xd4,0xcd,0x12,0xff, + 0xf4,0x4c,0xd5,0xff,0x90,0xcd,0x12,0xff,0xc2,0x4c,0xd5,0xff,0x82,0x00,0x00,0xff, + 0xaa,0x02,0x05,0xff,0x88,0xd4,0xba,0xff,0x14,0x00,0x00,0xff,0x01,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x0c,0x08,0x13,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0xd0,0xcd,0x12,0xff,0xc6,0x84,0xf1,0xff,0x7c,0x84,0xf1,0xff,0x20,0x20,0xf5,0xff, + 0x00,0x00,0x0a,0xff,0xf0,0xb0,0x94,0xff,0x64,0x6c,0xf1,0xff,0x85,0x6c,0xf1,0xff, + 0x8b,0x4f,0xd5,0xff,0x00,0x04,0xda,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff, + 0x39,0xde,0xd4,0xff,0x10,0x50,0xd5,0xff,0xaa,0x02,0x05,0xff,0x00,0x00,0x00,0xff, + 0x4f,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff, + 0xaa,0x02,0x05,0xff,0x4c,0xce,0x12,0xff,0x39,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5b,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x68,0x50,0xcd,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0xe3,0xea,0x90,0xff,0x5c,0xce,0x12,0xff, + 0x18,0x00,0x00,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 +}; + +/* 4x4 cube map dds */ +static const unsigned char dds_cube_map[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x04,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, + 0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50 +}; + +/* 4x4x2 volume map dds, 2 mipmaps */ +static const unsigned char dds_volume_map[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x8a,0x00,0x04,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x03,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, + 0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, + 0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x2f,0x7e,0xcf,0x79,0x01,0x54,0x5c,0x5c, + 0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab +}; + +/* invalid image file */ +static const unsigned char noimage[4] = +{ + 0x11,0x22,0x33,0x44 +}; + static WCHAR temp_dir[MAX_PATH]; static BOOL create_file(const WCHAR *filename, const char *data, unsigned int size, WCHAR *out_path) @@ -404,10 +631,378 @@ static void test_D3DX11CompileFromFile(void) delete_directory(L"include"); } +/* dds_header.flags */ +#define DDS_CAPS 0x00000001 +#define DDS_HEIGHT 0x00000002 +#define DDS_WIDTH 0x00000004 +#define DDS_PITCH 0x00000008 +#define DDS_PIXELFORMAT 0x00001000 +#define DDS_MIPMAPCOUNT 0x00020000 +#define DDS_LINEARSIZE 0x00080000 + +/* dds_header.caps */ +#define DDSCAPS_ALPHA 0x00000002 +#define DDS_CAPS_TEXTURE 0x00001000 + +/* dds_pixel_format.flags */ +#define DDS_PF_ALPHA 0x00000001 +#define DDS_PF_ALPHA_ONLY 0x00000002 +#define DDS_PF_FOURCC 0x00000004 +#define DDS_PF_RGB 0x00000040 +#define DDS_PF_LUMINANCE 0x00020000 +#define DDS_PF_BUMPLUMINANCE 0x00040000 +#define DDS_PF_BUMPDUDV 0x00080000 + +struct dds_pixel_format +{ + DWORD size; + DWORD flags; + DWORD fourcc; + DWORD bpp; + DWORD rmask; + DWORD gmask; + DWORD bmask; + DWORD amask; +}; + +struct dds_header +{ + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD pitch_or_linear_size; + DWORD depth; + DWORD miplevels; + DWORD reserved[11]; + struct dds_pixel_format pixel_format; + DWORD caps; + DWORD caps2; + DWORD caps3; + DWORD caps4; + DWORD reserved2; +}; + +/* fills dds_header with reasonable default values */ +static void fill_dds_header(struct dds_header *header) +{ + memset(header, 0, sizeof(*header)); + + header->size = sizeof(*header); + header->flags = DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT; + header->height = 4; + header->width = 4; + header->pixel_format.size = sizeof(header->pixel_format); + /* X8R8G8B8 */ + header->pixel_format.flags = DDS_PF_RGB; + header->pixel_format.fourcc = 0; + header->pixel_format.bpp = 32; + header->pixel_format.rmask = 0xff0000; + header->pixel_format.gmask = 0x00ff00; + header->pixel_format.bmask = 0x0000ff; + header->pixel_format.amask = 0; + header->caps = DDS_CAPS_TEXTURE; +} + +#define check_dds_pixel_format(flags, fourcc, bpp, rmask, gmask, bmask, amask, format) \ + check_dds_pixel_format_(__LINE__, flags, fourcc, bpp, rmask, gmask, bmask, amask, format) +static void check_dds_pixel_format_(unsigned int line, DWORD flags, DWORD fourcc, DWORD bpp, + DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, DXGI_FORMAT expected_format) +{ + D3DX11_IMAGE_INFO info; + HRESULT hr; + struct + { + DWORD magic; + struct dds_header header; + BYTE data[256]; + } dds; + + dds.magic = MAKEFOURCC('D','D','S',' '); + fill_dds_header(&dds.header); + dds.header.pixel_format.flags = flags; + dds.header.pixel_format.fourcc = fourcc; + dds.header.pixel_format.bpp = bpp; + dds.header.pixel_format.rmask = rmask; + dds.header.pixel_format.gmask = gmask; + dds.header.pixel_format.bmask = bmask; + dds.header.pixel_format.amask = amask; + memset(dds.data, 0, sizeof(dds.data)); + + hr = D3DX11GetImageInfoFromMemory(&dds, sizeof(dds), NULL, &info, NULL); + ok_(__FILE__, line)(hr == S_OK, "Unexpected hr %#x for pixel format %#x.\n", hr, expected_format); + if (SUCCEEDED(hr)) + { + ok_(__FILE__, line)(info.Format == expected_format, "Unexpected format %#x, expected %#x\n", + info.Format, expected_format); + } +} + +static void test_D3DX11GetImageInfoFromMemory(void) +{ + D3DX11_IMAGE_INFO info; + HRESULT hr; + + if (!strcmp(winetest_platform, "wine")) + { + skip("Skipping D3DX11GetImageInfoFromMemory() tests.\n"); + return; + } + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) + 5, NULL, &info, NULL); /* too large size */ + ok(hr == S_OK, "Unexpected hr %#x.", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, sizeof(noimage), NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp + 1, sizeof(bmp_1bpp) - 1, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, 0, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(noimage, 0, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(NULL, 4, NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(NULL, 0, NULL, NULL, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + /* test BMP support */ + hr = D3DX11GetImageInfoFromMemory(bmp_1bpp, sizeof(bmp_1bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_2bpp, sizeof(bmp_2bpp), NULL, &info, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = D3DX11GetImageInfoFromMemory(bmp_4bpp, sizeof(bmp_4bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_8bpp, sizeof(bmp_8bpp), NULL, &info, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_32bpp_xrgb, sizeof(bmp_32bpp_xrgb), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_BMP, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + /* Grayscale PNG */ + hr = D3DX11GetImageInfoFromMemory(png_grayscale, sizeof(png_grayscale), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 1, "Unexpected width %u.\n", info.Width); + ok(info.Height == 1, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.MiscFlags == 0, "Unexpected misc flags %#x\n", info.MiscFlags); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_PNG, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + /* test DDS support */ + hr = D3DX11GetImageInfoFromMemory(dds_24bit, sizeof(dds_24bit), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 2, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_24bit, sizeof(dds_24bit) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 2, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_16bit, sizeof(dds_16bit), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + memset(&info, 0, sizeof(info)); + hr = D3DX11GetImageInfoFromMemory(dds_16bit, sizeof(dds_16bit) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 2, "Unexpected width %u.\n", info.Width); + ok(info.Height == 2, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + memset(&info, 0, sizeof(info)); + hr = D3DX11GetImageInfoFromMemory(dds_8bit, sizeof(dds_8bit), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 16, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_cube_map, sizeof(dds_cube_map), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 6, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC3_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_cube_map, sizeof(dds_cube_map) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 1, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 6, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 1, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC3_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_volume_map, sizeof(dds_volume_map), NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 2, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 3, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC2_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + hr = D3DX11GetImageInfoFromMemory(dds_volume_map, sizeof(dds_volume_map) - 1, NULL, &info, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(info.Width == 4, "Unexpected width %u.\n", info.Width); + ok(info.Height == 4, "Unexpected height %u.\n", info.Height); + ok(info.Depth == 2, "Unexpected depth %u.\n", info.Depth); + ok(info.ArraySize == 1, "Unexpected array size %u.\n", info.ArraySize); + ok(info.MipLevels == 3, "Unexpected miplevels %u\n", info.MipLevels); + ok(info.Format == DXGI_FORMAT_BC2_UNORM, "Unexpected format %#x.\n", info.Format); + ok(info.ResourceDimension == D3D11_RESOURCE_DIMENSION_TEXTURE3D, "Unexpected resource type %#x.\n", info.ResourceDimension); + ok(info.ImageFileFormat == D3DX11_IFF_DDS, "Unexpected image file format %#x.\n", info.ImageFileFormat); + + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','1'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC1_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','2'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC2_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','3'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC2_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','4'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC3_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('D','X','T','5'), 0, 0, 0, 0, 0, DXGI_FORMAT_BC3_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('R','G','B','G'), 0, 0, 0, 0, 0, DXGI_FORMAT_R8G8_B8G8_UNORM); + check_dds_pixel_format(DDS_PF_FOURCC, MAKEFOURCC('G','R','G','B'), 0, 0, 0, 0, 0, DXGI_FORMAT_G8R8_G8B8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 8, 0xe0, 0x1c, 0x03, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_ALPHA_ONLY, 0, 8, 0, 0, 0, 0xff, DXGI_FORMAT_A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 16, 0x00e0, 0x001c, 0x0003, 0xff00, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 16, 0xf00, 0x0f0, 0x00f, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, DXGI_FORMAT_R10G10B10A2_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, DXGI_FORMAT_R10G10B10A2_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ff, 0x00ff00, 0xff0000, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, DXGI_FORMAT_R16G16_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 16, 0xffff, 0, 0, 0, DXGI_FORMAT_R16G16B16A16_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 16, 0x00ff, 0, 0, 0xff00, DXGI_FORMAT_R8G8B8A8_UNORM); + check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, DXGI_FORMAT_R8G8B8A8_UNORM); +} + START_TEST(d3dx11) { test_D3DX11CreateAsyncMemoryLoader(); test_D3DX11CreateAsyncFileLoader(); test_D3DX11CreateAsyncResourceLoader(); test_D3DX11CompileFromFile(); + test_D3DX11GetImageInfoFromMemory(); } -- 2.30.2

2 1

[PATCH] d3dx9: Implement getting/setting line width.
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/line.c | 19 +++++++++++++++---- dlls/d3dx9_36/tests/line.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 7b2e3b5428f..647eb1b5b2a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -29,6 +29,7 @@ struct d3dx9_line IDirect3DDevice9 *device; IDirect3DStateBlock9 *state; + float width; }; static inline struct d3dx9_line *impl_from_ID3DXLine(ID3DXLine *iface) @@ -192,16 +193,25 @@ static float WINAPI d3dx9_line_GetPatternScale(ID3DXLine *iface) static HRESULT WINAPI d3dx9_line_SetWidth(ID3DXLine *iface, float width) { - FIXME("iface %p, width %.8e stub!\n", iface, width); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e.\n", iface, width); + + if (width <= 0.0f) + return D3DERR_INVALIDCALL; + + line->width = width; + + return D3D_OK; } static float WINAPI d3dx9_line_GetWidth(ID3DXLine *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return 1.0f; + TRACE("iface %p.\n", iface); + + return line->width; } static HRESULT WINAPI d3dx9_line_SetAntialias(ID3DXLine *iface, BOOL antialias) @@ -306,6 +316,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object->ref = 1; object->device = device; IDirect3DDevice9_AddRef(device); + object->width = 1.0f; *line = &object->ID3DXLine_iface; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index ae8d07e0623..d89ae160ba5 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -115,6 +115,38 @@ static void test_create_line(IDirect3DDevice9* device) ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); } +static void test_line_width(IDirect3DDevice9* device) +{ + ID3DXLine *line = NULL; + ULONG refcount; + float width; + HRESULT hr; + + hr = D3DXCreateLine(device, &line); + ok(hr == D3D_OK, "Failed to create a line, hr %#x.\n", hr); + + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 0.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, -1.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 10.0f); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 10.0f, "Unexpected line width %.8e.\n", width); + + refcount = ID3DXLine_Release(line); + ok(!refcount, "Got %u references to line.\n", refcount); +} + START_TEST(line) { HWND wnd; @@ -148,6 +180,7 @@ START_TEST(line) } test_create_line(device); + test_line_width(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); -- 2.30.2

2 1

[PATCH] d2d1: Add D2D1Crop.
by Ziqing Hui 11 Aug '21

11 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- We add D2D1Crop defines to Wine now for Axure 9 [1]. It would fail on d2d_device_context_CreateEffect() without adding D2D1Crop to builtin_effects. [1] https://www.axure.com/release-history/rp9 dlls/d2d1/effect.c | 3 ++- dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 5f334d19f71..0c33f956826 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -24,7 +24,8 @@ static const struct d2d_effect_info builtin_effects[] = { {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff} + {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 343a2363e14..cd58d642ce1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9707,6 +9707,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 4154276345b..9bd0b7012ad 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -19,6 +19,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") typedef enum D2D1_BORDER_MODE { @@ -75,3 +76,10 @@ typedef enum D2D1_COMPOSITE_PROP D2D1_COMPOSITE_PROP_MODE = 0x0, D2D1_COMPOSITE_PROP_FORCE_DWORD = 0xffffffff } D2D1_COMPOSITE_PROP; + +typedef enum D2D1_CROP_PROP +{ + D2D1_CROP_PROP_RECT = 0x0, + D2D1_CROP_PROP_BORDER_MODE = 0x1, + D2D1_CROP_PROP_FORCE_DWORD = 0xffffffff +} D2D1_CROP_PROP; -- 2.25.1

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Fold constant casts from int to float.
by Zebediah Figura 11 Aug '21

11 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7e3e4d77..398be349 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -371,6 +371,11 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi switch (arg1->node.data_type->base_type) { + case HLSL_TYPE_INT: + for (i = 0; i < dimx; ++i) + res->value.f[i] = arg1->value.i[i]; + break; + case HLSL_TYPE_UINT: for (i = 0; i < dimx; ++i) res->value.f[i] = arg1->value.u[i]; -- 2.32.0

5 19

[PATCH 1/7] gdi32: Use GetDIBits in emfdrv_stretchblt.
by Jacek Caban 11 Aug '21

11 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/bitblt.c | 79 ++++++++++++------------------------ 1 file changed, 25 insertions(+), 54 deletions(-)

2 2

[PATCH] d3dx10: Forward D3DX10CreateEffectFromFileA() to D3DX10CreateEffectFromFileW().
by Nikolay Sivov 11 Aug '21

11 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/compiler.c | 30 ++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 ------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 932bdadea1a..01377f6c0da 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -18,6 +18,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -93,3 +94,32 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH return hr; } + +HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, + HRESULT *hresult) +{ + WCHAR *filenameW; + HRESULT hr; + int len; + + TRACE("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p.\n", + debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, + device, effectpool, pump, effect, errors, hresult); + + if (!filename) + return E_INVALIDARG; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + if (!(filenameW = heap_alloc(len * sizeof(*filenameW)))) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = D3DX10CreateEffectFromFileW(filenameW, defines, include, profile, hlslflags, fxflags, device, + effectpool, pump, effect, errors, hresult); + heap_free(filenameW); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 2c53924ac20..42f29ad6239 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -48,19 +48,6 @@ BOOL WINAPI D3DX10CheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) return FALSE; } -HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, - ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, - ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, - HRESULT *hresult) -{ - FIXME("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " - "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n", - debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, - device, effectpool, pump, effect, errors, hresult); - - return E_NOTIMPL; -} - HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, -- 2.30.2

1 0

[PATCH 4/4] iphlpapi: Implement GetIpStatisticsEx() on top of nsi.
by Huw Davies 11 Aug '21

11 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 82 +++++++++++ dlls/iphlpapi/ipstats.c | 252 ---------------------------------- dlls/nsi/tests/nsi.c | 4 - 3 files changed, 82 insertions(+), 256 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fe2daa0f24d..78f4c582e1a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2436,6 +2436,88 @@ err: return err; } +/****************************************************************** + * GetIpStatistics (IPHLPAPI.@) + * + * Get the IP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for IP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIpStatistics( MIB_IPSTATS *stats ) +{ + return GetIpStatisticsEx( stats, WS_AF_INET ); +} + +/****************************************************************** + * GetIpStatisticsEx (IPHLPAPI.@) + * + * Get the IPv4 and IPv6 statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for IP statistics + * family [In] specifies whether IPv4 or IPv6 statistics are returned + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIpStatisticsEx( MIB_IPSTATS *stats, DWORD family ) +{ + struct nsi_ip_ipstats_dynamic dyn; + struct nsi_ip_ipstats_static stat; + struct nsi_ip_cmpt_rw cmpt_rw; + struct nsi_ip_cmpt_dynamic cmpt_dyn; + const NPI_MODULEID *mod; + DWORD err, cmpt = 1; + + TRACE( "%p %d\n", stats, family ); + + if (!stats) return ERROR_INVALID_PARAMETER; + mod = ip_module_id( family ); + if (!mod) return ERROR_INVALID_PARAMETER; + + memset( stats, 0, sizeof(*stats) ); + + err = NsiGetAllParameters( 1, mod, NSI_IP_IPSTATS_TABLE, NULL, 0, NULL, 0, + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (err) return err; + + err = NsiGetAllParameters( 1, mod, NSI_IP_COMPARTMENT_TABLE, &cmpt, sizeof(cmpt), &cmpt_rw, sizeof(cmpt_rw), + &cmpt_dyn, sizeof(cmpt_dyn), NULL, 0 ); + if (err) return err; + + stats->u.Forwarding = cmpt_rw.not_forwarding + 1; + stats->dwDefaultTTL = cmpt_rw.default_ttl; + stats->dwInReceives = dyn.in_recv; + stats->dwInHdrErrors = dyn.in_hdr_errs; + stats->dwInAddrErrors = dyn.in_addr_errs; + stats->dwForwDatagrams = dyn.fwd_dgrams; + stats->dwInUnknownProtos = dyn.in_unk_protos; + stats->dwInDiscards = dyn.in_discards; + stats->dwInDelivers = dyn.in_delivers; + stats->dwOutRequests = dyn.out_reqs; + stats->dwRoutingDiscards = dyn.routing_discards; + stats->dwOutDiscards = dyn.out_discards; + stats->dwOutNoRoutes = dyn.out_no_routes; + stats->dwReasmTimeout = stat.reasm_timeout; + stats->dwReasmReqds = dyn.reasm_reqds; + stats->dwReasmOks = dyn.reasm_oks; + stats->dwReasmFails = dyn.reasm_fails; + stats->dwFragOks = dyn.frag_oks; + stats->dwFragFails = dyn.frag_fails; + stats->dwFragCreates = dyn.frag_creates; + stats->dwNumIf = cmpt_dyn.num_ifs; + stats->dwNumAddr = cmpt_dyn.num_addrs; + stats->dwNumRoutes = cmpt_dyn.num_routes; + + return err; +} + /* Gets the DNS server list into the list beginning at list. Assumes that * a single server address may be placed at list if *len is at least * sizeof(IP_ADDR_STRING) long. Otherwise, list->Next is set to firstDynamic, diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 115bafa6f8e..8335e4871c1 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -617,258 +617,6 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) return ret; } -/****************************************************************** - * GetIpStatisticsEx (IPHLPAPI.@) - * - * Get the IPv4 and IPv6 statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for IP statistics - * family [In] specifies whether IPv4 or IPv6 statistics are returned - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - MIB_IPFORWARDTABLE *fwd_table; - - if (!stats) return ERROR_INVALID_PARAMETER; - if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; - memset( stats, 0, sizeof(*stats) ); - - stats->dwNumIf = stats->dwNumAddr = get_interface_indices( FALSE, NULL ); - if (!AllocateAndGetIpForwardTableFromStack( &fwd_table, FALSE, GetProcessHeap(), 0 )) - { - stats->dwNumRoutes = fwd_table->dwNumEntries; - HeapFree( GetProcessHeap(), 0, fwd_table ); - } - - if (family == WS_AF_INET6) - { -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp6", "r"))) - { - struct { - const char *name; - DWORD *elem; - } ipstatlist[] = { - { "Ip6InReceives", &stats->dwInReceives }, - { "Ip6InHdrErrors", &stats->dwInHdrErrors }, - { "Ip6InAddrErrors", &stats->dwInAddrErrors }, - { "Ip6OutForwDatagrams", &stats->dwForwDatagrams }, - { "Ip6InUnknownProtos", &stats->dwInUnknownProtos }, - { "Ip6InDiscards", &stats->dwInDiscards }, - { "Ip6InDelivers", &stats->dwInDelivers }, - { "Ip6OutRequests", &stats->dwOutRequests }, - { "Ip6OutDiscards", &stats->dwOutDiscards }, - { "Ip6OutNoRoutes", &stats->dwOutNoRoutes }, - { "Ip6ReasmTimeout", &stats->dwReasmTimeout }, - { "Ip6ReasmReqds", &stats->dwReasmReqds }, - { "Ip6ReasmOKs", &stats->dwReasmOks }, - { "Ip6ReasmFails", &stats->dwReasmFails }, - { "Ip6FragOKs", &stats->dwFragOks }, - { "Ip6FragFails", &stats->dwFragFails }, - { "Ip6FragCreates", &stats->dwFragCreates }, - /* hmm, no routingDiscards, defaultTTL and forwarding? */ - }; - char buf[512], *ptr, *value; - DWORD res, i; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (!(value = strchr(buf, ' '))) - continue; - - /* terminate the valuename */ - ptr = value - 1; - *(ptr + 1) = '\0'; - - /* and strip leading spaces from value */ - value += 1; - while (*value==' ') value++; - if ((ptr = strchr(value, '\n'))) - *ptr='\0'; - - for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!_strnicmp(buf, ipstatlist[i].name, -1) && sscanf(value, "%d", &res)) - *ipstatlist[i].elem = res; - } - fclose(fp); - ret = NO_ERROR; - } - } -#else - FIXME( "unimplemented for IPv6\n" ); -#endif - return ret; - } - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/snmp", "r"))) - { - static const char hdr[] = "Ip:"; - char buf[512], *ptr; - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; - /* last line was a header, get another */ - if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) - { - ptr += sizeof(hdr); - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", - &stats->u.dwForwarding, - &stats->dwDefaultTTL, - &stats->dwInReceives, - &stats->dwInHdrErrors, - &stats->dwInAddrErrors, - &stats->dwForwDatagrams, - &stats->dwInUnknownProtos, - &stats->dwInDiscards, - &stats->dwInDelivers, - &stats->dwOutRequests, - &stats->dwOutDiscards, - &stats->dwOutNoRoutes, - &stats->dwReasmTimeout, - &stats->dwReasmReqds, - &stats->dwReasmOks, - &stats->dwReasmFails, - &stats->dwFragOks, - &stats->dwFragFails, - &stats->dwFragCreates ); - /* hmm, no routingDiscards */ - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - static char ip[] = "ip"; - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, ip, 0, ip )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - stats->u.dwForwarding = kstat_get_ui32( ksp, "forwarding" ); - stats->dwDefaultTTL = kstat_get_ui32( ksp, "defaultTTL" ); - stats->dwInReceives = kstat_get_ui32( ksp, "inReceives" ); - stats->dwInHdrErrors = kstat_get_ui32( ksp, "inHdrErrors" ); - stats->dwInAddrErrors = kstat_get_ui32( ksp, "inAddrErrors" ); - stats->dwForwDatagrams = kstat_get_ui32( ksp, "forwDatagrams" ); - stats->dwInUnknownProtos = kstat_get_ui32( ksp, "inUnknownProtos" ); - stats->dwInDiscards = kstat_get_ui32( ksp, "inDiscards" ); - stats->dwInDelivers = kstat_get_ui32( ksp, "inDelivers" ); - stats->dwOutRequests = kstat_get_ui32( ksp, "outRequests" ); - stats->dwRoutingDiscards = kstat_get_ui32( ksp, "routingDiscards" ); - stats->dwOutDiscards = kstat_get_ui32( ksp, "outDiscards" ); - stats->dwOutNoRoutes = kstat_get_ui32( ksp, "outNoRoutes" ); - stats->dwReasmTimeout = kstat_get_ui32( ksp, "reasmTimeout" ); - stats->dwReasmReqds = kstat_get_ui32( ksp, "reasmReqds" ); - stats->dwReasmOks = kstat_get_ui32( ksp, "reasmOKs" ); - stats->dwReasmFails = kstat_get_ui32( ksp, "reasmFails" ); - stats->dwFragOks = kstat_get_ui32( ksp, "fragOKs" ); - stats->dwFragFails = kstat_get_ui32( ksp, "fragFails" ); - stats->dwFragCreates = kstat_get_ui32( ksp, "fragCreates" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && (defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) || defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL)) - { - int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; - int ip_ttl, ip_forwarding; -#if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) - struct ipstat ip_stat; -#elif defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL) - struct ip_stats ip_stat; -#endif - size_t needed; - - needed = sizeof(ip_stat); - if(sysctl(mib, ARRAY_SIZE(mib), &ip_stat, &needed, NULL, 0) == -1) - { - ERR ("failed to get ipstat\n"); - return ERROR_NOT_SUPPORTED; - } - - needed = sizeof(ip_ttl); - if (sysctlbyname ("net.inet.ip.ttl", &ip_ttl, &needed, NULL, 0) == -1) - { - ERR ("failed to get ip Default TTL\n"); - return ERROR_NOT_SUPPORTED; - } - - needed = sizeof(ip_forwarding); - if (sysctlbyname ("net.inet.ip.forwarding", &ip_forwarding, &needed, NULL, 0) == -1) - { - ERR ("failed to get ip forwarding\n"); - return ERROR_NOT_SUPPORTED; - } - - /* ip.forwarding is 0 or 1 on BSD */ - stats->u.dwForwarding = ip_forwarding+1; - stats->dwDefaultTTL = ip_ttl; - stats->dwInReceives = ip_stat.ips_total; - stats->dwInHdrErrors = ip_stat.ips_badhlen + ip_stat.ips_badsum + ip_stat.ips_tooshort + ip_stat.ips_badlen + - ip_stat.ips_badvers + ip_stat.ips_badoptions; - /* ips_badaddr also includes outgoing packets with a bad address, but we can't account for that right now */ - stats->dwInAddrErrors = ip_stat.ips_cantforward + ip_stat.ips_badaddr + ip_stat.ips_notmember; - stats->dwForwDatagrams = ip_stat.ips_forward; - stats->dwInUnknownProtos = ip_stat.ips_noproto; - stats->dwInDiscards = ip_stat.ips_fragdropped; - stats->dwInDelivers = ip_stat.ips_delivered; - stats->dwOutRequests = ip_stat.ips_localout; - /*stats->dwRoutingDiscards = 0;*/ /* FIXME */ - stats->dwOutDiscards = ip_stat.ips_odropped; - stats->dwOutNoRoutes = ip_stat.ips_noroute; - stats->dwReasmTimeout = ip_stat.ips_fragtimeout; - stats->dwReasmReqds = ip_stat.ips_fragments; - stats->dwReasmOks = ip_stat.ips_reassembled; - stats->dwReasmFails = ip_stat.ips_fragments - ip_stat.ips_reassembled; - stats->dwFragOks = ip_stat.ips_fragmented; - stats->dwFragFails = ip_stat.ips_cantfrag; - stats->dwFragCreates = ip_stat.ips_ofragments; - ret = NO_ERROR; - } -#else - FIXME( "unimplemented for IPv4\n" ); -#endif - return ret; -} - -/****************************************************************** - * GetIpStatistics (IPHLPAPI.@) - * - * Get the IP statistics for the local computer. - * - * PARAMS - * stats [Out] buffer for IP statistics - * - * RETURNS - * Success: NO_ERROR - * Failure: error code from winerror.h - */ -DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) -{ - return GetIpStatisticsEx(stats, WS_AF_INET); -} - /****************************************************************** * GetTcpStatisticsEx (IPHLPAPI.@) * diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 598e7124afd..7d9d8e12bac 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -436,14 +436,10 @@ static void test_ip_cmpt( int family ) ok( !err, "got %d\n", err ); if (err) goto err; -todo_wine_if(family == AF_INET6 && table.dwForwarding - 1 != rw.not_forwarding) ok( table.dwForwarding - 1 == rw.not_forwarding, "%x vs %x\n", table.dwForwarding, rw.not_forwarding ); -todo_wine_if(family == AF_INET6 && table.dwDefaultTTL != rw.default_ttl) ok( table.dwDefaultTTL == rw.default_ttl, "%x vs %x\n", table.dwDefaultTTL, rw.default_ttl ); ok( table.dwNumIf == dyn.num_ifs, "%x vs %x\n", table.dwNumIf, dyn.num_ifs ); -todo_wine_if(table.dwNumAddr != dyn.num_addrs) ok( table.dwNumAddr == dyn.num_addrs, "%x vs %x\n", table.dwNumAddr, dyn.num_addrs ); -todo_wine_if(family == AF_INET6 && table.dwNumRoutes != dyn.num_routes) ok( table.dwNumRoutes == dyn.num_routes, "%x vs %x\n", table.dwNumRoutes, dyn.num_routes ); err: -- 2.23.0

1 0

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-devel