- wine-devel - winehq.org

[PATCH 9/9] gdi32: Use ntgdi name for GetTextCharsetInfo.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/uniscribe/shape.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 8/9] gdi32: Remove no longer used driver entry points.
by Jacek Caban 09 Aug '21

09 Aug '21

1 0

[PATCH 6/9] gdi32: Handle metafiles directly in OffsetViewportOrgEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 22 ---------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 25 ------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 22 insertions(+), 53 deletions(-)

1 0

[PATCH 5/9] gdi32: Handle metafiles directly in SetWindowOrgEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-)

1 0

[PATCH 4/9] gdi32: Handle metafiles directly in SetWindowExtEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++--------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 +++++++++++++++++ dlls/gdi32/mapping.c | 32 ---------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 27 insertions(+), 48 deletions(-)

1 0

[PATCH 3/9] gdi32: Handle metafiles directly in SetViewportOrgEx.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 17 +++++++++++++++++ dlls/gdi32/mapping.c | 26 -------------------------- dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 25 insertions(+), 42 deletions(-)

1 0

[PATCH 2/9] gdi32: Handle metafiles directly in SetViewportExtEx.
by Jacek Caban 09 Aug '21

09 Aug '21

1 0

[PATCH 1/9] gdi32: Store virtual resolution and size in DC_ATTR.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 6 ++---- dlls/gdi32/mapping.c | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 2 -- include/ntgdi.h | 2 ++ 4 files changed, 10 insertions(+), 12 deletions(-)

1 0

[PATCH] user32: When converting strings from A->W, ignore handles/resources
by Fabian Maurer 09 Aug '21

09 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/msg.c | 3 +++ dlls/user32/winproc.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..5ea05b156d6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5991,6 +5991,9 @@ static void test_setwindowpos(void) expect(winY, rc.bottom); DestroyWindow(hwnd); + + /* Test invalid text with WM_SETTEXT. This must not crash. */ + SendMessageA(GetDesktopWindow(), WM_SETTEXT, 0, (LPARAM)55); } static void invisible_parent_tests(void) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index f83d8b61a63..f4cf9f6e748 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -494,6 +494,8 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, case LB_ADDFILE: case EM_REPLACESEL: if (!lParam) ret = callback( hwnd, msg, wParam, lParam, result, arg ); + else if (IS_INTRESOURCE(lParam)) /* Check for handles/IDs similar to DEFWND_SetTextA */ + return 0; else { WCHAR *ptr, buffer[512]; -- 2.32.0

3 3

[PATCH 1/2] conhost: Use correct size when storing font FaceName in the registry
by Hugh McMaster 09 Aug '21

09 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4033eefa313..5881ad9c3ad 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -303,7 +303,8 @@ static void save_registry_key( HKEY key, const struct console_config *config ) val = config->edition_mode; RegSetValueExW( key, L"EditionMode", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); - RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, sizeof(config->face_name) ); + RegSetValueExW( key, L"FaceName", 0, REG_SZ, (BYTE *)&config->face_name, + (lstrlenW(config->face_name) + 1) * sizeof(WCHAR) ); val = config->font_pitch_family; RegSetValueExW( key, L"FontPitchFamily", 0, REG_DWORD, (BYTE *)&val, sizeof(val) ); -- 2.32.0

2 4

[PATCH] server: Fix the parameter size check for IOCTL_AFD_EVENT_SELECT.
by Zebediah Figura 09 Aug '21

09 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2660cf2dee0..27477200ed0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2420,7 +2420,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { const struct afd_event_select_params_64 *params = get_req_data(); - if (get_req_data_size() < sizeof(params)) + if (get_req_data_size() < sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); return 1; @@ -2433,7 +2433,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { const struct afd_event_select_params_32 *params = get_req_data(); - if (get_req_data_size() < sizeof(params)) + if (get_req_data_size() < sizeof(*params)) { set_error( STATUS_INVALID_PARAMETER ); return 1; -- 2.30.2

1 0

[PATCH] jscript: Also add function name to its detached scope in ES5 mode.
by Paul Gofman 09 Aug '21

09 Aug '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/engine.c | 4 ++++ dlls/mshtml/tests/es5.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cb9ea5cd9ac..47b4e56e8e4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -573,6 +573,7 @@ HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t *scope) { + function_code_t *func = frame->function; unsigned int i, index; HRESULT hres; @@ -591,6 +592,9 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ scope->obj = to_disp(scope->jsobj); } + if (scope == frame->base_scope && func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + jsdisp_propput_name(scope->jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); + index = scope->scope_index; for(i = 0; i < frame->function->local_scopes[index].locals_cnt; i++) { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e57aed5ca35..81c06a4145e 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1447,6 +1447,35 @@ sync_test("functions scope", function() { val = with_function(); ok(val == 8, "val != 8"); ok(w == 9, "w != 9"); + + var func, func_outer, ret; + var o = new Object(); + + func_outer = function e() + { + function func_inner() + { + ok(typeof e == "function", "typeof e == " + typeof e); + ret = e + } + func = func_inner + } + func_outer(); + func(); + ok(ret === func_outer, "ret != func_outer"); + + func_outer = function f(f) + { + function func_inner() + { + ok(typeof f == "object", "typeof f == " + typeof f); + ret = f + } + func = func_inner + } + func_outer(o); + func(); + ok(ret === o, "ret != o"); }); sync_test("console", function() { -- 2.31.1

3 2

[PATCH] kernel32/tests: Fix rounding error when calculating console font size
by Hugh McMaster 09 Aug '21

09 Aug '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6ee00aa49a6..bd5cad428bc 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3579,8 +3579,8 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); GetClientRect(GetConsoleWindow(), &r); GetConsoleScreenBufferInfo(std_output, &csbi); - font_width = (r.right - r.left + 1) / csbi.srWindow.Right; - font_height = (r.bottom - r.top + 1) / csbi.srWindow.Bottom; + font_width = (r.right - r.left) / (csbi.srWindow.Right - csbi.srWindow.Left + 1); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); ok(c.X == font_width, "got %d, expected %d\n", c.X, font_width); ok(c.Y == font_height, "got %d, expected %d\n", c.Y, font_height); -- 2.32.0

2 1

[PATCH] msi: Set first dialog as parent in subsequent dialogs
by Fabian Maurer 09 Aug '21

09 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..144d7308b3f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -139,6 +139,7 @@ typedef struct static DWORD uiThreadId; static HWND hMsiHiddenWindow; +static HANDLE hPrevious = NULL; static LPWSTR msi_get_window_text( HWND hwnd ) { @@ -3881,6 +3882,8 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, return SendMessageW( (HWND) lParam, WM_CTLCOLORSTATIC, wParam, lParam ); case WM_DESTROY: + if (dialog->hwnd == hPrevious) + hPrevious = NULL; dialog->hwnd = NULL; return 0; case WM_NOTIFY: @@ -3919,13 +3922,16 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + hPrevious, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); return ERROR_FUNCTION_FAILED; } + if (!hPrevious) + hPrevious = hwnd; + ShowWindow( hwnd, SW_SHOW ); /* UpdateWindow( hwnd ); - and causes the transparent static controls not to paint */ -- 2.32.0

2 2

[PATCH] include: add AV1 support to dxva.h
by Steve Lhomme 09 Aug '21

09 Aug '21

Based on the DXVA AV1 specs https://www.microsoft.com/en-us/download/details.aspx?id=101577 The structures and the associated define are available in Windows SDK since at least 10.0.20231.0. The GUIDs were present in previous SDKs as well. --- include/dxva.h | 279 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 279 insertions(+) diff --git a/include/dxva.h b/include/dxva.h index 4f18f2e60da..b474bd87111 100644 --- a/include/dxva.h +++ b/include/dxva.h @@ -563,6 +563,285 @@ typedef struct _DXVA_Status_VPx USHORT wNumMbsAffected; } DXVA_Status_VPx, *LPDXVA_Status_VPx; + +#define _DIRECTX_AV1_VA_ + +/* AV1 decoder GUIDs */ +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); + +/* AV1 picture entry data structure */ +typedef struct _DXVA_PicEntry_AV1 { + UINT width; + UINT height; + + // Global motion parameters + INT wmmat[6]; + union { + struct { + UCHAR wminvalid : 1; + UCHAR wmtype : 2; + UCHAR Reserved : 5; + }; + UCHAR GlobalMotionFlags; + }; + UCHAR Index; + USHORT Reserved16Bits; +} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1; + +/* AV1 picture parameters data structure */ +typedef struct _DXVA_PicParams_AV1 { + UINT width; + UINT height; + + UINT max_width; + UINT max_height; + + UCHAR CurrPicTextureIndex; + UCHAR superres_denom; + UCHAR bitdepth; + UCHAR seq_profile; + + // Tiles: + struct { + UCHAR cols; + UCHAR rows; + USHORT context_update_id; + USHORT widths[64]; + USHORT heights[64]; + } tiles; + + // Coding Tools + union { + struct { + UINT use_128x128_superblock : 1; + UINT intra_edge_filter : 1; + UINT interintra_compound : 1; + UINT masked_compound : 1; + UINT warped_motion : 1; + UINT dual_filter : 1; + UINT jnt_comp : 1; + UINT screen_content_tools : 1; + UINT integer_mv : 1; + UINT cdef : 1; + UINT restoration : 1; + UINT film_grain : 1; + UINT intrabc : 1; + UINT high_precision_mv : 1; + UINT switchable_motion_mode : 1; + UINT filter_intra : 1; + UINT disable_frame_end_update_cdf : 1; + UINT disable_cdf_update : 1; + UINT reference_mode : 1; + UINT skip_mode : 1; + UINT reduced_tx_set : 1; + UINT superres : 1; + UINT tx_mode : 2; + UINT use_ref_frame_mvs : 1; + UINT enable_ref_frame_mvs : 1; + UINT reference_frame_update : 1; + UINT Reserved : 5; + }; + UINT32 CodingParamToolFlags; + } coding; + + // Format & Picture Info flags + union { + struct { + UCHAR frame_type : 2; + UCHAR show_frame : 1; + UCHAR showable_frame : 1; + UCHAR subsampling_x : 1; + UCHAR subsampling_y : 1; + UCHAR mono_chrome : 1; + UCHAR Reserved : 1; + }; + UCHAR FormatAndPictureInfoFlags; + } format; + + // References + UCHAR primary_ref_frame; + UCHAR order_hint; + UCHAR order_hint_bits; + + DXVA_PicEntry_AV1 frame_refs[7]; + UCHAR RefFrameMapTextureIndex[8]; + + // Loop filter parameters + struct { + UCHAR filter_level[2]; + UCHAR filter_level_u; + UCHAR filter_level_v; + + UCHAR sharpness_level; + union { + struct { + UCHAR mode_ref_delta_enabled : 1; + UCHAR mode_ref_delta_update : 1; + UCHAR delta_lf_multi : 1; + UCHAR delta_lf_present : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + CHAR ref_deltas[8]; + CHAR mode_deltas[2]; + UCHAR delta_lf_res; + UCHAR frame_restoration_type[3]; + USHORT log2_restoration_unit_size[3]; + UINT16 Reserved16Bits; + } loop_filter; + + // Quantization + struct { + union { + struct { + UCHAR delta_q_present : 1; + UCHAR delta_q_res : 2; + UCHAR Reserved : 5; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + UCHAR base_qindex; + CHAR y_dc_delta_q; + CHAR u_dc_delta_q; + CHAR v_dc_delta_q; + CHAR u_ac_delta_q; + CHAR v_ac_delta_q; + // using_qmatrix: + UCHAR qm_y; + UCHAR qm_u; + UCHAR qm_v; + UINT16 Reserved16Bits; + } quantization; + + // Cdef parameters + struct { + union { + struct { + UCHAR damping : 2; + UCHAR bits : 2; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } y_strengths[8]; + + union { + struct { + UCHAR primary : 6; + UCHAR secondary : 2; + }; + UCHAR combined; + } uv_strengths[8]; + + } cdef; + + UCHAR interp_filter; + + // Segmentation + struct { + union { + struct { + UCHAR enabled : 1; + UCHAR update_map : 1; + UCHAR update_data : 1; + UCHAR temporal_update : 1; + UCHAR Reserved : 4; + }; + UCHAR ControlFlags; + } DUMMYUNIONNAME; + UCHAR Reserved24Bits[3]; + + union { + struct { + UCHAR alt_q : 1; + UCHAR alt_lf_y_v : 1; + UCHAR alt_lf_y_h : 1; + UCHAR alt_lf_u : 1; + UCHAR alt_lf_v : 1; + UCHAR ref_frame : 1; + UCHAR skip : 1; + UCHAR globalmv : 1; + }; + UCHAR mask; + } feature_mask[8]; + + SHORT feature_data[8][8]; + + } segmentation; + + struct { + union { + struct { + USHORT apply_grain : 1; + USHORT scaling_shift_minus8 : 2; + USHORT chroma_scaling_from_luma : 1; + USHORT ar_coeff_lag : 2; + USHORT ar_coeff_shift_minus6 : 2; + USHORT grain_scale_shift : 2; + USHORT overlap_flag : 1; + USHORT clip_to_restricted_range : 1; + USHORT matrix_coeff_is_identity : 1; + USHORT Reserved : 3; + }; + USHORT ControlFlags; + } DUMMYUNIONNAME; + + USHORT grain_seed; + UCHAR scaling_points_y[14][2]; + UCHAR num_y_points; + UCHAR scaling_points_cb[10][2]; + UCHAR num_cb_points; + UCHAR scaling_points_cr[10][2]; + UCHAR num_cr_points; + UCHAR ar_coeffs_y[24]; + UCHAR ar_coeffs_cb[25]; + UCHAR ar_coeffs_cr[25]; + UCHAR cb_mult; + UCHAR cb_luma_mult; + UCHAR cr_mult; + UCHAR cr_luma_mult; + UCHAR Reserved8Bits; + SHORT cb_offset; + SHORT cr_offset; + } film_grain; + + UINT Reserved32Bits; + UINT StatusReportFeedbackNumber; +} DXVA_PicParams_AV1, *LPDXVA_PicParams_AV1; + +/* AV1 tile data structure */ +typedef struct _DXVA_Tile_AV1 { + UINT DataOffset; + UINT DataSize; + USHORT row; + USHORT column; + USHORT Reserved16Bits; + UCHAR anchor_frame; + UCHAR Reserved8Bits; +} DXVA_Tile_AV1, *LPDXVA_Tile_AV1; + +typedef struct _DXVA_Status_AV1 { + UINT StatusReportFeedbackNumber; + DXVA_PicEntry_AV1 CurrPic; + UCHAR bBufType; + UCHAR bStatus; + UCHAR bReserved8Bits; + USHORT wNumMbsAffected; +} DXVA_Status_AV1, *LPDXVA_Status_AV1; + #include <poppack.h> typedef enum _DXVA_VideoChromaSubsampling -- 2.26.2

4 7

[PATCH v4 1/5] d2d1: Implement d2d_effect_GetInputCount().
by Ziqing Hui 09 Aug '21

09 Aug '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v4: Call d2d_array_reserve() before factory. memset() "effect->input_count" inputs. dlls/d2d1/d2d1_private.h | 5 ++++- dlls/d2d1/device.c | 8 +++++++- dlls/d2d1/effect.c | 25 +++++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 2 +- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index ce99e7c3432..48d15dfcf22 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -572,9 +572,12 @@ struct d2d_effect LONG refcount; ID2D1Factory *factory; + ID2D1Image **inputs; + size_t inputs_size; + size_t input_count; }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0647bc57fc3..d8704f1b43b 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1887,13 +1887,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; + HRESULT hr; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object, context->factory); + if (FAILED(hr = d2d_effect_init(object, context->factory))) + { + WARN("Failed to initialize effect, hr %#x.\n", hr); + heap_free(object); + return hr; + } TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 40dd2187953..acf83ab1b02 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -25,6 +25,12 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Effect_iface); } +static void d2d_effect_cleanup(struct d2d_effect *effect) +{ + heap_free(effect->inputs); + ID2D1Factory_Release(effect->factory); +} + static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { struct d2d_effect *effect = impl_from_ID2D1Effect(iface); @@ -72,7 +78,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) if (!refcount) { - ID2D1Factory_Release(effect->factory); + d2d_effect_cleanup(effect); heap_free(effect); } @@ -183,9 +189,11 @@ static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 ind static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); - return 0; + TRACE("iface %p.\n", iface); + + return effect->input_count; } static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) @@ -269,10 +277,19 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) +HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + + effect->input_count = 1; + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + effect->input_count, sizeof(*effect->inputs))) + return E_OUTOFMEMORY; + memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); + ID2D1Factory_AddRef(effect->factory = factory); + + return S_OK; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 146952d7418..64d9765e866 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9802,7 +9802,7 @@ static void test_effect(BOOL d3d11) } input_count = ID2D1Effect_GetInputCount(effect); - todo_wine + todo_wine_if(test->default_input_count != 1) ok (input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count); -- 2.25.1

4 12

[PATCH vkd3d v2 1/2] build: Make the default symbol visibility "hidden".
by Zebediah Figura 09 Aug '21

09 Aug '21

We tag far fewer symbols this way. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Move definitions to the header files. configure.ac | 1 + include/private/vkd3d_blob.h | 2 +- include/private/vkd3d_common.h | 2 +- include/private/vkd3d_debug.h | 19 +- include/private/vkd3d_memory.h | 3 +- include/private/vkd3d_utf8.h | 2 +- include/vkd3d.h | 48 ++--- include/vkd3d_shader.h | 41 +++-- include/vkd3d_utils.h | 35 ++-- include/vkd3d_windows.h | 17 +- libs/vkd3d-common/debug.c | 2 +- libs/vkd3d-shader/hlsl.h | 111 ++++++------ libs/vkd3d-shader/preproc.h | 12 +- libs/vkd3d-shader/vkd3d_shader_private.h | 80 ++++----- libs/vkd3d/vkd3d_private.h | 216 +++++++++++------------ 15 files changed, 286 insertions(+), 305 deletions(-) diff --git a/configure.ac b/configure.ac index 8a448e60..0ff159e3 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) + VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Winit-self]) diff --git a/include/private/vkd3d_blob.h b/include/private/vkd3d_blob.h index e78d3916..0f48e876 100644 --- a/include/private/vkd3d_blob.h +++ b/include/private/vkd3d_blob.h @@ -22,6 +22,6 @@ #include "vkd3d_windows.h" #include "vkd3d_d3dcommon.h" -HRESULT vkd3d_blob_create(void *buffer, SIZE_T size, ID3D10Blob **blob) DECLSPEC_HIDDEN; +HRESULT vkd3d_blob_create(void *buffer, SIZE_T size, ID3D10Blob **blob); #endif /* __VKD3D_BLOB_H */ diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 5aeca58e..57b0ad20 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -214,6 +214,6 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min *minor = atoi(version); } -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; +HRESULT hresult_from_vkd3d_result(int vkd3d_result); #endif /* __VKD3D_COMMON_H */ diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index c37c841a..a206a92b 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -44,15 +44,14 @@ enum vkd3d_dbg_level VKD3D_DBG_LEVEL_TRACE, }; -enum vkd3d_dbg_level vkd3d_dbg_get_level(void) DECLSPEC_HIDDEN; +enum vkd3d_dbg_level vkd3d_dbg_get_level(void); -void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, - const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; +void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4); -const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2) DECLSPEC_HIDDEN; -const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) DECLSPEC_HIDDEN; -const char *debugstr_a(const char *str) DECLSPEC_HIDDEN; -const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; +const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); +const char *debugstr_a(const char *str); +const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #define VKD3D_DBG_LOG(level) \ do { \ @@ -103,7 +102,7 @@ static inline const char *debugstr_guid(const GUID *guid) guid->Data4[5], guid->Data4[6], guid->Data4[7]); } -unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value) DECLSPEC_HIDDEN; +unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value); struct vkd3d_debug_option { @@ -111,8 +110,8 @@ struct vkd3d_debug_option uint64_t flag; }; -bool vkd3d_debug_list_has_member(const char *string, const char *member) DECLSPEC_HIDDEN; +bool vkd3d_debug_list_has_member(const char *string, const char *member); uint64_t vkd3d_parse_debug_options(const char *string, - const struct vkd3d_debug_option *options, unsigned int option_count) DECLSPEC_HIDDEN; + const struct vkd3d_debug_option *options, unsigned int option_count); #endif /* __VKD3D_DEBUG_H */ diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index bd56d30a..f6846d66 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -65,7 +65,6 @@ static inline char *vkd3d_strdup(const char *string) return ptr; } -bool vkd3d_array_reserve(void **elements, size_t *capacity, - size_t element_count, size_t element_size) DECLSPEC_HIDDEN; +bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size); #endif /* __VKD3D_MEMORY_H */ diff --git a/include/private/vkd3d_utf8.h b/include/private/vkd3d_utf8.h index ab32884b..ccb9e17e 100644 --- a/include/private/vkd3d_utf8.h +++ b/include/private/vkd3d_utf8.h @@ -21,6 +21,6 @@ #include "vkd3d_common.h" -char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; +char *vkd3d_strdup_w_utf8(const WCHAR *wstr, size_t wchar_size); #endif /* __VKD3D_UTF8_H */ diff --git a/include/vkd3d.h b/include/vkd3d.h index 0ef81053..1bb87b4a 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -153,44 +153,50 @@ struct vkd3d_image_resource_create_info D3D12_RESOURCE_STATES present_state; }; +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_API __attribute__((visibility("default"))) +#else +# define VKD3D_API +#endif + #ifndef VKD3D_NO_PROTOTYPES -HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, +VKD3D_API HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); -ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); -VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance); -ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); +VKD3D_API ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); +VKD3D_API VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance); +VKD3D_API ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); -HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, +VKD3D_API HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device); -IUnknown *vkd3d_get_device_parent(ID3D12Device *device); -VkDevice vkd3d_get_vk_device(ID3D12Device *device); -VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); -struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); +VKD3D_API IUnknown *vkd3d_get_device_parent(ID3D12Device *device); +VKD3D_API VkDevice vkd3d_get_vk_device(ID3D12Device *device); +VKD3D_API VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); +VKD3D_API struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); -uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); -VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); -void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); +VKD3D_API uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); +VKD3D_API VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); +VKD3D_API void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); -HRESULT vkd3d_create_image_resource(ID3D12Device *device, +VKD3D_API HRESULT vkd3d_create_image_resource(ID3D12Device *device, const struct vkd3d_image_resource_create_info *create_info, ID3D12Resource **resource); -ULONG vkd3d_resource_decref(ID3D12Resource *resource); -ULONG vkd3d_resource_incref(ID3D12Resource *resource); +VKD3D_API ULONG vkd3d_resource_decref(ID3D12Resource *resource); +VKD3D_API ULONG vkd3d_resource_incref(ID3D12Resource *resource); -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); -HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +VKD3D_API VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); /* 1.1 */ -DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); +VKD3D_API DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); /* 1.2 */ -HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, +VKD3D_API HRESULT vkd3d_serialize_versioned_root_signature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); -HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, +VKD3D_API HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); #endif /* VKD3D_NO_PROTOTYPES */ diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index b0412d30..24f99fb9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1340,6 +1340,12 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3)); } +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_SHADER_API __attribute__((visibility("default"))) +#else +# define VKD3D_SHADER_API +#endif + #ifndef VKD3D_SHADER_NO_PROTOTYPES /** @@ -1353,7 +1359,7 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com * string is null-terminated and UTF-8 encoded. This may be a pointer to static * data in libvkd3d-shader; it should not be freed. */ -const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); +VKD3D_SHADER_API const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); /** * Returns the source types supported, with any target type, by * vkd3d_shader_compile(). @@ -1368,7 +1374,7 @@ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); * vkd3d-shader. This array may be a pointer to static data in libvkd3d-shader; * it should not be freed. */ -const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); +VKD3D_SHADER_API const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); /** * Returns the target types supported, with the given source type, by * vkd3d_shader_compile(). @@ -1382,7 +1388,7 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns * vkd3d-shader. This array may be a pointer to static data in libvkd3d-shader; * it should not be freed. */ -const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( +VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( enum vkd3d_shader_source_type source_type, unsigned int *count); /** @@ -1428,7 +1434,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, +VKD3D_SHADER_API int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); /** * Free shader messages allocated by another vkd3d-shader function, such as @@ -1437,7 +1443,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, * \param messages Messages to free. This pointer is optional and may be NULL, * in which case no action will be taken. */ -void vkd3d_shader_free_messages(char *messages); +VKD3D_SHADER_API void vkd3d_shader_free_messages(char *messages); /** * Free shader code allocated by another vkd3d-shader function, such as * vkd3d_shader_compile(). @@ -1447,7 +1453,7 @@ void vkd3d_shader_free_messages(char *messages); * * \param code Code to free. */ -void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); +VKD3D_SHADER_API void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); /** * Convert a byte code description of a shader root signature to a structural @@ -1479,7 +1485,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, +VKD3D_SHADER_API int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_versioned_root_signature_desc *root_signature, char **messages); /** * Free a structural representation of a shader root signature allocated by @@ -1491,7 +1497,8 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, * * \param root_signature Signature description to free. */ -void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signature_desc *root_signature); +VKD3D_SHADER_API void vkd3d_shader_free_root_signature( + struct vkd3d_shader_versioned_root_signature_desc *root_signature); /** * Convert a structural description of a shader root signature to a byte code @@ -1516,7 +1523,8 @@ void vkd3d_shader_free_root_signature(struct vkd3d_shader_versioned_root_signatu * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_root_signature_desc *root_signature, +VKD3D_SHADER_API int vkd3d_shader_serialize_root_signature( + const struct vkd3d_shader_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc, char **messages); /** * Convert a structural representation of a root signature to a different @@ -1538,7 +1546,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, +VKD3D_SHADER_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signature_desc *dst, enum vkd3d_shader_root_signature_version version, const struct vkd3d_shader_versioned_root_signature_desc *src); /** @@ -1565,7 +1573,7 @@ int vkd3d_shader_convert_root_signature(struct vkd3d_shader_versioned_root_signa * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages); +VKD3D_SHADER_API int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char **messages); /** * Free members of struct vkd3d_shader_scan_descriptor_info() allocated by * vkd3d_shader_scan(). @@ -1575,7 +1583,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char * * \param scan_descriptor_info Descriptor information to free. */ -void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); +VKD3D_SHADER_API void vkd3d_shader_free_scan_descriptor_info( + struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info); /** * Read the input signature of a compiled shader, returning a structural @@ -1601,7 +1610,7 @@ void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_ * * \return A member of \ref vkd3d_result. */ -int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, +VKD3D_SHADER_API int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature, char **messages); /** * Find a single element of a parsed input signature. @@ -1622,7 +1631,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, * NULL if no such element was found. If not NULL, the return value points into * the \a signature parameter and should not be explicitly freed. */ -struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( +VKD3D_SHADER_API struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( const struct vkd3d_shader_signature *signature, const char *semantic_name, unsigned int semantic_index, unsigned int stream_index); /** @@ -1634,7 +1643,7 @@ struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( * * \param signature Signature description to free. */ -void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); +VKD3D_SHADER_API void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); /* 1.3 */ @@ -1662,7 +1671,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * * \since 1.3 */ -int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, +VKD3D_SHADER_API int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); #endif /* VKD3D_SHADER_NO_PROTOTYPES */ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index a694de6c..ea310a0e 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -34,37 +34,44 @@ extern "C" { #define VKD3D_WAIT_FAILED (~0u) #define VKD3D_INFINITE (~0u) +#if defined(__GNUC__) && !defined(__MINGW32__) +# define VKD3D_UTILS_API __attribute__((visibility("default"))) +#else +# define VKD3D_UTILS_API +#endif + /* 1.0 */ -HANDLE vkd3d_create_event(void); -HRESULT vkd3d_signal_event(HANDLE event); -unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); -void vkd3d_destroy_event(HANDLE event); +VKD3D_UTILS_API HANDLE vkd3d_create_event(void); +VKD3D_UTILS_API HRESULT vkd3d_signal_event(HANDLE event); +VKD3D_UTILS_API unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds); +VKD3D_UTILS_API void vkd3d_destroy_event(HANDLE event); #define D3D12CreateDevice(a, b, c, d) D3D12CreateDeviceVKD3D(a, b, c, d, VKD3D_UTILS_API_VERSION) -HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); -HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateRootSignatureDeserializer( + const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +VKD3D_UTILS_API HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug); +VKD3D_UTILS_API HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); /* 1.2 */ -HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL feature_level, REFIID iid, void **device, enum vkd3d_api_version api_version); -HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateVersionedRootSignatureDeserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, +VKD3D_UTILS_API HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob); /* 1.3 */ -HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, +VKD3D_UTILS_API HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT flags, UINT effect_flags, ID3DBlob **shader, ID3DBlob **error_messages); -HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, +VKD3D_UTILS_API HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT flags, UINT effect_flags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages); -HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); -HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, +VKD3D_UTILS_API HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); +VKD3D_UTILS_API HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 7d8a8b19..24dad10d 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -132,18 +132,18 @@ typedef GUID IID; # ifdef INITGUID # ifndef __cplusplus # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name DECLSPEC_HIDDEN; \ + const GUID name; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; \ + EXTERN_C const GUID name; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 }} # endif # else # define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; + EXTERN_C const GUID name; # endif /* INITGUID */ /* __uuidof emulation */ @@ -251,17 +251,6 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; #endif /* _WIN32 */ -/* Define DECLSPEC_HIDDEN */ -#ifndef DECLSPEC_HIDDEN -# if defined(__MINGW32__) -# define DECLSPEC_HIDDEN -# elif defined(__GNUC__) -# define DECLSPEC_HIDDEN __attribute__((visibility("hidden"))) -# else -# define DECLSPEC_HIDDEN -# endif -#endif /* DECLSPEC_HIDDEN */ - /* Define min() & max() macros */ #ifndef NOMINMAX # ifndef min diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 5e49cf10..dcf53fa9 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -31,7 +31,7 @@ #define VKD3D_DEBUG_BUFFER_COUNT 64 #define VKD3D_DEBUG_BUFFER_SIZE 512 -extern const char *vkd3d_dbg_env_name DECLSPEC_HIDDEN; +extern const char *vkd3d_dbg_env_name; static const char *debug_level_names[] = { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 54273ac6..aede3a55 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -601,91 +601,84 @@ 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_type(struct hlsl_ctx *ctx, const struct hlsl_type *type) DECLSPEC_HIDDEN; -const char *debug_hlsl_writemask(unsigned int writemask) DECLSPEC_HIDDEN; +const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); +const char *debug_hlsl_writemask(unsigned int writemask); -struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const struct hlsl_type *type) DECLSPEC_HIDDEN; -struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsigned int modifiers) DECLSPEC_HIDDEN; -const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const struct hlsl_type *type); +struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsigned int modifiers); +const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type); -void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl, - bool intrinsic) DECLSPEC_HIDDEN; -bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) DECLSPEC_HIDDEN; +void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function_decl *decl, bool intrinsic); +bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var); -void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; +void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, - struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; +int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); -void hlsl_free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; -void hlsl_free_instr_list(struct list *list) DECLSPEC_HIDDEN; -void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN; -void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; +void hlsl_free_instr(struct hlsl_ir_node *node); +void hlsl_free_instr_list(struct list *list); +void hlsl_free_type(struct hlsl_type *type); +void hlsl_free_var(struct hlsl_ir_var *decl); -bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; -struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN; -struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN; -struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; +bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name); +struct hlsl_ir_function_decl *hlsl_get_func_decl(struct hlsl_ctx *ctx, const char *name); +struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive); +struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name); -struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, - unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, - struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; + struct hlsl_ir_node *arg2); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, - const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc); struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, - struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node) DECLSPEC_HIDDEN; + struct vkd3d_shader_location *loc); +struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node); struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, - struct list *parameters, const struct hlsl_semantic *semantic, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + struct list *parameters, const struct hlsl_semantic *semantic, struct vkd3d_shader_location loc); +struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc); +struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc); struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_type *type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, - struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; + struct hlsl_type *type, struct vkd3d_shader_location loc); +struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_location loc); +struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs); struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; -struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; + struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields); struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, - struct hlsl_ir_node *val, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; + struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, - const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct vkd3d_shader_location loc); struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, - enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, - const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, - struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + struct vkd3d_shader_location loc); struct hlsl_ir_var *hlsl_new_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, const struct hlsl_semantic *semantic, unsigned int modifiers, - const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; + const struct hlsl_reg_reservation *reg_reservation); struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, - const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; + const struct vkd3d_shader_location loc); -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) DECLSPEC_HIDDEN; -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) DECLSPEC_HIDDEN; -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) DECLSPEC_HIDDEN; +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_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); -void hlsl_push_scope(struct hlsl_ctx *ctx) DECLSPEC_HIDDEN; -void hlsl_pop_scope(struct hlsl_ctx *ctx) DECLSPEC_HIDDEN; +void hlsl_push_scope(struct hlsl_ctx *ctx); +void hlsl_pop_scope(struct hlsl_ctx *ctx); -bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLSPEC_HIDDEN; +bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type); struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, - unsigned int default_majority, unsigned int modifiers) DECLSPEC_HIDDEN; -unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; -unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset) DECLSPEC_HIDDEN; -bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; -bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; + unsigned int default_majority, unsigned int modifiers); +unsigned int hlsl_type_component_count(struct hlsl_type *type); +unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int offset); +bool hlsl_type_is_void(const struct hlsl_type *type); +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); -int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; +int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); #endif diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 15d173a4..e1cb75e1 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -131,13 +131,13 @@ struct preproc_ctx }; bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, char **arg_names, - size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) DECLSPEC_HIDDEN; -void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; -struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) DECLSPEC_HIDDEN; -void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; -bool preproc_push_include(struct preproc_ctx *ctx, char *filename, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; + size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body); +void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code); +struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name); +void preproc_free_macro(struct preproc_macro *macro); +bool preproc_push_include(struct preproc_ctx *ctx, char *filename, const struct vkd3d_shader_code *code); void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, - enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5); static inline struct preproc_file *preproc_get_top_file(struct preproc_ctx *ctx) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 85859e84..cd3cd49d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -858,20 +858,20 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } -void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; +void vkd3d_shader_trace(void *data); -const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; +const char *shader_get_type_prefix(enum vkd3d_shader_type type); struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; -void shader_sm4_free(void *data) DECLSPEC_HIDDEN; + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); +void shader_sm4_free(void *data); void shader_sm4_read_header(void *data, const DWORD **ptr, - struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; + struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, - struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; -bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; + struct vkd3d_shader_instruction *ins); +bool shader_sm4_is_end(void *data, const DWORD **ptr); struct vkd3d_string_buffer { @@ -887,20 +887,18 @@ struct vkd3d_string_buffer_cache }; enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; -int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, - const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; -void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, - struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); +void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer); +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list); +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list); +int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3); +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, struct vkd3d_string_buffer *buffer); #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) -void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function); +int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args); struct vkd3d_bytecode_buffer { @@ -909,8 +907,8 @@ struct vkd3d_bytecode_buffer int status; }; -size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size) DECLSPEC_HIDDEN; -void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value) DECLSPEC_HIDDEN; +size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size); +void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value); static inline size_t put_u32(struct vkd3d_bytecode_buffer *buffer, uint32_t value) { @@ -944,53 +942,51 @@ struct vkd3d_shader_message_context struct vkd3d_string_buffer messages; }; -void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, - char **out) DECLSPEC_HIDDEN; +void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context); +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out); void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, - enum vkd3d_shader_log_level log_level) DECLSPEC_HIDDEN; + enum vkd3d_shader_log_level log_level); void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, - const char *function) DECLSPEC_HIDDEN; + const char *function); #define vkd3d_shader_message_context_trace_messages(context) \ vkd3d_shader_message_context_trace_messages_(context, __FUNCTION__) void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5); void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, va_list args); void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_log_level level, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_log_level level, const char *format, va_list args); void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, - enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; + enum vkd3d_shader_error error, const char *format, va_list args); -void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) DECLSPEC_HIDDEN; +void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader); int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, const char *source_name, - struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc); +void free_shader_desc(struct vkd3d_shader_desc *desc); int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, - struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature); struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, - struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_message_context *message_context); int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; + const struct vkd3d_shader_instruction *instruction); int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; -void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *spirv); +void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler); -void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]); int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context); static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index deb8ee99..0fa51a2f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -84,9 +84,9 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; +HRESULT hresult_from_errno(int rc); +HRESULT hresult_from_vk_result(VkResult vr); +HRESULT hresult_from_vkd3d_result(int vkd3d_result); struct vkd3d_vulkan_info { @@ -163,8 +163,8 @@ union vkd3d_thread_handle }; HRESULT vkd3d_create_thread(struct vkd3d_instance *instance, - PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; -HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread) DECLSPEC_HIDDEN; + PFN_vkd3d_thread thread_main, void *data, union vkd3d_thread_handle *thread); +HRESULT vkd3d_join_thread(struct vkd3d_instance *instance, union vkd3d_thread_handle *thread); struct vkd3d_waiting_fence { @@ -200,10 +200,8 @@ struct vkd3d_fence_worker struct d3d12_device *device; }; -HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, - struct d3d12_device *device) DECLSPEC_HIDDEN; -HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, - struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device); +HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, struct d3d12_device *device); struct vkd3d_gpu_va_allocation { @@ -232,11 +230,9 @@ struct vkd3d_gpu_va_allocator }; D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, - size_t alignment, size_t size, void *ptr) DECLSPEC_HIDDEN; -void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, - D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; -void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, - D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; + size_t alignment, size_t size, void *ptr); +void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); +void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); struct vkd3d_render_pass_key { @@ -258,12 +254,10 @@ struct vkd3d_render_pass_cache size_t render_passes_size; }; -void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, - struct d3d12_device *device) DECLSPEC_HIDDEN; -HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, - struct d3d12_device *device, const struct vkd3d_render_pass_key *key, - VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache) DECLSPEC_HIDDEN; +void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, struct d3d12_device *device); +HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, struct d3d12_device *device, + const struct vkd3d_render_pass_key *key, VkRenderPass *vk_render_pass); +void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache); struct vkd3d_private_store { @@ -318,12 +312,10 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store pthread_mutex_destroy(&store->mutex); } -HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, - const GUID *tag, unsigned int *out_size, void *out) DECLSPEC_HIDDEN; +HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out); HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, - const GUID *tag, unsigned int data_size, const void *data) DECLSPEC_HIDDEN; -HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, - const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN; + const GUID *tag, unsigned int data_size, const void *data); +HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object); struct vkd3d_signaled_semaphore { @@ -363,8 +355,8 @@ struct d3d12_fence struct vkd3d_private_store private_store; }; -HRESULT d3d12_fence_create(struct d3d12_device *device, - uint64_t initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; +HRESULT d3d12_fence_create(struct d3d12_device *device, uint64_t initial_value, + D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence); /* ID3D12Heap */ struct d3d12_heap @@ -388,8 +380,8 @@ struct d3d12_heap }; HRESULT d3d12_heap_create(struct d3d12_device *device, const D3D12_HEAP_DESC *desc, - const struct d3d12_resource *resource, struct d3d12_heap **heap) DECLSPEC_HIDDEN; -struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) DECLSPEC_HIDDEN; + const struct d3d12_resource *resource, struct d3d12_heap **heap); +struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface); #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) @@ -437,29 +429,29 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } -bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; -HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device) DECLSPEC_HIDDEN; +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource); +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device); HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_heap *heap, uint64_t heap_offset, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state, - const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource) DECLSPEC_HIDDEN; -struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DECLSPEC_HIDDEN; + const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); +struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface); HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) DECLSPEC_HIDDEN; + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size); HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN; + const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer); HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, - const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info) DECLSPEC_HIDDEN; + const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_ALLOCATION_INFO *allocation_info); enum vkd3d_view_type { @@ -497,8 +489,8 @@ struct vkd3d_view } info; }; -void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_view_incref(struct vkd3d_view *view) DECLSPEC_HIDDEN; +void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device); +void vkd3d_view_incref(struct vkd3d_view *view); struct vkd3d_texture_view_desc { @@ -513,9 +505,9 @@ struct vkd3d_texture_view_desc }; bool vkd3d_create_buffer_view(struct d3d12_device *device, VkBuffer vk_buffer, const struct vkd3d_format *format, - VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view) DECLSPEC_HIDDEN; + VkDeviceSize offset, VkDeviceSize size, struct vkd3d_view **view); bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, - const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) DECLSPEC_HIDDEN; + const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view); struct d3d12_desc { @@ -538,25 +530,22 @@ static inline struct d3d12_desc *d3d12_desc_from_gpu_handle(D3D12_GPU_DESCRIPTOR return (struct d3d12_desc *)(intptr_t)gpu_handle.ptr; } -void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) DECLSPEC_HIDDEN; +void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, - struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_device *device, const D3D12_CONSTANT_BUFFER_VIEW_DESC *desc); void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, - const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + const D3D12_SHADER_RESOURCE_VIEW_DESC *desc); void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_resource *counter_resource, - const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) DECLSPEC_HIDDEN; -void d3d12_desc_create_sampler(struct d3d12_desc *sampler, - struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; -void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, - struct d3d12_device *device) DECLSPEC_HIDDEN; + const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc); +void d3d12_desc_create_sampler(struct d3d12_desc *sampler, struct d3d12_device *device, const D3D12_SAMPLER_DESC *desc); +void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *src, struct d3d12_device *device); bool vkd3d_create_raw_buffer_view(struct d3d12_device *device, - D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view) DECLSPEC_HIDDEN; + D3D12_GPU_VIRTUAL_ADDRESS gpu_address, VkBufferView *vk_buffer_view); HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, - const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler) DECLSPEC_HIDDEN; + const D3D12_STATIC_SAMPLER_DESC *desc, VkSampler *vk_sampler); struct d3d12_rtv_desc { @@ -576,7 +565,7 @@ static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DE } void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, - struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc); struct d3d12_dsv_desc { @@ -596,7 +585,7 @@ static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DE } void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, - struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN; + struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc); /* ID3D12DescriptorHeap */ struct d3d12_descriptor_heap @@ -614,7 +603,7 @@ struct d3d12_descriptor_heap }; HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, - const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap) DECLSPEC_HIDDEN; + const D3D12_DESCRIPTOR_HEAP_DESC *desc, struct d3d12_descriptor_heap **descriptor_heap); /* ID3D12QueryHeap */ struct d3d12_query_heap @@ -631,9 +620,9 @@ struct d3d12_query_heap uint64_t availability_mask[]; }; -HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_HEAP_DESC *desc, - struct d3d12_query_heap **heap) DECLSPEC_HIDDEN; -struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface) DECLSPEC_HIDDEN; +HRESULT d3d12_query_heap_create(struct d3d12_device *device, + const D3D12_QUERY_HEAP_DESC *desc, struct d3d12_query_heap **heap); +struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface); /* A Vulkan query has to be issued at least one time before the result is * available. In D3D12 it is legal to get query reults for not issued queries. @@ -734,11 +723,11 @@ struct d3d12_root_signature }; HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *bytecode, - size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; -struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; + size_t bytecode_length, struct d3d12_root_signature **root_signature); +struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface); int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_shader_versioned_root_signature_desc *desc); struct d3d12_graphics_pipeline_state { @@ -837,13 +826,12 @@ static inline bool d3d12_pipeline_state_has_unknown_dsv_format(struct d3d12_pipe } HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, - const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state); HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, - const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; + const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state); VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, - D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, - VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; + D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, VkRenderPass *vk_render_pass); +struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface); struct vkd3d_buffer { @@ -903,7 +891,7 @@ struct d3d12_command_allocator }; HRESULT d3d12_command_allocator_create(struct d3d12_device *device, - D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator) DECLSPEC_HIDDEN; + D3D12_COMMAND_LIST_TYPE type, struct d3d12_command_allocator **allocator); struct vkd3d_push_descriptor { @@ -995,7 +983,7 @@ struct d3d12_command_list HRESULT d3d12_command_list_create(struct d3d12_device *device, UINT node_mask, D3D12_COMMAND_LIST_TYPE type, ID3D12CommandAllocator *allocator_iface, - ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list) DECLSPEC_HIDDEN; + ID3D12PipelineState *initial_pipeline_state, struct d3d12_command_list **list); struct vkd3d_queue { @@ -1022,12 +1010,11 @@ struct vkd3d_queue VkSemaphore old_vk_semaphores[VKD3D_MAX_VK_SYNC_OBJECTS]; }; -VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) DECLSPEC_HIDDEN; -HRESULT vkd3d_queue_create(struct d3d12_device *device, - uint32_t family_index, const VkQueueFamilyProperties *properties, - struct vkd3d_queue **queue) DECLSPEC_HIDDEN; -void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_queue_release(struct vkd3d_queue *queue) DECLSPEC_HIDDEN; +VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue); +HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, + const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue); +void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device); +void vkd3d_queue_release(struct vkd3d_queue *queue); /* ID3D12CommandQueue */ struct d3d12_command_queue @@ -1048,7 +1035,7 @@ struct d3d12_command_queue }; HRESULT d3d12_command_queue_create(struct d3d12_device *device, - const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue) DECLSPEC_HIDDEN; + const D3D12_COMMAND_QUEUE_DESC *desc, struct d3d12_command_queue **queue); /* ID3D12CommandSignature */ struct d3d12_command_signature @@ -1063,9 +1050,9 @@ struct d3d12_command_signature struct vkd3d_private_store private_store; }; -HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc, - struct d3d12_command_signature **signature) DECLSPEC_HIDDEN; -struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) DECLSPEC_HIDDEN; +HRESULT d3d12_command_signature_create(struct d3d12_device *device, + const D3D12_COMMAND_SIGNATURE_DESC *desc, struct d3d12_command_signature **signature); +struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface); /* NULL resources */ struct vkd3d_null_resources @@ -1083,10 +1070,8 @@ struct vkd3d_null_resources VkDeviceMemory vk_2d_storage_image_memory; }; -HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, - struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, - struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, struct d3d12_device *device); +void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, struct d3d12_device *device); struct vkd3d_format_compatibility_list { @@ -1124,8 +1109,8 @@ struct vkd3d_uav_clear_state struct vkd3d_uav_clear_pipelines pipelines_uint; }; -HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); +void vkd3d_uav_clear_state_cleanup(struct vkd3d_uav_clear_state *state, struct d3d12_device *device); /* ID3D12Device */ struct d3d12_device @@ -1181,13 +1166,12 @@ struct d3d12_device }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, - const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; -struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, - D3D12_COMMAND_LIST_TYPE type) DECLSPEC_HIDDEN; -bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) DECLSPEC_HIDDEN; + const struct vkd3d_device_create_info *create_info, struct d3d12_device **device); +struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type); +bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent); void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, - const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; -struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; + const char *message, ...) VKD3D_PRINTF_FUNC(3, 4); +struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface); static inline HRESULT d3d12_device_query_interface(struct d3d12_device *device, REFIID iid, void **object) { @@ -1262,15 +1246,14 @@ static inline bool vkd3d_format_is_compressed(const struct vkd3d_format *format) void vkd3d_format_copy_data(const struct vkd3d_format *format, const uint8_t *src, unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, - unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d); const struct vkd3d_format *vkd3d_get_format(const struct d3d12_device *device, - DXGI_FORMAT dxgi_format, bool depth_stencil) DECLSPEC_HIDDEN; -const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, - DXGI_FORMAT dxgi_format) DECLSPEC_HIDDEN; + DXGI_FORMAT dxgi_format, bool depth_stencil); +const struct vkd3d_format *vkd3d_find_uint_format(const struct d3d12_device *device, DXGI_FORMAT dxgi_format); -HRESULT vkd3d_init_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; -void vkd3d_cleanup_format_info(struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_init_format_info(struct d3d12_device *device); +void vkd3d_cleanup_format_info(struct d3d12_device *device); static inline const struct vkd3d_format *vkd3d_format_from_d3d12_resource_desc( const struct d3d12_device *device, const D3D12_RESOURCE_DESC *desc, DXGI_FORMAT view_format) @@ -1318,24 +1301,23 @@ static inline unsigned int vkd3d_compute_workgroup_count(unsigned int thread_cou return (thread_count + workgroup_size - 1) / workgroup_size; } -VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; -VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; -VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op); +VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc); +VkSampleCountFlagBits vk_samples_from_sample_count(unsigned int sample_count); -bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; +bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level); -bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; +bool is_valid_resource_state(D3D12_RESOURCE_STATES state); +bool is_write_resource_state(D3D12_RESOURCE_STATES state); -HRESULT return_interface(void *iface, REFIID iface_iid, - REFIID requested_iid, void **object) DECLSPEC_HIDDEN; +HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object); -const char *debug_d3d12_box(const D3D12_BOX *box) DECLSPEC_HIDDEN; -const char *debug_d3d12_shader_component_mapping(unsigned int mapping) DECLSPEC_HIDDEN; -const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; -const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; -const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; -const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; +const char *debug_d3d12_box(const D3D12_BOX *box); +const char *debug_d3d12_shader_component_mapping(unsigned int mapping); +const char *debug_vk_extent_3d(VkExtent3D extent); +const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags); +const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags); +const char *debug_vk_queue_flags(VkQueueFlags flags); static inline void debug_ignored_node_mask(unsigned int mask) { @@ -1344,15 +1326,15 @@ static inline void debug_ignored_node_mask(unsigned int mask) } HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, - PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr); HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, - const struct vkd3d_vk_global_procs *global_procs, VkInstance instance) DECLSPEC_HIDDEN; + const struct vkd3d_vk_global_procs *global_procs, VkInstance instance); HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, - const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; + const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device); extern const char vkd3d_build[]; -bool vkd3d_get_program_name(char program_name[PATH_MAX]) DECLSPEC_HIDDEN; +bool vkd3d_get_program_name(char program_name[PATH_MAX]); static inline void vkd3d_set_thread_name(const char *name) { @@ -1364,9 +1346,9 @@ static inline void vkd3d_set_thread_name(const char *name) } VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const char *name) DECLSPEC_HIDDEN; + VkDebugReportObjectTypeEXT vk_object_type, const char *name); HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, - VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; + VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name); static inline void vk_prepend_struct(void *header, void *structure) { -- 2.32.0

5 7

[PATCH vkd3d 1/4] vkd3d-shader: Implement DMAX instruction.
by Conor McCarthy 09 Aug '21

09 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- 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 + 5 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 9da89a4a..584ece93 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -798,6 +798,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, + {VKD3D_SM5_OP_DMAX, VKD3DSIH_DMAX, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, {VKD3D_SM5_OP_DLT, VKD3DSIH_DLT, "u", "dd"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index c94a73d4..e4d21467 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -318,6 +318,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DADD = 0xbf, + VKD3D_SM5_OP_DMAX = 0xc0, VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DGE = 0xc4, VKD3D_SM5_OP_DLT = 0xc5, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3a1f1969..a94a38a6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6843,6 +6843,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( } glsl_insts[] = { + {VKD3DSIH_DMAX, GLSLstd450NMax}, {VKD3DSIH_EXP, GLSLstd450Exp2}, {VKD3DSIH_FIRSTBIT_HI, GLSLstd450FindUMsb}, {VKD3DSIH_FIRSTBIT_LO, GLSLstd450FindILsb}, @@ -9532,6 +9533,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_XOR: vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction); break; + case VKD3DSIH_DMAX: case VKD3DSIH_EXP: case VKD3DSIH_FIRSTBIT_HI: case VKD3DSIH_FIRSTBIT_LO: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d9306d6b..0da29a8f 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", + /* VKD3DSIH_DMAX */ "dmax", /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DNE */ "dne", /* VKD3DSIH_DP2 */ "dp2", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 85859e84..f7762ef2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -197,6 +197,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DGE, VKD3DSIH_DIV, VKD3DSIH_DLT, + VKD3DSIH_DMAX, VKD3DSIH_DMOV, VKD3DSIH_DNE, VKD3DSIH_DP2, -- 2.32.0

2 7

[PATCH v1] mmdevapi: Implement AEV_GetMasterVolumeLevelScalar and AEV_SetMasterVolumeLevelScalar methods.
by Haidong Yu 09 Aug '21

09 Aug '21

3 2

[PATCH 5/5] gdi32: Handle metafiles directly in RealizePalette.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 11 +++++ dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 19 ++------ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/palette.c | 20 --------- dlls/gdi32/tests/metafile.c | 81 ++++++++++++++++++++++++++++++++++ 9 files changed, 98 insertions(+), 40 deletions(-)

2 1

[PATCH 4/5] gdi32: Handle metafiles directly in SelectPalette.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 18 ++++++++---------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 18 ++++++++++++++++++ dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/mfdrv/objects.c | 20 +++++++++----------- dlls/gdi32/palette.c | 28 ++-------------------------- 10 files changed, 42 insertions(+), 52 deletions(-)

2 1

[PATCH 3/5] gdi32: Handle EMFs directly in SelectObject.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 - dlls/gdi32/enhmfdrv/init.c | 4 +- dlls/gdi32/enhmfdrv/objects.c | 90 +++++++------ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/objects.c | 3 + dlls/gdi32/tests/metafile.c | 191 +++++++++++++++++++++++++++ 6 files changed, 247 insertions(+), 44 deletions(-)

2 1

[PATCH 2/5] gdi32: Handle metafiles directly in SelectObject.
by Jacek Caban 09 Aug '21

09 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/init.c | 11 ++- dlls/gdi32/mfdrv/metafiledrv.h | 7 +- dlls/gdi32/mfdrv/objects.c | 81 ++++++++++++------ dlls/gdi32/objects.c | 2 + dlls/gdi32/tests/metafile.c | 151 +++++++++++++++++++++++++++++++++ include/ntgdi.h | 1 + 8 files changed, 219 insertions(+), 37 deletions(-)

2 1

[PATCH 1/5] gdi32: Handle deletion of objects associated with metafile without accessing kernel objects.
by Jacek Caban 09 Aug '21

09 Aug '21

2 1

[PATCH 1/3] d3d10/effect: Store string annotation values.
by Nikolay Sivov 09 Aug '21

09 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 19 +++- dlls/d3d10/tests/effect.c | 181 ++++++++++++++++--------------------- 3 files changed, 95 insertions(+), 106 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8d48231d971..fc4d50004af 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -188,6 +188,7 @@ struct d3d10_effect_variable char *name; char *semantic; + char *value; DWORD buffer_offset; DWORD annotation_count; DWORD flag; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 86ef50aac01..18aed7b52de 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1330,12 +1330,28 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, static HRESULT parse_fx10_annotation(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *a) { + DWORD offset; HRESULT hr; if (FAILED(hr = parse_fx10_variable_head(data, data_size, ptr, a))) return hr; - skip_dword_unknown("annotation", ptr, 1); + read_dword(ptr, &offset); + TRACE("Annotation value is at offset %#x.\n", offset); + + switch (a->type->basetype) + { + case D3D10_SVT_STRING: + if (!fx10_copy_string(data, data_size, offset, &a->value)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + break; + + default: + FIXME("Unhandled object type %#x.\n", a->type->basetype); + } /* mark the variable as annotation */ a->flag = D3D10_EFFECT_VARIABLE_ANNOTATION; @@ -2744,6 +2760,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) heap_free(v->name); heap_free(v->semantic); + heap_free(v->value); if (v->annotations) { for (i = 0; i < v->annotation_count; ++i) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index fc0b8180b97..871bf78cc27 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -1161,7 +1161,7 @@ static void test_effect_variable_element(void) * test_effect_variable_type_class */ #if 0 -cbuffer cb <String s = "STRING";> +cbuffer cb <String s = "STRING"; String s2 = "STRING"; > { float f; vector <int, 2> i; @@ -1186,109 +1186,60 @@ GeometryShader gs[2]; PixelShader ps; VertexShader vs[1]; #endif -static DWORD fx_test_evtc[] = { -0x43425844, 0xc04c50cb, 0x0afeb4ef, 0xbb93f346, -0x97a29499, 0x00000001, 0x00000659, 0x00000001, -0x00000024, 0x30315846, 0x0000062d, 0xfeff1001, -0x00000001, 0x00000004, 0x00000011, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x000003d9, -0x00000000, 0x00000008, 0x00000001, 0x00000001, -0x00000001, 0x00000001, 0x00000001, 0x00000001, -0x00000004, 0x00000000, 0x00000000, 0x53006263, -0x6e697274, 0x00070067, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00010000, -0x00730000, 0x49525453, 0x6600474e, 0x74616f6c, -0x00003300, 0x00000100, 0x00000000, 0x00000400, -0x00001000, 0x00000400, 0x00090900, 0x69006600, -0x0032746e, 0x00000057, 0x00000001, 0x00000000, -0x00000008, 0x00000010, 0x00000008, 0x00001112, -0x69750069, 0x7832746e, 0x007a0033, 0x00010000, -0x00000000, 0x00280000, 0x00300000, 0x00180000, -0x5a1b0000, 0x00750000, 0x6c6f6f62, 0x00337832, -0x000000a0, 0x00000001, 0x00000000, 0x0000001c, -0x00000020, 0x00000018, 0x00001a23, 0x6c420062, -0x53646e65, 0x65746174, 0x0000c600, 0x00000200, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00000200, 0x656c6200, 0x4400646e, 0x68747065, -0x6e657453, 0x536c6963, 0x65746174, 0x0000f300, -0x00000200, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00000300, 0x70656400, 0x74736874, -0x69636e65, 0x6152006c, 0x72657473, 0x72657a69, -0x74617453, 0x012e0065, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00040000, -0x61720000, 0x53007473, 0x6c706d61, 0x74537265, -0x00657461, 0x0000015f, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000015, -0x006d6173, 0x646e6552, 0x61547265, 0x74656772, -0x77656956, 0x00018c00, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00001300, -0x76747200, 0x70654400, 0x74536874, 0x69636e65, -0x6569566c, 0x01bd0077, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00140000, -0x73640000, 0x65540076, 0x72757478, 0x00443165, -0x000001ee, 0x00000002, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x0000000a, 0x54003174, -0x75747865, 0x44316572, 0x61727241, 0x02170079, -0x00020000, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x000b0000, 0x31740000, 0x65540061, -0x72757478, 0x00443265, 0x00000246, 0x00000002, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x0000000c, 0x54003274, 0x75747865, 0x44326572, -0x6f00534d, 0x02000002, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x0e000000, 0x74000000, -0x736d6432, 0x78655400, 0x65727574, 0x72414432, -0x00796172, 0x0000029d, 0x00000002, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x0000000d, -0x00613274, 0x74786554, 0x32657275, 0x41534d44, -0x79617272, 0x0002cc00, 0x00000200, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000f00, -0x64327400, 0x0061736d, 0x74786554, 0x33657275, -0x03000044, 0x00020000, 0x00000000, 0x00000000, -0x00000000, 0x00000000, 0x00100000, 0x33740000, -0x78655400, 0x65727574, 0x65627543, 0x00032900, -0x00000200, 0x00000000, 0x00000000, 0x00000000, -0x00000000, 0x00001100, 0x00717400, 0x6d6f6547, -0x79727465, 0x64616853, 0x54007265, 0x02000003, -0x02000000, 0x00000000, 0x00000000, 0x00000000, -0x07000000, 0x67000000, 0x69500073, 0x536c6578, -0x65646168, 0x03820072, 0x00020000, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00050000, -0x73700000, 0x72655600, 0x53786574, 0x65646168, -0x03ad0072, 0x00020000, 0x00010000, 0x00000000, -0x00000000, 0x00000000, 0x00060000, 0x73760000, -0x00000400, 0x00006000, 0x00000000, 0x00000400, -0xffffff00, 0x000001ff, 0x00002a00, 0x00000e00, -0x00002c00, 0x00005500, 0x00003900, 0x00000000, -0x00000000, 0x00000000, 0x00000000, 0x00000000, -0x00007800, 0x00005c00, 0x00000000, 0x00000400, -0x00000000, 0x00000000, 0x00000000, 0x00009e00, -0x00008200, 0x00000000, 0x00001000, 0x00000000, -0x00000000, 0x00000000, 0x0000c400, 0x0000a800, -0x00000000, 0x00004000, 0x00000000, 0x00000000, -0x00000000, 0x0000ed00, 0x0000d100, 0x00000000, -0xffffff00, 0x000000ff, 0x00000000, 0x00012100, -0x00010500, 0x00000000, 0xffffff00, 0x000000ff, -0x00000000, 0x00015a00, 0x00013e00, 0x00000000, -0xffffff00, 0x000000ff, 0x00000000, 0x00018800, -0x00016c00, 0x00000000, 0xffffff00, 0x000000ff, -0x00000000, 0x0001b900, 0x00019d00, 0x00000000, -0xffffff00, 0x000000ff, 0x0001ea00, 0x0001ce00, -0x00000000, 0xffffff00, 0x000000ff, 0x00021400, -0x0001f800, 0x00000000, 0xffffff00, 0x000000ff, -0x00024200, 0x00022600, 0x00000000, 0xffffff00, -0x000000ff, 0x00026c00, 0x00025000, 0x00000000, -0xffffff00, 0x000000ff, 0x00029700, 0x00027b00, -0x00000000, 0xffffff00, 0x000000ff, 0x0002c800, -0x0002ac00, 0x00000000, 0xffffff00, 0x000000ff, -0x0002f900, 0x0002dd00, 0x00000000, 0xffffff00, -0x000000ff, 0x00032600, 0x00030a00, 0x00000000, -0xffffff00, 0x000000ff, 0x00035100, 0x00033500, -0x00000000, 0xffffff00, 0x000000ff, 0x00037f00, -0x00036300, 0x00000000, 0xffffff00, 0x000000ff, -0x00000000, 0x00000000, 0x0003aa00, 0x00038e00, -0x00000000, 0xffffff00, 0x000000ff, 0x00000000, -0x0003d600, 0x0003ba00, 0x00000000, 0xffffff00, -0x000000ff, 0x00000000, 0x00000000, +static DWORD fx_test_evtc[] = +{ +0x43425844, 0x16ff7a62, 0x6eb690dc, 0x60dd5ba4, 0x903b0ce7, 0x00000001, 0x00000668, 0x00000001, +0x00000024, 0x30315846, 0x0000063c, 0xfeff1001, 0x00000001, 0x00000004, 0x00000011, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x000003dc, 0x00000000, 0x00000008, 0x00000001, 0x00000001, +0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000004, 0x00000000, 0x00000000, 0x53006263, +0x6e697274, 0x00070067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, +0x00730000, 0x49525453, 0x7300474e, 0x6c660032, 0x0074616f, 0x00000036, 0x00000001, 0x00000000, +0x00000004, 0x00000010, 0x00000004, 0x00000909, 0x6e690066, 0x5a003274, 0x01000000, 0x00000000, +0x08000000, 0x10000000, 0x08000000, 0x12000000, 0x69000011, 0x6e697500, 0x33783274, 0x00007d00, +0x00000100, 0x00000000, 0x00002800, 0x00003000, 0x00001800, 0x005a1b00, 0x62007500, 0x326c6f6f, +0xa3003378, 0x01000000, 0x00000000, 0x1c000000, 0x20000000, 0x18000000, 0x23000000, 0x6200001a, +0x656c4200, 0x7453646e, 0x00657461, 0x000000c9, 0x00000002, 0x00000000, 0x00000000, 0x00000000, +0x00000000, 0x00000002, 0x6e656c62, 0x65440064, 0x53687470, 0x636e6574, 0x74536c69, 0x00657461, +0x000000f6, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x74706564, +0x65747368, 0x6c69636e, 0x73615200, 0x69726574, 0x5372657a, 0x65746174, 0x00013100, 0x00000200, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000400, 0x73617200, 0x61530074, 0x656c706d, +0x61745372, 0x62006574, 0x02000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x15000000, +0x73000000, 0x52006d61, 0x65646e65, 0x72615472, 0x56746567, 0x00776569, 0x0000018f, 0x00000002, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00767472, 0x74706544, 0x65745368, +0x6c69636e, 0x77656956, 0x0001c000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00001400, 0x76736400, 0x78655400, 0x65727574, 0xf1004431, 0x02000001, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x0a000000, 0x74000000, 0x65540031, 0x72757478, 0x41443165, 0x79617272, +0x00021a00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000b00, 0x61317400, +0x78655400, 0x65727574, 0x49004432, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x0c000000, 0x74000000, 0x65540032, 0x72757478, 0x4d443265, 0x02720053, 0x00020000, 0x00000000, +0x00000000, 0x00000000, 0x00000000, 0x000e0000, 0x32740000, 0x00736d64, 0x74786554, 0x32657275, +0x72724144, 0xa0007961, 0x02000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0d000000, +0x74000000, 0x54006132, 0x75747865, 0x44326572, 0x7241534d, 0x00796172, 0x000002cf, 0x00000002, +0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000f, 0x6d643274, 0x54006173, 0x75747865, +0x44336572, 0x00030300, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001000, +0x00337400, 0x74786554, 0x43657275, 0x00656275, 0x0000032c, 0x00000002, 0x00000000, 0x00000000, +0x00000000, 0x00000000, 0x00000011, 0x47007174, 0x656d6f65, 0x53797274, 0x65646168, 0x03570072, +0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00070000, 0x73670000, 0x78695000, +0x68536c65, 0x72656461, 0x00038500, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x00000500, 0x00737000, 0x74726556, 0x68537865, 0x72656461, 0x0003b000, 0x00000200, 0x00000100, +0x00000000, 0x00000000, 0x00000000, 0x00000600, 0x00737600, 0x00000004, 0x00000060, 0x00000000, +0x00000004, 0xffffffff, 0x00000002, 0x0000002a, 0x0000000e, 0x0000002c, 0x00000033, 0x0000000e, +0x0000002c, 0x00000058, 0x0000003c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +0x0000007b, 0x0000005f, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x000000a1, +0x00000085, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x000000c7, 0x000000ab, +0x00000000, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x000000f0, 0x000000d4, 0x00000000, +0xffffffff, 0x00000000, 0x00000000, 0x00000124, 0x00000108, 0x00000000, 0xffffffff, 0x00000000, +0x00000000, 0x0000015d, 0x00000141, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x0000018b, +0x0000016f, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x000001bc, 0x000001a0, 0x00000000, +0xffffffff, 0x00000000, 0x000001ed, 0x000001d1, 0x00000000, 0xffffffff, 0x00000000, 0x00000217, +0x000001fb, 0x00000000, 0xffffffff, 0x00000000, 0x00000245, 0x00000229, 0x00000000, 0xffffffff, +0x00000000, 0x0000026f, 0x00000253, 0x00000000, 0xffffffff, 0x00000000, 0x0000029a, 0x0000027e, +0x00000000, 0xffffffff, 0x00000000, 0x000002cb, 0x000002af, 0x00000000, 0xffffffff, 0x00000000, +0x000002fc, 0x000002e0, 0x00000000, 0xffffffff, 0x00000000, 0x00000329, 0x0000030d, 0x00000000, +0xffffffff, 0x00000000, 0x00000354, 0x00000338, 0x00000000, 0xffffffff, 0x00000000, 0x00000382, +0x00000366, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x000003ad, 0x00000391, +0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x000003d9, 0x000003bd, 0x00000000, 0xffffffff, +0x00000000, 0x00000000, }; static BOOL is_valid_check(BOOL a, BOOL b) @@ -1382,6 +1333,7 @@ static void check_as(ID3D10EffectVariable *variable) static void test_effect_variable_type_class(void) { + ID3D10EffectStringVariable *string_var; ID3D10Effect *effect; ID3D10EffectConstantBuffer *constantbuffer, *null_buffer, *parent; ID3D10EffectVariable *variable; @@ -1392,6 +1344,7 @@ static void test_effect_variable_type_class(void) ULONG refcount; HRESULT hr; unsigned int variable_nr = 0; + const char *str1, *str2; if (!(device = create_device())) { @@ -1413,7 +1366,7 @@ static void test_effect_variable_type_class(void) ok(strcmp(vd.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); ok(vd.Flags == 0, "Type is %u, expected 0\n", vd.Flags); - ok(vd.Annotations == 1, "Elements is %u, expected 1\n", vd.Annotations); + ok(vd.Annotations == 2, "Elements is %u, expected 1\n", vd.Annotations); ok(vd.BufferOffset == 0, "Members is %u, expected 0\n", vd.BufferOffset); ok(vd.ExplicitBindPoint == 0, "ExplicitBindPoint is %u, expected 0\n", vd.ExplicitBindPoint); @@ -1469,6 +1422,24 @@ static void test_effect_variable_type_class(void) ok(td.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", td.UnpackedSize); ok(td.Stride == 0x0, "Stride is %#x, expected 0x0\n", td.Stride); + string_var = variable->lpVtbl->AsString(variable); + hr = string_var->lpVtbl->GetString(string_var, &str1); +todo_wine + ok(SUCCEEDED(hr), "GetString failed %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); + + variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); + string_var = variable->lpVtbl->AsString(variable); + hr = string_var->lpVtbl->GetString(string_var, &str2); +todo_wine + ok(SUCCEEDED(hr), "GetString failed %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(str2 != str1, "Unexpected string pointer.\n"); + ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); + } + /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); -- 2.30.2

1 2

[PATCH 1/5] xinput1_3: Consistently name struct xinput_controller variable.
by Rémi Bernon 09 Aug '21

09 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 134 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 248f8f796e5..25f3b0f0407 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -240,18 +240,18 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA preparsed, XINPUT_CAPABILITIES *x return TRUE; } -static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *state) +static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATION *state) { - struct hid_platform_private *private = device->platform_private; + struct hid_platform_private *private = controller->platform_private; char *output_report_buf = private->output_report_buf; ULONG output_report_len = private->caps.OutputReportByteLength; - if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) { - device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; - device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; + controller->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + controller->vibration.wRightMotorSpeed = state->wRightMotorSpeed; - if (device->enabled) + if (controller->enabled) { memset(output_report_buf, 0, output_report_len); output_report_buf[0] = /* report id */ 0; @@ -395,16 +395,16 @@ static void HID_find_gamepads(void) LeaveCriticalSection(&xinput_crit); } -static void remove_gamepad(struct xinput_controller *device) +static void remove_gamepad(struct xinput_controller *controller) { - EnterCriticalSection(&device->crit); + EnterCriticalSection(&controller->crit); - if (device->platform_private) + if (controller->platform_private) { - struct hid_platform_private *private = device->platform_private; + struct hid_platform_private *private = controller->platform_private; - controller_disable(device); - device->platform_private = NULL; + controller_disable(controller); + controller->platform_private = NULL; CloseHandle(private->device); free(private->input_report_buf[0]); @@ -414,7 +414,7 @@ static void remove_gamepad(struct xinput_controller *device) free(private); } - LeaveCriticalSection(&device->crit); + LeaveCriticalSection(&controller->crit); } static void HID_destroy_gamepads(void) @@ -433,9 +433,9 @@ static BYTE scale_byte(LONG value, const struct axis_info *axis) return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; } -static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *state) +static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE *state) { - struct hid_platform_private *private = device->platform_private; + struct hid_platform_private *private = controller->platform_private; int i; char **report_buf = private->input_report_buf, *tmp; ULONG report_len = private->caps.InputReportByteLength; @@ -445,14 +445,14 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta ULONG button_length, hat_value; LONG value; - if (!device->enabled) return; + if (!controller->enabled) return; if (!HidD_GetInputReport(private->device, report_buf[0], report_len)) { if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) { EnterCriticalSection(&xinput_crit); - remove_gamepad(device); + remove_gamepad(controller); LeaveCriticalSection(&xinput_crit); } else ERR("Failed to get input report, HidD_GetInputReport failed with error %u\n", GetLastError()); @@ -461,27 +461,27 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta if (memcmp(report_buf[0], report_buf[1], report_len) != 0) { - device->state.dwPacketNumber++; + controller->state.dwPacketNumber++; button_length = ARRAY_SIZE(buttons); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetUsages HID_USAGE_PAGE_BUTTON returned %#x\n", status); - device->state.Gamepad.wButtons = 0; + controller->state.Gamepad.wButtons = 0; for (i = 0; i < button_length; i++) { switch (buttons[i]) { - case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; - case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; - case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; - case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; - case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; - case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; - case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; - case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; - case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; - case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; - case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + case 1: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; + case 2: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; + case 3: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; + case 4: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; + case 5: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; + case 6: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; + case 7: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 8: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 9: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 10: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; + case 11: controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; } } @@ -496,81 +496,81 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta case 0: break; case 1: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; break; case 2: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; break; case 3: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; break; case 4: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; break; case 5: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; break; case 6: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; break; case 7: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; break; case 8: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; + controller->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; break; } } status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_X returned %#x\n", status); - else device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + else controller->state.Gamepad.sThumbLX = scale_short(value, &private->lx); status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Y returned %#x\n", status); - else device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + else controller->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RX returned %#x\n", status); - else device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + else controller->state.Gamepad.sThumbRX = scale_short(value, &private->rx); status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RY returned %#x\n", status); - else device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + else controller->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_RZ returned %#x\n", status); - else device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + else controller->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->preparsed, report_buf[0], report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetScaledUsageValue HID_USAGE_PAGE_GENERIC / HID_USAGE_GENERIC_Z returned %#x\n", status); - else device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + else controller->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); } tmp = report_buf[0]; report_buf[0] = report_buf[1]; report_buf[1] = tmp; - memcpy(state, &device->state, sizeof(*state)); + memcpy(state, &controller->state, sizeof(*state)); } -static BOOL verify_and_lock_device(struct xinput_controller *device) +static BOOL verify_and_lock_device(struct xinput_controller *controller) { - if (!device->platform_private) return FALSE; + if (!controller->platform_private) return FALSE; - EnterCriticalSection(&device->crit); + EnterCriticalSection(&controller->crit); - if (!device->platform_private) + if (!controller->platform_private) { - LeaveCriticalSection(&device->crit); + LeaveCriticalSection(&controller->crit); return FALSE; } return TRUE; } -static void unlock_device(struct xinput_controller *device) +static void unlock_device(struct xinput_controller *controller) { - LeaveCriticalSection(&device->crit); + LeaveCriticalSection(&controller->crit); } BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) @@ -768,7 +768,7 @@ static BOOL trigger_is_on(const BYTE value) static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) { - struct xinput_controller *device = &controllers[index]; + struct xinput_controller *controller = &controllers[index]; const XINPUT_GAMEPAD *cur; DWORD ret = ERROR_EMPTY; int i; @@ -795,26 +795,26 @@ static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) /* note: guide button does not send an event */ }; - if (!verify_and_lock_device(device)) return ERROR_DEVICE_NOT_CONNECTED; + if (!verify_and_lock_device(controller)) return ERROR_DEVICE_NOT_CONNECTED; - cur = &device->state.Gamepad; + cur = &controller->state.Gamepad; /*** buttons ***/ for (i = 0; i < ARRAY_SIZE(buttons); ++i) { - if ((cur->wButtons & buttons[i].mask) ^ (device->last_keystroke.wButtons & buttons[i].mask)) + if ((cur->wButtons & buttons[i].mask) ^ (controller->last_keystroke.wButtons & buttons[i].mask)) { keystroke->VirtualKey = buttons[i].vk; keystroke->Unicode = 0; /* unused */ if (cur->wButtons & buttons[i].mask) { keystroke->Flags = XINPUT_KEYSTROKE_KEYDOWN; - device->last_keystroke.wButtons |= buttons[i].mask; + controller->last_keystroke.wButtons |= buttons[i].mask; } else { keystroke->Flags = XINPUT_KEYSTROKE_KEYUP; - device->last_keystroke.wButtons &= ~buttons[i].mask; + controller->last_keystroke.wButtons &= ~buttons[i].mask; } keystroke->UserIndex = index; keystroke->HidCode = 0; @@ -824,45 +824,45 @@ static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) } /*** triggers ***/ - if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(device->last_keystroke.bLeftTrigger)) + if (trigger_is_on(cur->bLeftTrigger) ^ trigger_is_on(controller->last_keystroke.bLeftTrigger)) { keystroke->VirtualKey = VK_PAD_LTRIGGER; keystroke->Unicode = 0; /* unused */ keystroke->Flags = trigger_is_on(cur->bLeftTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; keystroke->UserIndex = index; keystroke->HidCode = 0; - device->last_keystroke.bLeftTrigger = cur->bLeftTrigger; + controller->last_keystroke.bLeftTrigger = cur->bLeftTrigger; ret = ERROR_SUCCESS; goto done; } - if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(device->last_keystroke.bRightTrigger)) + if (trigger_is_on(cur->bRightTrigger) ^ trigger_is_on(controller->last_keystroke.bRightTrigger)) { keystroke->VirtualKey = VK_PAD_RTRIGGER; keystroke->Unicode = 0; /* unused */ keystroke->Flags = trigger_is_on(cur->bRightTrigger) ? XINPUT_KEYSTROKE_KEYDOWN : XINPUT_KEYSTROKE_KEYUP; keystroke->UserIndex = index; keystroke->HidCode = 0; - device->last_keystroke.bRightTrigger = cur->bRightTrigger; + controller->last_keystroke.bRightTrigger = cur->bRightTrigger; ret = ERROR_SUCCESS; goto done; } /*** joysticks ***/ ret = check_joystick_keystroke(index, keystroke, &cur->sThumbLX, &cur->sThumbLY, - &device->last_keystroke.sThumbLX, - &device->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); + &controller->last_keystroke.sThumbLX, + &controller->last_keystroke.sThumbLY, VK_PAD_LTHUMB_UP); if (ret == ERROR_SUCCESS) goto done; ret = check_joystick_keystroke(index, keystroke, &cur->sThumbRX, &cur->sThumbRY, - &device->last_keystroke.sThumbRX, - &device->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); + &controller->last_keystroke.sThumbRX, + &controller->last_keystroke.sThumbRY, VK_PAD_RTHUMB_UP); if (ret == ERROR_SUCCESS) goto done; done: - unlock_device(device); + unlock_device(controller); return ret; } -- 2.32.0

1 4

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

09 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ifenum.c | 671 +--------------------------------- dlls/iphlpapi/ifenum.h | 42 --- dlls/iphlpapi/iphlpapi_main.c | 647 ++++++++++++-------------------- 3 files changed, 233 insertions(+), 1127 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 8108c7ff8c2..9cb576f86fd 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -122,7 +122,7 @@ static BOOL isLoopbackInterface(int fd, const char *name) /* The comments say MAX_ADAPTER_NAME is required, but really only IF_NAMESIZE * bytes are necessary. */ -char *getInterfaceNameByIndex(IF_INDEX index, char *name) +static char *getInterfaceNameByIndex(IF_INDEX index, char *name) { return if_indextoname(index, name); } @@ -146,7 +146,7 @@ DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) return ret; } -BOOL isIfIndexLoopback(ULONG idx) +static BOOL isIfIndexLoopback(ULONG idx) { BOOL ret = FALSE; char name[IFNAMSIZ]; @@ -394,670 +394,3 @@ DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) } #endif -static DWORD getInterfaceBCastAddrByName(const char *name) -{ - DWORD ret = INADDR_ANY; - - if (name) { - int fd = socket(PF_INET, SOCK_DGRAM, 0); - - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFBRDADDR, &ifr) == 0) - memcpy(&ret, ifr.ifr_addr.sa_data + 2, sizeof(DWORD)); - close(fd); - } - } - return ret; -} - -static DWORD getInterfaceMaskByName(const char *name) -{ - DWORD ret = INADDR_NONE; - - if (name) { - int fd = socket(PF_INET, SOCK_DGRAM, 0); - - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if (ioctl(fd, SIOCGIFNETMASK, &ifr) == 0) - memcpy(&ret, ifr.ifr_addr.sa_data + 2, sizeof(DWORD)); - close(fd); - } - } - return ret; -} - -#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) -static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type) -{ - DWORD ret; - int fd; - - if (!name || !len || !addr || !type) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct ifreq ifr; - - memset(&ifr, 0, sizeof(struct ifreq)); - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if ((ioctl(fd, SIOCGIFHWADDR, &ifr))) - ret = ERROR_INVALID_DATA; - else { - unsigned int addrLen; - - switch (ifr.ifr_hwaddr.sa_family) - { -#ifdef ARPHRD_LOOPBACK - case ARPHRD_LOOPBACK: - addrLen = 0; - *type = MIB_IF_TYPE_LOOPBACK; - break; -#endif -#ifdef ARPHRD_ETHER - case ARPHRD_ETHER: - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_ETHERNET; - break; -#endif -#ifdef ARPHRD_FDDI - case ARPHRD_FDDI: - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_FDDI; - break; -#endif -#ifdef ARPHRD_IEEE802 - case ARPHRD_IEEE802: /* 802.2 Ethernet && Token Ring, guess TR? */ - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_TOKENRING; - break; -#endif -#ifdef ARPHRD_IEEE802_TR - case ARPHRD_IEEE802_TR: /* also Token Ring? */ - addrLen = ETH_ALEN; - *type = MIB_IF_TYPE_TOKENRING; - break; -#endif -#ifdef ARPHRD_SLIP - case ARPHRD_SLIP: - addrLen = 0; - *type = MIB_IF_TYPE_SLIP; - break; -#endif -#ifdef ARPHRD_PPP - case ARPHRD_PPP: - addrLen = 0; - *type = MIB_IF_TYPE_PPP; - break; -#endif - default: - addrLen = 0; - *type = MIB_IF_TYPE_OTHER; - } - if (addrLen > *len) { - ret = ERROR_INSUFFICIENT_BUFFER; - *len = addrLen; - } - else { - if (addrLen > 0) - memcpy(addr, ifr.ifr_hwaddr.sa_data, addrLen); - /* zero out remaining bytes for broken implementations */ - memset(addr + addrLen, 0, *len - addrLen); - *len = addrLen; - ret = NO_ERROR; - } - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - return ret; -} -#elif defined (SIOCGARP) -static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type) -{ - DWORD ret; - int fd; - - if (!name || !len || !addr || !type) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - if (isLoopbackInterface(fd, name)) { - *type = MIB_IF_TYPE_LOOPBACK; - memset(addr, 0, *len); - *len = 0; - ret=NOERROR; - } - else { - struct arpreq arp; - struct sockaddr_in *saddr; - struct ifreq ifr; - - /* get IP addr */ - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - ioctl(fd, SIOCGIFADDR, &ifr); - memset(&arp, 0, sizeof(struct arpreq)); - arp.arp_pa.sa_family = AF_INET; - saddr = (struct sockaddr_in *)&arp; /* proto addr is first member */ - saddr->sin_family = AF_INET; - memcpy(&saddr->sin_addr.s_addr, ifr.ifr_addr.sa_data + 2, sizeof(DWORD)); - if ((ioctl(fd, SIOCGARP, &arp))) - ret = ERROR_INVALID_DATA; - else { - /* FIXME: heh: who said it was ethernet? */ - int addrLen = ETH_ALEN; - - if (addrLen > *len) { - ret = ERROR_INSUFFICIENT_BUFFER; - *len = addrLen; - } - else { - if (addrLen > 0) - memcpy(addr, &arp.arp_ha.sa_data[0], addrLen); - /* zero out remaining bytes for broken implementations */ - memset(addr + addrLen, 0, *len - addrLen); - *len = addrLen; - *type = MIB_IF_TYPE_ETHERNET; - ret = NO_ERROR; - } - } - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - - return ret; -} -#elif defined (HAVE_SYS_SYSCTL_H) && defined (HAVE_NET_IF_DL_H) -static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type) -{ - DWORD ret; - struct if_msghdr *ifm; - struct sockaddr_dl *sdl; - u_char *p, *buf; - size_t mibLen; - int mib[] = { CTL_NET, AF_ROUTE, 0, AF_LINK, NET_RT_IFLIST, 0 }; - unsigned addrLen; - BOOL found = FALSE; - - if (!name || !len || !addr || !type) - return ERROR_INVALID_PARAMETER; - - if (sysctl(mib, 6, NULL, &mibLen, NULL, 0) < 0) - return ERROR_NO_MORE_FILES; - - buf = HeapAlloc(GetProcessHeap(), 0, mibLen); - if (!buf) - return ERROR_NOT_ENOUGH_MEMORY; - - if (sysctl(mib, 6, buf, &mibLen, NULL, 0) < 0) { - HeapFree(GetProcessHeap(), 0, buf); - return ERROR_NO_MORE_FILES; - } - - ret = ERROR_INVALID_DATA; - for (p = buf; !found && p < buf + mibLen; p += ifm->ifm_msglen) { - ifm = (struct if_msghdr *)p; - sdl = (struct sockaddr_dl *)(ifm + 1); - - if (ifm->ifm_type != RTM_IFINFO || (ifm->ifm_addrs & RTA_IFP) == 0) - continue; - - if (sdl->sdl_family != AF_LINK || sdl->sdl_nlen == 0 || - memcmp(sdl->sdl_data, name, max(sdl->sdl_nlen, strlen(name))) != 0) - continue; - - found = TRUE; - addrLen = min(MAX_INTERFACE_PHYSADDR, sdl->sdl_alen); - if (addrLen > *len) { - ret = ERROR_INSUFFICIENT_BUFFER; - *len = addrLen; - } - else { - if (addrLen > 0) - memcpy(addr, LLADDR(sdl), addrLen); - /* zero out remaining bytes for broken implementations */ - memset(addr + addrLen, 0, *len - addrLen); - *len = addrLen; -#if defined(HAVE_NET_IF_TYPES_H) - switch (sdl->sdl_type) - { - case IFT_ETHER: - *type = MIB_IF_TYPE_ETHERNET; - break; - case IFT_FDDI: - *type = MIB_IF_TYPE_FDDI; - break; - case IFT_ISO88024: /* Token Bus */ - *type = MIB_IF_TYPE_TOKENRING; - break; - case IFT_ISO88025: /* Token Ring */ - *type = MIB_IF_TYPE_TOKENRING; - break; - case IFT_PPP: - *type = MIB_IF_TYPE_PPP; - break; - case IFT_SLIP: - *type = MIB_IF_TYPE_SLIP; - break; - case IFT_LOOP: - *type = MIB_IF_TYPE_LOOPBACK; - break; - default: - *type = MIB_IF_TYPE_OTHER; - } -#else - /* default if we don't know */ - *type = MIB_IF_TYPE_ETHERNET; -#endif - ret = NO_ERROR; - } - } - HeapFree(GetProcessHeap(), 0, buf); - return ret; -} -#endif - -DWORD getInterfacePhysicalByIndex(IF_INDEX index, PDWORD len, PBYTE addr, - PDWORD type) -{ - char nameBuf[IF_NAMESIZE]; - char *name = getInterfaceNameByIndex(index, nameBuf); - - if (name) - return getInterfacePhysicalByName(name, len, addr, type); - else - return ERROR_INVALID_DATA; -} - -DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) -{ - DWORD ret; - int fd; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!mtu) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if ((ioctl(fd, SIOCGIFMTU, &ifr))) - ret = ERROR_INVALID_DATA; - else { -#ifndef __sun - *mtu = ifr.ifr_mtu; -#else - *mtu = ifr.ifr_metric; -#endif - ret = NO_ERROR; - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - return ret; -} - -DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) -{ - DWORD ret; - int fd; - - if (!name) - return ERROR_INVALID_PARAMETER; - if (!status) - return ERROR_INVALID_PARAMETER; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - struct ifreq ifr; - - lstrcpynA(ifr.ifr_name, name, IFNAMSIZ); - if ((ioctl(fd, SIOCGIFFLAGS, &ifr))) - ret = ERROR_INVALID_DATA; - else { - if (ifr.ifr_flags & IFF_UP) - *status = MIB_IF_OPER_STATUS_OPERATIONAL; - else - *status = MIB_IF_OPER_STATUS_NON_OPERATIONAL; - ret = NO_ERROR; - } - close(fd); - } - else - ret = ERROR_NO_MORE_FILES; - return ret; -} - -static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, - const struct sockaddr *sa) -{ - DWORD ret, bcast; - - ret = getInterfaceIndexByName(ifName, &ipAddrRow->dwIndex); - memcpy(&ipAddrRow->dwAddr, sa->sa_data + 2, sizeof(DWORD)); - ipAddrRow->dwMask = getInterfaceMaskByName(ifName); - /* the dwBCastAddr member isn't the broadcast address, it indicates whether - * the interface uses the 1's broadcast address (1) or the 0's broadcast - * address (0). - */ - bcast = getInterfaceBCastAddrByName(ifName); - ipAddrRow->dwBCastAddr = (bcast & ipAddrRow->dwMask) ? 1 : 0; - /* FIXME: hardcoded reasm size, not sure where to get it */ - ipAddrRow->dwReasmSize = 65535; - ipAddrRow->unused1 = 0; - /* wType is a bit field composed of MIB_IPADDR_* flags. Windows <= XP seems - * to like returning undocumented values 0x20 + 0x02 but for our current - * needs returning MIB_IPADDR_PRIMARY is enough. - */ - ipAddrRow->wType = MIB_IPADDR_PRIMARY; - return ret; -} - -#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) - -/* Counts the IPv4 addresses in the system using the return value from - * getifaddrs, returning the count. - */ -static DWORD countIPv4Addresses(struct ifaddrs *ifa) -{ - DWORD numAddresses = 0; - - for (; ifa; ifa = ifa->ifa_next) - if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) - numAddresses++; - return numAddresses; -} - -DWORD getNumIPAddresses(void) -{ - DWORD numAddresses = 0; - struct ifaddrs *ifa; - - if (!getifaddrs(&ifa)) - { - numAddresses = countIPv4Addresses(ifa); - freeifaddrs(ifa); - } - return numAddresses; -} - -DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) -{ - DWORD ret; - - if (!ppIpAddrTable) - ret = ERROR_INVALID_PARAMETER; - else - { - struct ifaddrs *ifa; - - if (!getifaddrs(&ifa)) - { - DWORD size = sizeof(MIB_IPADDRTABLE); - DWORD numAddresses = countIPv4Addresses(ifa); - - if (numAddresses > 1) - size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); - *ppIpAddrTable = HeapAlloc(heap, flags, size); - if (*ppIpAddrTable) - { - DWORD i = 0; - struct ifaddrs *ifp; - - ret = NO_ERROR; - (*ppIpAddrTable)->dwNumEntries = numAddresses; - for (ifp = ifa; !ret && ifp; ifp = ifp->ifa_next) - { - if (!ifp->ifa_addr || ifp->ifa_addr->sa_family != AF_INET) - continue; - - ret = getIPAddrRowByName(&(*ppIpAddrTable)->table[i], ifp->ifa_name, - ifp->ifa_addr); - i++; - } - if (ret) - HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); - } - else - ret = ERROR_OUTOFMEMORY; - freeifaddrs(ifa); - } - else - ret = ERROR_INVALID_PARAMETER; - } - return ret; -} - -ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) -{ - struct ifaddrs *ifa; - ULONG ret; - - if (!getifaddrs(&ifa)) - { - struct ifaddrs *p; - ULONG n; - char name[IFNAMSIZ]; - - getInterfaceNameByIndex(index, name); - for (p = ifa, n = 0; p; p = p->ifa_next) - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - n++; - if (n) - { - *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + - sizeof(struct WS_sockaddr_in6))); - *masks = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + - sizeof(struct WS_sockaddr_in6))); - if (*addrs && *masks) - { - struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( - (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); - struct WS_sockaddr_in6 *mask_addr = (struct WS_sockaddr_in6 *)( - (BYTE *)*masks + n * sizeof(SOCKET_ADDRESS)); - - for (p = ifa, n = 0; p; p = p->ifa_next) - { - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - { - struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; - struct sockaddr_in6 *mask = (struct sockaddr_in6 *)p->ifa_netmask; - - next_addr->sin6_family = WS_AF_INET6; - next_addr->sin6_port = addr->sin6_port; - next_addr->sin6_flowinfo = addr->sin6_flowinfo; - memcpy(&next_addr->sin6_addr, &addr->sin6_addr, - sizeof(next_addr->sin6_addr)); - next_addr->sin6_scope_id = addr->sin6_scope_id; - (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; - (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); - next_addr++; - - mask_addr->sin6_family = WS_AF_INET6; - mask_addr->sin6_port = mask->sin6_port; - mask_addr->sin6_flowinfo = mask->sin6_flowinfo; - memcpy(&mask_addr->sin6_addr, &mask->sin6_addr, - sizeof(mask_addr->sin6_addr)); - mask_addr->sin6_scope_id = mask->sin6_scope_id; - (*masks)[n].lpSockaddr = (LPSOCKADDR)mask_addr; - (*masks)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); - mask_addr++; - n++; - } - } - *num_addrs = n; - ret = ERROR_SUCCESS; - } - else - { - HeapFree(GetProcessHeap(), 0, *addrs); - HeapFree(GetProcessHeap(), 0, *masks); - ret = ERROR_OUTOFMEMORY; - } - } - else - { - *addrs = NULL; - *num_addrs = 0; - *masks = NULL; - ret = ERROR_SUCCESS; - } - freeifaddrs(ifa); - } - else - ret = ERROR_NO_DATA; - return ret; -} - -#else - -/* Enumerates the IP addresses in the system using SIOCGIFCONF, returning - * the count to you in *pcAddresses. It also returns to you the struct ifconf - * used by the call to ioctl, so that you may process the addresses further. - * Free ifc->ifc_buf using HeapFree. - * Returns NO_ERROR on success, something else on failure. - */ -static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc) -{ - DWORD ret; - int fd; - - fd = socket(PF_INET, SOCK_DGRAM, 0); - if (fd != -1) { - int ioctlRet = 0; - DWORD guessedNumAddresses = 0, numAddresses = 0; - caddr_t ifPtr; - int lastlen; - - ret = NO_ERROR; - ifc->ifc_len = 0; - ifc->ifc_buf = NULL; - /* there is no way to know the interface count beforehand, - so we need to loop again and again upping our max each time - until returned is constant across 2 calls */ - do { - lastlen = ifc->ifc_len; - HeapFree(GetProcessHeap(), 0, ifc->ifc_buf); - if (guessedNumAddresses == 0) - guessedNumAddresses = INITIAL_INTERFACES_ASSUMED; - else - guessedNumAddresses *= 2; - ifc->ifc_len = sizeof(struct ifreq) * guessedNumAddresses; - ifc->ifc_buf = HeapAlloc(GetProcessHeap(), 0, ifc->ifc_len); - ioctlRet = ioctl(fd, SIOCGIFCONF, ifc); - } while ((ioctlRet == 0) && (ifc->ifc_len != lastlen)); - - if (ioctlRet == 0) { - ifPtr = ifc->ifc_buf; - while (ifPtr && (char *)ifPtr < ifc->ifc_buf + ifc->ifc_len) { - struct ifreq *ifr = (struct ifreq *)ifPtr; - - if (ifr->ifr_addr.sa_family == AF_INET) - numAddresses++; - - ifPtr = (char *)ifPtr + ifreq_len((struct ifreq *)ifPtr); - } - } - else - ret = ERROR_INVALID_PARAMETER; /* FIXME: map from errno to Win32 */ - if (!ret) - *pcAddresses = numAddresses; - else - { - HeapFree(GetProcessHeap(), 0, ifc->ifc_buf); - ifc->ifc_buf = NULL; - } - close(fd); - } - else - ret = ERROR_NO_SYSTEM_RESOURCES; - return ret; -} - -DWORD getNumIPAddresses(void) -{ - DWORD numAddresses = 0; - struct ifconf ifc; - - if (!enumIPAddresses(&numAddresses, &ifc)) - HeapFree(GetProcessHeap(), 0, ifc.ifc_buf); - return numAddresses; -} - -DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) -{ - DWORD ret; - - if (!ppIpAddrTable) - ret = ERROR_INVALID_PARAMETER; - else - { - DWORD numAddresses = 0; - struct ifconf ifc; - - ret = enumIPAddresses(&numAddresses, &ifc); - if (!ret) - { - DWORD size = sizeof(MIB_IPADDRTABLE); - - if (numAddresses > 1) - size += (numAddresses - 1) * sizeof(MIB_IPADDRROW); - *ppIpAddrTable = HeapAlloc(heap, flags, size); - if (*ppIpAddrTable) { - DWORD i = 0; - caddr_t ifPtr; - - ret = NO_ERROR; - (*ppIpAddrTable)->dwNumEntries = numAddresses; - ifPtr = ifc.ifc_buf; - while (!ret && ifPtr && (char *)ifPtr < ifc.ifc_buf + ifc.ifc_len) { - struct ifreq *ifr = (struct ifreq *)ifPtr; - - ifPtr = (char *)ifPtr + ifreq_len(ifr); - - if (ifr->ifr_addr.sa_family != AF_INET) - continue; - - ret = getIPAddrRowByName(&(*ppIpAddrTable)->table[i], ifr->ifr_name, - &ifr->ifr_addr); - i++; - } - if (ret) - HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); - } - else - ret = ERROR_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, ifc.ifc_buf); - } - } - return ret; -} - -ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, SOCKET_ADDRESS **masks) -{ - *addrs = NULL; - *num_addrs = 0; - *masks = NULL; - return ERROR_SUCCESS; -} - -#endif diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index d0143eaaf69..710b493ad36 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -44,8 +44,6 @@ #define MAX_INTERFACE_PHYSADDR 8 #define MAX_INTERFACE_DESCRIPTION 256 -BOOL isIfIndexLoopback(ULONG idx) DECLSPEC_HIDDEN; - /* A table of interface indexes, see get_interface_indices(). */ typedef struct _InterfaceIndexTable { DWORD numIndexes; @@ -59,50 +57,10 @@ DWORD get_interface_indices( BOOL skip_loopback, InterfaceIndexTable **table ) D /* ByName/ByIndex versions of various getter functions. */ -/* can be used as quick check to see if you've got a valid index, returns NULL - * if not. Overwrites your buffer, which should be at least of size - * MAX_ADAPTER_NAME. - */ -char *getInterfaceNameByIndex(IF_INDEX index, char *name) DECLSPEC_HIDDEN; - /* Fills index with the index of name, if found. Returns * ERROR_INVALID_PARAMETER if name or index is NULL, ERROR_INVALID_DATA if name * is not found, and NO_ERROR on success. */ DWORD getInterfaceIndexByName(const char *name, IF_INDEX *index) DECLSPEC_HIDDEN; -/* Gets a few physical characteristics of a device: MAC addr len, MAC addr, - * and type as one of the MIB_IF_TYPEs. - * len's in-out: on in, needs to say how many bytes are available in addr, - * which to be safe should be MAX_INTERFACE_PHYSADDR. On out, it's how many - * bytes were set, or how many were required if addr isn't big enough. - * Returns ERROR_INVALID_PARAMETER if name, len, addr, or type is NULL. - * Returns ERROR_INVALID_DATA if name/index isn't valid. - * Returns ERROR_INSUFFICIENT_BUFFER if addr isn't large enough for the - * physical address; *len will contain the required size. - * May return other errors, e.g. ERROR_OUTOFMEMORY or ERROR_NO_MORE_FILES, - * if internal errors occur. - * Returns NO_ERROR on success. - */ -DWORD getInterfacePhysicalByIndex(IF_INDEX index, PDWORD len, PBYTE addr, - PDWORD type) DECLSPEC_HIDDEN; - -DWORD getNumIPAddresses(void) DECLSPEC_HIDDEN; - -/* Gets the configured IP addresses for the system, and sets *ppIpAddrTable to - * a table of them allocated from heap, or NULL if out of memory. Returns - * NO_ERROR on success, something else on failure. Note there may be more than - * one IP address may exist per interface. - */ -DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) DECLSPEC_HIDDEN; - -/* Returns the IPv6 addresses for a particular interface index. - * Returns NO_ERROR on success, something else on failure. - */ -ULONG v6addressesFromIndex(IF_INDEX index, SOCKET_ADDRESS **addrs, ULONG *num_addrs, - SOCKET_ADDRESS **masks) DECLSPEC_HIDDEN; - -DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; -DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; - #endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 22e17e06757..2700ecd3172 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -109,6 +109,15 @@ DWORD WINAPI ConvertStringToGuidW( const WCHAR *str, GUID *guid ) return RtlNtStatusToDosError( RtlGUIDFromString( &ustr, guid ) ); } +static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) +{ + unsigned int copy = src->Length; + + if (copy >= len * sizeof(WCHAR)) copy = 0; + memcpy( dst, src->String, copy ); + memset( (char *)dst + copy, 0, len * sizeof(WCHAR) - copy ); +} + /****************************************************************** * AddIPAddress (IPHLPAPI.@) * @@ -913,129 +922,6 @@ void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *s } } -static DWORD typeFromMibType(DWORD mib_type) -{ - switch (mib_type) - { - case MIB_IF_TYPE_ETHERNET: return IF_TYPE_ETHERNET_CSMACD; - case MIB_IF_TYPE_TOKENRING: return IF_TYPE_ISO88025_TOKENRING; - case MIB_IF_TYPE_PPP: return IF_TYPE_PPP; - case MIB_IF_TYPE_LOOPBACK: return IF_TYPE_SOFTWARE_LOOPBACK; - default: return IF_TYPE_OTHER; - } -} - -static NET_IF_CONNECTION_TYPE connectionTypeFromMibType(DWORD mib_type) -{ - switch (mib_type) - { - case MIB_IF_TYPE_PPP: return NET_IF_CONNECTION_DEMAND; - case MIB_IF_TYPE_SLIP: return NET_IF_CONNECTION_DEMAND; - default: return NET_IF_CONNECTION_DEDICATED; - } -} - -static ULONG v4addressesFromIndex(IF_INDEX index, DWORD **addrs, ULONG *num_addrs, DWORD **masks) -{ - ULONG ret, i, j; - MIB_IPADDRTABLE *at; - - *num_addrs = 0; - if ((ret = getIPAddrTable(&at, GetProcessHeap(), 0))) return ret; - for (i = 0; i < at->dwNumEntries; i++) - { - if (at->table[i].dwIndex == index) (*num_addrs)++; - } - if (!(*addrs = HeapAlloc(GetProcessHeap(), 0, *num_addrs * sizeof(DWORD)))) - { - HeapFree(GetProcessHeap(), 0, at); - return ERROR_OUTOFMEMORY; - } - if (!(*masks = HeapAlloc(GetProcessHeap(), 0, *num_addrs * sizeof(DWORD)))) - { - HeapFree(GetProcessHeap(), 0, *addrs); - HeapFree(GetProcessHeap(), 0, at); - return ERROR_OUTOFMEMORY; - } - for (i = 0, j = 0; i < at->dwNumEntries; i++) - { - if (at->table[i].dwIndex == index) - { - (*addrs)[j] = at->table[i].dwAddr; - (*masks)[j] = at->table[i].dwMask; - j++; - } - } - HeapFree(GetProcessHeap(), 0, at); - return ERROR_SUCCESS; -} - -static char *debugstr_ipv4(const in_addr_t *in_addr, char *buf) -{ - const BYTE *addrp; - char *p = buf; - - for (addrp = (const BYTE *)in_addr; - addrp - (const BYTE *)in_addr < sizeof(*in_addr); - addrp++) - { - if (addrp == (const BYTE *)in_addr + sizeof(*in_addr) - 1) - sprintf(p, "%d", *addrp); - else - p += sprintf(p, "%d.", *addrp); - } - return buf; -} - -static ULONG count_v4_gateways(DWORD index, PMIB_IPFORWARDTABLE routeTable) -{ - DWORD i, num_gateways = 0; - - for (i = 0; i < routeTable->dwNumEntries; i++) - { - if (routeTable->table[i].dwForwardIfIndex == index && - routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) - num_gateways++; - } - return num_gateways; -} - -static DWORD mask_v4_to_prefix(DWORD m) -{ -#ifdef HAVE___BUILTIN_POPCOUNT - return __builtin_popcount(m); -#else - m -= m >> 1 & 0x55555555; - m = (m & 0x33333333) + (m >> 2 & 0x33333333); - return ((m + (m >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; -#endif -} - -static DWORD mask_v6_to_prefix(SOCKET_ADDRESS *m) -{ - const IN6_ADDR *mask = &((struct WS_sockaddr_in6 *)m->lpSockaddr)->sin6_addr; - DWORD ret = 0, i; - - for (i = 0; i < 8; i++) - ret += mask_v4_to_prefix(mask->u.Word[i]); - return ret; -} - -static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, - PMIB_IPFORWARDTABLE routeTable) -{ - DWORD i; - PMIB_IPFORWARDROW row = NULL; - - for (i = 0; !row && i < routeTable->dwNumEntries; i++) - { - if (routeTable->table[i].dwForwardIfIndex == index && - routeTable->table[i].u1.ForwardType == MIB_IPROUTE_TYPE_INDIRECT) - row = &routeTable->table[i]; - } - return row; -} - static BOOL sockaddr_is_loopback( SOCKADDR *sock ) { if (sock->sa_family == WS_AF_INET) @@ -1067,308 +953,211 @@ static BOOL unicast_is_dns_eligible( IP_ADAPTER_UNICAST_ADDRESS *uni ) !sockaddr_is_linklocal( uni->Address.lpSockaddr ); } -static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) +static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) { - /* Actually this information should be read somewhere from the system - * but it doesn't matter much for the bugs found so far. - * This information is required for DirectPlay8 games. */ - if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK) - { - ua->PrefixOrigin = IpPrefixOriginDhcp; - ua->SuffixOrigin = IpSuffixOriginDhcp; - } - else - { - ua->PrefixOrigin = IpPrefixOriginManual; - ua->SuffixOrigin = IpSuffixOriginManual; - } - - /* The address is not duplicated in the network */ - ua->DadState = IpDadStatePreferred; - - /* Some address life time values, required even for non-dhcp addresses */ - ua->ValidLifetime = 60000; - ua->PreferredLifetime = 60000; - ua->LeaseLifetime = 60000; - - if (unicast_is_dns_eligible( ua )) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; -} - -static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, - IP_ADAPTER_ADDRESSES *aa, char **ptr) -{ - ULONG ret = ERROR_SUCCESS, i, j, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0; - DWORD *v4addrs = NULL, *v4masks = NULL; - SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; - PMIB_IPFORWARDTABLE routeTable = NULL; - BOOL output_gateways; - char name[IF_NAMESIZE], *src; - WCHAR *dst; - DWORD buflen, type; - INTERNAL_IF_OPER_STATUS status; - NET_LUID luid; - GUID guid; + struct nsi_ipv4_unicast_key *key4; + struct nsi_ipv6_unicast_key *key6; + struct nsi_ip_unicast_rw *rw; + struct nsi_ip_unicast_dynamic *dyn; + struct nsi_ip_unicast_static *stat; + IP_ADAPTER_UNICAST_ADDRESS *addr, **next; + DWORD err, count, i, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + NET_LUID *luid; + void *key; - if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (ret) return ret; - num_v4_gateways = count_v4_gateways(index, routeTable); - } - output_gateways = (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) && (family == WS_AF_INET || family == WS_AF_UNSPEC); + err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_UNICAST_TABLE, &key, key_size, + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; - if (family == WS_AF_INET) - { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - } - else if (family == WS_AF_INET6) - { - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); - } - else if (family == WS_AF_UNSPEC) - { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - if (!ret) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); - } - else - { - FIXME("address family %u unsupported\n", family); - ret = ERROR_NO_DATA; - } - if (ret) - { - HeapFree(GetProcessHeap(), 0, v4addrs); - HeapFree(GetProcessHeap(), 0, v4masks); - HeapFree(GetProcessHeap(), 0, v6addrs); - HeapFree(GetProcessHeap(), 0, v6masks); - HeapFree(GetProcessHeap(), 0, routeTable); - return ret; - } - if (1) + while (aa) { - memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); - aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); - aa->u.s.IfIndex = index; - - ConvertInterfaceIndexToLuid(index, &luid); - ConvertInterfaceLuidToGuid(&luid, &guid); - ConvertGuidToStringA( &guid, *ptr, CHARS_IN_GUID ); - aa->AdapterName = *ptr; - *ptr += (CHARS_IN_GUID + 1) & ~1; + for (next = &aa->FirstUnicastAddress; *next; next = &(*next)->Next) + ; - getInterfaceNameByIndex(index, name); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - { - aa->FriendlyName = (WCHAR *)*ptr; - for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) - *dst = *src; - *dst++ = 0; - *ptr = (char *)dst; - } - aa->Description = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) - *dst = *src; - *dst++ = 0; - *ptr = (char *)dst; - - TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, - num_v6addrs); - - buflen = MAX_INTERFACE_PHYSADDR; - getInterfacePhysicalByIndex(index, &buflen, aa->PhysicalAddress, &type); - aa->PhysicalAddressLength = buflen; - aa->IfType = typeFromMibType(type); - aa->ConnectionType = connectionTypeFromMibType(type); - ConvertInterfaceIndexToLuid( index, &aa->Luid ); - - if (output_gateways && num_v4_gateways) - { - PMIB_IPFORWARDROW adapterRow; - - if ((adapterRow = findIPv4Gateway(index, routeTable))) - { - PIP_ADAPTER_GATEWAY_ADDRESS gw; - PSOCKADDR_IN sin; - - gw = heap_alloc( sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN) ); - aa->FirstGatewayAddress = gw; - - gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); - sin = (PSOCKADDR_IN)(gw + 1); - sin->sin_family = WS_AF_INET; - sin->sin_port = 0; - memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, - sizeof(DWORD)); - gw->Address.lpSockaddr = (LPSOCKADDR)sin; - gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); - gw->Next = NULL; - } - } - if (num_v4addrs && !(flags & GAA_FLAG_SKIP_UNICAST)) + for (i = 0; i < count; i++) { - IP_ADAPTER_UNICAST_ADDRESS *ua; - struct WS_sockaddr_in *sa; - aa->u1.s1.Ipv4Enabled = TRUE; - ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); - for (i = 0; i < num_v4addrs; i++) + key4 = (struct nsi_ipv4_unicast_key *)key + i; + key6 = (struct nsi_ipv6_unicast_key *)key + i; + luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + if (luid->Value != aa->Luid.Value) continue; + addr = heap_alloc_zero( sizeof(*addr) + sockaddr_size ); + if (!addr) { - char addr_buf[16]; - - memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); - ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); - ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); - ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - - sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; - sa->sin_family = WS_AF_INET; - sa->sin_addr.S_un.S_addr = v4addrs[i]; - sa->sin_port = 0; - TRACE("IPv4 %d/%d: %s\n", i + 1, num_v4addrs, - debugstr_ipv4(&sa->sin_addr.S_un.S_addr, addr_buf)); - fill_unicast_addr_data(aa, ua); - - ua->OnLinkPrefixLength = mask_v4_to_prefix(v4masks[i]); - - if (i < num_v4addrs - 1) - { - ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); - ua = ua->Next; - } + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } - } - if (num_v6addrs && !(flags & GAA_FLAG_SKIP_UNICAST)) - { - IP_ADAPTER_UNICAST_ADDRESS *ua; - struct WS_sockaddr_in6 *sa; - - aa->u1.s1.Ipv6Enabled = TRUE; - if (aa->FirstUnicastAddress) + addr->u.s.Length = sizeof(*addr); + addr->Address.lpSockaddr = (SOCKADDR *)(addr + 1); + addr->Address.iSockaddrLength = sockaddr_size; + addr->Address.lpSockaddr->sa_family = family; + if (family == WS_AF_INET) { - for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) - ; - ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); - ua = ua->Next; + SOCKADDR_IN *in = (SOCKADDR_IN *)addr->Address.lpSockaddr; + in->sin_addr = key4->addr; } else - ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); - for (i = 0; i < num_v6addrs; i++) { - char addr_buf[46]; - - memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); - ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); - ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; - ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - - sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; - memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); - TRACE("IPv6 %d/%d: %s\n", i + 1, num_v6addrs, - debugstr_ipv6(sa, addr_buf)); - fill_unicast_addr_data(aa, ua); - - ua->OnLinkPrefixLength = mask_v6_to_prefix(&v6masks[i]); - - if (i < num_v6addrs - 1) - { - ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); - ua = ua->Next; - } + SOCKADDR_IN6 *in6 = (SOCKADDR_IN6 *)addr->Address.lpSockaddr; + in6->sin6_addr = key6->addr; + in6->sin6_scope_id = dyn[i].scope_id; } + addr->PrefixOrigin = rw[i].prefix_origin; + addr->SuffixOrigin = rw[i].suffix_origin; + addr->DadState = dyn[i].dad_state; + addr->ValidLifetime = rw[i].valid_lifetime; + addr->PreferredLifetime = rw[i].preferred_lifetime; + addr->LeaseLifetime = rw[i].valid_lifetime; /* FIXME */ + addr->OnLinkPrefixLength = rw[i].on_link_prefix; + if (unicast_is_dns_eligible( addr )) addr->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; + + *next = addr; + next = &addr->Next; } - if (num_v4addrs && (flags & GAA_FLAG_INCLUDE_PREFIX)) - { - IP_ADAPTER_PREFIX *prefix; + aa = aa->Next; + } - prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); - for (i = 0; i < num_v4addrs; i++) - { - char addr_buf[16]; - struct WS_sockaddr_in *sa; +err: + NsiFreeTable( key, rw, dyn, stat ); + return err; +} - prefix->u.s.Length = sizeof(*prefix); - prefix->u.s.Flags = 0; - prefix->Next = NULL; - prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in); - prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); +static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) +{ + struct nsi_ipv4_forward_key *key4; + struct nsi_ipv6_forward_key *key6; + IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; + IP_ADAPTER_PREFIX *prefix, **prefix_next; + DWORD err, count, i, prefix_len, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + SOCKADDR_INET sockaddr; + NET_LUID *luid; + void *key; - sa = (struct WS_sockaddr_in *)prefix->Address.lpSockaddr; - sa->sin_family = WS_AF_INET; - sa->sin_addr.S_un.S_addr = v4addrs[i] & v4masks[i]; - sa->sin_port = 0; + err = NsiAllocateAndGetTable( 1, ip_module_id( family ), NSI_IP_FORWARD_TABLE, &key, key_size, + NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + if (err) return err; - prefix->PrefixLength = mask_v4_to_prefix(v4masks[i]); + while (aa) + { + for (gw_next = &aa->FirstGatewayAddress; *gw_next; gw_next = &(*gw_next)->Next) + ; + for (prefix_next = &aa->FirstPrefix; *prefix_next; prefix_next = &(*prefix_next)->Next) + ; - TRACE("IPv4 network: %s/%u\n", - debugstr_ipv4((const in_addr_t *)&sa->sin_addr.S_un.S_addr, addr_buf), - prefix->PrefixLength); + for (i = 0; i < count; i++) + { + key4 = (struct nsi_ipv4_forward_key *)key + i; + key6 = (struct nsi_ipv6_forward_key *)key + i; + luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + if (luid->Value != aa->Luid.Value) continue; - if (i < num_v4addrs - 1) + if (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) + { + memset( &sockaddr, 0, sizeof(sockaddr) ); + if (family == WS_AF_INET) { - prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); - prefix = prefix->Next; + if (key4->next_hop.WS_s_addr != 0) + { + sockaddr.si_family = family; + sockaddr.Ipv4.sin_addr = key4->next_hop; + } + } + else + { + static const IN6_ADDR zero; + if (memcmp( &key6->next_hop, &zero, sizeof(zero) )) + { + sockaddr.si_family = family; + sockaddr.Ipv6.sin6_addr = key6->next_hop; + } } - } - } - if (num_v6addrs && (flags & GAA_FLAG_INCLUDE_PREFIX)) - { - IP_ADAPTER_PREFIX *prefix; - if (aa->FirstPrefix) - { - for (prefix = aa->FirstPrefix; prefix->Next; prefix = prefix->Next) - ; - prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); - prefix = prefix->Next; + if (sockaddr.si_family) + { + gw = heap_alloc_zero( sizeof(*gw) + sockaddr_size ); + if (!gw) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + gw->u.s.Length = sizeof(*gw); + gw->Address.lpSockaddr = (SOCKADDR *)(gw + 1); + gw->Address.iSockaddrLength = sockaddr_size; + memcpy( gw->Address.lpSockaddr, &sockaddr, sockaddr_size ); + *gw_next = gw; + gw_next = &gw->Next; + } } - else - prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); - for (i = 0; i < num_v6addrs; i++) + + if (flags & GAA_FLAG_INCLUDE_PREFIX) { - char addr_buf[46]; - struct WS_sockaddr_in6 *sa; - const IN6_ADDR *addr, *mask; - - prefix->u.s.Length = sizeof(*prefix); - prefix->u.s.Flags = 0; - prefix->Next = NULL; - prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in6); - prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); - - sa = (struct WS_sockaddr_in6 *)prefix->Address.lpSockaddr; - sa->sin6_family = WS_AF_INET6; - sa->sin6_port = 0; - sa->sin6_flowinfo = 0; - addr = &((struct WS_sockaddr_in6 *)v6addrs[i].lpSockaddr)->sin6_addr; - mask = &((struct WS_sockaddr_in6 *)v6masks[i].lpSockaddr)->sin6_addr; - for (j = 0; j < 8; j++) sa->sin6_addr.u.Word[j] = addr->u.Word[j] & mask->u.Word[j]; - sa->sin6_scope_id = 0; - - prefix->PrefixLength = mask_v6_to_prefix(&v6masks[i]); - - TRACE("IPv6 network: %s/%u\n", debugstr_ipv6(sa, addr_buf), prefix->PrefixLength); - - if (i < num_v6addrs - 1) + memset( &sockaddr, 0, sizeof(sockaddr) ); + if (family == WS_AF_INET) + { + if (!key4->next_hop.WS_s_addr) + { + sockaddr.si_family = family; + sockaddr.Ipv4.sin_addr = key4->prefix; + prefix_len = key4->prefix_len; + } + } + else { - prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); - prefix = prefix->Next; + static const IN6_ADDR zero; + if (!memcmp( &key6->next_hop, &zero, sizeof(zero) )) + { + sockaddr.si_family = family; + sockaddr.Ipv6.sin6_addr = key6->prefix; + prefix_len = key6->prefix_len; + } + } + + if (sockaddr.si_family) + { + prefix = heap_alloc_zero( sizeof(*prefix) + sockaddr_size ); + if (!prefix) + { + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; + } + prefix->u.s.Length = sizeof(*prefix); + prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); + prefix->Address.iSockaddrLength = sockaddr_size; + memcpy( prefix->Address.lpSockaddr, &sockaddr, sockaddr_size ); + prefix->PrefixLength = prefix_len; + *prefix_next = prefix; + prefix_next = &prefix->Next; } } } + aa = aa->Next; + } - getInterfaceMtuByName(name, &aa->Mtu); +err: + NsiFreeTable( key, NULL, NULL, NULL ); + return err; +} - getInterfaceStatusByName(name, &status); - if (status == MIB_IF_OPER_STATUS_OPERATIONAL) aa->OperStatus = IfOperStatusUp; - else if (status == MIB_IF_OPER_STATUS_NON_OPERATIONAL) aa->OperStatus = IfOperStatusDown; - else aa->OperStatus = IfOperStatusUnknown; +static DWORD call_families( DWORD (*fn)( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ), + IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) +{ + DWORD err; + + if (family != WS_AF_INET) + { + err = fn( aa, WS_AF_INET6, flags ); + if (err) return err; } - HeapFree(GetProcessHeap(), 0, routeTable); - HeapFree(GetProcessHeap(), 0, v6addrs); - HeapFree(GetProcessHeap(), 0, v6masks); - HeapFree(GetProcessHeap(), 0, v4addrs); - HeapFree(GetProcessHeap(), 0, v4masks); - return ERROR_SUCCESS; + + if (family != WS_AF_INET6) + { + err = fn( aa, WS_AF_INET, flags ); + if (err) return err; + } + return err; } static DWORD dns_servers_query_code( ULONG family ) @@ -1461,20 +1250,21 @@ err: static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) { IP_ADAPTER_ADDRESSES *aa; + NET_LUID *luids; + struct nsi_ndis_ifinfo_rw *rw; + struct nsi_ndis_ifinfo_dynamic *dyn; + struct nsi_ndis_ifinfo_static *stat; DWORD err, i, count, needed; + GUID guid; char *str_ptr; - InterfaceIndexTable *table; - get_interface_indices( FALSE, &table ); - if (!table || !table->numIndexes) - { - HeapFree(GetProcessHeap(), 0, table); - return ERROR_NO_DATA; - } - count = table->numIndexes; + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luids, sizeof(*luids), + (void **)&rw, sizeof(*rw), (void **)&dyn, sizeof(*dyn), + (void **)&stat, sizeof(*stat), &count, 0 ); + if (err) return err; - needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(IF_COUNTED_STRING)); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(IF_COUNTED_STRING); + needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(stat->descr.String)); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(rw->alias.String); aa = heap_alloc_zero( needed ); if (!aa) @@ -1486,18 +1276,52 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD str_ptr = (char *)(aa + count); for (i = 0; i < count; i++) { - if ((err = adapterAddressesFromIndex(family, flags, table->indexes[i], aa + i, &str_ptr))) + aa[i].u.s.Length = sizeof(*aa); + aa[i].u.s.IfIndex = stat[i].if_index; + if (i < count - 1) aa[i].Next = aa + i + 1; + ConvertInterfaceLuidToGuid( luids + i, &guid ); + ConvertGuidToStringA( &guid, str_ptr, CHARS_IN_GUID ); + aa[i].AdapterName = str_ptr; + str_ptr += (CHARS_IN_GUID + 1) & ~1; + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(stat[i].descr.String), &stat[i].descr ); + aa[i].Description = (WCHAR *)str_ptr; + str_ptr += sizeof(stat[i].descr.String); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) { - HeapFree(GetProcessHeap(), 0, table); - return err; + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); + aa[i].FriendlyName = (WCHAR *)str_ptr; + str_ptr += sizeof(rw[i].alias.String); } - if (i < count - 1) aa[i].Next = aa + i + 1; + aa[i].PhysicalAddressLength = rw->phys_addr.Length; + if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; + memcpy( aa[i].PhysicalAddress, rw->phys_addr.Address, aa[i].PhysicalAddressLength ); + aa[i].Mtu = dyn[i].mtu; + aa[i].IfType = stat[i].type; + aa[i].OperStatus = dyn[i].oper_status; + aa[i].TransmitLinkSpeed = dyn[i].xmit_speed; + aa[i].ReceiveLinkSpeed = dyn[i].rcv_speed; + aa[i].Luid = luids[i]; + aa[i].NetworkGuid = rw[i].network_guid; + aa[i].ConnectionType = stat[i].conn_type; + } + + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + { + err = call_families( unicast_addresses_alloc, aa, family, flags ); + if (err) goto err; + } + + if (flags & (GAA_FLAG_INCLUDE_ALL_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX)) + { + err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags ); + if (err) goto err; } err = dns_info_alloc( aa, family, flags ); + if (err) goto err; err: - HeapFree(GetProcessHeap(), 0, table); + NsiFreeTable( luids, rw, dyn, stat ); if (!err) *info = aa; else adapters_addresses_free( aa ); return err; @@ -1861,15 +1685,6 @@ err: return err; } -static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ) -{ - unsigned int copy = src->Length; - - if (copy >= len * sizeof(WCHAR)) copy = 0; - memcpy( dst, src->String, copy ); - memset( (char *)dst + copy, 0, len * sizeof(WCHAR) - copy ); -} - static void if_row2_fill( MIB_IF_ROW2 *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { -- 2.23.0

1 0

[PATCH 3/4] iphlpapi: Mark non-loopback, non-linklocal addresses as dns eligible.
by Huw Davies 09 Aug '21

09 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dbe4a12afe8..22e17e06757 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1036,6 +1036,37 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } +static BOOL sockaddr_is_loopback( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET) + { + SOCKADDR_IN *sin = (SOCKADDR_IN *)sock; + return (sin->sin_addr.WS_s_addr & 0xff) == 127; + } + else if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL sockaddr_is_linklocal( SOCKADDR *sock ) +{ + if (sock->sa_family == WS_AF_INET6) + { + SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; + return WS_IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); + } + return FALSE; +} + +static BOOL unicast_is_dns_eligible( IP_ADAPTER_UNICAST_ADDRESS *uni ) +{ + return !sockaddr_is_loopback( uni->Address.lpSockaddr ) && + !sockaddr_is_linklocal( uni->Address.lpSockaddr ); +} + static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ADDRESS *ua) { /* Actually this information should be read somewhere from the system @@ -1059,6 +1090,8 @@ static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ ua->ValidLifetime = 60000; ua->PreferredLifetime = 60000; ua->LeaseLifetime = 60000; + + if (unicast_is_dns_eligible( ua )) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; } static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, @@ -1186,8 +1219,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); - if (num_v4_gateways) - ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET; -- 2.23.0

1 0

[PATCH 2/4] iphlpapi: Rewrite GetAdaptersAddresses() to first alloc and then copy the info.
by Huw Davies 09 Aug '21

09 Aug '21

This refractoring is necessary to simplify implementing it on top of nsi. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 502 ++++++++++++++++++++-------------- 1 file changed, 300 insertions(+), 202 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6a934f926d1..dbe4a12afe8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -760,6 +760,159 @@ err: return err; } +static void address_entry_free( void *ptr, ULONG offset, void *ctxt ) +{ + heap_free( ptr ); +} + +static void address_entry_size( void *ptr, ULONG offset, void *ctxt ) +{ + IP_ADAPTER_DNS_SERVER_ADDRESS *src_addr = ptr; /* all list types are super-sets of this type */ + ULONG *total = (ULONG *)ctxt, align = sizeof(ULONGLONG) - 1; + + *total = (*total + src_addr->u.s.Length + src_addr->Address.iSockaddrLength + align) & ~align; +} + +struct address_entry_copy_params +{ + IP_ADAPTER_ADDRESSES *src, *dst; + char *ptr; + void *next; + ULONG cur_offset; +}; + +static void address_entry_copy( void *ptr, ULONG offset, void *ctxt ) +{ + struct address_entry_copy_params *params = ctxt; + IP_ADAPTER_DNS_SERVER_ADDRESS *src_addr = ptr; /* all list types are super-sets of this type */ + IP_ADAPTER_DNS_SERVER_ADDRESS *dst_addr = (IP_ADAPTER_DNS_SERVER_ADDRESS *)params->ptr; + ULONG align = sizeof(ULONGLONG) - 1; + + memcpy( dst_addr, src_addr, src_addr->u.s.Length ); + params->ptr += src_addr->u.s.Length; + dst_addr->Address.lpSockaddr = (SOCKADDR *)params->ptr; + memcpy( dst_addr->Address.lpSockaddr, src_addr->Address.lpSockaddr, src_addr->Address.iSockaddrLength ); + params->ptr += (src_addr->Address.iSockaddrLength + align) & ~align; + + if (params->cur_offset != offset) /* new list */ + { + params->next = (BYTE *)params->dst + offset; + params->cur_offset = offset; + } + *(IP_ADAPTER_DNS_SERVER_ADDRESS **)params->next = dst_addr; + params->next = &dst_addr->Next; +} + +static void address_lists_iterate( IP_ADAPTER_ADDRESSES *aa, void (*fn)(void *entry, ULONG offset, void *ctxt), void *ctxt ) +{ + IP_ADAPTER_UNICAST_ADDRESS *uni; + IP_ADAPTER_DNS_SERVER_ADDRESS *dns; + IP_ADAPTER_GATEWAY_ADDRESS *gw; + IP_ADAPTER_PREFIX *prefix; + void *next; + + for (uni = aa->FirstUnicastAddress; uni; uni = next) + { + next = uni->Next; + fn( uni, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstUnicastAddress ), ctxt ); + } + + for (dns = aa->FirstDnsServerAddress; dns; dns = next) + { + next = dns->Next; + fn( dns, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstDnsServerAddress ), ctxt ); + } + + for (gw = aa->FirstGatewayAddress; gw; gw = next) + { + next = gw->Next; + fn( gw, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstGatewayAddress ), ctxt ); + } + + for (prefix = aa->FirstPrefix; prefix; prefix = next) + { + next = prefix->Next; + fn( prefix, FIELD_OFFSET( IP_ADAPTER_ADDRESSES, FirstPrefix ), ctxt ); + } +} + +void adapters_addresses_free( IP_ADAPTER_ADDRESSES *info ) +{ + IP_ADAPTER_ADDRESSES *aa; + + for (aa = info; aa; aa = aa->Next) + { + address_lists_iterate( aa, address_entry_free, NULL ); + + heap_free( aa->DnsSuffix ); + } + heap_free( info ); +} + +ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) +{ + IP_ADAPTER_ADDRESSES *aa; + ULONG size = 0, align = sizeof(ULONGLONG) - 1; + + for (aa = info; aa; aa = aa->Next) + { + size += sizeof(*aa) + ((strlen( aa->AdapterName ) + 1 + 1) & ~1); + size += (strlenW( aa->Description ) + 1 + strlenW( aa->DnsSuffix ) + 1) * sizeof(WCHAR); + if (aa->FriendlyName) size += (strlenW(aa->FriendlyName) + 1) * sizeof(WCHAR); + size = (size + align) & ~align; + address_lists_iterate( aa, address_entry_size, &size ); + } + return size; +} + +void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) +{ + char *ptr; + DWORD len, align = sizeof(ULONGLONG) - 1; + struct address_entry_copy_params params; + + while (src) + { + ptr = (char *)(dst + 1); + *dst = *src; + dst->AdapterName = ptr; + len = strlen( src->AdapterName ) + 1; + memcpy( dst->AdapterName, src->AdapterName, len ); + ptr += (len + 1) & ~1; + dst->Description = (WCHAR *)ptr; + len = (strlenW( src->Description ) + 1) * sizeof(WCHAR); + memcpy( dst->Description, src->Description, len ); + ptr += len; + dst->DnsSuffix = (WCHAR *)ptr; + len = (strlenW( src->DnsSuffix ) + 1) * sizeof(WCHAR); + memcpy( dst->DnsSuffix, src->DnsSuffix, len ); + ptr += len; + if (src->FriendlyName) + { + dst->FriendlyName = (WCHAR *)ptr; + len = (strlenW( src->FriendlyName ) + 1) * sizeof(WCHAR); + memcpy( dst->FriendlyName, src->FriendlyName, len ); + ptr += len; + } + ptr = (char *)(((UINT_PTR)ptr + align) & ~align); + + params.src = src; + params.dst = dst; + params.ptr = ptr; + params.next = NULL; + params.cur_offset = ~0u; + address_lists_iterate( src, address_entry_copy, &params ); + ptr = params.ptr; + + if (src->Next) + { + dst->Next = (IP_ADAPTER_ADDRESSES *)ptr; + dst = dst->Next; + } + src = src->Next; + } +} + static DWORD typeFromMibType(DWORD mib_type) { switch (mib_type) @@ -909,13 +1062,19 @@ static void fill_unicast_addr_data(IP_ADAPTER_ADDRESSES *aa, IP_ADAPTER_UNICAST_ } static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index, - IP_ADAPTER_ADDRESSES *aa, ULONG *size) + IP_ADAPTER_ADDRESSES *aa, char **ptr) { - ULONG ret = ERROR_SUCCESS, i, j, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; + ULONG ret = ERROR_SUCCESS, i, j, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0; DWORD *v4addrs = NULL, *v4masks = NULL; SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; BOOL output_gateways; + char name[IF_NAMESIZE], *src; + WCHAR *dst; + DWORD buflen, type; + INTERNAL_IF_OPER_STATUS status; + NET_LUID luid; + GUID guid; if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) { @@ -953,61 +1112,32 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index return ret; } - total_size = sizeof(IP_ADAPTER_ADDRESSES); - total_size += CHARS_IN_GUID; - total_size += IF_NAMESIZE * sizeof(WCHAR); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - total_size += IF_NAMESIZE * sizeof(WCHAR); - if (flags & GAA_FLAG_INCLUDE_PREFIX) - { - total_size += sizeof(IP_ADAPTER_PREFIX) * num_v4addrs; - total_size += sizeof(IP_ADAPTER_PREFIX) * num_v6addrs; - total_size += sizeof(struct sockaddr_in) * num_v4addrs; - for (i = 0; i < num_v6addrs; i++) - total_size += v6masks[i].iSockaddrLength; - } - total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; - total_size += sizeof(struct sockaddr_in) * num_v4addrs; - if (output_gateways) - total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; - total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; - total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; - for (i = 0; i < num_v6addrs; i++) - total_size += v6addrs[i].iSockaddrLength; - - if (aa && *size >= total_size) - { - char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES), *src; - WCHAR *dst; - DWORD buflen, type; - INTERNAL_IF_OPER_STATUS status; - NET_LUID luid; - GUID guid; - + if (1) + { memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); aa->u.s.IfIndex = index; ConvertInterfaceIndexToLuid(index, &luid); ConvertInterfaceLuidToGuid(&luid, &guid); - ConvertGuidToStringA( &guid, ptr, CHARS_IN_GUID ); - aa->AdapterName = ptr; - ptr += CHARS_IN_GUID; + ConvertGuidToStringA( &guid, *ptr, CHARS_IN_GUID ); + aa->AdapterName = *ptr; + *ptr += (CHARS_IN_GUID + 1) & ~1; getInterfaceNameByIndex(index, name); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) { - aa->FriendlyName = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + aa->FriendlyName = (WCHAR *)*ptr; + for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) *dst = *src; *dst++ = 0; - ptr = (char *)dst; + *ptr = (char *)dst; } aa->Description = (WCHAR *)ptr; - for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++) + for (src = name, dst = (WCHAR *)*ptr; *src; src++, dst++) *dst = *src; *dst++ = 0; - ptr = (char *)dst; + *ptr = (char *)dst; TRACE("%s: %d IPv4 addresses, %d IPv6 addresses:\n", name, num_v4addrs, num_v6addrs); @@ -1028,12 +1158,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index PIP_ADAPTER_GATEWAY_ADDRESS gw; PSOCKADDR_IN sin; - gw = (PIP_ADAPTER_GATEWAY_ADDRESS)ptr; + gw = heap_alloc( sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN) ); aa->FirstGatewayAddress = gw; gw->u.s.Length = sizeof(IP_ADAPTER_GATEWAY_ADDRESS); - ptr += sizeof(IP_ADAPTER_GATEWAY_ADDRESS); - sin = (PSOCKADDR_IN)ptr; + sin = (PSOCKADDR_IN)(gw + 1); sin->sin_family = WS_AF_INET; sin->sin_port = 0; memcpy(&sin->sin_addr, &adapterRow->dwForwardNextHop, @@ -1041,7 +1170,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index gw->Address.lpSockaddr = (LPSOCKADDR)sin; gw->Address.iSockaddrLength = sizeof(SOCKADDR_IN); gw->Next = NULL; - ptr += sizeof(SOCKADDR_IN); } } if (num_v4addrs && !(flags & GAA_FLAG_SKIP_UNICAST)) @@ -1049,7 +1177,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index IP_ADAPTER_UNICAST_ADDRESS *ua; struct WS_sockaddr_in *sa; aa->u1.s1.Ipv4Enabled = TRUE; - ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); for (i = 0; i < num_v4addrs; i++) { char addr_buf[16]; @@ -1057,7 +1185,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); - ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); if (num_v4_gateways) ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; @@ -1071,10 +1199,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->OnLinkPrefixLength = mask_v4_to_prefix(v4masks[i]); - ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v4addrs - 1) { - ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN) ); ua = ua->Next; } } @@ -1089,11 +1216,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) ; - ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; - ua = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); + ua = ua->Next; } else - ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = aa->FirstUnicastAddress = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); for (i = 0; i < num_v6addrs; i++) { char addr_buf[46]; @@ -1101,7 +1228,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = v6addrs[i].iSockaddrLength; - ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + ua->Address.lpSockaddr = (SOCKADDR *)(ua + 1); sa = (struct WS_sockaddr_in6 *)ua->Address.lpSockaddr; memcpy(sa, v6addrs[i].lpSockaddr, sizeof(*sa)); @@ -1111,10 +1238,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->OnLinkPrefixLength = mask_v6_to_prefix(&v6masks[i]); - ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_v6addrs - 1) { - ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua->Next = heap_alloc_zero( sizeof(IP_ADAPTER_UNICAST_ADDRESS) + sizeof(SOCKADDR_IN6) ); ua = ua->Next; } } @@ -1123,7 +1249,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { IP_ADAPTER_PREFIX *prefix; - prefix = aa->FirstPrefix = (IP_ADAPTER_PREFIX *)ptr; + prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); for (i = 0; i < num_v4addrs; i++) { char addr_buf[16]; @@ -1133,7 +1259,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index prefix->u.s.Flags = 0; prefix->Next = NULL; prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in); - prefix->Address.lpSockaddr = (SOCKADDR *)((char *)prefix + prefix->u.s.Length); + prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); sa = (struct WS_sockaddr_in *)prefix->Address.lpSockaddr; sa->sin_family = WS_AF_INET; @@ -1146,10 +1272,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index debugstr_ipv4((const in_addr_t *)&sa->sin_addr.S_un.S_addr, addr_buf), prefix->PrefixLength); - ptr += prefix->u.s.Length + prefix->Address.iSockaddrLength; if (i < num_v4addrs - 1) { - prefix->Next = (IP_ADAPTER_PREFIX *)ptr; + prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN) ); prefix = prefix->Next; } } @@ -1162,11 +1287,11 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index { for (prefix = aa->FirstPrefix; prefix->Next; prefix = prefix->Next) ; - prefix->Next = (IP_ADAPTER_PREFIX *)ptr; - prefix = (IP_ADAPTER_PREFIX *)ptr; + prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); + prefix = prefix->Next; } else - prefix = aa->FirstPrefix = (IP_ADAPTER_PREFIX *)ptr; + prefix = aa->FirstPrefix = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); for (i = 0; i < num_v6addrs; i++) { char addr_buf[46]; @@ -1177,7 +1302,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index prefix->u.s.Flags = 0; prefix->Next = NULL; prefix->Address.iSockaddrLength = sizeof(struct sockaddr_in6); - prefix->Address.lpSockaddr = (SOCKADDR *)((char *)prefix + prefix->u.s.Length); + prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); sa = (struct WS_sockaddr_in6 *)prefix->Address.lpSockaddr; sa->sin6_family = WS_AF_INET6; @@ -1192,10 +1317,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index TRACE("IPv6 network: %s/%u\n", debugstr_ipv6(sa, addr_buf), prefix->PrefixLength); - ptr += prefix->u.s.Length + prefix->Address.iSockaddrLength; if (i < num_v6addrs - 1) { - prefix->Next = (IP_ADAPTER_PREFIX *)ptr; + prefix->Next = heap_alloc_zero( sizeof(*prefix) + sizeof(SOCKADDR_IN6) ); prefix = prefix->Next; } } @@ -1208,7 +1332,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index else if (status == MIB_IF_OPER_STATUS_NON_OPERATIONAL) aa->OperStatus = IfOperStatusDown; else aa->OperStatus = IfOperStatusUnknown; } - *size = total_size; HeapFree(GetProcessHeap(), 0, routeTable); HeapFree(GetProcessHeap(), 0, v6addrs); HeapFree(GetProcessHeap(), 0, v6masks); @@ -1224,97 +1347,92 @@ static DWORD dns_servers_query_code( ULONG family ) return DnsConfigDnsServersUnspec; } -static ULONG get_dns_server_addresses( ULONG family, IP_ADAPTER_DNS_SERVER_ADDRESS *address, ULONG *len ) +static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags ) { char buf[FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[3])]; - DNS_ADDR_ARRAY *servers = (DNS_ADDR_ARRAY *)buf; - DWORD err, num, i, needed, array_len = sizeof(buf); + IP_ADAPTER_DNS_SERVER_ADDRESS *dns, **next; DWORD query = dns_servers_query_code( family ); - SOCKADDR_INET *out_addrs; + DWORD err, i, size, attempt, sockaddr_len; + WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1]; + DNS_ADDR_ARRAY *servers; + DNS_TXT_DATAW *search; - for (;;) + while (aa) { - err = DnsQueryConfig( query, 0, NULL, NULL, servers, &array_len ); - if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) goto err; - num = (array_len - FIELD_OFFSET(DNS_ADDR_ARRAY, AddrArray[0])) / sizeof(DNS_ADDR); - needed = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(*out_addrs)); - if (!address || *len < needed) + MultiByteToWideChar( CP_ACP, 0, aa->AdapterName, -1, name, ARRAY_SIZE(name) ); + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) { - *len = needed; - err = ERROR_BUFFER_OVERFLOW; - goto err; + servers = (DNS_ADDR_ARRAY *)buf; + for (attempt = 0; attempt < 5; attempt++) + { + err = DnsQueryConfig( query, 0, name, NULL, servers, &size ); + if (err != ERROR_MORE_DATA) break; + if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); + servers = heap_alloc( size ); + if (!servers) + { + err = ERROR_NOT_ENOUGH_MEMORY; + break; + } + } + if (!err) + { + next = &aa->FirstDnsServerAddress; + for (i = 0; i < servers->AddrCount; i++) + { + sockaddr_len = servers->AddrArray[i].Data.DnsAddrUserDword[0]; + if (sockaddr_len > sizeof(servers->AddrArray[i].MaxSa)) + sockaddr_len = sizeof(servers->AddrArray[i].MaxSa); + dns = heap_alloc_zero( sizeof(*dns) + sockaddr_len ); + if (!dns) + { + err = ERROR_NOT_ENOUGH_MEMORY; + break; + } + dns->u.s.Length = sizeof(*dns); + dns->Address.lpSockaddr = (SOCKADDR *)(dns + 1); + dns->Address.iSockaddrLength = sockaddr_len; + memcpy( dns->Address.lpSockaddr, servers->AddrArray[i].MaxSa, sockaddr_len ); + *next = dns; + next = &dns->Next; + } + } + if (servers != (DNS_ADDR_ARRAY *)buf) heap_free( servers ); + if (err) goto err; } - if (!err) break; - if ((char *)servers != buf) heap_free( servers ); - servers = heap_alloc( array_len ); - if (!servers) + aa->DnsSuffix = heap_alloc( MAX_DNS_SUFFIX_STRING_LENGTH * sizeof(WCHAR) ); + if (!aa->DnsSuffix) { err = ERROR_NOT_ENOUGH_MEMORY; goto err; } - } - - *len = needed; - out_addrs = (SOCKADDR_INET *)(address + num); - for (i = 0; i < num; i++) - { - address[i].u.s.Length = sizeof(*address); - address[i].u.s.Reserved = 0; - address[i].Next = NULL; - address[i].Address.iSockaddrLength = servers->AddrArray[i].Data.DnsAddrUserDword[0]; - if (address[i].Address.iSockaddrLength > sizeof(*out_addrs)) - address[i].Address.iSockaddrLength = 0; - address[i].Address.lpSockaddr = (SOCKADDR *)(out_addrs + i); - memcpy( out_addrs + i, servers->AddrArray[i].MaxSa, address[i].Address.iSockaddrLength ); - memset( (BYTE *)(out_addrs + i) + address[i].Address.iSockaddrLength, 0, - sizeof(*out_addrs) - address[i].Address.iSockaddrLength ); - if (i) address[i - 1].Next = address + i; - } - err = ERROR_SUCCESS; - -err: - if ((char *)servers != buf) heap_free( servers ); - return err; -} - -static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) -{ - DWORD err, list_len = 0, needed = 1; - DNS_TXT_DATAW *search = NULL; + aa->DnsSuffix[0] = '\0'; - if (suffix && *len > 0) *suffix = '\0'; - - err = DnsQueryConfig( DnsConfigSearchList, 0, NULL, NULL, NULL, &list_len ); - if (err) goto err; - - search = heap_alloc( list_len ); - err = DnsQueryConfig( DnsConfigSearchList, 0, NULL, NULL, search, &list_len ); - if (err || !search->dwStringCount) goto err; + if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, NULL, &size ) && + (search = heap_alloc( size ))) + { + if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && + search->dwStringCount && strlenW( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + { + strcpyW( aa->DnsSuffix, search->pStringArray[0] ); + } + heap_free( search ); + } - needed = (strlenW( search->pStringArray[0] ) + 1) * sizeof(WCHAR); - if (!suffix || *len < needed) - { - err = ERROR_INSUFFICIENT_BUFFER; - goto err; + aa = aa->Next; } - memcpy( suffix, search->pStringArray[0], needed ); err: - *len = needed; - heap_free( search ); return err; } -ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, - PIP_ADAPTER_ADDRESSES aa, PULONG buflen) +static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADDRESSES **info ) { + IP_ADAPTER_ADDRESSES *aa; + DWORD err, i, count, needed; + char *str_ptr; InterfaceIndexTable *table; - ULONG i, size, dns_server_size = 0, dns_suffix_size, total_size, ret = ERROR_NO_DATA; - - TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); - - if (!buflen) return ERROR_INVALID_PARAMETER; get_interface_indices( FALSE, &table ); if (!table || !table->numIndexes) @@ -1322,82 +1440,62 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P HeapFree(GetProcessHeap(), 0, table); return ERROR_NO_DATA; } - total_size = 0; - for (i = 0; i < table->numIndexes; i++) - { - size = 0; - if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], NULL, &size))) - { - HeapFree(GetProcessHeap(), 0, table); - return ret; - } - total_size += size; - } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + count = table->numIndexes; + + needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(IF_COUNTED_STRING)); + if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(IF_COUNTED_STRING); + + aa = heap_alloc_zero( needed ); + if (!aa) { - /* Since DNS servers aren't really per adapter, get enough space for a - * single copy of them. - */ - get_dns_server_addresses( family, NULL, &dns_server_size ); - total_size += dns_server_size; + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } - /* Since DNS suffix also isn't really per adapter, get enough space for a - * single copy of it. - */ - get_dns_suffix(NULL, &dns_suffix_size); - total_size += dns_suffix_size; - if (aa && *buflen >= total_size) - { - ULONG bytes_left = size = total_size; - PIP_ADAPTER_ADDRESSES first_aa = aa; - PIP_ADAPTER_DNS_SERVER_ADDRESS firstDns; - WCHAR *dnsSuffix; - for (i = 0; i < table->numIndexes; i++) - { - if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], aa, &size))) - { - HeapFree(GetProcessHeap(), 0, table); - return ret; - } - if (i < table->numIndexes - 1) - { - aa->Next = (IP_ADAPTER_ADDRESSES *)((char *)aa + size); - aa = aa->Next; - size = bytes_left -= size; - } - } - if (dns_server_size) - { - firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); - get_dns_server_addresses( family, firstDns, &dns_server_size ); - for (aa = first_aa; aa; aa = aa->Next) - { - if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) - aa->FirstDnsServerAddress = firstDns; - } - } - aa = first_aa; - dnsSuffix = (WCHAR *)((BYTE *)aa + total_size - dns_suffix_size); - get_dns_suffix(dnsSuffix, &dns_suffix_size); - for (; aa; aa = aa->Next) + str_ptr = (char *)(aa + count); + for (i = 0; i < count; i++) + { + if ((err = adapterAddressesFromIndex(family, flags, table->indexes[i], aa + i, &str_ptr))) { - if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) - aa->DnsSuffix = dnsSuffix; - else - aa->DnsSuffix = dnsSuffix + dns_suffix_size / sizeof(WCHAR) - 1; + HeapFree(GetProcessHeap(), 0, table); + return err; } - ret = ERROR_SUCCESS; + if (i < count - 1) aa[i].Next = aa + i + 1; } - else + + err = dns_info_alloc( aa, family, flags ); + +err: + HeapFree(GetProcessHeap(), 0, table); + if (!err) *info = aa; + else adapters_addresses_free( aa ); + return err; +} + +ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses( ULONG family, ULONG flags, void *reserved, + IP_ADAPTER_ADDRESSES *aa, ULONG *size ) +{ + IP_ADAPTER_ADDRESSES *info; + DWORD err, needed; + + TRACE( "(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, size ); + + if (!size) return ERROR_INVALID_PARAMETER; + + err = adapters_addresses_alloc( family, flags, &info ); + if (err) return err; + + needed = adapters_addresses_size( info ); + if (!aa || *size < needed) { - ret = ERROR_BUFFER_OVERFLOW; - *buflen = total_size; + *size = needed; + err = ERROR_BUFFER_OVERFLOW; } + else + adapters_addresses_copy( aa, info ); - TRACE("num adapters %u\n", table->numIndexes); - HeapFree(GetProcessHeap(), 0, table); - return ret; + adapters_addresses_free( info ); + return err; } /****************************************************************** -- 2.23.0

1 0

[PATCH 1/4] dnsapi: Return ERROR_MORE_DATA on insufficient buffer.
by Huw Davies 09 Aug '21

09 Aug '21

This was already done correctly in the res_getservers() case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/tests/query.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 7e545cf36fb..864c517333d 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -414,7 +414,7 @@ DNS_STATUS CDECL resolv_get_serverlist( USHORT family, DNS_ADDR_ARRAY *addrs, DW if (!addrs || *len < needed) { *len = needed; - return !addrs ? ERROR_SUCCESS : ERROR_INSUFFICIENT_BUFFER; + return !addrs ? ERROR_SUCCESS : ERROR_MORE_DATA; } *len = needed; memset( addrs, 0, needed ); diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 5fb47d89782..e691822a46a 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -155,6 +155,10 @@ static void test_DnsQueryConfig( void ) err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, NULL, &size ); if (err) continue; ipv4 = malloc( size ); + size--; + err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + size++; err = DnsQueryConfig( DnsConfigDnsServersIpv4, 0, name, NULL, ipv4, &size ); ok( !err, "got %d\n", err ); -- 2.23.0

1 0

[PATCH 1/5] hidclass.sys: Validate report IDs in hid_device_xfer_report.
by Rémi Bernon 09 Aug '21

09 Aug '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 17 +++++++++++++++-- dlls/ntoskrnl.exe/tests/driver_hid.c | 4 ---- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 -------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 83c0c1159ff..44965e118a2 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -303,7 +303,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { const WINE_HIDP_PREPARSED_DATA *preparsed = ext->u.pdo.preparsed_data; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - BYTE report_id = HID_INPUT_VALUE_CAPS( preparsed )->report_id; + struct hid_value_caps *caps = NULL, *caps_end = NULL; ULONG report_len = 0, buffer_len = 0; HID_XFER_PACKET packet; BYTE *buffer = NULL; @@ -326,13 +326,19 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP { case IOCTL_HID_GET_INPUT_REPORT: report_len = preparsed->caps.InputReportByteLength; + caps = HID_INPUT_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Input]; break; case IOCTL_HID_SET_OUTPUT_REPORT: report_len = preparsed->caps.OutputReportByteLength; + caps = HID_OUTPUT_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Output]; break; case IOCTL_HID_GET_FEATURE: case IOCTL_HID_SET_FEATURE: report_len = preparsed->caps.FeatureReportByteLength; + caps = HID_FEATURE_VALUE_CAPS( preparsed ); + caps_end = caps + preparsed->value_caps_count[HidP_Feature]; break; } @@ -347,11 +353,18 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP return; } + for (; caps != caps_end; ++caps) if (!caps->report_id || caps->report_id == buffer[0]) break; + if (caps == caps_end) + { + irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + return; + } + packet.reportId = buffer[0]; packet.reportBuffer = buffer; packet.reportBufferLen = buffer_len; - if (!report_id) + if (!caps->report_id) { packet.reportId = 0; packet.reportBuffer++; diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 4f0a8591299..83f546aa972 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -532,7 +532,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -552,7 +551,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(in_size == sizeof(*packet), "got input size %u\n", in_size); ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -569,7 +567,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(!in_size, "got input size %u\n", in_size); ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); @@ -588,7 +585,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(in_size == sizeof(*packet), "got input size %u\n", in_size); ok(!out_size, "got output size %u\n", out_size); - todo_wine_if(packet->reportId == 0x5a) ok(packet->reportId == report_id, "got id %u\n", packet->reportId); ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 128a81a5f83..4909ab202a6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2454,9 +2454,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_GetInputReport(file, buffer, caps.InputReportByteLength); if (report_id || broken(!ret) /* w7u */) { - todo_wine ok(!ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetInputReport returned error %u\n", GetLastError()); } @@ -2499,9 +2497,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_GetFeature(file, buffer, caps.FeatureReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_GetFeature returned error %u\n", GetLastError()); } @@ -2544,9 +2540,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_SetFeature(file, buffer, caps.FeatureReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_SetFeature succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetFeature returned error %u\n", GetLastError()); } @@ -2593,9 +2587,7 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled ret = HidD_SetOutputReport(file, buffer, caps.OutputReportByteLength); if (report_id || broken(!ret)) { - todo_wine ok(!ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError()); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), "HidD_SetOutputReport returned error %u\n", GetLastError()); } -- 2.32.0

2 6

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

09 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. 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 2

[PATCH] uxtheme: Fix a typo in comment.
by Zhiyi Zhang 09 Aug '21

09 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 8c3c4ae2218..b8196b09966 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -523,7 +523,7 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, } /*********************************************************************** - * UXTHEME_DrawImageGlyph + * UXTHEME_DrawGlyph * * Draw glyph on top of background, if appropriate */ -- 2.30.2

1 0

[PATCH 2/2] user32: Load uxtheme when theming is active.
by Zhiyi Zhang 09 Aug '21

09 Aug '21

In comctl32 DllMain(), IsThemeActive() is a delay-loaded function and shouldn't be called in DllMain(). Instead, tests showed that uxtheme should be loaded by user32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51540 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Further tests not included in this patch series show that uxtheme gets unloaded when theming is turned off and gets loaded when theming is turned on even after application startup. This dynamic loading/unloading behavior requires at least a window and a message loop (merely calling GetMessage() is enough), which suggests a WH_GETMESSAGE hook is installed and listens for WM_THEMECHANGED. The WM_THEMECHANGED lparam is a reserved parameter that is TRUE then theming is active and FALSE otherwise. Due to the WH_GETMESSAGE hook involved, I decided not to implement the dynamic loading and unloading of uxtheme for user32 to avoid filtering every messages. Also a test application that doesn't link to comctl32 and doesn't have a comctl32 v6 manifest still has its standard scrollbars and dialogs themed when theming is active. dlls/comctl32/commctrl.c | 3 --- dlls/user32/class.c | 16 ++++++++++++++++ dlls/user32/tests/class.c | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1c7718e2400..b457bdcb8be 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -208,9 +208,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TRACKBAR_Register (); TREEVIEW_Register (); UPDOWN_Register (); - - /* Call IsThemeActive() so that delay-loaded uxtheme.dll is loaded for hooking user32 */ - IsThemeActive(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/user32/class.c b/dlls/user32/class.c index c17a612c5b9..cef52883988 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -539,6 +539,19 @@ static void register_builtin( const struct builtin_class_descr *descr ) release_class_ptr( classPtr ); } +static void load_uxtheme(void) +{ + BOOL (WINAPI * pIsThemeActive)(void); + HMODULE uxtheme; + + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + if (!pIsThemeActive || !pIsThemeActive()) + FreeLibrary(uxtheme); + } +} /*********************************************************************** * register_builtins @@ -557,6 +570,9 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); register_builtin( &IME_builtin_class ); + + /* Load uxtheme.dll so that standard scrollbars and dialogs are hooked for theming support */ + load_uxtheme(); return TRUE; } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 0f4fd1cf90e..e6762032107 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1511,6 +1511,7 @@ static void test_uxtheme(void) dll_loaded = !!GetModuleHandleA("comctl32.dll"); ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + todo_wine_if(dll_loaded) ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); /* Creating a window triggers uxtheme load when theming is active */ @@ -1531,7 +1532,6 @@ static void test_uxtheme(void) is_theme_active = pIsThemeActive(); FreeLibrary(uxtheme); - todo_wine_if(is_theme_active) ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive"); -- 2.30.2

1 0

[PATCH 1/2] user32/tests: Test that user32 loads uxtheme.
by Zhiyi Zhang 09 Aug '21

09 Aug '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/class.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 94dd8105a50..0f4fd1cf90e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1490,6 +1490,55 @@ static void test_actctx_classes(void) ReleaseActCtx(context); } +static void test_uxtheme(void) +{ + static const CHAR *class_name = "test_uxtheme_class"; + BOOL (WINAPI * pIsThemeActive)(void); + BOOL dll_loaded, is_theme_active; + WNDCLASSEXA class; + HMODULE uxtheme; + ATOM atom; + HWND hwnd; + + memset(&class, 0, sizeof(class)); + class.cbSize = sizeof(class); + class.lpfnWndProc = DefWindowProcA; + class.hInstance = GetModuleHandleA(NULL); + class.lpszClassName = class_name; + atom = RegisterClassExA(&class); + ok(atom, "RegisterClassExA failed, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + ok(!dll_loaded, "Expected uxtheme.dll not loaded.\n"); + + /* Creating a window triggers uxtheme load when theming is active */ + hwnd = CreateWindowA(class_name, "Test", WS_POPUP, 0, 0, 1, 1, NULL, NULL, + GetModuleHandleA(NULL), NULL); + ok(!!hwnd, "Failed to create a test window, error %u.\n", GetLastError()); + + dll_loaded = !!GetModuleHandleA("comctl32.dll"); + ok(!dll_loaded, "Expected comctl32.dll not loaded.\n"); + + /* Uxtheme is loaded when theming is active */ + dll_loaded = !!GetModuleHandleA("uxtheme.dll"); + + uxtheme = LoadLibraryA("uxtheme.dll"); + ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError()); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError()); + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + + todo_wine_if(is_theme_active) + ok(dll_loaded == is_theme_active, "Expected uxtheme %s when theming is %s.\n", + is_theme_active ? "loaded" : "not loaded", is_theme_active ? "active" : "inactive"); + + DestroyWindow(hwnd); + UnregisterClassA(class_name, GetModuleHandleA(NULL)); +} + START_TEST(class) { char **argv; @@ -1502,6 +1551,7 @@ START_TEST(class) return; } + test_uxtheme(); test_IME(); test_GetClassInfo(); test_extra_values(); -- 2.30.2

1 0

[PATCH] tapi32: Add lineGetTranslateCapsW stub
by Alex Henrie 09 Aug '21

09 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38585 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- A stub is enough to avoid the error. --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a72..0df9746084b 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -751,6 +751,15 @@ DWORD WINAPI lineGetStatusMessages(HLINE hLine, LPDWORD lpdwLineStatus, LPDWORD return 0; } +/*********************************************************************** + * lineGetTranslateCapsW (TAPI32.@) + */ +DWORD WINAPI lineGetTranslateCapsW(HLINEAPP line_app, DWORD api_version, LINETRANSLATECAPS *caps) +{ + FIXME("(%p, %08x, %p): stub.\n", line_app, api_version, caps); + return LINEERR_OPERATIONFAILED; +} + /*********************************************************************** * lineGetTranslateCaps (TAPI32.@) * diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 62631efe236..6c01a870479 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -67,6 +67,7 @@ @ stdcall lineGetStatusMessages(long ptr ptr) @ stdcall lineGetTranslateCaps(long long ptr) lineGetTranslateCapsA @ stdcall lineGetTranslateCapsA(long long ptr) +@ stdcall lineGetTranslateCapsW(ptr long ptr) @ stdcall lineHandoff(long str long) lineHandoffA @ stdcall lineHandoffA(long str long) @ stdcall lineHold(long) -- 2.32.0

1 0

[v2 PATCH 1/2] d3dx10: Partially implement D3DX10CreateEffectFromMemory().
by Nikolay Sivov 09 Aug '21

09 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: use default include handler dlls/d3dx10_43/d3dx10_43_main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 06b00cb0393..da9e105efba 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -32,6 +32,7 @@ #include "d3d10_1.h" #include "d3dx10.h" +#include "d3dcompiler.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -79,12 +80,32 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) { - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + ID3D10Blob *code; + HRESULT hr; + + TRACE("data %p, datasize %lu, 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", data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, effectpool, pump, effect, errors, hresult); - return E_NOTIMPL; + if (pump) + FIXME("Asynchronous mode is not supported.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, NULL, profile, + hlslflags, fxflags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + fxflags, device, effectpool, effect); + ID3D10Blob_Release(code); + + return hr; } HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, -- 2.30.2

1 1

[tools] winetest/build-patterns: Use JavaScript to hide the WineTest reruns.
by Francois Gouget 09 Aug '21

09 Aug '21

They are now included on all pages since they will not mess up the patterns. Also reruns are now right next to the first run which makes it easier to compare them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 16 +++++--------- winetest/patterns.js | 49 ++++++++++++++++++++++++++++++++++++++--- winetest/report.css | 3 +++ 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a1691db3d..474fa1ffc 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -436,8 +436,7 @@ sub cmpreports { my $ra = $reports{$a}; my $rb = $reports{$b}; - return $ra->{is_rerun} <=> $rb->{is_rerun} || - ($platform_order{$ra->{platform}} || 0) <=> ($platform_order{$rb->{platform}} || 0) || + return ($platform_order{$ra->{platform}} || 0) <=> ($platform_order{$rb->{platform}} || 0) || $ra->{tag} cmp $rb->{tag} || ($ra->{num} || 0) <=> ($rb->{num} || 0); } @@ -1465,7 +1464,8 @@ EOF if (!$nolist) { my @table = ("<details><summary>Page cutomization</summary> -<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p>"); +<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p> +<label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label><br>"); if (!$subpage or $subpage eq "-tb-win") { push @table, "<label><input id='tbwin' class='groupcb' type='checkbox' checked> Show the TestBot Windows reports</label><br>"; @@ -1498,7 +1498,8 @@ EOF my $reportdir = $sortedreports[$reportindex] || ""; my $report = $reports{$reportdir}; my $group = " data-group='". ($report->{tag} =~ /^newtb-/ ? "tb" : "") . ($report->{is_wine} ? "wine" : "win") ."'"; - push @table, "<td><label><input class='reportcb'$group type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + my $rerun = $report->{is_rerun} ? " data-rerun='1'" : ""; + push @table, "<td><label><input class='reportcb'$group$rerun type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; } push @table, "</tr>"; } @@ -1546,13 +1547,6 @@ my %tbreports; foreach my $report (values %reports) { next if ($report->{tag} !~ /^newtb-/); # ignore non-TestBot reports - if ($report->{is_rerun}) - { - # Skip reruns because they are infrequent and thus usually do not - # meaningfully contribute to the patterns. - # They can still be checked on the 'all reports' page. - next; - } # Windows and Wine have different failure modes so put them on separate # pages. my $page = $report->{is_wine} ? "wine" : "win"; diff --git a/winetest/patterns.js b/winetest/patterns.js index 80ac4b868..4876113fa 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -18,14 +18,42 @@ */ "use strict"; +var hide_reruns; +var groups; var cbs; -function refreshPage(changes) +function refreshPage(changes, rerun_checked) { + if (rerun_checked != undefined && rerun_checked != hide_reruns) + { + for (let key in cbs) + { + const cb = cbs[key]; + if (!cb.rerun) continue; + + cb.dom.disabled = rerun_checked; + if (rerun_checked) + { + cb.dom.parentNode.classList.add("disabled"); + cb.dom.parentNode.title = "Reruns are hidden"; + changes[key] = false; + } + else + { + cb.dom.parentNode.classList.remove("disabled"); + cb.dom.parentNode.title = undefined; + changes[key] = groups[cb.group].checked; + } + cb.dom.checked = changes[key]; + } + hide_reruns = rerun_checked; + } + for (let key in changes) { const cb = cbs[key]; if (cb.checked == changes[key]) continue; + if (cb.dom.parentNode.disabled) continue; if (changes[key]) { @@ -50,16 +78,22 @@ function refreshPage(changes) } } +function toggledRerunCB(e) +{ + refreshPage({}, e.target.checked); +} + function toggledGroupCB(e) { const group = e.target.id; const checked = e.target.checked; + groups[group].checked = checked; const changes = {}; for (let key in cbs) { const cb = cbs[key]; - if (cb.group == group) + if (cb.group == group && !cb.dom.disabled) { cb.dom.checked = checked; changes[key] = checked; @@ -78,7 +112,15 @@ function toggledReportCB(e) function init() { + hide_reruns = false; /* reruns are shown by default */ + const domreruns = document.getElementById("reruns"); + domreruns.addEventListener('click', toggledRerunCB); + + groups = {}; document.querySelectorAll("input.groupcb").forEach(domcb => { + groups[domcb.id] = { dom: domcb, + checked: domcb.checked + }; domcb.addEventListener('click', toggledGroupCB); }); @@ -89,6 +131,7 @@ function init() checked: true, /* all reports are shown by default */ display: domcb.style.display, group: domcb.getAttribute("data-group"), + rerun: domcb.getAttribute("data-rerun"), patlines: [] }; changes[domcb.id] = domcb.checked; @@ -118,7 +161,7 @@ function init() /* When reloading a page the browser may preserve the checkbox state * so reapply them to the rest of the page. */ - refreshPage(changes); + refreshPage(changes, domreruns.checked); } window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index f193bc3be..d42e05d8d 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -75,6 +75,9 @@ table.output td { padding: 0 5px 5px; border: 1px solid #601919; } +.disabled { + color: grey; +} .pattern { display: inline-block; -- 2.20.1

1 0

[PATCH] msvcrt: Fix x87 FPU status register assignment detection.
by Piotr Caban 08 Aug '21

08 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51568 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51579 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH] mscoree: Only override Microsoft.Xna.Framework version 4.
by Esme Povirk 08 Aug '21

08 Aug '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- At some point when I wasn't paying attention, Wine Mono's C++/CLI support got good enough to run the original XNA redists. We only have a replacement for XNA version 4. This relaxes the default so that XNA 3.x can still load and work. In theory, we could get rid of this default entirely, but XNA has been known to be picky about graphics drivers, and at the moment FNA has more testing in this environment, so I still feel FNA is the better choice when possible. Also ideally we would add general version filtering capabilities to the override settings, so the new default could be expressed in that syntax, but I don't see an immediate need for it. dlls/mscoree/metahost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index acefb2887ca..b3816600214 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -89,6 +89,7 @@ MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); const char* (CDECL *mono_assembly_name_get_culture)(MonoAssemblyName *aname); +WORD (CDECL *mono_assembly_name_get_version)(MonoAssemblyName *aname, WORD *minor, WORD *build, WORD *revision); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -199,6 +200,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_name_get_name); LOAD_MONO_FUNCTION(mono_assembly_name_get_culture); + LOAD_MONO_FUNCTION(mono_assembly_name_get_version); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1553,8 +1555,9 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } - if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) - /* XNA redist is broken in Wine Mono, use FNA instead. */ + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0 && + mono_assembly_name_get_version(aname, NULL, NULL, NULL) == 4) + /* Use FNA as a replacement for XNA4. */ return 0; return ASSEMBLY_SEARCH_UNDEFINED; -- 2.30.2

1 0

[tools 1/2] winetest/build-patterns: Allow hiding some reports on the patterns page.
by Francois Gouget 08 Aug '21

08 Aug '21

This allows zooming on the results of a specific machine or test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 31 ++++++++++++- winetest/patterns.js | 100 ++++++++++++++++++++++++++++++++++++++++ winetest/report.css | 6 +++ 3 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 winetest/patterns.js diff --git a/winetest/build-patterns b/winetest/build-patterns index d530ad2f8..fc6f7edbe 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -20,6 +20,7 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); +use POSIX; # ceil() use Text::CSV::Encoded; use Time::Piece; @@ -980,7 +981,7 @@ sub write_pattern_line($$$) my ($html, $test, $reportdir) = @_; my $testreport = $test->{testreports}->{$reportdir}; - print $html "<div class='pattern'>"; + print $html "<div class='patline' data-id='$reportdir'><div class='pattern'>"; my $has_newmode; my ($range_symbol, $range_count) = ("", 0); @@ -1086,7 +1087,7 @@ sub write_pattern_line($$$) } my $label = $reportdir; $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n"; + print $html "</div> $label\n</div>"; } sub index2symbol($) @@ -1288,6 +1289,7 @@ sub write_patterns_page($$$) <head> <title>$title</title> <link rel="stylesheet" href="/report.css" type="text/css"> + <script type="text/javascript" defer="true" src="/patterns.js"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> @@ -1462,6 +1464,31 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { + my @table = ("<details><summary>Page cutomization</summary> +<div class='detailsbox'><p>Uncheck the reports you do not want to see on this page.</p> +<table width='100%'>"); + my @reportmap; + for (my $i = 0; $i < @sortedreports; $i++) + { + my $reportdir = $sortedreports[$i]; + push @reportmap, $i if ($pagereports->{$reportdir}); + } + my $count = @reportmap; + for (my $i = 0; $i < ceil($count/4); $i++) + { + push @table, "<tr>"; + for (my $c = 0; $c < $count; $c += ceil($count/4)) + { + my $reportindex = $reportmap[$i + $c]; + last if (!defined $reportindex); + my $reportdir = $sortedreports[$reportindex] || ""; + push @table, "<td><label><input class='reportcb' type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + } + push @table, "</tr>"; + } + push @table, "</div></table></details>"; + $tests{0}->{desc} .= join("", @table); + $tests{0}->{desc} .= "<p>Unlike the other patterns on this page, the one below shows the number of failed test units for each configuration.</p>"; } diff --git a/winetest/patterns.js b/winetest/patterns.js new file mode 100644 index 000000000..a70df079e --- /dev/null +++ b/winetest/patterns.js @@ -0,0 +1,100 @@ +/* Hide / show reports on the patterns page + * + * Copyright 2021 Francois Gouget + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +var cbs; + +function refreshPage(changes) +{ + for (let key in changes) + { + const cb = cbs[key]; + if (cb.checked == changes[key]) continue; + + if (changes[key]) + { + cb.patlines.forEach(patline => { + patline.dom.style.display = patline.display; + const test = patline.test; + if (++test.linecount == 1 && test.id != "summary") + test.dom.style.display = test.display; + }); + } + else + { + cb.patlines.forEach(patline => { + patline.dom.style.display = "none"; + const test = patline.test; + if (--test.linecount == 0 && test.id != "summary") + test.dom.style.display = "none"; + }); + } + + cb.checked = changes[key]; + } +} + +function toggledReportCB(e) +{ + const cb = e.target; + const changes = {}; + changes[cb.id] = cb.checked; + refreshPage(changes); +} + +function init() +{ + const changes = {}; + cbs = {}; + document.querySelectorAll("input.reportcb").forEach(domcb => { + cbs[domcb.id] = { checked: true, /* all reports are shown by default */ + display: domcb.style.display, + patlines: [] + }; + changes[domcb.id] = domcb.checked; + domcb.addEventListener('click', toggledReportCB); + }); + + document.querySelectorAll("div.testfile").forEach(domtest => { + const test = { id: domtest.id, + dom: domtest, + display: domtest.style.display, + linecount: 0 + }; + + domtest.querySelectorAll("div.patline").forEach(domline => { + const cb = cbs[domline.getAttribute("data-id")]; + if (cb) + { + cb.patlines.push({ dom: domline, + display: domline.style.display, + test: test + }); + if (cb.checked) test.linecount++; + } + }); + }); + + /* When reloading a page the browser may preserve the checkbox state + * so reapply them to the rest of the page. + */ + refreshPage(changes); +} + +window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index 4594c5d49..f193bc3be 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -70,6 +70,12 @@ table.output td { float: right; } +.detailsbox { + margin: 5px 1em 0 1em; + padding: 0 5px 5px; + border: 1px solid #601919; +} + .pattern { display: inline-block; font-family: monospace; -- 2.20.1

2 3

[PATCH v5 resend 1/3] advapi32/tests: Add some test for perflib keys.
by Zebediah Figura 07 Aug '21

07 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 139 +++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 72423eae94c..cdf9b18f5d1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -99,6 +99,11 @@ static void InitFunctionPtrs(void) pNtUnloadKey = (void *)GetProcAddress( hntdll, "NtUnloadKey" ); } +static BOOL is_special_key(HKEY key) +{ + return !!((ULONG_PTR)key & 0x80000000); +} + /* delete key and all its subkeys */ static DWORD delete_key( HKEY hkey ) { @@ -3809,6 +3814,139 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_perflib_key(void) +{ + unsigned int primary_lang = PRIMARYLANGID(GetUserDefaultLangID()); + unsigned int buffer_size = 1024 * 1024; + OBJECT_NAME_INFORMATION *name_info; + HKEY perflib_key, key, key2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + char lang_name[4]; + char *buffer; + DWORD size; + LONG ret; + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); + ok(!ret, "got %u\n", ret); + + ret = RegOpenKeyExA(perflib_key, "009", 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + /* English always returns TEXT; most other languages return NLSTEXT, but + * some (e.g. Hindi) return TEXT */ + todo_wine ok(key == HKEY_PERFORMANCE_TEXT || key == HKEY_PERFORMANCE_NLSTEXT, "got key %p\n", key); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"009"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, perflib_key, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_ALL_ACCESS, &attr); + todo_wine ok(ret == STATUS_PREDEFINED_HANDLE || ret == STATUS_ACCESS_DENIED + || ret == STATUS_SUCCESS /* Win < 7 */, "got %#x\n", ret); + if (ret == STATUS_PREDEFINED_HANDLE) + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + else if (ret == STATUS_SUCCESS) + ok(key == HKEY_PERFORMANCE_TEXT, "got key %p\n", key); + else + { + skip("Not enough permissions to test the perflib key.\n"); + RegCloseKey(perflib_key); + return; + } + + buffer = malloc(buffer_size); + + ret = NtQueryKey(key, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateKey(key, 0, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"counter"); + ret = NtQueryValueKey(key, &string, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateValueKey(key, 0, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtSetValueKey(key, &string, 0, REG_SZ, "test", 5); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteValueKey(key, &string); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"subkey"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, key, NULL); + ret = NtOpenKey((HANDLE *)&key2, KEY_READ, &attr); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(ret == STATUS_OBJECT_NAME_NOT_FOUND + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + + ret = NtCreateKey((HANDLE *)&key2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret || broken(ret == STATUS_ACCESS_DENIED) /* w8adm */ + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + if (!ret) + { + NtDeleteKey(key2); + NtClose(key2); + } + + /* it's a real handle, though */ + ret = NtQueryObject(key, ObjectNameInformation, buffer, buffer_size, &size); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + if (!ret) + { + name_info = (OBJECT_NAME_INFORMATION *)buffer; + ok(!wcsicmp(name_info->Name.Buffer, L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT" + "\\CurrentVersion\\Perflib\\009"), "got name %s\n", debugstr_w(name_info->Name.Buffer)); + } + + ret = NtClose(key); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + + /* multilingual support was not really completely thought through */ + + sprintf(lang_name, "%03x", primary_lang); + if (primary_lang != LANG_ENGLISH) + { + ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + } + + ret = RegCloseKey(perflib_key); + ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); + todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); + + free(buffer); +} + static void test_RegLoadMUIString(void) { HMODULE hUser32, hResDll, hFile; @@ -4213,6 +4351,7 @@ START_TEST(registry) test_RegQueryValueExPerformanceData(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); + test_perflib_key(); /* cleanup */ delete_key( hkey_main ); -- 2.30.2

2 3

[PATCH] user32/tests: GetClipboardData() returns no error for missing formats.
by Francois Gouget 07 Aug '21

07 Aug '21

Despite the documentation that says if GetClipboardData() returns NULL one can check GetLastError() to know why! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/clipboard.c | 1 + dlls/user32/tests/clipboard.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index e8de7d9bdf6..a13085719a9 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -1070,6 +1070,7 @@ HANDLE WINAPI GetClipboardData( UINT format ) GlobalFree( data ); if (status == STATUS_BUFFER_OVERFLOW) continue; /* retry with the new size */ + if (status == STATUS_OBJECT_NAME_NOT_FOUND) return 0; /* no such format */ if (status) { SetLastError( RtlNtStatusToDosError( status )); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c8de860f8cc..4103baeef9b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1543,6 +1543,11 @@ static void test_handles( HWND hwnd ) data = GetClipboardData( 0xdeadfade ); ok( data == ptr, "wrong data %p\n", data ); + SetLastError( 0xdeadbeef ); + data = GetClipboardData( CF_RIFF ); + ok( GetLastError() == 0xdeadbeef, "unexpected last error %d\n", GetLastError() ); + ok( !data, "wrong data %p\n", data ); + h = SetClipboardData( CF_PRIVATEFIRST + 7, htext4 ); ok( h == htext4, "got %p\n", h ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); -- 2.20.1

2 1

[PATCH 1/4] ntdll: Add missing break to case IPV6_PKTINFO
by Alex Henrie 07 Aug '21

07 Aug '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- It looks like I lost the break statement in rebasing, sorry. --- dlls/ntdll/unix/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 4f1b9a468eb..35c846eb7ae 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -458,6 +458,7 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) ptr = fill_control_message( WS_IPPROTO_IPV6, WS_IPV6_PKTINFO, ptr, &ctlsize, (void *)&data_win, sizeof(data_win) ); if (!ptr) goto error; + break; } #endif /* IPV6_PKTINFO */ -- 2.32.0

3 5

[PATCH 1/2] oleaut32: Add support for longer currency symbols.
by Francois Gouget 07 Aug '21

07 Aug '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Note that the test for Swiss francs still fails because Wine uses "SFr." as the currency symbol instead of "CHF". The "SFr." symbol is obsolete and this is the subject of bug 51460. https://bugs.winehq.org/show_bug.cgi?id=51460 --- dlls/oleaut32/tests/vartest.c | 4 +-- dlls/oleaut32/variant.c | 46 +++++++++++++++++++++-------------- dlls/oleaut32/variant.h | 13 ---------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index fbcfba32c80..6dddc79e829 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2439,10 +2439,10 @@ static void test_VarParseNumFromStrMisc(void) /* Windows 8.1 incorrectly doubles the right-to-left mark: * "\x62f.\x645.\x200f\x200f 5" */ - todo_wine ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); + ok(hres == S_OK || broken(hres == DISP_E_TYPEMISMATCH), "returned %08x\n", hres); if (hres == S_OK) { - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,6,0,0); EXPECT2(5,FAILDIG); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2ec07817460..fe4bdb41ed2 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1499,6 +1499,19 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) return S_OK; } +/* The localised characters that make up a valid number */ +typedef struct tagVARIANT_NUMBER_CHARS +{ + WCHAR cNegativeSymbol; + WCHAR cPositiveSymbol; + WCHAR cDecimalPoint; + WCHAR cDigitSeparator; + DWORD sCurrencyLen; + WCHAR sCurrency[8]; + WCHAR cCurrencyDecimalPoint; + WCHAR cCurrencyDigitSeparator; +} VARIANT_NUMBER_CHARS; + #define GET_NUMBER_TEXT(fld,name) \ buff[0] = 0; \ if (!GetLocaleInfoW(lcid, lctype|fld, buff, 2)) \ @@ -1510,7 +1523,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) /* Get the valid number characters for an lcid */ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { - static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',0,'$',0,'.',',' }; + static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',0,1,{'$',0},'.',',' }; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; @@ -1522,17 +1535,16 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID GET_NUMBER_TEXT(LOCALE_SMONDECIMALSEP, cCurrencyDecimalPoint); GET_NUMBER_TEXT(LOCALE_SMONTHOUSANDSEP, cCurrencyDigitSeparator); - /* Local currency symbols are often 2 characters */ - lpChars->cCurrencyLocal2 = '\0'; - switch(GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, buff, ARRAY_SIZE(buff))) + if (!GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, lpChars->sCurrency, ARRAY_SIZE(lpChars->sCurrency))) { - case 3: lpChars->cCurrencyLocal2 = buff[1]; /* Fall through */ - case 2: lpChars->cCurrencyLocal = buff[0]; - break; - default: WARN("buffer too small for LOCALE_SCURRENCY\n"); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + WARN("buffer too small for LOCALE_SCURRENCY\n"); + *lpChars->sCurrency = 0; } - TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, - lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); + if (!*lpChars->sCurrency) + wcscpy(lpChars->sCurrency, L"$"); + lpChars->sCurrencyLen = wcslen(lpChars->sCurrency); + TRACE("lcid 0x%x, sCurrency=%u %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); } /* Number Parsing States */ @@ -1656,12 +1668,11 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla } else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && !(pNumprs->dwOutFlags & NUMPRS_CURRENCY) && - *lpszStr == chars.cCurrencyLocal && - (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) + wcsncmp(lpszStr, chars.sCurrency, chars.sCurrencyLen) == 0) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; - cchUsed += chars.cCurrencyLocal2 ? 2 : 1; - lpszStr += chars.cCurrencyLocal2 ? 2 : 1; + cchUsed += chars.sCurrencyLen; + lpszStr += chars.sCurrencyLen; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; } @@ -1972,12 +1983,11 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla pNumprs->dwOutFlags |= NUMPRS_NEG; } else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && - *lpszStr == chars.cCurrencyLocal && - (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) + wcsncmp(lpszStr, chars.sCurrency, chars.sCurrencyLen) == 0) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; - cchUsed += chars.cCurrencyLocal2 ? 2 : 1; - lpszStr += chars.cCurrencyLocal2 ? 2 : 1; + cchUsed += chars.sCurrencyLen; + lpszStr += chars.sCurrencyLen; } else break; diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 76444cf0514..1be8f8cdc79 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -101,19 +101,6 @@ #define VAR_BOOLYESNO 0x0800 /* Convert bool to "Yes"/"No" */ #define VAR_NEGATIVE 0x1000 /* Number is negative */ -/* The localised characters that make up a valid number */ -typedef struct tagVARIANT_NUMBER_CHARS -{ - WCHAR cNegativeSymbol; - WCHAR cPositiveSymbol; - WCHAR cDecimalPoint; - WCHAR cDigitSeparator; - WCHAR cCurrencyLocal; - WCHAR cCurrencyLocal2; - WCHAR cCurrencyDecimalPoint; - WCHAR cCurrencyDigitSeparator; -} VARIANT_NUMBER_CHARS; - unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, -- 2.20.1

1 1

[PATCH] user32/tests: Use wine_dbgstr_a() instead of %.8s.
by Francois Gouget 07 Aug '21

07 Aug '21

This should better handle NULL pointers and bad strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Maybe wine_dbgstr_an(,7) would be even better. Not very important either way. --- dlls/user32/tests/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 3e89e679927..bf35a224940 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1973,7 +1973,7 @@ static void test_data_handles(void) ok( is_fixed( h ), "expected fixed mem %p\n", h ); ok( is_moveable( text ), "expected moveable mem %p\n", text ); ptr = GlobalLock( h ); - ok( !strcmp( ptr, "foobar" ), "wrong data '%.8s'\n", ptr ); + ok( ptr && !strcmp( ptr, "foobar" ), "wrong data %s\n", wine_dbgstr_a(ptr) ); GlobalUnlock( h ); r = EmptyClipboard(); -- 2.20.1

1 0

[PATCH 1/6] ws2_32: Move gethostname() to the Unix library.
by Zebediah Figura 07 Aug '21

07 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/protocol.c | 16 +++++++++------- dlls/ws2_32/unixlib.c | 10 ++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index c65e6b9674e..48e7e062d7f 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -913,6 +913,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) { struct WS_hostent *host = NULL; char hostname[100]; + int ret; TRACE( "%s\n", debugstr_a(name) ); @@ -922,9 +923,9 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) return NULL; } - if (gethostname( hostname, 100 ) == -1) + if ((ret = unix_funcs->gethostname( hostname, 100 ))) { - SetLastError( WSAENOBUFS ); + SetLastError( ret ); return NULL; } @@ -973,7 +974,7 @@ struct WS_hostent * WINAPI WS_gethostbyname( const char *name ) int WINAPI WS_gethostname( char *name, int namelen ) { char buf[256]; - int len; + int len, ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -983,9 +984,9 @@ int WINAPI WS_gethostname( char *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) ) != 0) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } @@ -1009,6 +1010,7 @@ int WINAPI WS_gethostname( char *name, int namelen ) int WINAPI GetHostNameW( WCHAR *name, int namelen ) { char buf[256]; + int ret; TRACE( "name %p, len %d\n", name, namelen ); @@ -1018,9 +1020,9 @@ int WINAPI GetHostNameW( WCHAR *name, int namelen ) return -1; } - if (gethostname( buf, sizeof(buf) )) + if ((ret = unix_funcs->gethostname( buf, sizeof(buf) ))) { - SetLastError( sock_get_error( errno ) ); + SetLastError( ret ); return -1; } diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 2a5fcd1b60d..cde73198c16 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -30,6 +30,7 @@ #include <errno.h> #include <pthread.h> #include <stdarg.h> +#include <unistd.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -789,11 +790,20 @@ static int CDECL unix_gethostbyname( const char *name, struct WS_hostent *const #endif +static int CDECL unix_gethostname( char *name, int len ) +{ + if (!gethostname( name, len )) + return 0; + return errno_from_unix( errno ); +} + + static const struct unix_funcs funcs = { unix_getaddrinfo, unix_gethostbyaddr, unix_gethostbyname, + unix_gethostname, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 38454e1a9ba..973f24a10a9 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -203,6 +203,7 @@ struct unix_funcs int (CDECL *gethostbyaddr)( const void *addr, int len, int family, struct WS(hostent) *host, unsigned int *size ); int (CDECL *gethostbyname)( const char *name, struct WS(hostent) *host, unsigned int *size ); + int (CDECL *gethostname)( char *name, int len ); }; extern const struct unix_funcs *unix_funcs; -- 2.32.0

4 8

[PATCH] ntoskrnl: Add MmGetPhysicalAddress semi-stub
by Alex Henrie 07 Aug '21

07 Aug '21

Wine doesn't have access to the physical address space, but it works to pretend that it's the same as the virtual address space. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47047 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0580231d8e3..7f5ca846db2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2723,6 +2723,17 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) return !IsBadReadPtr(VirtualAddress, 1); } +/*********************************************************************** + * MmGetPhysicalAddress (NTOSKRNL.EXE.@) + */ +PHYSICAL_ADDRESS WINAPI MmGetPhysicalAddress(void *virtual_address) +{ + PHYSICAL_ADDRESS ret; + FIXME("(%p): semi-stub\n", virtual_address); + ret.QuadPart = (ULONG_PTR)virtual_address; + return ret; +} + /*********************************************************************** * MmMapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ea6d9e9fc95..f51833b91a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -702,7 +702,7 @@ @ stub MmFreeMappingAddress @ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl -@ stub MmGetPhysicalAddress +@ stdcall MmGetPhysicalAddress(ptr) @ stub MmGetPhysicalMemoryRanges @ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical -- 2.32.0

1 0

[PATCH] ntoskrnl: Implement MmGetPhysicalAddress
by Alex Henrie 07 Aug '21

07 Aug '21

Wine doesn't have access to the physical address space, but it works to pretend that it's the same as the virtual address space. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47047 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0580231d8e3..76bf339e9bb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2723,6 +2723,17 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) return !IsBadReadPtr(VirtualAddress, 1); } +/*********************************************************************** + * MmGetPhysicalAddress (NTOSKRNL.EXE.@) + */ +PHYSICAL_ADDRESS MmGetPhysicalAddress(void *virtual_address) +{ + PHYSICAL_ADDRESS ret; + TRACE("(%p)\n", virtual_address); + ret.QuadPart = (ULONG_PTR)virtual_address; + return ret; +} + /*********************************************************************** * MmMapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ea6d9e9fc95..f51833b91a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -702,7 +702,7 @@ @ stub MmFreeMappingAddress @ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl -@ stub MmGetPhysicalAddress +@ stdcall MmGetPhysicalAddress(ptr) @ stub MmGetPhysicalMemoryRanges @ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical -- 2.32.0

4 4

[PATCH] tbs: Add Tbsi_GetDeviceInfo stub.
by Gijs Vermeulen 06 Aug '21

06 Aug '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51560 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/tbs/tbs.c | 6 ++++++ dlls/tbs/tbs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tbs/tbs.c b/dlls/tbs/tbs.c index 452a3890e68..cb18d01fa2c 100644 --- a/dlls/tbs/tbs.c +++ b/dlls/tbs/tbs.c @@ -29,3 +29,9 @@ TBS_RESULT WINAPI Tbsi_Context_Create(const TBS_CONTEXT_PARAMS *params, TBS_HCON FIXME("(%p, %p) stub\n", params, out); return TBS_E_TPM_NOT_FOUND; } + +TBS_RESULT WINAPI Tbsi_GetDeviceInfo(UINT32 size, void *info) +{ + FIXME("(%u, %p) stub\n", size, info); + return TBS_E_TPM_NOT_FOUND; +} diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec index 151ea1c6478..5fa68007254 100644 --- a/dlls/tbs/tbs.spec +++ b/dlls/tbs/tbs.spec @@ -6,7 +6,7 @@ @ stdcall Tbsi_Context_Create(ptr ptr) @ stub Tbsi_Create_Windows_Key @ stub Tbsi_FilterLog -@ stub Tbsi_GetDeviceInfo +@ stdcall Tbsi_GetDeviceInfo(long ptr) @ stub Tbsi_Get_OwnerAuth @ stub Tbsi_Get_TCG_Log @ stub Tbsi_Get_TCG_Log_Ex -- 2.32.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