September 2023 - Wine-commits

Zebediah Figura : wined3d: Make wined3d_stateblock_state_{init,cleanup}() static.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: fb0c4ec5a32791ce43eecffcafc4478da26c7d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/fb0c4ec5a32791ce43eecffcafc447… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 16:59:02 2022 -0600 wined3d: Make wined3d_stateblock_state_{init,cleanup}() static. --- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3cd7077eab2..b263bbb8fda 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -489,7 +489,7 @@ void state_unbind_resources(struct wined3d_state *state) } } -void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) +static void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { struct wined3d_light_info *light, *cursor; struct wined3d_vertex_declaration *decl; @@ -2065,7 +2065,7 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state state->streams[i].frequency = 1; } -void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, +static void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, uint32_t flags) { rb_init(&state->light_state->lights_tree, lights_compare); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09f078344c8..c89bd191255 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3608,10 +3608,6 @@ struct wined3d_stateblock unsigned int num_contained_sampler_states; }; -void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, - const struct wined3d_device *device, uint32_t flags) DECLSPEC_HIDDEN; -void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; - bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN; struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_light_state *state,

1 0

Zebediah Figura : wined3d: Move struct wined3d_stateblock into stateblock.c.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: a2c552f723a3aa65eca6e518266c8b9bde4e7176 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2c552f723a3aa65eca6e518266c8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 17:05:34 2022 -0600 wined3d: Move struct wined3d_stateblock into stateblock.c. --- dlls/wined3d/stateblock.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 59 ------------------------------------------ 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b263bbb8fda..c8d62ad9f85 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -28,6 +28,63 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); +struct wined3d_saved_states +{ + uint32_t vs_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_VS_CONSTS_F)]; + uint16_t vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ + uint16_t vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ + uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)]; + uint16_t pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ + uint16_t pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ + uint32_t transform[WINED3D_BITMAP_SIZE(WINED3D_HIGHEST_TRANSFORM_STATE + 1)]; + uint16_t streamSource; /* WINED3D_MAX_STREAMS, 16 */ + uint16_t streamFreq; /* WINED3D_MAX_STREAMS, 16 */ + uint32_t renderState[WINED3D_BITMAP_SIZE(WINEHIGHEST_RENDER_STATE + 1)]; + uint32_t textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ + uint16_t samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ + uint32_t clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ + uint32_t textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ + uint32_t indices : 1; + uint32_t material : 1; + uint32_t viewport : 1; + uint32_t vertexDecl : 1; + uint32_t pixelShader : 1; + uint32_t vertexShader : 1; + uint32_t scissorRect : 1; + uint32_t store_stream_offset : 1; + uint32_t alpha_to_coverage : 1; + uint32_t lights : 1; + uint32_t transforms : 1; + uint32_t padding : 1; + + struct list changed_lights; +}; + +struct stage_state +{ + unsigned int stage, state; +}; + +struct wined3d_stateblock +{ + LONG ref; + struct wined3d_device *device; + + struct wined3d_saved_states changed; + + struct wined3d_stateblock_state stateblock_state; + struct wined3d_light_state light_state; + + unsigned int contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int num_contained_render_states; + unsigned int contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; + unsigned int num_contained_transform_states; + struct stage_state contained_tss_states[WINED3D_MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)]; + unsigned int num_contained_tss_states; + struct stage_state contained_sampler_states[WINED3D_MAX_COMBINED_SAMPLERS * WINED3D_HIGHEST_SAMPLER_STATE]; + unsigned int num_contained_sampler_states; +}; + static const DWORD pixel_states_render[] = { WINED3D_RS_ALPHABLENDENABLE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c89bd191255..0b92ae52e64 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3549,65 +3549,6 @@ struct wined3d_vertex_declaration BOOL position_transformed; }; -struct wined3d_saved_states -{ - uint32_t vs_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_VS_CONSTS_F)]; - WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ - uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)]; - WORD pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - WORD pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ - uint32_t transform[WINED3D_BITMAP_SIZE(WINED3D_HIGHEST_TRANSFORM_STATE + 1)]; - WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ - WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ - uint32_t renderState[WINED3D_BITMAP_SIZE(WINEHIGHEST_RENDER_STATE + 1)]; - DWORD textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ - WORD samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ - DWORD indices : 1; - DWORD material : 1; - DWORD viewport : 1; - DWORD vertexDecl : 1; - DWORD pixelShader : 1; - DWORD vertexShader : 1; - DWORD scissorRect : 1; - DWORD store_stream_offset : 1; - DWORD alpha_to_coverage : 1; - DWORD lights : 1; - DWORD transforms : 1; - DWORD padding : 1; - - struct list changed_lights; -}; - -struct StageState { - DWORD stage; - DWORD state; -}; - -struct wined3d_stateblock -{ - LONG ref; /* Note: Ref counting not required */ - struct wined3d_device *device; - - /* Array indicating whether things have been set or changed */ - struct wined3d_saved_states changed; - - struct wined3d_stateblock_state stateblock_state; - struct wined3d_light_state light_state; - - /* Contained state management */ - DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; - unsigned int num_contained_render_states; - DWORD contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; - unsigned int num_contained_transform_states; - struct StageState contained_tss_states[WINED3D_MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)]; - unsigned int num_contained_tss_states; - struct StageState contained_sampler_states[WINED3D_MAX_COMBINED_SAMPLERS * WINED3D_HIGHEST_SAMPLER_STATE]; - unsigned int num_contained_sampler_states; -}; - bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN; struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_light_state *state,

1 0

Andrew Brobston : d2d1: Support GUID_WICPixelFormat32bppRGB.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: 54b875c08e5700426078f141ce897feb54ca6c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/54b875c08e5700426078f141ce897f… Author: Andrew Brobston <winehq(a)brobston.com> Date: Sun Sep 24 11:01:53 2023 -0500 d2d1: Support GUID_WICPixelFormat32bppRGB. Needed by PowerFritz 18. --- dlls/d2d1/bitmap.c | 1 + dlls/d2d1/tests/d2d1.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 316d0f25ad6..e5048611519 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -680,6 +680,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + {&GUID_WICPixelFormat32bppRGB, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, }; if (FAILED(hr = IWICBitmapSource_GetSize(bitmap_source, &size.width, &size.height))) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9480e1fc1a5..024886706c3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10433,6 +10433,7 @@ static void test_wic_bitmap_format(BOOL d3d11) {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {&GUID_WICPixelFormat32bppPRGBA, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + {&GUID_WICPixelFormat32bppRGB, {DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, }; if (!init_test_context(&ctx, d3d11))

1 0

Bartosz Kosiorek : gdiplus/tests: Add tests of InterpolationMode Bilinear for GdipDrawImagePointsRect.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: d18fd2c194e98840828b36394107dad02b292f62 URL: https://gitlab.winehq.org/wine/wine/-/commit/d18fd2c194e98840828b36394107da… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Sep 17 19:28:30 2023 +0200 gdiplus/tests: Add tests of InterpolationMode Bilinear for GdipDrawImagePointsRect. --- dlls/gdiplus/tests/image.c | 112 +++++++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 18fe8fcba37..4d93e28d951 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4797,6 +4797,23 @@ static void test_image_format(void) } } +INT compare_with_precision(const BYTE *ptr1, const BYTE *ptr2, size_t num, INT precision) +{ + if (ptr1 == NULL || ptr2 == NULL) + return ptr1 < ptr2 ? -1 : 1; + + for (size_t i = 0; i < num; i++) + { + INT byte1 = ptr1[i]; + INT byte2 = ptr2[i]; + + if ((byte1 < byte2 - precision) || (byte1 > byte2 + precision)) + return byte1 < byte2 ? -1 : 1; + } + + return 0; +} + static void test_DrawImage_scale(void) { static const BYTE back_8x1[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40, @@ -4825,45 +4842,71 @@ static void test_DrawImage_scale(void) 0xcc,0xcc,0xcc, 0xcc,0xcc,0xcc, 0x40,0x40,0x40, 0x40,0x40,0x40 }; static const BYTE image_250_half[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0x80,0x80,0x80, 0x80,0x80,0x80, 0x80,0x80,0x80, 0xcc,0xcc,0xcc, 0xcc,0xcc,0xcc, 0x40,0x40,0x40 }; + + static const BYTE image_bil_080[24] = { 0x40,0x40,0x40, 0x93,0x93,0x93, 0x86,0x86,0x86, 0x40,0x40,0x40, + 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40 }; + static const BYTE image_bil_120[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0xb2,0xb2,0xb2, 0x87,0x87,0x87, + 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40 }; + static const BYTE image_bil_150[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0x99,0x99,0x99, 0xcc,0xcc,0xcc, + 0x6f,0x6f,0x6f, 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40 }; + static const BYTE image_bil_180[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0x88,0x88,0x88, 0xb2,0xb2,0xb2, + 0xad,0xad,0xad, 0x5f,0x5f,0x5f, 0x40,0x40,0x40, 0x40,0x40,0x40 }; + static const BYTE image_bil_200[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0x80,0x80,0x80, 0xa6,0xa6,0xa6, + 0xcc,0xcc,0xcc, 0x86,0x86,0x86, 0x40,0x40,0x40, 0x40,0x40,0x40 }; + static const BYTE image_bil_250[24] = { 0x40,0x40,0x40, 0x40,0x40,0x40, 0x40,0x40,0x40, 0x8f,0x8f,0x8f, + 0xad,0xad,0xad, 0xcc,0xcc,0xcc, 0x95,0x95,0x95, 0x5c,0x5c,0x5c }; static const struct test_data { REAL scale_x; + InterpolationMode interpolation_mode; PixelOffsetMode pixel_offset_mode; const BYTE *image; + INT precision; BOOL todo; } td[] = { - { 0.8, PixelOffsetModeNone, image_080 }, /* 0 */ - { 1.0, PixelOffsetModeNone, image_100 }, - { 1.2, PixelOffsetModeNone, image_120 }, - { 1.5, PixelOffsetModeNone, image_150 }, - { 1.8, PixelOffsetModeNone, image_180 }, - { 2.0, PixelOffsetModeNone, image_200 }, - { 2.5, PixelOffsetModeNone, image_250 }, - - { 0.8, PixelOffsetModeHighSpeed, image_080 }, /* 7 */ - { 1.0, PixelOffsetModeHighSpeed, image_100 }, - { 1.2, PixelOffsetModeHighSpeed, image_120 }, - { 1.5, PixelOffsetModeHighSpeed, image_150 }, - { 1.8, PixelOffsetModeHighSpeed, image_180 }, - { 2.0, PixelOffsetModeHighSpeed, image_200 }, - { 2.5, PixelOffsetModeHighSpeed, image_250 }, - - { 0.8, PixelOffsetModeHalf, image_080 }, /* 14 */ - { 1.0, PixelOffsetModeHalf, image_100 }, - { 1.2, PixelOffsetModeHalf, image_120_half, TRUE }, - { 1.5, PixelOffsetModeHalf, image_150_half, TRUE }, - { 1.8, PixelOffsetModeHalf, image_180_half, TRUE }, - { 2.0, PixelOffsetModeHalf, image_200_half, TRUE }, - { 2.5, PixelOffsetModeHalf, image_250_half, TRUE }, - - { 0.8, PixelOffsetModeHighQuality, image_080 }, /* 21 */ - { 1.0, PixelOffsetModeHighQuality, image_100 }, - { 1.2, PixelOffsetModeHighQuality, image_120_half, TRUE }, - { 1.5, PixelOffsetModeHighQuality, image_150_half, TRUE }, - { 1.8, PixelOffsetModeHighQuality, image_180_half, TRUE }, - { 2.0, PixelOffsetModeHighQuality, image_200_half, TRUE }, - { 2.5, PixelOffsetModeHighQuality, image_250_half, TRUE }, + { 0.8, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_080 }, /* 0 */ + { 1.0, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_100 }, + { 1.2, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_120 }, + { 1.5, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_150 }, + { 1.8, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_180 }, + { 2.0, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_200 }, + { 2.5, InterpolationModeNearestNeighbor, PixelOffsetModeNone, image_250 }, + + { 0.8, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_080 }, /* 7 */ + { 1.0, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_100 }, + { 1.2, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_120 }, + { 1.5, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_150 }, + { 1.8, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_180 }, + { 2.0, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_200 }, + { 2.5, InterpolationModeNearestNeighbor, PixelOffsetModeHighSpeed, image_250 }, + + /* TODO There are missing left pixel column of image*/ + { 0.8, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_080 }, /* 14 */ + { 1.0, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_100 }, + { 1.2, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_120_half, 0, TRUE }, + { 1.5, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_150_half, 0, TRUE }, + { 1.8, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_180_half, 0, TRUE }, + { 2.0, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_200_half, 0, TRUE }, + { 2.5, InterpolationModeNearestNeighbor, PixelOffsetModeHalf, image_250_half, 0, TRUE }, + + { 0.8, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_080 }, /* 21 */ + { 1.0, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_100 }, + { 1.2, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_120_half, 0, TRUE }, + { 1.5, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_150_half, 0, TRUE }, + { 1.8, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_180_half, 0, TRUE }, + { 2.0, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_200_half, 0, TRUE }, + { 2.5, InterpolationModeNearestNeighbor, PixelOffsetModeHighQuality, image_250_half, 0, TRUE }, + + /* The bilinear interpolation results are little bit different than on Windows */ + /* TODO In two cases, there are missing right pixel column of image */ + { 0.8, InterpolationModeBilinear, PixelOffsetModeNone, image_bil_080, 1, TRUE }, /* 28 */ + { 1.0, InterpolationModeBilinear, PixelOffsetModeNone, image_100 }, + { 1.2, InterpolationModeBilinear, PixelOffsetModeNone, image_bil_120, 2 }, + { 1.5, InterpolationModeBilinear, PixelOffsetModeNone, image_bil_150, 1 }, + { 1.8, InterpolationModeBilinear, PixelOffsetModeNone, image_bil_180, 1, TRUE }, + { 2.0, InterpolationModeBilinear, PixelOffsetModeNone, image_bil_200, 1 }, + { 2.5, InterpolationModeBilinear, PixelOffsetModeNone, image_bil_250, 1 }, }; BYTE src_2x1[6] = { 0x80,0x80,0x80, 0xcc,0xcc,0xcc }; BYTE dst_8x1[24]; @@ -4888,11 +4931,12 @@ static void test_DrawImage_scale(void) expect(Ok, status); status = GdipGetImageGraphicsContext(u2.image, &graphics); expect(Ok, status); - status = GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); - expect(Ok, status); for (i = 0; i < ARRAY_SIZE(td); i++) { + status = GdipSetInterpolationMode(graphics, td[i].interpolation_mode); + expect(Ok, status); + status = GdipSetPixelOffsetMode(graphics, td[i].pixel_offset_mode); expect(Ok, status); @@ -4906,7 +4950,7 @@ static void test_DrawImage_scale(void) status = GdipDrawImageI(graphics, u1.image, 1, 0); expect(Ok, status); - match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; + match = compare_with_precision(dst_8x1, td[i].image, sizeof(dst_8x1), td[i].precision) == 0; todo_wine_if (!match && td[i].todo) ok(match, "%d: data should match\n", i); if (!match)

1 0

Brendan Shanks : msv1_0: Implement ntlm_fork() using posix_spawn().
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: 6d366ce7b40d4adf043e23065db92a98660a99a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/6d366ce7b40d4adf043e23065db92a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 13 12:01:13 2023 -0700 msv1_0: Implement ntlm_fork() using posix_spawn(). --- dlls/msv1_0/unixlib.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index 5ab028ed51f..b51dde2ef0a 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -28,6 +28,7 @@ #include <unistd.h> #include <fcntl.h> #include <errno.h> +#include <spawn.h> #include <sys/wait.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -39,6 +40,8 @@ #include "wine/debug.h" #include "unixlib.h" +extern char **environ; + WINE_DEFAULT_DEBUG_CHANNEL(ntlm); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -155,6 +158,7 @@ static NTSTATUS ntlm_fork( void *args ) { const struct fork_params *params = args; struct ntlm_ctx *ctx = params->ctx; + posix_spawn_file_actions_t file_actions; int pipe_in[2], pipe_out[2]; #ifdef HAVE_PIPE2 @@ -179,29 +183,29 @@ static NTSTATUS ntlm_fork( void *args ) fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); } - if (!(ctx->pid = fork())) /* child */ - { - dup2( pipe_out[0], 0 ); - close( pipe_out[0] ); - close( pipe_out[1] ); + posix_spawn_file_actions_init( &file_actions ); - dup2( pipe_in[1], 1 ); - close( pipe_in[0] ); - close( pipe_in[1] ); + posix_spawn_file_actions_adddup2( &file_actions, pipe_out[0], 0 ); + posix_spawn_file_actions_addclose( &file_actions, pipe_out[0] ); + posix_spawn_file_actions_addclose( &file_actions, pipe_out[1] ); - execvp( params->argv[0], params->argv ); + posix_spawn_file_actions_adddup2( &file_actions, pipe_in[1], 1 ); + posix_spawn_file_actions_addclose( &file_actions, pipe_in[0] ); + posix_spawn_file_actions_addclose( &file_actions, pipe_in[1] ); - write( 1, "BH\n", 3 ); - _exit( 1 ); - } - else + if (posix_spawnp( &ctx->pid, params->argv[0], &file_actions, NULL, params->argv, environ )) { - ctx->pipe_in = pipe_in[0]; - close( pipe_in[1] ); - ctx->pipe_out = pipe_out[1]; - close( pipe_out[0] ); + ctx->pid = -1; + write( pipe_in[1], "BH\n", 3 ); } + ctx->pipe_in = pipe_in[0]; + close( pipe_in[1] ); + ctx->pipe_out = pipe_out[1]; + close( pipe_out[0] ); + + posix_spawn_file_actions_destroy( &file_actions ); + return SEC_E_OK; }

1 0

Akihiro Sagawa : cmd/tests: Add dir built-in command test.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: 6800ab403e94d626f5ca0d01c516eae0a4a8a896 URL: https://gitlab.winehq.org/wine/wine/-/commit/6800ab403e94d626f5ca0d01c516ea… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 19 22:38:41 2023 +0900 cmd/tests: Add dir built-in command test. --- programs/cmd/tests/Makefile.in | 3 +- programs/cmd/tests/directory.c | 133 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 87942fedcf9..9f50cbe042b 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = cmd.exe C_SRCS = \ - batch.c + batch.c \ + directory.c RC_SRCS = rsrc.rc diff --git a/programs/cmd/tests/directory.c b/programs/cmd/tests/directory.c new file mode 100644 index 00000000000..7b965f068b0 --- /dev/null +++ b/programs/cmd/tests/directory.c @@ -0,0 +1,133 @@ +/* + * Copyright 2023 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "wine/test.h" + +#define MAX_BUFFER 65536 + +static char stdout_buffer[MAX_BUFFER], stderr_buffer[MAX_BUFFER]; +static DWORD stdout_size, stderr_size; +static char work_dir[MAX_PATH]; + +static void read_all_from_handle(HANDLE handle, char *buffer, DWORD *size) +{ + char bytes[4096]; + DWORD bytes_read; + + memset(buffer, 0, MAX_BUFFER); + *size = 0; + for (;;) + { + BOOL success = ReadFile(handle, bytes, sizeof(bytes), &bytes_read, NULL); + if (!success || !bytes_read) + break; + if (*size + bytes_read > MAX_BUFFER) + { + ok(FALSE, "Insufficient buffer.\n"); + break; + } + memcpy(buffer + *size, bytes, bytes_read); + *size += bytes_read; + } +} + +#define run_dir(a, b) _run_dir(__FILE__, __LINE__, a, b) +static void _run_dir(const char *file, int line, const char *commandline, int exitcode_expected) +{ + HANDLE child_stdout_write, child_stderr_write, parent_stdout_read, parent_stderr_read; + SECURITY_ATTRIBUTES security_attributes = {0}; + PROCESS_INFORMATION process_info = {0}; + STARTUPINFOA startup_info = {0}; + DWORD exitcode; + char cmd[256]; + + security_attributes.nLength = sizeof(SECURITY_ATTRIBUTES); + security_attributes.bInheritHandle = TRUE; + + CreatePipe(&parent_stdout_read, &child_stdout_write, &security_attributes, 0); + CreatePipe(&parent_stderr_read, &child_stderr_write, &security_attributes, 0); + SetHandleInformation(parent_stdout_read, HANDLE_FLAG_INHERIT, 0); + SetHandleInformation(parent_stderr_read, HANDLE_FLAG_INHERIT, 0); + + startup_info.cb = sizeof(STARTUPINFOA); + startup_info.hStdOutput = child_stdout_write; + startup_info.hStdError = child_stderr_write; + startup_info.dwFlags |= STARTF_USESTDHANDLES; + + sprintf(cmd, "cmd.exe /d /c dir %s", commandline); + CreateProcessA(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info); + CloseHandle(child_stdout_write); + CloseHandle(child_stderr_write); + + read_all_from_handle(parent_stdout_read, stdout_buffer, &stdout_size); + read_all_from_handle(parent_stderr_read, stderr_buffer, &stderr_size); + CloseHandle(parent_stdout_read); + CloseHandle(parent_stderr_read); + + WaitForSingleObject(process_info.hProcess, INFINITE); + GetExitCodeProcess(process_info.hProcess, &exitcode); + CloseHandle(process_info.hProcess); + CloseHandle(process_info.hThread); + ok_(file, line)(exitcode == exitcode_expected, "expected exitcode %d, got %ld\n", + exitcode_expected, exitcode); +} + +static void test_basic(void) +{ + /* no options */ + run_dir("", 0); + ok(stdout_size > 0, "unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "unexpected stderr buffer size %ld.\n", stderr_size); + + /* if file doesn't exist, cmd.exe prints an error message to stderr. */ + run_dir("nonexistent", 1); + ok(stdout_size > 0, "unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size > 0, "unexpected stderr buffer size %ld.\n", stderr_size); + + /* unknown option produces an error message to stderr. */ + run_dir("/*", 1); + ok(stdout_size == 0, "unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size > 0, "unexpected stderr buffer size %ld.\n", stderr_size); + + /* errorlevel for usage is 0. But, cmd.exe's exit code is 1. */ + todo_wine run_dir("/?", 1); + ok(stdout_size > 0, "unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "unexpected stderr buffer size %ld.\n", stderr_size); +} + +START_TEST(directory) +{ + WCHAR curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + GetTempPathA(ARRAY_SIZE(work_dir), work_dir); + lstrcatA(work_dir, "winetest.dir"); + ret = CreateDirectoryA(work_dir, NULL); + ok(ret, "Failed to create %s\n", work_dir); + ret = SetCurrentDirectoryA(work_dir); + ok(ret, "Failed to set the working directory\n"); + + test_basic(); + + ret = SetCurrentDirectoryW(curdir); + ok(ret, "Failed to restore the current directory\n"); + ret = RemoveDirectoryA(work_dir); + ok(ret, "Failed to remove the working directory\n"); +}

1 0

Akihiro Sagawa : cmd/tests: Test file time stamp format.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: 2188e11e787c85a3fa08df20a4edf3a5e7441a3c URL: https://gitlab.winehq.org/wine/wine/-/commit/2188e11e787c85a3fa08df20a4edf3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 19 22:38:41 2023 +0900 cmd/tests: Test file time stamp format. --- programs/cmd/tests/directory.c | 127 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/programs/cmd/tests/directory.c b/programs/cmd/tests/directory.c index 7b965f068b0..6644bc52b35 100644 --- a/programs/cmd/tests/directory.c +++ b/programs/cmd/tests/directory.c @@ -25,6 +25,8 @@ static char stdout_buffer[MAX_BUFFER], stderr_buffer[MAX_BUFFER]; static DWORD stdout_size, stderr_size; static char work_dir[MAX_PATH]; +typedef BOOL (*find_line_callback)(const char* line, void *data); + static void read_all_from_handle(HANDLE handle, char *buffer, DWORD *size) { char bytes[4096]; @@ -88,6 +90,36 @@ static void _run_dir(const char *file, int line, const char *commandline, int ex exitcode_expected, exitcode); } +static BOOL find_line(const char* buf, find_line_callback callback, void *data) +{ + BOOL found = FALSE; + const char* p = buf; + char *line = NULL; + size_t size = 0; + + while (*p) + { + size_t len; + const char* eol = strpbrk(p, "\r\n"); + len = eol ? (eol - p) : strlen(p); + if (len + 1 > size) + { + char *ptr = realloc(line, len + 1); + if (!ptr) break; + line = ptr; + size = len + 1; + } + memcpy(line, p, len); + line[len] = '\0'; + found = callback(line, data); + if (found) break; + if (*eol == '\r' && *(eol+1) == '\n') eol++; + p = eol + 1; + } + free(line); + return found; +} + static void test_basic(void) { /* no options */ @@ -111,6 +143,100 @@ static void test_basic(void) ok(stderr_size == 0, "unexpected stderr buffer size %ld.\n", stderr_size); } +struct timestamp_param { + SYSTEMTIME st; + const char* filename; +}; + +static BOOL match_timestamp(const char* line, void *data) +{ + const struct timestamp_param *param = (const struct timestamp_param *)data; + char pattern[MAX_BUFFER], *ptr; + + if ((ptr = strstr(line, " 0 ")) && strstr(ptr, param->filename)) { + char format[60]; + + while (*ptr == ' ') *ptr-- = '\0'; + + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, format, sizeof(format)); + if ((ptr = strstr(format, "d")) && strncmp(ptr, "ddd", 3) && + (!strncmp(ptr, "dd", 2) || !strncmp(ptr, "d", 1))) + { + sprintf(pattern, "%02hd", param->st.wDay); + todo_wine_if(strncmp(ptr, "dd", 2)) + ok(!!strstr(line, pattern), "expected day %s, got %s\n", pattern, wine_dbgstr_a(line)); + } + else + skip("date format %s doesn't represent day of the month as digits\n", wine_dbgstr_a(format)); + + if ((ptr = strstr(format, "M")) && strncmp(ptr, "MMM", 3) && + (!strncmp(ptr, "MM", 2) || !strncmp(ptr, "M", 1))) + { + sprintf(pattern, "%02hd", param->st.wMonth); + todo_wine_if(strncmp(ptr, "MM", 2)) + ok(!!strstr(line, pattern), "expected month %s, got %s\n", pattern, wine_dbgstr_a(line)); + } + else + skip("date format %s doesn't represent month as digits\n", wine_dbgstr_a(format)); + + GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, format, sizeof(format)); + if (strstr(format, "h") || strstr(format, "H")) + { + sprintf(pattern, "%02hd", param->st.wHour); + todo_wine_if(!strstr(format, "hh") && !strstr(format, "HH")) + ok(!!strstr(line, pattern), "expected hour %s, got %s\n", pattern, wine_dbgstr_a(line)); + } + else + skip("time format %s doesn't represent hour as digits\n", wine_dbgstr_a(format)); + + if (strstr(format, "m")) + { + sprintf(pattern, "%02hd", param->st.wMinute); + todo_wine_if(!strstr(format, "mm")) + ok(!!strstr(line, pattern), "expected minute %s, got %s\n", pattern, wine_dbgstr_a(line)); + } + else + skip("time format %s doesn't represent minute as digits\n", wine_dbgstr_a(format)); + + return TRUE; + } + return FALSE; +} + +static void test_timestamp(void) +{ + static const char* filename = "test.dir"; + FILETIME local, ft; + SYSTEMTIME st = { + /* Use single digits for leading zeros except the year */ + .wYear = 2009, .wMonth = 1, .wDay = 3, .wHour = 5, .wMinute = 7, + }; + struct timestamp_param param = { + .filename = filename, + }; + HANDLE file; + BOOL ret; + + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Can't create file, err %lu\n", GetLastError()); + + SystemTimeToFileTime(&st, &local); + LocalFileTimeToFileTime(&local, &ft); + SetFileTime(file, NULL, NULL, &ft); + FileTimeToLocalFileTime(&ft, &local); + FileTimeToSystemTime(&local, &param.st); + + CloseHandle(file); + + run_dir(filename, 0); + stdout_buffer[stdout_size] = '\0'; + ret = find_line(stdout_buffer, match_timestamp, &param); + ok(ret, "file name is not found in the output\n"); + + ret = DeleteFileA(filename); + ok(ret, "Can't delete file, err %lu\n", GetLastError()); +} + START_TEST(directory) { WCHAR curdir[MAX_PATH]; @@ -125,6 +251,7 @@ START_TEST(directory) ok(ret, "Failed to set the working directory\n"); test_basic(); + test_timestamp(); ret = SetCurrentDirectoryW(curdir); ok(ret, "Failed to restore the current directory\n");

1 0

Akihiro Sagawa : cmd: Always outputs leading zeros when listing file time information.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: ae8b7109f050754d95c15752741fa29059cd278e URL: https://gitlab.winehq.org/wine/wine/-/commit/ae8b7109f050754d95c15752741fa2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 19 22:39:10 2023 +0900 cmd: Always outputs leading zeros when listing file time information. --- programs/cmd/directory.c | 118 +++++++++++++++++++++++++++++++++++++++-- programs/cmd/tests/directory.c | 4 -- 2 files changed, 114 insertions(+), 8 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 6efcbb3a841..4d3ae3f9c7d 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -41,6 +41,10 @@ typedef enum _DISPLAYORDER Date } DISPLAYORDER; +#define MAX_DATETIME_FORMAT 80 + +static WCHAR date_format[MAX_DATETIME_FORMAT * 2]; +static WCHAR time_format[MAX_DATETIME_FORMAT * 2]; static int file_total, dir_total, max_width; static ULONGLONG byte_total; static DISPLAYTIME dirTime; @@ -345,8 +349,10 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le FileTimeToLocalFileTime (&fd[i].ftCreationTime, &ft); } FileTimeToSystemTime (&ft, &st); - GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, ARRAY_SIZE(datestring)); - GetTimeFormatW(0, TIME_NOSECONDS, &st, NULL, timestring, ARRAY_SIZE(timestring)); + GetDateFormatW(LOCALE_USER_DEFAULT, 0, &st, date_format, + datestring, ARRAY_SIZE(datestring)); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, time_format, + timestring, ARRAY_SIZE(timestring)); if (wide) { @@ -375,7 +381,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le dir_count++; if (!bare) { - WCMD_output (L"%1!10s! %2!8s! <DIR> ", datestring, timestring); + WCMD_output (L"%1 %2 <DIR> ", datestring, timestring); if (shortname) WCMD_output(L"%1!-13s!", fd[i].cAlternateFileName); if (usernames) WCMD_output(L"%1!-23s!", username); WCMD_output(L"%1",fd[i].cFileName); @@ -394,7 +400,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le file_size.u.HighPart = fd[i].nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; if (!bare) { - WCMD_output (L"%1!10s! %2!8s! %3!10s! ", datestring, timestring, + WCMD_output (L"%1 %2 %3!14s! ", datestring, timestring, WCMD_filesize64(file_size.QuadPart)); if (shortname) WCMD_output(L"%1!-13s!", fd[i].cAlternateFileName); if (usernames) WCMD_output(L"%1!-23s!", username); @@ -523,6 +529,107 @@ static void WCMD_dir_trailer(const WCHAR *path) { } } +/* Get the length of a date/time formatting pattern */ +/* copied from dlls/kernelbase/locale.c */ +static int get_pattern_len( const WCHAR *pattern, const WCHAR *accept ) +{ + int i; + + if (*pattern == '\'') + { + for (i = 1; pattern[i]; i++) + { + if (pattern[i] != '\'') continue; + if (pattern[++i] != '\'') return i; + } + return i; + } + if (!wcschr( accept, *pattern )) return 1; + for (i = 1; pattern[i]; i++) if (pattern[i] != pattern[0]) break; + return i; +} + +/* Initialize date format to use abbreviated one with leading zeros */ +static void init_date_format(void) +{ + WCHAR sys_format[MAX_DATETIME_FORMAT]; + int src_pat_len, dst_pat_len; + const WCHAR *src; + WCHAR *dst = date_format; + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, sys_format, ARRAY_SIZE(sys_format)); + + for (src = sys_format; *src; src += src_pat_len, dst += dst_pat_len) { + src_pat_len = dst_pat_len = get_pattern_len(src, L"yMd"); + + switch (*src) + { + case '\'': + wmemcpy(dst, src, src_pat_len); + break; + + case 'd': + case 'M': + if (src_pat_len == 4) /* full name */ + dst_pat_len--; /* -> use abbreviated one */ + /* fallthrough */ + case 'y': + if (src_pat_len == 1) /* without leading zeros */ + dst_pat_len++; /* -> with leading zeros */ + wmemset(dst, *src, dst_pat_len); + break; + + default: + *dst = *src; + break; + } + } + *dst = '\0'; + + TRACE("date format: %s\n", wine_dbgstr_w(date_format)); +} + +/* Initialize time format to use leading zeros */ +static void init_time_format(void) +{ + WCHAR sys_format[MAX_DATETIME_FORMAT]; + int src_pat_len, dst_pat_len; + const WCHAR *src; + WCHAR *dst = time_format; + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, sys_format, ARRAY_SIZE(sys_format)); + + for (src = sys_format; *src; src += src_pat_len, dst += dst_pat_len) { + src_pat_len = dst_pat_len = get_pattern_len(src, L"Hhmst"); + + switch (*src) + { + case '\'': + wmemcpy(dst, src, src_pat_len); + break; + + case 'H': + case 'h': + case 'm': + case 's': + if (src_pat_len == 1) /* without leading zeros */ + dst_pat_len++; /* -> with leading zeros */ + /* fallthrough */ + case 't': + wmemset(dst, *src, dst_pat_len); + break; + + default: + *dst = *src; + break; + } + } + *dst = '\0'; + + /* seconds portion will be dropped by TIME_NOSECONDS */ + TRACE("time format: %s\n", wine_dbgstr_w(time_format)); +} + /***************************************************************************** * WCMD_directory * @@ -727,6 +834,9 @@ void WCMD_directory (WCHAR *args) WCMD_enter_paged_mode(NULL); } + init_date_format(); + init_time_format(); + argno = 0; argN = args; GetCurrentDirectoryW(MAX_PATH, cwd); diff --git a/programs/cmd/tests/directory.c b/programs/cmd/tests/directory.c index 6644bc52b35..1a62ce120ca 100644 --- a/programs/cmd/tests/directory.c +++ b/programs/cmd/tests/directory.c @@ -163,7 +163,6 @@ static BOOL match_timestamp(const char* line, void *data) (!strncmp(ptr, "dd", 2) || !strncmp(ptr, "d", 1))) { sprintf(pattern, "%02hd", param->st.wDay); - todo_wine_if(strncmp(ptr, "dd", 2)) ok(!!strstr(line, pattern), "expected day %s, got %s\n", pattern, wine_dbgstr_a(line)); } else @@ -173,7 +172,6 @@ static BOOL match_timestamp(const char* line, void *data) (!strncmp(ptr, "MM", 2) || !strncmp(ptr, "M", 1))) { sprintf(pattern, "%02hd", param->st.wMonth); - todo_wine_if(strncmp(ptr, "MM", 2)) ok(!!strstr(line, pattern), "expected month %s, got %s\n", pattern, wine_dbgstr_a(line)); } else @@ -183,7 +181,6 @@ static BOOL match_timestamp(const char* line, void *data) if (strstr(format, "h") || strstr(format, "H")) { sprintf(pattern, "%02hd", param->st.wHour); - todo_wine_if(!strstr(format, "hh") && !strstr(format, "HH")) ok(!!strstr(line, pattern), "expected hour %s, got %s\n", pattern, wine_dbgstr_a(line)); } else @@ -192,7 +189,6 @@ static BOOL match_timestamp(const char* line, void *data) if (strstr(format, "m")) { sprintf(pattern, "%02hd", param->st.wMinute); - todo_wine_if(!strstr(format, "mm")) ok(!!strstr(line, pattern), "expected minute %s, got %s\n", pattern, wine_dbgstr_a(line)); } else

1 0

Biswapriyo Nath : include: Add ID3D12VideoEncoderHeap in d3d12video.idl.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: c965dbae349017264458d90f19e72c40f7cf2f1f URL: https://gitlab.winehq.org/wine/wine/-/commit/c965dbae349017264458d90f19e72c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:41:41 2023 +0000 include: Add ID3D12VideoEncoderHeap in d3d12video.idl. --- include/d3d12video.idl | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 2dbba443cdc..723d8aa8826 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -612,6 +612,81 @@ typedef struct D3D12_VIDEO_ENCODER_PROFILE_DESC }; } D3D12_VIDEO_ENCODER_PROFILE_DESC; +typedef enum D3D12_VIDEO_ENCODER_LEVELS_H264 +{ + D3D12_VIDEO_ENCODER_LEVELS_H264_1 = 0, + D3D12_VIDEO_ENCODER_LEVELS_H264_1b = 1, + D3D12_VIDEO_ENCODER_LEVELS_H264_11 = 2, + D3D12_VIDEO_ENCODER_LEVELS_H264_12 = 3, + D3D12_VIDEO_ENCODER_LEVELS_H264_13 = 4, + D3D12_VIDEO_ENCODER_LEVELS_H264_2 = 5, + D3D12_VIDEO_ENCODER_LEVELS_H264_21 = 6, + D3D12_VIDEO_ENCODER_LEVELS_H264_22 = 7, + D3D12_VIDEO_ENCODER_LEVELS_H264_3 = 8, + D3D12_VIDEO_ENCODER_LEVELS_H264_31 = 9, + D3D12_VIDEO_ENCODER_LEVELS_H264_32 = 10, + D3D12_VIDEO_ENCODER_LEVELS_H264_4 = 11, + D3D12_VIDEO_ENCODER_LEVELS_H264_41 = 12, + D3D12_VIDEO_ENCODER_LEVELS_H264_42 = 13, + D3D12_VIDEO_ENCODER_LEVELS_H264_5 = 14, + D3D12_VIDEO_ENCODER_LEVELS_H264_51 = 15, + D3D12_VIDEO_ENCODER_LEVELS_H264_52 = 16, + D3D12_VIDEO_ENCODER_LEVELS_H264_6 = 17, + D3D12_VIDEO_ENCODER_LEVELS_H264_61 = 18, + D3D12_VIDEO_ENCODER_LEVELS_H264_62 = 19, +} D3D12_VIDEO_ENCODER_LEVELS_H264; + +typedef enum D3D12_VIDEO_ENCODER_TIER_HEVC +{ + D3D12_VIDEO_ENCODER_TIER_HEVC_MAIN = 0, + D3D12_VIDEO_ENCODER_TIER_HEVC_HIGH = 1, +} D3D12_VIDEO_ENCODER_TIER_HEVC; + +typedef enum D3D12_VIDEO_ENCODER_LEVELS_HEVC +{ + D3D12_VIDEO_ENCODER_LEVELS_HEVC_1 = 0, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_2 = 1, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_21 = 2, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_3 = 3, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_31 = 4, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_4 = 5, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_41 = 6, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_5 = 7, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_51 = 8, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_52 = 9, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_6 = 10, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_61 = 11, + D3D12_VIDEO_ENCODER_LEVELS_HEVC_62 = 12, +} D3D12_VIDEO_ENCODER_LEVELS_HEVC; + +typedef struct D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC +{ + D3D12_VIDEO_ENCODER_LEVELS_HEVC Level; + D3D12_VIDEO_ENCODER_TIER_HEVC Tier; +} D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC; + +typedef struct D3D12_VIDEO_ENCODER_LEVEL_SETTING +{ + UINT DataSize; + union + { + D3D12_VIDEO_ENCODER_LEVELS_H264 *pH264LevelSetting; + D3D12_VIDEO_ENCODER_LEVEL_TIER_CONSTRAINTS_HEVC *pHEVCLevelSetting; + }; +} D3D12_VIDEO_ENCODER_LEVEL_SETTING; + +typedef struct D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC +{ + UINT Width; + UINT Height; +} D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC; + +typedef enum D3D12_VIDEO_ENCODER_HEAP_FLAGS +{ + D3D12_VIDEO_ENCODER_HEAP_FLAG_NONE = 0x0, +} D3D12_VIDEO_ENCODER_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_HEAP_FLAGS);") + typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_0_ALL_LUMA_CHROMA_SLICE_BLOCK_EDGES_ALWAYS_FILTERED = 0, @@ -733,3 +808,33 @@ interface ID3D12VideoEncoder : ID3D12Pageable D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE GetMaxMotionEstimationPrecision(); } + +[ + uuid(22b35d96-876a-44c0-b25e-fb8c9c7f1c4a), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoEncoderHeap : ID3D12Pageable +{ + UINT GetNodeMask(); + + D3D12_VIDEO_ENCODER_HEAP_FLAGS GetEncoderHeapFlags(); + + D3D12_VIDEO_ENCODER_CODEC GetCodec(); + + HRESULT GetCodecProfile( + [in, out] D3D12_VIDEO_ENCODER_PROFILE_DESC dst_profile + ); + + HRESULT GetCodecLevel( + [in, out] D3D12_VIDEO_ENCODER_LEVEL_SETTING dst_level + ); + + UINT GetResolutionListCount(); + + HRESULT GetResolutionList( + [in] const UINT resolutions_list_count, + [out] D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *resolution_list + ); +}

1 0

Biswapriyo Nath : include: Add ID3D12VideoDevice3 in d3d12video.idl.
by Alexandre Julliard 26 Sep '23

26 Sep '23

Module: wine Branch: master Commit: 15b46d5b56a5f31020150176aa711427932656f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/15b46d5b56a5f31020150176aa7114… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 26 03:41:47 2023 +0000 include: Add ID3D12VideoDevice3 in d3d12video.idl. --- include/d3d12video.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 723d8aa8826..277ceb8776d 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -687,6 +687,17 @@ typedef enum D3D12_VIDEO_ENCODER_HEAP_FLAGS } D3D12_VIDEO_ENCODER_HEAP_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_HEAP_FLAGS);") +typedef struct D3D12_VIDEO_ENCODER_HEAP_DESC +{ + UINT NodeMask; + D3D12_VIDEO_ENCODER_HEAP_FLAGS Flags; + D3D12_VIDEO_ENCODER_CODEC EncodeCodec; + D3D12_VIDEO_ENCODER_PROFILE_DESC EncodeProfile; + D3D12_VIDEO_ENCODER_LEVEL_SETTING EncodeLevel; + UINT ResolutionsListCount; + const D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *pResolutionList; +} D3D12_VIDEO_ENCODER_HEAP_DESC; + typedef enum D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODES { D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION_H264_SLICES_DEBLOCKING_MODE_0_ALL_LUMA_CHROMA_SLICE_BLOCK_EDGES_ALWAYS_FILTERED = 0, @@ -782,6 +793,17 @@ typedef enum D3D12_VIDEO_ENCODER_FLAGS } D3D12_VIDEO_ENCODER_FLAGS; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_FLAGS);") +typedef struct D3D12_VIDEO_ENCODER_DESC +{ + UINT NodeMask; + D3D12_VIDEO_ENCODER_FLAGS Flags; + D3D12_VIDEO_ENCODER_CODEC EncodeCodec; + D3D12_VIDEO_ENCODER_PROFILE_DESC EncodeProfile; + DXGI_FORMAT InputFormat; + D3D12_VIDEO_ENCODER_CODEC_CONFIGURATION CodecConfiguration; + D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE MaxMotionEstimationPrecision; +} D3D12_VIDEO_ENCODER_DESC; + [ uuid(2e0d212d-8df9-44a6-a770-bb289b182737), object, @@ -838,3 +860,24 @@ interface ID3D12VideoEncoderHeap : ID3D12Pageable [out] D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC *resolution_list ); } + +[ + uuid(4243adb4-3a32-4666-973c-0ccc5625dc44), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDevice3 : ID3D12VideoDevice2 +{ + HRESULT CreateVideoEncoder( + [in] const D3D12_VIDEO_ENCODER_DESC *desc, + [in] REFIID riid, + [out] void **video_encoder + ); + + HRESULT CreateVideoEncoderHeap( + [in] const D3D12_VIDEO_ENCODER_HEAP_DESC *desc, + [in] REFIID riid, + [out] void **video_encoder_heap + ); +}

1 0