November 2020 - Wine-commits

Piotr Caban : msvcp90: Remove MSVCP_bool type.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: af5f928e69e3d822fa055a355d5e36c4be1fe68e URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5f928e69e3d822fa055a35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:58 2020 +0100 msvcp90: Remove MSVCP_bool type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 273 +++++++++++++++++++++++----------------------- dlls/msvcp90/locale.c | 94 ++++++++-------- dlls/msvcp90/math.c | 24 ++-- dlls/msvcp90/misc.c | 26 ++--- dlls/msvcp90/msvcp90.h | 31 +++--- dlls/msvcp90/msvcp_main.c | 4 +- dlls/msvcp90/string.c | 116 ++++++++++---------- 8 files changed, 286 insertions(+), 284 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af5f928e69e3d822fa05…

1 0

Piotr Caban : msvcp60: Remove MSVCP_size_t type.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 5087759e4ce26f177e8d6092761e96c6486ff41d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5087759e4ce26f177e8d6092… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:14 2020 +0100 msvcp60: Remove MSVCP_size_t type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 70 +++--- dlls/msvcp60/main.c | 2 +- dlls/msvcp60/msvcp.h | 41 ++-- dlls/msvcp60/string.c | 578 +++++++++++++++++++++++++------------------------- 4 files changed, 345 insertions(+), 346 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5087759e4ce26f177e8d…

1 0

Piotr Caban : msvcp60: Use wide-char string literals.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 5beff5209ee049556c6b683bfae1f76faf8a0f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beff5209ee049556c6b683b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:18 2020 +0100 msvcp60: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 15b1f74b811..93bd693890c 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2878,21 +2878,20 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) /* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z */ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) { - static const wchar_t rW[] = {'r',0}; static const struct { int mode; const wchar_t str[4]; const wchar_t str_bin[4]; } str_mode[] = { - {OPENMODE_out, {'w',0}, {'w','b',0}}, - {OPENMODE_out|OPENMODE_app, {'a',0}, {'a','b',0}}, - {OPENMODE_app, {'a',0}, {'a','b',0}}, - {OPENMODE_out|OPENMODE_trunc, {'w',0}, {'w','b',0}}, - {OPENMODE_in, {'r',0}, {'r','b',0}}, - {OPENMODE_in|OPENMODE_out, {'r','+',0}, {'r','+','b',0}}, - {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, {'w','+',0}, {'w','+','b',0}}, - {OPENMODE_in|OPENMODE_out|OPENMODE_app, {'a','+',0}, {'a','+','b',0}}, - {OPENMODE_in|OPENMODE_app, {'a','+',0}, {'a','+','b',0}} + {OPENMODE_out, L"w", L"wb"}, + {OPENMODE_out|OPENMODE_app, L"a", L"ab"}, + {OPENMODE_app, L"a", L"ab"}, + {OPENMODE_out|OPENMODE_trunc, L"w", L"wb"}, + {OPENMODE_in, L"r", L"rb"}, + {OPENMODE_in|OPENMODE_out, L"r+", L"r+b"}, + {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, L"w+", L"w+b"}, + {OPENMODE_in|OPENMODE_out|OPENMODE_app, L"a+", L"a+b"}, + {OPENMODE_in|OPENMODE_app, L"a+", L"a+b"} }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); @@ -2907,13 +2906,13 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; - if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) + if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, L"r"))) return NULL; else if(f) fclose(f); if((mode & OPENMODE__Noreplace) && (mode & (OPENMODE_out|OPENMODE_app)) - && (f = _wfopen(name, rW))) { + && (f = _wfopen(name, L"r"))) { fclose(f); return NULL; }

1 0

Piotr Caban : msvcp60/tests: Use wide-char string literals.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 28587de754af661d7e0d9c735e66c1e64676c525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28587de754af661d7e0d9c73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:20 2020 +0100 msvcp60/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 4 +--- dlls/msvcp60/tests/string.c | 21 +++++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 806090b9667..b4753f3ee51 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1614,8 +1614,6 @@ static void test_istream_getline(void) static void test_ostream_print_ushort(void) { - static const wchar_t str65[] = { '6','5',0 }; - basic_stringstream_wchar wss; basic_string_wchar pwstr; const wchar_t *wstr; @@ -1625,7 +1623,7 @@ static void test_ostream_print_ushort(void) call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); - ok(!lstrcmpW(str65, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + ok(!lstrcmpW(L"65", wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); call_func1(p_basic_string_wchar_dtor, &pwstr); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 6a0efc178cf..ca6b05d6627 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -562,12 +562,11 @@ static void test_basic_string_char_concatenate(void) { } static void test_basic_string_char_find(void) { - static const char tmp[] = {'a','a','a','\0','b','b','b',0}; basic_string_char str; size_t ret; call_func1(p_basic_string_char_ctor, &str); - call_func3(p_basic_string_char_assign_cstr_len, &str, tmp, 7); + call_func3(p_basic_string_char_assign_cstr_len, &str, "aaa\0bbb", 7); ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 0, 3); ok(ret == 0, "ret = %lu\n", (unsigned long)ret); ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 1, 3); @@ -660,8 +659,6 @@ static void test_basic_string_char_replace(void) { } static void test_basic_string_wchar(void) { - static const wchar_t test[] = { 't','e','s','t',0 }; - basic_string_wchar str1, str2, *pstr; const wchar_t *str; size_t size, capacity; @@ -676,12 +673,12 @@ static void test_basic_string_wchar(void) { ok(*str == '\0', "*str = %c\n", *str); call_func1(p_basic_string_wchar_dtor, &str1); - pstr = call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, test, &fake_allocator); + pstr = call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, L"test", &fake_allocator); ok(pstr == &str1, "pstr != &str1\n"); str = call_func1(p_basic_string_wchar_cstr, &str1); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str1); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); @@ -691,9 +688,9 @@ static void test_basic_string_wchar(void) { pstr = call_func2(p_basic_string_wchar_copy_ctor, &str2, &str1); ok(pstr == &str2, "pstr != &str2\n"); str = call_func1(p_basic_string_wchar_cstr, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); call_func3(p_basic_string_wchar_erase, &str2, 1, 2); str = call_func1(p_basic_string_wchar_cstr, &str2); @@ -715,11 +712,11 @@ static void test_basic_string_wchar(void) { capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); - call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4); + call_func3(p_basic_string_wchar_assign_cstr_len, &str2, L"test", 4); str = call_func1(p_basic_string_wchar_cstr, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, (str+1), 2); str = call_func1(p_basic_string_wchar_cstr, &str2);

1 0

Piotr Caban : msvcp60: Remove MSVCP_bool type.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 74859a9cdcf3f37682c99168d727875628d9fcf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74859a9cdcf3f37682c99168… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 17:28:27 2020 +0100 msvcp60: Remove MSVCP_bool type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 222 +++++++++++++++++++++++++------------------------- dlls/msvcp60/msvcp.h | 24 +++--- dlls/msvcp60/string.c | 88 ++++++++++---------- 3 files changed, 167 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74859a9cdcf3f37682c9…

1 0

Henri Verbeet : include: Update the d3d12 headers from vkd3d.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 382c78588095d590d035d5d1c9600d77e045c349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=382c78588095d590d035d5d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 27 17:50:59 2020 +0330 include: Update the d3d12 headers from vkd3d. This corresponds to vkd3d as of commit ffa7bd39f399c70c3c73775284cfc0587462ee9b. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 9cb546b57ee..42f33a06e40 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -88,6 +88,7 @@ typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT D3D12_SHADER_MIN_PRECISION_SUPPORT_10_BIT = 0x1, D3D12_SHADER_MIN_PRECISION_SUPPORT_16_BIT = 0x2, } D3D12_SHADER_MIN_PRECISION_SUPPORT; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_SHADER_MIN_PRECISION_SUPPORT);") typedef enum D3D12_TILED_RESOURCES_TIER { @@ -159,6 +160,7 @@ typedef enum D3D12_FORMAT_SUPPORT1 D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_INPUT = 0x20000000, D3D12_FORMAT_SUPPORT1_VIDEO_ENCODER = 0x40000000, } D3D12_FORMAT_SUPPORT1; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FORMAT_SUPPORT1);") typedef enum D3D12_FORMAT_SUPPORT2 { @@ -175,6 +177,7 @@ typedef enum D3D12_FORMAT_SUPPORT2 D3D12_FORMAT_SUPPORT2_TILED = 0x00000200, D3D12_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x00004000, } D3D12_FORMAT_SUPPORT2; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FORMAT_SUPPORT2);") typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE { @@ -198,6 +201,7 @@ typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_INPROC_CACHE = 0x4, D3D12_SHADER_CACHE_SUPPORT_AUTOMATIC_DISK_CACHE = 0x8, } D3D12_SHADER_CACHE_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_SHADER_CACHE_SUPPORT_FLAGS);") typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS { @@ -210,6 +214,7 @@ typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_PROCESS = 0x20, D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_ENCODE = 0x40, } D3D12_COMMAND_LIST_SUPPORT_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_LIST_SUPPORT_FLAGS);") typedef enum D3D12_VIEW_INSTANCING_TIER { @@ -412,6 +417,7 @@ typedef enum D3D12_HEAP_FLAGS D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES = 0x44, D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES = 0x84, } D3D12_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_HEAP_FLAGS);") typedef struct D3D12_HEAP_DESC { @@ -503,6 +509,12 @@ typedef enum D3D12_RESOURCE_STATES D3D12_RESOURCE_STATE_GENERIC_READ = 0x1 | 0x2 | 0x40 | 0x80 | 0x200 | 0x800, D3D12_RESOURCE_STATE_PRESENT = 0x0, D3D12_RESOURCE_STATE_PREDICATION = 0x200, + D3D12_RESOURCE_STATE_VIDEO_DECODE_READ = 0x10000, + D3D12_RESOURCE_STATE_VIDEO_DECODE_WRITE = 0x20000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_READ = 0x40000, + D3D12_RESOURCE_STATE_VIDEO_PROCESS_WRITE = 0x80000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_READ = 0x200000, + D3D12_RESOURCE_STATE_VIDEO_ENCODE_WRITE = 0x800000, } D3D12_RESOURCE_STATES; cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_STATES);") @@ -519,6 +531,7 @@ typedef enum D3D12_RESOURCE_BARRIER_FLAGS D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY = 0x1, D3D12_RESOURCE_BARRIER_FLAG_END_ONLY = 0x2, } D3D12_RESOURCE_BARRIER_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_RESOURCE_BARRIER_FLAGS);") typedef struct D3D12_RESOURCE_TRANSITION_BARRIER { @@ -665,6 +678,7 @@ typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, } D3D12_DESCRIPTOR_RANGE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DESCRIPTOR_RANGE_FLAGS);") typedef struct D3D12_DESCRIPTOR_RANGE1 { @@ -708,6 +722,7 @@ typedef enum D3D12_ROOT_DESCRIPTOR_FLAGS D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, } D3D12_ROOT_DESCRIPTOR_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_DESCRIPTOR_FLAGS);") typedef struct D3D12_ROOT_DESCRIPTOR1 { @@ -901,6 +916,7 @@ typedef enum D3D12_ROOT_SIGNATURE_FLAGS D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20, D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40, } D3D12_ROOT_SIGNATURE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_ROOT_SIGNATURE_FLAGS);") typedef struct D3D12_ROOT_SIGNATURE_DESC { @@ -951,6 +967,7 @@ typedef enum D3D12_DESCRIPTOR_HEAP_FLAGS D3D12_DESCRIPTOR_HEAP_FLAG_NONE = 0x0, D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE = 0x1, } D3D12_DESCRIPTOR_HEAP_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_DESCRIPTOR_HEAP_FLAGS);") typedef struct D3D12_DESCRIPTOR_HEAP_DESC { @@ -988,6 +1005,7 @@ typedef enum D3D12_BUFFER_SRV_FLAGS D3D12_BUFFER_SRV_FLAG_NONE = 0x0, D3D12_BUFFER_SRV_FLAG_RAW = 0x1, } D3D12_BUFFER_SRV_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_BUFFER_SRV_FLAGS);") typedef enum D3D12_SHADER_COMPONENT_MAPPING { @@ -1123,6 +1141,7 @@ typedef enum D3D12_BUFFER_UAV_FLAGS D3D12_BUFFER_UAV_FLAG_NONE = 0x0, D3D12_BUFFER_UAV_FLAG_RAW = 0x1, } D3D12_BUFFER_UAV_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_BUFFER_UAV_FLAGS);") typedef struct D3D12_BUFFER_UAV { @@ -1569,6 +1588,7 @@ typedef enum D3D12_PIPELINE_STATE_FLAGS D3D12_PIPELINE_STATE_FLAG_NONE = 0x0, D3D12_PIPELINE_STATE_FLAG_DEBUG = 0x1, } D3D12_PIPELINE_STATE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_PIPELINE_STATE_FLAGS);") typedef struct D3D12_GRAPHICS_PIPELINE_STATE_DESC { @@ -1624,6 +1644,7 @@ typedef enum D3D12_COMMAND_QUEUE_FLAGS D3D12_COMMAND_QUEUE_FLAG_NONE = 0x0, D3D12_COMMAND_QUEUE_FLAG_DISABLE_GPU_TIMEOUT = 0x1, } D3D12_COMMAND_QUEUE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_COMMAND_QUEUE_FLAGS);") typedef struct D3D12_COMMAND_QUEUE_DESC { @@ -1907,6 +1928,7 @@ typedef enum D3D12_TILE_COPY_FLAGS D3D12_TILE_COPY_FLAG_LINEAR_BUFFER_TO_SWIZZLED_TILED_RESOURCE = 0x2, D3D12_TILE_COPY_FLAG_SWIZZLED_TILED_RESOURCE_TO_LINEAR_BUFFER = 0x4, } D3D12_TILE_COPY_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_TILE_COPY_FLAGS);") typedef struct D3D12_INDEX_BUFFER_VIEW { @@ -2193,6 +2215,7 @@ typedef enum D3D12_TILE_MAPPING_FLAGS D3D12_TILE_MAPPING_FLAG_NONE = 0x0, D3D12_TILE_MAPPING_FLAG_NO_HAZARD = 0x1, } D3D12_TILE_MAPPING_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_TILE_MAPPING_FLAGS);") [ uuid(0ec870a6-5d7e-4c22-8cfc-5baae07616ed), @@ -2240,6 +2263,7 @@ typedef enum D3D12_FENCE_FLAGS D3D12_FENCE_FLAG_SHARED = 0x1, D3D12_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x2, } D3D12_FENCE_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_FENCE_FLAGS);") typedef enum D3D12_QUERY_HEAP_TYPE {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 9591dec3861b61c565c66e53e77bbb73428fbe0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9591dec3861b61c565c66e53… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Nov 27 16:03:34 2020 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/po/fi.po b/po/fi.po index 5dcbb033700..278894eb89a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6920,10 +6920,8 @@ msgid "Not implemented.\n" msgstr "Ei toteutettu.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-kutsu epäonnistui.\n" +msgstr "Kutsu epäonnistui.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" @@ -9898,16 +9896,12 @@ msgid "Iran Daylight Time" msgstr "Iranin kesäaika" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Haitin normaaliaika" +msgstr "Saint-Pierren normaaliaika" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Haitin kesäaika" +msgstr "Saint-Pierren kesäaika" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -9950,16 +9944,12 @@ msgid "Central Asia Daylight Time" msgstr "Keski-Aasian kesäaika" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Korean normaaliaika" +msgstr "Lord Howen normaaliaika" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Korean kesäaika" +msgstr "Lord Howen kesäaika" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10010,16 +10000,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Azerbaidžanin kesäaika" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Magadanin normaaliaika" +msgstr "Magallanesin normaaliaika" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Magadanin kesäaika" +msgstr "Magallanesin kesäaika" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10370,16 +10356,12 @@ msgid "Arabian Daylight Time" msgstr "Arabian kesäaika" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Kalliovuorten normaaliaika" +msgstr "Tocantinsin normaaliaika" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Kalliovuorten kesäaika" +msgstr "Tocantinsin kesäaika" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10390,16 +10372,12 @@ msgid "Russian Daylight Time" msgstr "Venäjän kesäaika" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Australian keskinen normaaliaika" +msgstr "Australian keskilännen normaaliaika" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Australian keskinen kesäaika" +msgstr "Australian keskilännen kesäaika" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time"

1 0

Robert Wilhelm : vbscript: Remove overzealous check in parse_hex_literal.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 9821da55469bed316dbe2e6b54273da742ad3450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9821da55469bed316dbe2e6b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 17:33:21 2020 +0100 vbscript: Remove overzealous check in parse_hex_literal. is_identifier_char also triggers on logical operators like "or". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50179 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index e98ed98e194..357cad7158c 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -315,7 +315,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) while((d = hex_to_int(*++ctx->ptr)) != -1) l = l*16 + d; - if(begin + 9 /* max digits+1 */ < ctx->ptr || (*ctx->ptr != '&' && is_identifier_char(*ctx->ptr))) { + if(begin + 9 /* max digits+1 */ < ctx->ptr) { FIXME("invalid literal\n"); return 0; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 419a4349896..a716cdbc65f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -60,6 +60,7 @@ Call ok(&hfffe = -2, "&hfffe <> -2") Call ok(&hffff& = 65535, "&hffff& <> -1") Call ok(&hfffe& = 65534, "&hfffe& <> -2") Call ok(&hffffffff& = -1, "&hffffffff& <> -1") +Call ok((&h01or&h02)=3,"&h01or&h02 <> 3") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5)

1 0

Robert Wilhelm : vbscript: Add parameters to FIXME in VBScript_AddTypeLib.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 21890eb3e31311dd203e2e2a224bcdcadcc6a466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21890eb3e31311dd203e2e2a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 18:52:15 2020 +0100 vbscript: Add parameters to FIXME in VBScript_AddTypeLib. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f31bdf2d351..4b57b4b2b93 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -739,7 +739,7 @@ static HRESULT WINAPI VBScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTyp DWORD dwMajor, DWORD dwMinor, DWORD dwFlags) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s %d %d %d)\n", This, debugstr_guid(rguidTypeLib), dwMajor, dwMinor, dwFlags); return E_NOTIMPL; }

1 0

Robert Wilhelm : vbscript: Remove no longer used bool call_statement_t.is_strict member variable.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: a7c8499902c675bbb7b44ac00b8d41146b7ee179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c8499902c675bbb7b44ac0… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 19:46:38 2020 +0100 vbscript: Remove no longer used bool call_statement_t.is_strict member variable. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f5d8a616b9f..2888ea3b546 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -140,7 +140,6 @@ typedef struct _statement_t { typedef struct { statement_t stat; call_expression_t *expr; - BOOL is_strict; } call_statement_t; typedef struct { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 034baffa4dd..37b14f05e14 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,7 +46,7 @@ static call_expression_t *new_call_expression(parser_ctx_t*,expression_t*,expres static call_expression_t *make_call_expression(parser_ctx_t*,expression_t*,expression_t*); static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); -static statement_t *new_call_statement(parser_ctx_t*,unsigned,BOOL,expression_t*); +static statement_t *new_call_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,unsigned,expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,unsigned,dim_decl_t*); @@ -200,8 +200,8 @@ Statement SimpleStatement : CallExpression ArgumentList_opt { call_expression_t *call_expr = make_call_expression(ctx, $1, $2); CHECK_ERROR; - $$ = new_call_statement(ctx, @$, FALSE, &call_expr->expr); CHECK_ERROR; }; - | tCALL UnaryExpression { $$ = new_call_statement(ctx, @$, TRUE, $2); CHECK_ERROR; } + $$ = new_call_statement(ctx, @$, &call_expr->expr); CHECK_ERROR; }; + | tCALL UnaryExpression { $$ = new_call_statement(ctx, @$, $2); CHECK_ERROR; } | CallExpression '=' Expression { $$ = new_assign_statement(ctx, @$, $1, $3); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } @@ -734,7 +734,7 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return stat; } -static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, BOOL is_strict, expression_t *expr) +static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, expression_t *expr) { call_expression_t *call_expr = NULL; call_statement_t *stat; @@ -758,7 +758,6 @@ static statement_t *new_call_statement(parser_ctx_t *ctx, unsigned loc, BOOL is_ return NULL; stat->expr = call_expr; - stat->is_strict = is_strict; return &stat->stat; }

1 0