wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from exit.c functions.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 2c35caa7671ec4fbf90651e3301cfc58c011031c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c35caa7671ec4fbf90651e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:47 2020 +0100 msvcrt: Remove MSVCRT_ prefix from exit.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 14 +++++------ dlls/msvcr100/msvcr100.spec | 20 +++++++-------- dlls/msvcr110/msvcr110.spec | 22 ++++++++--------- dlls/msvcr120/msvcr120.spec | 24 +++++++++--------- dlls/msvcr70/msvcr70.spec | 16 ++++++------ dlls/msvcr71/msvcr71.spec | 16 ++++++------ dlls/msvcr80/msvcr80.spec | 20 +++++++-------- dlls/msvcr90/msvcr90.spec | 20 +++++++-------- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/except.c | 6 ++--- dlls/msvcrt/exit.c | 44 ++++++++++++++++----------------- dlls/msvcrt/locale.c | 10 ++++---- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/msvcrt.spec | 18 +++++++------- dlls/msvcrt/process.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 16 ++++++------ dlls/ucrtbase/ucrtbase.spec | 60 ++++++++++++++++++++++----------------------- 18 files changed, 156 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c35caa7671ec4fbf906…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from except.c functions.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 6bd9ea5be9c1e53d2cf7369c5eb75817b3c80df5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bd9ea5be9c1e53d2cf7369c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:42 2020 +0100 msvcrt: Remove MSVCRT_ prefix from except.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrt/except.c | 22 +++++++++++----------- dlls/msvcrt/exit.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 18 +++++++++--------- 14 files changed, 62 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bd9ea5be9c1e53d2cf7…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from environ.c functions.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 9011b0b7c05c481ff043357be655f1fc7e66b924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9011b0b7c05c481ff043357b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:33 2020 +0100 msvcrt: Remove MSVCRT_ prefix from environ.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/dir.c | 4 ++-- dlls/msvcrt/environ.c | 16 ++++++++-------- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/process.c | 2 +- dlls/msvcrt/time.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 17 files changed, 39 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9011b0b7c05c481ff043…

1 0

Piotr Caban : msvcrt: Use stdio.h definitions.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: wine Branch: master Commit: 0d479b9d8c54184cce9678b3095bf01d5b4a473c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d479b9d8c54184cce9678b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 2 00:53:28 2020 +0100 msvcrt: Use stdio.h definitions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 242 ++++++++++++++++++++++++------------------------- dlls/msvcrt/msvcrt.h | 31 +------ include/msvcrt/stdio.h | 1 + 3 files changed, 126 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d479b9d8c54184cce96…

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

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

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

Zebediah Figura : vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: 5065cb6c1f3298bf1cb4612de5b8643a34e00efa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5065cb6c1f3298bf1cb4612… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 2 09:29:11 2020 -0600 vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess(). 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-shader/vkd3d_shader_main.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6289a18..1a02924 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -252,7 +252,8 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) +static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, + bool validate_target_type) { const enum vkd3d_shader_source_type *source_types; const enum vkd3d_shader_target_type *target_types; @@ -276,16 +277,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); - for (i = 0; i < count; ++i) + if (validate_target_type) { - if (target_types[i] == compile_info->target_type) - break; - } - if (i == count) - { - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) + { + if (target_types[i] == compile_info->target_type) + break; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } return VKD3D_OK; @@ -832,7 +836,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -933,7 +937,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -1150,10 +1154,15 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { + int ret; + TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); if (messages) *messages = NULL; + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) + return ret; + return VKD3D_ERROR_NOT_IMPLEMENTED; }

1 0

Zebediah Figura : tests: Add a test for macro invocation split across multiple files.
by Alexandre Julliard 02 Dec '20

02 Dec '20

Module: vkd3d Branch: master Commit: f4bbbb2975d056d4eb587b6e8293e8bc35ca7c26 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f4bbbb2975d056d4eb587b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 1 20:51:11 2020 -0600 tests: Add a test for macro invocation split across multiple files. 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/hlsl_d3d12.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 03a732c..4f4cc37 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -72,6 +72,14 @@ static const char test_include_file2[] = static const char test_include_file3[] = "#undef BRONTES"; +static const char test_include2_top[] = + "#define FUNC(a, b) a ## b\n" + "#include \"file4\"\n" + ",ss)"; + +static const char test_include2_file4[] = + "FUNC(pa"; + static unsigned int refcount_file1, refcount_file2, refcount_file3, include_count_file2; static HRESULT WINAPI test_include_Open(ID3DInclude *iface, D3D_INCLUDE_TYPE type, @@ -106,6 +114,13 @@ static HRESULT WINAPI test_include_Open(ID3DInclude *iface, D3D_INCLUDE_TYPE typ *size = strlen(test_include_file3); ++refcount_file3; } + else if (!strcmp(filename, "file4")) + { + ok(type == D3D_INCLUDE_LOCAL, "Got type %#x.\n", type); + ok(!parent_data, "Got parent data %p.\n", parent_data); + *code = test_include2_file4; + *size = strlen(test_include2_file4); + } else { ok(0, "Unexpected filename \"%s\".\n", filename); @@ -390,6 +405,9 @@ static void test_preprocess(void) ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3); todo ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); + /* Macro invocation spread across multiple files. */ + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2020