December 2020 - Wine-commits

Alexandre Julliard : wine.inf: Create a default win.ini file.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 31062ee534e1a9b6ed02dafb1967f7cbe7520420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31062ee534e1a9b6ed02dafb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 12:19:25 2020 +0100 wine.inf: Create a default win.ini file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d292b065a0e..0cbbcb710f6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2758,6 +2758,8 @@ system.ini, drivers32,,"; vidc.IV50=ir50_32.dll" system.ini, drivers32,,"; vidc.IV31=ir32_32.dll" system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" +win.ini, mail,,"mapi=1" + [Timezones] ; The timezone information (TZI field) comes from the Olson timezone database ; http://www.twinsun.com/tz/tz-link.htm

1 0

Alexandre Julliard : rpcrt4/tests: Avoid a printf format warning.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: b61cfa88235d77cee4878837afd9f65d025e4a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b61cfa88235d77cee4878837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 12:19:18 2020 +0100 rpcrt4/tests: Avoid a printf format warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 0b9e71ec0a2..8ae63a140e7 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -896,9 +896,9 @@ static void test_RpcIfInqId(void) ok(status == RPC_S_OK, "Test %u: Expected %#x, got %#x.\n", test_idx, RPC_S_OK, status); ok(!memcmp(&if_id.Uuid, &guid, sizeof(guid)), "Test %u: Expected UUID %s, got %s.\n", test_idx, wine_dbgstr_guid(&guid), wine_dbgstr_guid(&if_id.Uuid)); - ok(if_id.VersMajor == 1, "Test %u: Expected major version %hu, got %hu.\n", test_idx, 1, + ok(if_id.VersMajor == 1, "Test %u: Expected major version 1, got %hu.\n", test_idx, if_id.VersMajor); - ok(if_id.VersMinor == 2, "Test %u: Expected minor version %hu, got %hu.\n", test_idx, 2, + ok(if_id.VersMinor == 2, "Test %u: Expected minor version 2, got %hu.\n", test_idx, if_id.VersMinor); } }

1 0

Alexandre Julliard : hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 810a2f0be26a308b5105d5e97bc2a7223962800d URL: https://source.winehq.org/git/wine.git/?a=commit;h=810a2f0be26a308b5105d5e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 12:19:34 2020 +0100 hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index f9c13a91312..75bbc2e4ba2 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -102,7 +102,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * char *text = &content.buf[1]; int textlen = content.len-1; - if(!_strnicmp(node_name.buf, "title", -1)) + if(!stricmp(node_name.buf, "title")) { int wlen = MultiByteToWideChar(CP_ACP, 0, text, textlen, NULL, 0); title = heap_alloc((wlen+1)*sizeof(WCHAR));

1 0

Nikolay Sivov : dwrite/shaping: Merge extension subtables handling with existing helper.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 240567a8b3858c67b32f2146a190cf2abbb8bc1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=240567a8b3858c67b32f2146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 2 14:44:01 2020 +0300 dwrite/shaping: Merge extension subtables handling with existing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 103 +++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 60 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 68da6e4ecfb..1cf47e5ac69 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3499,13 +3499,46 @@ static void opentype_layout_apply_gpos_value(struct scriptshaping_context *conte } } +struct lookup +{ + unsigned short index; + unsigned short type; + unsigned short flags; + unsigned short subtable_count; + + unsigned int mask; + unsigned int offset; +}; + static unsigned int opentype_layout_get_gsubgpos_subtable(const struct scriptshaping_context *context, - unsigned int lookup_offset, unsigned int subtable) + const struct lookup *lookup, unsigned int subtable, unsigned int *lookup_type) { - unsigned int subtable_offset = table_read_be_word(&context->table->table, lookup_offset + + unsigned int subtable_offset = table_read_be_word(&context->table->table, lookup->offset + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + const struct ot_gsubgpos_extension_format1 *format1; + + subtable_offset += lookup->offset; + + if ((context->table == &context->cache->gsub && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || + (context->table == &context->cache->gpos && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) + { + *lookup_type = lookup->type; + return subtable_offset; + } + + *lookup_type = 0; + + if (!(format1 = table_read_ensure(&context->table->table, subtable_offset, sizeof(*format1)))) + return 0; + + if (GET_BE_WORD(format1->format) != 1) + { + WARN("Unexpected extension table format %#x.\n", format1->format); + return 0; + } - return lookup_offset + subtable_offset; + *lookup_type = GET_BE_WORD(format1->lookup_type); + return subtable_offset + GET_BE_DWORD(format1->extension_offset); } struct ot_lookup @@ -3715,17 +3748,6 @@ static BOOL glyph_iterator_prev(struct glyph_iterator *iter) return FALSE; } -struct lookup -{ - unsigned short index; - unsigned short type; - unsigned short flags; - unsigned short subtable_count; - - unsigned int mask; - unsigned int offset; -}; - static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { @@ -4247,31 +4269,6 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap return TRUE; } -static unsigned int opentype_layout_adjust_extension_subtable(struct scriptshaping_context *context, - unsigned int *subtable_offset, const struct lookup *lookup) -{ - const struct ot_gsubgpos_extension_format1 *format1; - - if ((context->table == &context->cache->gsub && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || - (context->table == &context->cache->gpos && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) - { - return lookup->type; - } - - if (!(format1 = table_read_ensure(&context->table->table, *subtable_offset, sizeof(*format1)))) - return 0; - - if (GET_BE_WORD(format1->format) != 1) - { - WARN("Unexpected extension table format %#x.\n", format1->format); - return 0; - } - - *subtable_offset = *subtable_offset + GET_BE_DWORD(format1->extension_offset); - - return GET_BE_WORD(format1->lookup_type); -} - static BOOL opentype_layout_apply_context(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset); static BOOL opentype_layout_apply_chain_context(struct scriptshaping_context *context, const struct lookup *lookup, @@ -4284,9 +4281,7 @@ static BOOL opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); switch (lookup_type) { @@ -5595,9 +5590,7 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); switch (lookup_type) { @@ -5740,14 +5733,9 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c static BOOL opentype_is_gsub_lookup_reversed(const struct scriptshaping_context *context, const struct lookup *lookup) { - unsigned int subtable_offset, lookup_type = lookup->type; + unsigned int lookup_type; - if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) - { - subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, 0); - /* Assumes format 1. */ - lookup_type = table_read_be_word(&context->table->table, subtable_offset + 2); - } + opentype_layout_get_gsubgpos_subtable(context, lookup, 0, &lookup_type); return lookup_type == GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST; } @@ -5914,9 +5902,7 @@ static BOOL opentype_layout_gsub_lookup_is_glyph_covered(struct scriptshaping_co for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); format = table_read_be_word(gsub, subtable_offset); @@ -5981,9 +5967,7 @@ static BOOL opentype_layout_gpos_lookup_is_glyph_covered(struct scriptshaping_co for (i = 0; i < lookup->subtable_count; ++i) { - unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); + unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup, i, &lookup_type); format = table_read_be_word(gpos, subtable_offset); @@ -6104,8 +6088,7 @@ BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) for (j = 0; j < lookup->subtable_count && !count; ++j) { - subtable_offset = opentype_layout_get_gsubgpos_subtable(&context, lookup->offset, j); - lookup_type = opentype_layout_adjust_extension_subtable(&context, &subtable_offset, lookup); + subtable_offset = opentype_layout_get_gsubgpos_subtable(&context, lookup, j, &lookup_type); if (lookup_type != GSUB_LOOKUP_SINGLE_SUBST) continue;

1 0

Michael Stefaniuc : windowscodecs: Use wide-char string literals in metadataquery.c.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: e5e76fd311a1a439a7b83b0fd6ebdabce91fdf3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5e76fd311a1a439a7b83b0f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:20 2020 +0100 windowscodecs: Use wide-char string literals in metadataquery.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 241 +++++++++++-------------------------- 1 file changed, 71 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5e76fd311a1a439a7b8…

1 0

Michael Stefaniuc : windowscodecs: Use wide-char string literals in regsvr.c.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: dcb65e3f6578614bf873da4a20ed18137ad5eae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcb65e3f6578614bf873da4a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:22 2020 +0100 windowscodecs: Use wide-char string literals in regsvr.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 2fb03a2e1e9..5ab43353320 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -147,37 +147,36 @@ static HRESULT unregister_pixelformats(struct regsvr_pixelformat const *list); /*********************************************************************** * static string constants */ -static const WCHAR clsid_keyname[] = { - 'C', 'L', 'S', 'I', 'D', 0 }; +static const WCHAR clsid_keyname[] = L"CLSID"; static const char author_valuename[] = "Author"; static const char friendlyname_valuename[] = "FriendlyName"; -static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; -static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; +static const WCHAR vendor_valuename[] = L"Vendor"; +static const WCHAR containerformat_valuename[] = L"ContainerFormat"; static const char version_valuename[] = "Version"; static const char mimetypes_valuename[] = "MimeTypes"; static const char extensions_valuename[] = "FileExtensions"; -static const WCHAR formats_keyname[] = {'F','o','r','m','a','t','s',0}; -static const WCHAR patterns_keyname[] = {'P','a','t','t','e','r','n','s',0}; -static const WCHAR instance_keyname[] = {'I','n','s','t','a','n','c','e',0}; -static const WCHAR clsid_valuename[] = {'C','L','S','I','D',0}; +static const WCHAR formats_keyname[] = L"Formats"; +static const WCHAR patterns_keyname[] = L"Patterns"; +static const WCHAR instance_keyname[] = L"Instance"; +static const WCHAR clsid_valuename[] = L"CLSID"; static const char length_valuename[] = "Length"; static const char position_valuename[] = "Position"; static const char pattern_valuename[] = "Pattern"; static const char mask_valuename[] = "Mask"; static const char endofstream_valuename[] = "EndOfStream"; -static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; -static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a','F','o','r','m','a','t',0}; +static const WCHAR pixelformats_keyname[] = L"PixelFormats"; +static const WCHAR metadataformat_valuename[] = L"MetadataFormat"; static const char specversion_valuename[] = "SpecVersion"; static const char requiresfullstream_valuename[] = "RequiresFullStream"; static const char supportspadding_valuename[] = "SupportsPadding"; static const char requiresfixedsize_valuename[] = "FixedSize"; -static const WCHAR containers_keyname[] = {'C','o','n','t','a','i','n','e','r','s',0}; +static const WCHAR containers_keyname[] = L"Containers"; static const char dataoffset_valuename[] = "DataOffset"; static const char bitsperpixel_valuename[] = "BitLength"; static const char channelcount_valuename[] = "ChannelCount"; static const char numericrepresentation_valuename[] = "NumericRepresentation"; static const char supportstransparency_valuename[] = "SupportsTransparency"; -static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; +static const WCHAR channelmasks_keyname[] = L"ChannelMasks"; /*********************************************************************** * register_decoders @@ -305,8 +304,7 @@ static HRESULT register_decoders(struct regsvr_decoder const *list) for (i=0; list->patterns[i].length; i++) { HKEY pattern_key; - static const WCHAR int_format[] = {'%','i',0}; - swprintf(buf, 39, int_format, i); + swprintf(buf, 39, L"%i", i); res = RegCreateKeyExW(patterns_key, buf, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &pattern_key, NULL); if (res != ERROR_SUCCESS) break; @@ -851,8 +849,7 @@ static HRESULT register_metadatareaders(struct regsvr_metadatareader const *list for (i=0; container->patterns[i].length; i++) { HKEY pattern_key; - static const WCHAR int_format[] = {'%','i',0}; - swprintf(buf, 39, int_format, i); + swprintf(buf, 39, L"%i", i); res = RegCreateKeyExW(format_key, buf, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &pattern_key, NULL); if (res != ERROR_SUCCESS) break; @@ -1031,7 +1028,6 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->channelmasks) { - static const WCHAR valuename_format[] = {'%','d',0}; HKEY masks_key; UINT i, mask_size; WCHAR mask_valuename[11]; @@ -1043,7 +1039,7 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; for (i=0; i < list->channelcount; i++) { - swprintf(mask_valuename, ARRAY_SIZE(mask_valuename), valuename_format, i); + swprintf(mask_valuename, ARRAY_SIZE(mask_valuename), L"%d", i); res = RegSetValueExW(masks_key, mask_valuename, 0, REG_BINARY, list->channelmasks[i], mask_size); if (res != ERROR_SUCCESS) break;

1 0

Michael Stefaniuc : windowscodecs: Use wide-char string literals.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: a2c6c3133089ae529e23c7f405d295d8b7a27d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c6c3133089ae529e23c7f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 1 00:58:23 2020 +0100 windowscodecs: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 172 ++++++++++++++++------------------------- dlls/windowscodecs/pngformat.c | 21 +++-- 2 files changed, 75 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2c6c3133089ae529e23…

1 0

Piotr Caban : msvcrt: Use heap structures and definitions from public header.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 6d799bfa06a818b068bec6ce540477f89d4f63e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d799bfa06a818b068bec6ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:24 2020 +0100 msvcrt: Use heap structures and definitions from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 29 +++++++++++++++-------------- dlls/msvcrt/msvcrt.h | 18 ------------------ 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index c541d8aa6fa..94b1f6a6b87 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include <malloc.h> #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -246,9 +247,9 @@ int CDECL _heapchk(void) (sb_heap && !HeapValidate(sb_heap, 0, NULL))) { msvcrt_set_errno(GetLastError()); - return MSVCRT__HEAPBADNODE; + return _HEAPBADNODE; } - return MSVCRT__HEAPOK; + return _HEAPOK; } /********************************************************************* @@ -269,7 +270,7 @@ int CDECL _heapmin(void) /********************************************************************* * _heapwalk (MSVCRT.@) */ -int CDECL _heapwalk(struct MSVCRT__heapinfo* next) +int CDECL _heapwalk(_HEAPINFO *next) { PROCESS_HEAP_ENTRY phe; @@ -279,14 +280,14 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) LOCK_HEAP; phe.lpData = next->_pentry; phe.cbData = next->_size; - phe.wFlags = next->_useflag == MSVCRT__USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; + phe.wFlags = next->_useflag == _USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && !HeapValidate( heap, 0, phe.lpData )) { UNLOCK_HEAP; msvcrt_set_errno(GetLastError()); - return MSVCRT__HEAPBADNODE; + return _HEAPBADNODE; } do @@ -295,19 +296,19 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) { UNLOCK_HEAP; if (GetLastError() == ERROR_NO_MORE_ITEMS) - return MSVCRT__HEAPEND; + return _HEAPEND; msvcrt_set_errno(GetLastError()); if (!phe.lpData) - return MSVCRT__HEAPBADBEGIN; - return MSVCRT__HEAPBADNODE; + return _HEAPBADBEGIN; + return _HEAPBADNODE; } } while (phe.wFlags & (PROCESS_HEAP_REGION|PROCESS_HEAP_UNCOMMITTED_RANGE)); UNLOCK_HEAP; next->_pentry = phe.lpData; next->_size = phe.cbData; - next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? MSVCRT__USEDENTRY : MSVCRT__FREEENTRY; - return MSVCRT__HEAPOK; + next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? _USEDENTRY : _FREEENTRY; + return _HEAPOK; } /********************************************************************* @@ -316,17 +317,17 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) int CDECL _heapset(unsigned int value) { int retval; - struct MSVCRT__heapinfo heap; + _HEAPINFO heap; memset( &heap, 0, sizeof(heap) ); LOCK_HEAP; - while ((retval = _heapwalk(&heap)) == MSVCRT__HEAPOK) + while ((retval = _heapwalk(&heap)) == _HEAPOK) { - if (heap._useflag == MSVCRT__FREEENTRY) + if (heap._useflag == _FREEENTRY) memset(heap._pentry, value, heap._size); } UNLOCK_HEAP; - return retval == MSVCRT__HEAPEND? MSVCRT__HEAPOK : retval; + return retval == _HEAPEND ? _HEAPOK : retval; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 91d5b879a6f..8b20acbfd7e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -247,8 +247,6 @@ extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; -extern unsigned int __cdecl _control87(unsigned int, unsigned int); - /* run-time error codes */ #define _RT_STACK 0 #define _RT_NULLPTR 1 @@ -287,12 +285,6 @@ extern FILE MSVCRT__iob[]; typedef struct _complex _Dcomplex; -struct MSVCRT__heapinfo { - int* _pentry; - size_t _size; - int _useflag; -}; - #ifdef __i386__ struct MSVCRT___JUMP_BUFFER { unsigned long Ebp; @@ -560,16 +552,6 @@ struct MSVCRT__stat64 { #define MSVCRT__P_NOWAITO 3 #define MSVCRT__P_DETACH 4 -#define MSVCRT__HEAPEMPTY -1 -#define MSVCRT__HEAPOK -2 -#define MSVCRT__HEAPBADBEGIN -3 -#define MSVCRT__HEAPBADNODE -4 -#define MSVCRT__HEAPEND -5 -#define MSVCRT__HEAPBADPTR -6 - -#define MSVCRT__FREEENTRY 0 -#define MSVCRT__USEDENTRY 1 - #define MSVCRT__OUT_TO_DEFAULT 0 #define MSVCRT__OUT_TO_STDERR 1 #define MSVCRT__OUT_TO_MSGBOX 2

1 0

Zebediah Figura : tests: Use vkd3d_memmem() in shader_runner_d3d12 (Valgrind).
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: e1aea0a3afbe219cf62b3d196f7acce0a35f2ef7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e1aea0a3afbe219cf62b3d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 1 20:51:08 2020 -0600 tests: Use vkd3d_memmem() in shader_runner_d3d12 (Valgrind). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index bf5c3e0..4221804 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -372,6 +372,7 @@ START_TEST(shader_runner_d3d12) case STATE_PREPROC: { ID3D10Blob *blob = NULL, *errors = NULL; + SIZE_T size; HRESULT hr; char *text; @@ -387,8 +388,11 @@ START_TEST(shader_runner_d3d12) } text = ID3D10Blob_GetBufferPointer(blob); - ok(strstr(text, "pass"), "'pass' not found in preprocessed shader.\n"); - ok(!strstr(text, "fail"), "'fail' found in preprocessed shader.\n"); + size = ID3D10Blob_GetBufferSize(blob); + ok(vkd3d_memmem(text, size, "pass", strlen("pass")), + "'pass' not found in preprocessed shader.\n"); + ok(!vkd3d_memmem(text, size, "fail", strlen("fail")), + "'fail' found in preprocessed shader.\n"); ID3D10Blob_Release(blob); }

1 0

Zebediah Figura : vkd3d-utils: Return an error from open_include() if a NULL ID3DInclude was passed to D3DPreprocess().
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: dc7fd3760d4ca358568d676cfad3dfb0a1e478e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc7fd3760d4ca358568d676… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 1 20:51:09 2020 -0600 vkd3d-utils: Return an error from open_include() if a NULL ID3DInclude was passed to D3DPreprocess(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f799d0a..2bbedd8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -131,6 +131,9 @@ static int open_include(const char *filename, bool local, const char *parent_dat ID3DInclude *iface = context; unsigned int size; + if (!iface) + return VKD3D_ERROR; + if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_data, &code->code, &size))) return VKD3D_ERROR;

1 0