April 2022 - Wine-commits - list.winehq.org

Paul Gofman : kernel32/tests: Add a broken last error result in test_CopyFileW().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: e015409e743df36b8e08e08eeb77773d9cb3bb8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e015409e743df36b8e08e08e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 27 09:03:34 2022 -0500 kernel32/tests: Add a broken last error result in test_CopyFileW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52858 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1fb9e98cf41..378078c20d5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -902,12 +902,14 @@ static void test_CopyFileW(void) SetLastError(0xdeadbeef); ret = CopyFileW(source, dest, FALSE); ok(ret, "CopyFileW: error %ld\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Unexpected error %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = CopyFileExW(source, dest, NULL, NULL, NULL, 0 ); ok(ret, "CopyFileExW: error %ld\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Unexpected error %lu.\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError());

1 0

Dmitry Timoshkov : ieframe: Initialize new history log entry.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 732f281570e3d33508c4619b160ea9d655a93a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=732f281570e3d33508c4619b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 26 20:40:20 2022 +0300 ieframe: Initialize new history log entry. In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..e73659f1736 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -469,6 +469,8 @@ static void update_travellog(DocHost *This) if(This->travellog.loading_pos == -1) { This->travellog.position++; + This->travellog.log[This->travellog.position].stream = NULL; + This->travellog.log[This->travellog.position].url = NULL; }else { This->travellog.position = This->travellog.loading_pos; This->travellog.loading_pos = -1;

1 0

Ziqing Hui : include: Add defines for ID2D1Transform.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 6b77ceee871e8b1174debdf8ee58f614eb19a551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b77ceee871e8b1174debdf8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 27 12:24:38 2022 +0800 include: Add defines for ID2D1Transform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 162 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index cec7de8c311..6838492c498 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -258,3 +258,165 @@ interface ID2D1TransformGraph : IUnknown [in] UINT32 index ); } + +[ + object, + uuid(ef1a287d-342a-4f76-8fdb-da0d6ea9f92b), + local, +] +interface ID2D1Transform : ID2D1TransformNode +{ + HRESULT MapOutputRectToInputRects( + [in] const D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *input_rects, + [in] UINT32 input_rects_count + ); + HRESULT MapInputRectsToOutputRect( + [in] const D2D1_RECT_L *input_rects, + [in] const D2D1_RECT_L *input_opaque_rects, + [in] UINT32 input_rect_count, + [out] D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *output_opaque_rect + ); + HRESULT MapInvalidRect( + [in] UINT32 index, + [in] D2D1_RECT_L input_rect, + [out] D2D1_RECT_L *output_rect + ); +} + +[ + object, + uuid(36bfdcb6-9739-435d-a30d-a653beff6a6f), + local, +] +interface ID2D1DrawTransform : ID2D1Transform +{ + HRESULT SetDrawInfo( + [in] ID2D1DrawInfo *info + ); +} + +[ + object, + uuid(0d85573c-01e3-4f7d-bfd9-0d60608bf3c3), + local, +] +interface ID2D1ComputeTransform : ID2D1Transform +{ + HRESULT SetComputeInfo( + [in] ID2D1ComputeInfo *info + ); + HRESULT CalculateThreadgroups( + [in] const D2D1_RECT_L *output_rect, + [out] UINT32 *dimension_x, + [out] UINT32 *dimension_y, + [out] UINT32 *dimension_z + ); +} + +[ + object, + uuid(0359dc30-95e6-4568-9055-27720d130e93), + local, +] +interface ID2D1AnalysisTransform : IUnknown +{ + HRESULT ProcessAnalysisResults( + [in] const BYTE *data, + [in] UINT32 size + ); +} + +[ + object, + uuid(db1800dd-0c34-4cf9-be90-31cc0a5653e1), + local, +] +interface ID2D1SourceTransform : ID2D1Transform +{ + HRESULT SetRenderInfo( + [in] ID2D1RenderInfo *info + ); + HRESULT Draw( + [in] ID2D1Bitmap1 *target, + [in] const D2D1_RECT_L *draw_rect, + [in] D2D1_POINT_2U target_origin + ); +} + +[ + object, + uuid(1a799d8a-69f7-4e4c-9fed-437ccc6684cc), + local, +] +interface ID2D1ConcreteTransform : ID2D1TransformNode +{ + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); +} + +[ + object, + uuid(63ac0b32-ba44-450f-8806-7f4ca1ff2f1b), + local, +] +interface ID2D1BlendTransform : ID2D1ConcreteTransform +{ + void SetDescription( + [in] const D2D1_BLEND_DESCRIPTION *description + ); + void GetDescription( + [out] D2D1_BLEND_DESCRIPTION *description + ); +} + +[ + object, + uuid(4998735c-3a19-473c-9781-656847e3a347), + local, +] +interface ID2D1BorderTransform : ID2D1ConcreteTransform +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); +} + +[ + object, + uuid(3fe6adea-7643-4f53-bd14-a0ce63f24042), + local, +] +interface ID2D1OffsetTransform : ID2D1TransformNode +{ + void SetOffset( + [in] D2D1_POINT_2L offset + ); + D2D1_POINT_2L GetOffset(); +} + +[ + object, + uuid(90f732e2-5092-4606-a819-8651970baccd), + local, +] +interface ID2D1BoundsAdjustmentTransform : ID2D1TransformNode +{ + void SetOutputBounds( + [in] const D2D1_RECT_L *bounds + ); + void GetOutputBounds( + [out] D2D1_RECT_L *bounds + ); +}

1 0

Matteo Bruni : d3dx9/effect: Return a uint32_t from the bytecode read helper.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 71091ed5d9a6fb567f5da8864e999ff34e0f6d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71091ed5d9a6fb567f5da886… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 27 10:27:54 2022 +0200 d3dx9/effect: Return a uint32_t from the bytecode read helper. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 16 +-- dlls/d3dx9_36/effect.c | 268 +++++++++++++++++++++--------------------- 2 files changed, 141 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71091ed5d9a6fb567f5d…

1 0

Eric Pouech : d3dx9: Use correct integral type.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: fc67b16803a6f7793573b28d9cd69c7106468a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc67b16803a6f7793573b28d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 27 10:27:55 2022 +0200 d3dx9: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 3 ++- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/shader.c | 21 +++++++++++---------- dlls/d3dx9_36/surface.c | 6 +++--- dlls/d3dx9_36/volume.c | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 44bcda0271a..7ee754b104a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -230,7 +230,8 @@ static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) /* Returns the smallest power of 2 which is greater than or equal to num */ static inline uint32_t make_pow2(uint32_t num) { - uint32_t index; + DWORD index; + return BitScanReverse(&index, num - 1) ? 1u << (index + 1) : 1; } diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6cfe97492f3..f74fba6e424 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -54,7 +54,7 @@ struct d3dx9_mesh IDirect3DVertexBuffer9 *vertex_buffer; IDirect3DIndexBuffer9 *index_buffer; DWORD *attrib_buffer; - int attrib_buffer_lock_count; + LONG attrib_buffer_lock_count; DWORD attrib_table_size; D3DXATTRIBUTERANGE *attrib_table; }; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 2241455898e..eae01674c0a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -281,7 +281,7 @@ static HRESULT WINAPI d3dx_include_from_file_open(ID3DXInclude *iface, D3DXINCLU if(!buffer) goto error; *buffer = pathname; - if(!ReadFile(file, buffer + 1, size, bytes, NULL)) + if (!ReadFile(file, buffer + 1, size, (DWORD *)bytes, NULL)) goto error; *data = buffer + 1; @@ -339,11 +339,11 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - const void *buffer; - DWORD len; - HRESULT hr; struct d3dx_include_from_file include_from_file; + const void *buffer; + unsigned int len; char *filename_a; + HRESULT hr; TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, flags, shader, error_messages); @@ -475,11 +475,12 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { - const void *buffer; - DWORD len, filename_len; - HRESULT hr; struct d3dx_include_from_file include_from_file; + unsigned int filename_len; + const void *buffer; char *filename_a; + HRESULT hr; + UINT len; TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " "flags %#x, shader %p, error_messages %p, constant_table %p.\n", @@ -603,11 +604,11 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMACRO *defines, ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - const void *buffer; - DWORD len; - HRESULT hr; struct d3dx_include_from_file include_from_file; + const void *buffer; char *filename_a; + HRESULT hr; + UINT len; TRACE("filename %s, defines %p, include %p, shader %p, error_messages %p.\n", debugstr_w(filename), defines, include, shader, error_messages); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 2ca6f093b55..39733d3ef7e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1391,7 +1391,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileW(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const WCHAR *src_file, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - UINT data_size; + DWORD data_size; void *data; HRESULT hr; @@ -1417,7 +1417,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const char *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - UINT data_size; + DWORD data_size; HRSRC resinfo; void *data; @@ -1445,7 +1445,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const WCHAR *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - UINT data_size; + DWORD data_size; HRSRC resinfo; void *data; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 93afaa16b10..d601650cff5 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -60,9 +60,9 @@ HRESULT WINAPI D3DXLoadVolumeFromFileW(IDirect3DVolume9 *dst_volume, D3DCOLOR color_key, D3DXIMAGE_INFO *info) { + DWORD data_size; HRESULT hr; void *data; - UINT data_size; TRACE("(%p, %p, %p, %s, %p, %#x, %#x, %p)\n", dst_volume, dst_palette, dst_box, debugstr_w(filename), src_box,

1 0

Nikolay Sivov : nls: Hardcode minus sign for all locales.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 1ad2cb51c5b3cf98104ea15db4fc6f38e9da6e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad2cb51c5b3cf98104ea15d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 14:21:16 2022 +0300 nls: Hardcode minus sign for all locales. CLDR data for RTL locales includes LRM marker for minus sign text, in addition to that some locales are using different dash character. Windows seems to consistently use same character for all locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52866 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 730526 -> 730506 bytes tools/make_unicode | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nls/locale.nls b/nls/locale.nls index 329224c92fc..af2f061944a 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 29dea8cd52e..40b64ddca71 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -4716,7 +4716,7 @@ sub build_locale_data() $sthousand =~ s/\x{202f}/\x{00a0}/; my $smonthousandsep = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/currencyGroup" ) || $sthousand; my $spositivesign = ""; - my $snegativesign = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/minusSign" ); + my $snegativesign = "-"; my $spercent = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/percentSign" ); my $snan = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/nan" ); my $sposinfinity = loc_query( $loc, "/ldml/numbers/symbols[\@numberSystem='latn']/infinity" );

1 0

Nikolay Sivov : dwrite/opentype: Use stdint type for color font structures.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: b3291c80fb23b8d42b4272644df4d675fba06960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3291c80fb23b8d42b427264… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 14:22:54 2022 +0300 dwrite/opentype: Use stdint type for color font structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 110 +++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 49 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 195607aa67f..9aeef88c92c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -243,25 +243,25 @@ struct tt_hhea struct sbix_header { - WORD version; - WORD flags; - DWORD num_strikes; - DWORD strike_offset[1]; + uint16_t version; + uint16_t flags; + uint32_t num_strikes; + uint32_t strike_offset[1]; }; struct sbix_strike { - WORD ppem; - WORD ppi; - DWORD glyphdata_offsets[1]; + uint16_t ppem; + uint16_t ppi; + uint32_t glyphdata_offsets[1]; }; struct sbix_glyph_data { - WORD originOffsetX; - WORD originOffsetY; - DWORD graphic_type; - BYTE data[1]; + int16_t originOffsetX; + int16_t originOffsetY; + uint32_t graphic_type; + uint8_t data[1]; }; struct maxp @@ -272,29 +272,41 @@ struct maxp struct cblc_header { - WORD major_version; - WORD minor_version; - DWORD num_sizes; + uint16_t major_version; + uint16_t minor_version; + uint32_t num_sizes; }; -typedef struct { - BYTE res[12]; -} sbitLineMetrics; +struct sbit_line_metrics +{ + int8_t ascender; + int8_t descender; + uint8_t widthMax; + int8_t caretSlopeNumerator; + int8_t caretSlopeDenominator; + int8_t caretOffset; + int8_t minOriginSB; + int8_t minAdvanceSB; + int8_t maxBeforeBL; + int8_t minAfterBL; + int8_t pad1; + int8_t pad2; +}; struct cblc_bitmapsize_table { - DWORD indexSubTableArrayOffset; - DWORD indexTablesSize; - DWORD numberofIndexSubTables; - DWORD colorRef; - sbitLineMetrics hori; - sbitLineMetrics vert; - WORD startGlyphIndex; - WORD endGlyphIndex; - BYTE ppemX; - BYTE ppemY; - BYTE bit_depth; - BYTE flags; + uint32_t indexSubTableArrayOffset; + uint32_t indexTablesSize; + uint32_t numberofIndexSubTables; + uint32_t colorRef; + struct sbit_line_metrics hori; + struct sbit_line_metrics vert; + uint16_t startGlyphIndex; + uint16_t endGlyphIndex; + uint8_t ppemX; + uint8_t ppemY; + uint8_t bit_depth; + int8_t flags; }; struct gasp_range @@ -1204,43 +1216,43 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_WEIGHT_ST /* CPAL table */ struct cpal_header_0 { - USHORT version; - USHORT num_palette_entries; - USHORT num_palettes; - USHORT num_color_records; - ULONG offset_first_color_record; - USHORT color_record_indices[1]; + uint16_t version; + uint16_t num_palette_entries; + uint16_t num_palettes; + uint16_t num_color_records; + uint32_t offset_first_color_record; + uint16_t color_record_indices[1]; }; struct cpal_color_record { - BYTE blue; - BYTE green; - BYTE red; - BYTE alpha; + uint8_t blue; + uint8_t green; + uint8_t red; + uint8_t alpha; }; /* COLR table */ struct colr_header { - USHORT version; - USHORT num_baseglyph_records; - ULONG offset_baseglyph_records; - ULONG offset_layer_records; - USHORT num_layer_records; + uint16_t version; + uint16_t num_baseglyph_records; + uint32_t offset_baseglyph_records; + uint32_t offset_layer_records; + uint16_t num_layer_records; }; struct colr_baseglyph_record { - USHORT glyph; - USHORT first_layer_index; - USHORT num_layers; + uint16_t glyph; + uint16_t first_layer_index; + uint16_t num_layers; }; struct colr_layer_record { - USHORT glyph; - USHORT palette_index; + uint16_t glyph; + uint16_t palette_index; }; struct meta_data_map

1 0

Nikolay Sivov : dwrite/opentype: Use stdint types for font file structures.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: f5e33215ee2e6f9af05185e6519aa4f2620b2bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e33215ee2e6f9af05185e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 27 14:22:55 2022 +0300 dwrite/opentype: Use stdint types for font file structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 194 ++++++++++++++++++++++++++----------------------- 1 file changed, 104 insertions(+), 90 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 9aeef88c92c..7df0d207bc6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -73,39 +73,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define GLYPH_CONTEXT_MAX_LENGTH 64 #define SHAPE_MAX_NESTING_LEVEL 6 -typedef struct { - CHAR TTCTag[4]; - DWORD Version; - DWORD numFonts; - DWORD OffsetTable[1]; -} TTC_Header_V1; - -typedef struct { - DWORD version; - WORD numTables; - WORD searchRange; - WORD entrySelector; - WORD rangeShift; -} TTC_SFNT_V1; - -typedef struct { - DWORD tag; - DWORD checkSum; - DWORD offset; - DWORD length; -} TT_TableRecord; +struct ttc_header +{ + uint32_t tag; + uint16_t major_version; + uint16_t minor_version; + uint32_t num_fonts; + uint32_t offsets[1]; +}; + +struct ot_table_dir +{ + uint32_t version; + uint16_t numTables; + uint16_t searchRange; + uint16_t entrySelector; + uint16_t rangeShift; +}; + +struct ot_table_record +{ + uint32_t tag; + uint32_t checksum; + uint32_t offset; + uint32_t length; +}; struct cmap_encoding_record { - WORD platformID; - WORD encodingID; - DWORD offset; + uint16_t platformID; + uint16_t encodingID; + uint32_t offset; }; struct cmap_header { - WORD version; - WORD num_tables; + uint16_t version; + uint16_t num_tables; struct cmap_encoding_record tables[1]; }; @@ -224,21 +228,21 @@ struct tt_os2 struct tt_hhea { - USHORT majorVersion; - USHORT minorVersion; - SHORT ascender; - SHORT descender; - SHORT linegap; - USHORT advanceWidthMax; - SHORT minLeftSideBearing; - SHORT minRightSideBearing; - SHORT xMaxExtent; - SHORT caretSlopeRise; - SHORT caretSlopeRun; - SHORT caretOffset; - SHORT reserved[4]; - SHORT metricDataFormat; - USHORT numberOfHMetrics; + uint16_t majorVersion; + uint16_t minorVersion; + int16_t ascender; + int16_t descender; + int16_t linegap; + uint16_t advanceWidthMax; + int16_t minLeftSideBearing; + int16_t minRightSideBearing; + int16_t xMaxExtent; + int16_t caretSlopeRise; + int16_t caretSlopeRun; + int16_t caretOffset; + int16_t reserved[4]; + int16_t metricDataFormat; + uint16_t numberOfHMetrics; }; struct sbix_header @@ -337,49 +341,49 @@ enum OS2_FSSELECTION { struct name_record { - WORD platformID; - WORD encodingID; - WORD languageID; - WORD nameID; - WORD length; - WORD offset; + uint16_t platformID; + uint16_t encodingID; + uint16_t languageID; + uint16_t nameID; + uint16_t length; + uint16_t offset; }; struct name_header { - WORD format; - WORD count; - WORD stringOffset; + uint16_t format; + uint16_t count; + uint16_t stringOffset; struct name_record records[1]; }; struct vdmx_header { - WORD version; - WORD num_recs; - WORD num_ratios; + uint16_t version; + uint16_t num_recs; + uint16_t num_ratios; }; struct vdmx_ratio { - BYTE bCharSet; - BYTE xRatio; - BYTE yStartRatio; - BYTE yEndRatio; + uint8_t bCharSet; + uint8_t xRatio; + uint8_t yStartRatio; + uint8_t yEndRatio; }; struct vdmx_vtable { - WORD yPelHeight; - SHORT yMax; - SHORT yMin; + uint16_t yPelHeight; + int16_t yMax; + int16_t yMin; }; struct vdmx_group { - WORD recs; - BYTE startsz; - BYTE endsz; + uint16_t recs; + uint8_t startsz; + uint8_t endsz; struct vdmx_vtable entries[1]; }; @@ -1257,17 +1261,17 @@ struct colr_layer_record struct meta_data_map { - DWORD tag; - DWORD offset; - DWORD length; + uint32_t tag; + uint32_t offset; + uint32_t length; }; struct meta_header { - DWORD version; - DWORD flags; - DWORD reserved; - DWORD data_maps_count; + uint32_t version; + uint32_t flags; + uint32_t reserved; + uint32_t data_maps_count; struct meta_data_map maps[1]; }; @@ -1338,8 +1342,7 @@ typedef HRESULT (*dwrite_fontfile_analyzer)(IDWriteFontFileStream *stream, UINT3 static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type) { - static const DWORD ttctag = MS_TTCF_TAG; - const TTC_Header_V1 *header; + const struct ttc_header *header; void *context; HRESULT hr; @@ -1347,8 +1350,9 @@ static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font if (FAILED(hr)) return hr; - if (!memcmp(header->TTCTag, &ttctag, sizeof(ttctag))) { - *font_count = GET_BE_DWORD(header->numFonts); + if (header->tag == MS_TTCF_TAG) + { + *font_count = GET_BE_DWORD(header->num_fonts); *file_type = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION; *face_type = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION; } @@ -1519,8 +1523,8 @@ HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, void **table_context, UINT32 *table_size, BOOL *found) { void *table_directory_context, *sfnt_context; - TT_TableRecord *table_record = NULL; - TTC_SFNT_V1 *font_header = NULL; + const struct ot_table_record *table_record = NULL; + const struct ot_table_dir *table_dir = NULL; UINT32 table_offset = 0; UINT16 table_count; HRESULT hr; @@ -1531,38 +1535,48 @@ HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, *table_data = NULL; *table_context = NULL; - if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) { - const TTC_Header_V1 *ttc_header; + if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) + { + const struct ttc_header *ttc_header; void * ttc_context; - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); - if (SUCCEEDED(hr)) { - if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->numFonts)) + + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&ttc_header, 0, + sizeof(*ttc_header), &ttc_context); + if (SUCCEEDED(hr)) + { + if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->num_fonts)) hr = E_INVALIDARG; - else { - table_offset = GET_BE_DWORD(ttc_header->OffsetTable[stream_desc->face_index]); - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + else + { + table_offset = GET_BE_DWORD(ttc_header->offsets[stream_desc->face_index]); + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, table_offset, + sizeof(*table_dir), &sfnt_context); } IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, ttc_context); } } else - hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, 0, + sizeof(*table_dir), &sfnt_context); if (FAILED(hr)) return hr; - table_count = GET_BE_WORD(font_header->numTables); - table_offset += sizeof(*font_header); + table_count = GET_BE_WORD(table_dir->numTables); + table_offset += sizeof(*table_dir); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, sfnt_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_record, table_offset, table_count * sizeof(*table_record), &table_directory_context); - if (hr == S_OK) { + if (hr == S_OK) + { UINT16 i; - for (i = 0; i < table_count; i++) { - if (table_record->tag == tag) { + for (i = 0; i < table_count; ++i) + { + if (table_record->tag == tag) + { UINT32 offset = GET_BE_DWORD(table_record->offset); UINT32 length = GET_BE_DWORD(table_record->length);

1 0

Alexandre Julliard : kernelbase: Add support for storing LOCALE_SINTLSYMBOL in the registry.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: d6effa7282ba58e0c38158e4ffe7e613b9d6defa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6effa7282ba58e0c38158e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 14:00:34 2022 +0200 kernelbase: Add support for storing LOCALE_SINTLSYMBOL in the registry. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 125 +++++++++++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6effa7282ba58e0c381…

1 0

Alexandre Julliard : kernel32/tests: Mark a failing test as broken.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: f68cccc82579ebedf6f9961f3bc30b2eb9307e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f68cccc82579ebedf6f9961f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 16:13:39 2022 +0200 kernel32/tests: Mark a failing test as broken. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52861 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 48 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 8dc5814162a..65687313fbb 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4435,29 +4435,31 @@ static void test_GetCPInfo(void) ok( ret, "UnmapViewOfFile failed err %lu\n", GetLastError() ); status = pNtGetNlsSectionPtr( 11, 65001, NULL, &ptr, &size ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "failed %lx\n", status ); - if (pRtlInitCodePageTable) - { - static USHORT utf8[20] = { 0, CP_UTF8 }; - - memset( &table, 0xcc, sizeof(table) ); - pRtlInitCodePageTable( utf8, &table ); - ok( table.CodePage == CP_UTF8, "wrong codepage %u\n", table.CodePage ); - if (table.MaximumCharacterSize) - { - ok( table.MaximumCharacterSize == 4, "wrong char size %u\n", table.MaximumCharacterSize ); - ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); - ok( table.UniDefaultChar == 0xfffd, "wrong default char %x\n", table.UniDefaultChar ); - ok( table.TransDefaultChar == '?', "wrong default char %x\n", table.TransDefaultChar ); - ok( table.TransUniDefaultChar == '?', "wrong default char %x\n", table.TransUniDefaultChar ); - ok( !table.DBCSCodePage, "wrong dbcs %u\n", table.DBCSCodePage ); - ok( !table.MultiByteTable, "wrong mbtable %p\n", table.MultiByteTable ); - ok( !table.WideCharTable, "wrong wctable %p\n", table.WideCharTable ); - ok( !table.DBCSRanges, "wrong ranges %p\n", table.DBCSRanges ); - ok( !table.DBCSOffsets, "wrong offsets %p\n", table.DBCSOffsets ); - } - else win_skip( "utf-8 codepage not supported\n" ); - } + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || broken(!status), /* win10 1709 */ + "failed %lx\n", status ); + if (!status) UnmapViewOfFile( ptr ); + if (pRtlInitCodePageTable) + { + static USHORT utf8[20] = { 0, CP_UTF8 }; + + memset( &table, 0xcc, sizeof(table) ); + pRtlInitCodePageTable( utf8, &table ); + ok( table.CodePage == CP_UTF8, "wrong codepage %u\n", table.CodePage ); + if (table.MaximumCharacterSize) + { + ok( table.MaximumCharacterSize == 4, "wrong char size %u\n", table.MaximumCharacterSize ); + ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); + ok( table.UniDefaultChar == 0xfffd, "wrong default char %x\n", table.UniDefaultChar ); + ok( table.TransDefaultChar == '?', "wrong default char %x\n", table.TransDefaultChar ); + ok( table.TransUniDefaultChar == '?', "wrong default char %x\n", table.TransUniDefaultChar ); + ok( !table.DBCSCodePage, "wrong dbcs %u\n", table.DBCSCodePage ); + ok( !table.MultiByteTable, "wrong mbtable %p\n", table.MultiByteTable ); + ok( !table.WideCharTable, "wrong wctable %p\n", table.WideCharTable ); + ok( !table.DBCSRanges, "wrong ranges %p\n", table.DBCSRanges ); + ok( !table.DBCSOffsets, "wrong offsets %p\n", table.DBCSOffsets ); + } + else win_skip( "utf-8 codepage not supported\n" ); + } /* normalization tables */

1 0