November 2020 - Wine-Commits

Piotr Caban : msvcp90/tests: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 1990a5e0bc7fe00b392d66fa87ad19f89259c48f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1990a5e0bc7fe00b392d66fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:53 2020 +0100 msvcp90/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/msvcp90/tests/ios.c | 16 ++++------------ dlls/msvcp90/tests/string.c | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 6957f4ccba9..994420dd229 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -2111,8 +2111,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; @@ -2122,7 +2120,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); @@ -2130,8 +2128,6 @@ static void test_ostream_print_ushort(void) static void test_ostream_print_float(void) { - static const char float_str[] = "3.14159"; - basic_stringstream_char ss; basic_string_char pstr; const char *str; @@ -2142,7 +2138,7 @@ static void test_ostream_print_float(void) call_func2_ptr_flt(p_basic_ostream_char_print_float, &ss.base.base2, val); call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); str = call_func1(p_basic_string_char_cstr, &pstr); - ok(!strcmp(float_str, str), "str = %s\n", str); + ok(!strcmp("3.14159", str), "str = %s\n", str); call_func1(p_basic_string_char_dtor, &pstr); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -2150,8 +2146,6 @@ static void test_ostream_print_float(void) static void test_ostream_print_double(void) { - static const char double_str[] = "3.14159"; - basic_stringstream_char ss; basic_string_char pstr; const char *str; @@ -2162,7 +2156,7 @@ static void test_ostream_print_double(void) call_func2_ptr_dbl(p_basic_ostream_char_print_double, &ss.base.base2, val); call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); str = call_func1(p_basic_string_char_cstr, &pstr); - ok(!strcmp(double_str, str), "str = %s\n", str); + ok(!strcmp("3.14159", str), "str = %s\n", str); call_func1(p_basic_string_char_dtor, &pstr); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -2170,8 +2164,6 @@ static void test_ostream_print_double(void) static void test_ostream_wchar_print_double(void) { - static const wchar_t double_str[] = { '3', '.', '1', '4', '1', '5', '9', 0 }; - basic_stringstream_wchar wss; basic_string_wchar pwstr; const wchar_t *wstr; @@ -2184,7 +2176,7 @@ static void test_ostream_wchar_print_double(void) call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); - ok(!lstrcmpW(double_str, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + ok(!lstrcmpW(L"3.14159", 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/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index a0f16a9908d..6c919f84d95 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -517,12 +517,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); @@ -615,8 +614,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; @@ -631,12 +628,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_func2(p_basic_string_wchar_ctor_cstr, &str1, test); + pstr = call_func2(p_basic_string_wchar_ctor_cstr, &str1, L"test"); 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); @@ -646,9 +643,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); @@ -670,11 +667,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); @@ -769,7 +766,6 @@ static void test_basic_string_char_find_last_not_of(void) { static void test_basic_string_dtor(void) { #ifdef __i386__ - static const wchar_t qwerty[] = { 'q','w','e','r','t','y',0 }; basic_string_wchar str1; basic_string_char str2; void *ret; @@ -777,7 +773,7 @@ static void test_basic_string_dtor(void) { /* FEAR 1 installer expects that string destructors set EAX to * zero on return (see bug 37358). */ - call_func2(p_basic_string_wchar_ctor_cstr, &str1, qwerty); + call_func2(p_basic_string_wchar_ctor_cstr, &str1, L"qwerty"); ret = call_func1(p_basic_string_wchar_dtor, &str1); ok(ret == NULL, "expected NULL, got %p\n", ret);

1 0

Piotr Caban : msvcp90: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 4deb599d5a300240b96ac63c84a5b422dd9633a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4deb599d5a300240b96ac63c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:51 2020 +0100 msvcp90: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 34 ++++++++++++++-------------------- dlls/msvcp90/string.c | 4 +--- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a532bde91b3..09591cc0f1d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3198,21 +3198,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); @@ -3227,13 +3226,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; } @@ -14959,9 +14958,6 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* HANDLE handle; WIN32_FIND_DATAW data; wchar_t temppath[MAX_PATH]; - static const wchar_t dot[] = {'.', 0}; - static const wchar_t dotdot[] = {'.', '.', 0}; - static const wchar_t asterisk[] = {'\\', '*', 0}; TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); if(wcslen(dest) > MAX_PATH - 3) { @@ -14970,7 +14966,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* return NULL; } wcscpy(temppath, dest); - wcscat(temppath, asterisk); + wcscat(temppath, L"\\*"); handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { @@ -14978,7 +14974,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* *target = '\0'; return NULL; } - while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { + while(!wcscmp(data.cFileName, L".") || !wcscmp(data.cFileName, L"..")) { if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; @@ -15026,8 +15022,6 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum file_type* type) { WIN32_FIND_DATAW data; - static const wchar_t dot[] = {'.', 0}; - static const wchar_t dotdot[] = {'.', '.', 0}; TRACE("(%p %p %p)\n", target, handle, type); @@ -15037,7 +15031,7 @@ wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum fil *target = '\0'; return target; } - } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)); + } while(!wcscmp(data.cFileName, L".") || !wcscmp(data.cFileName, L"..")); wcscpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index bf2933914ef..894883ade05 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -2287,10 +2287,8 @@ const wchar_t* __thiscall basic_string_wchar_const_ptr(const basic_string_wchar DEFINE_THISCALL_WRAPPER(basic_string_wchar_eos, 8) void __thiscall basic_string_wchar_eos(basic_string_wchar *this, size_t len) { - static const wchar_t nullbyte_w = '\0'; - this->size = len; - MSVCP_char_traits_wchar_assign(basic_string_wchar_ptr(this)+len, &nullbyte_w); + MSVCP_char_traits_wchar_assign(basic_string_wchar_ptr(this)+len, L""); } /* ?_Inside@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAE_NPB_W(a)Z */

1 0

Piotr Caban : msvcp90: Remove MSVCP_bool type.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

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

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

Nov. 27, 2020

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

Piotr Caban : msvcrt: Use simple type definitions from public header.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: fa272adaeb9df503a8fe04d503e07a41ae0c32a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa272adaeb9df503a8fe04d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 14:17:05 2020 +0100 msvcrt: Use simple type definitions from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 11 +- dlls/msvcrt/dir.c | 92 +++++++-------- dlls/msvcrt/environ.c | 20 ++-- dlls/msvcrt/errno.c | 12 +- dlls/msvcrt/except.c | 5 +- dlls/msvcrt/file.c | 108 ++++++++--------- dlls/msvcrt/heap.c | 86 +++++++------- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/lock.c | 31 ++--- dlls/msvcrt/math.c | 52 ++++----- dlls/msvcrt/mbcs.c | 161 +++++++++++++------------- dlls/msvcrt/misc.c | 27 +++-- dlls/msvcrt/msvcrt.h | 301 +++++++++++++++++++++++------------------------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/process.c | 118 +++++++++---------- dlls/msvcrt/scanf.c | 20 ++-- dlls/msvcrt/scanf.h | 8 +- dlls/msvcrt/scheduler.c | 19 +-- dlls/msvcrt/string.c | 210 ++++++++++++++++----------------- dlls/msvcrt/time.c | 188 +++++++++++++++--------------- dlls/msvcrt/wcs.c | 259 ++++++++++++++++++++--------------------- 21 files changed, 859 insertions(+), 875 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa272adaeb9df503a8fe…

1 0

Piotr Caban : msvcrt/tests: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 4a4621f42f95eff2178a6cade7c8e71bdf2de5e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4621f42f95eff2178a6cad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 14:16:56 2020 +0100 msvcrt/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/msvcrt/tests/dir.c | 104 +++++++++++--------------------- dlls/msvcrt/tests/environ.c | 7 +-- dlls/msvcrt/tests/file.c | 8 +-- dlls/msvcrt/tests/locale.c | 8 +-- dlls/msvcrt/tests/printf.c | 140 +++++++++++++++++--------------------------- dlls/msvcrt/tests/scanf.c | 15 ++--- dlls/msvcrt/tests/string.c | 57 ++++++++---------- dlls/msvcrt/tests/time.c | 10 +--- 8 files changed, 125 insertions(+), 224 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a4621f42f95eff2178a…

1 0

Zebediah Figura : qcap: Use wide-char string literals.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 8f8cdc7ac7e00f4afaae7a947b8c169c5373e659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f8cdc7ac7e00f4afaae7a94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:35 2020 -0600 qcap: Use wide-char string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 3 +-- dlls/qcap/avico.c | 10 +++------- dlls/qcap/avimux.c | 13 +++---------- dlls/qcap/filewriter.c | 3 +-- dlls/qcap/qcap_main.c | 9 +++------ dlls/qcap/smartteefilter.c | 9 +++------ dlls/qcap/vfwcapture.c | 6 ++---- 7 files changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 7477cca6d60..0021e8dd982 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -108,12 +108,11 @@ static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBa AudioRecord *This = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; - static const WCHAR WaveInIDW[] = {'W','a','v','e','I','n','I','D',0}; TRACE("(%p/%p)->(%p, %p)\n", iface, This, pPropBag, pErrorLog); V_VT(&var) = VT_I4; - hr = IPropertyBag_Read(pPropBag, WaveInIDW, &var, pErrorLog); + hr = IPropertyBag_Read(pPropBag, L"WaveInID", &var, pErrorLog); if (SUCCEEDED(hr)) { FIXME("FIXME: implement opening waveIn device %d\n", V_I4(&var)); diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 01a43c9577d..f1730a394c5 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -213,12 +213,10 @@ static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, VARIANT v; HRESULT hres; - static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; - TRACE("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); V_VT(&v) = VT_BSTR; - hres = IPropertyBag_Read(pPropBag, fcc_handlerW, &v, NULL); + hres = IPropertyBag_Read(pPropBag, L"FccHandler", &v, NULL); if(FAILED(hres)) { WARN("Could not read FccHandler: %08x\n", hres); return hres; @@ -470,8 +468,6 @@ static const struct strmbase_source_ops source_ops = HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) { - static const WCHAR source_name[] = {'O','u','t',0}; - static const WCHAR sink_name[] = {'I','n',0}; AVICompressor *object; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -480,8 +476,8 @@ HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) strmbase_filter_init(&object->filter, outer, &CLSID_AVICo, &filter_ops); object->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; - strmbase_sink_init(&object->sink, &object->filter, sink_name, &sink_ops, NULL); - strmbase_source_init(&object->source, &object->filter, source_name, &source_ops); + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); TRACE("Created AVI compressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 7ae2d673676..38d4bb7c88c 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1777,15 +1777,14 @@ static const IQualityControlVtbl AviMuxIn_QualityControlVtbl = { static HRESULT create_input_pin(AviMux *avimux) { - WCHAR name[] = {'I','n','p','u','t',' ','0','0',0}; AviMuxIn *object; + WCHAR name[19]; HRESULT hr; if(avimux->input_pin_no >= MAX_PIN_NO-1) return E_FAIL; - name[7] = '0' + (avimux->input_pin_no+1) % 10; - name[6] = '0' + (avimux->input_pin_no+1) / 10; + swprintf(name, ARRAY_SIZE(name), L"Input %02u", avimux->input_pin_no + 1); if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1824,10 +1823,7 @@ static HRESULT create_input_pin(AviMux *avimux) HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) { - static const WCHAR output_name[] = {'A','V','I',' ','O','u','t',0}; - AviMux *avimux; - PIN_INFO info; HRESULT hr; if (!(avimux = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AviMux)))) @@ -1840,10 +1836,7 @@ HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) avimux->IPersistMediaPropertyBag_iface.lpVtbl = &PersistMediaPropertyBagVtbl; avimux->ISpecifyPropertyPages_iface.lpVtbl = &SpecifyPropertyPagesVtbl; - info.dir = PINDIR_OUTPUT; - info.pFilter = &avimux->filter.IBaseFilter_iface; - lstrcpyW(info.achName, output_name); - strmbase_source_init(&avimux->source, &avimux->filter, output_name, &source_ops); + strmbase_source_init(&avimux->source, &avimux->filter, L"AVI Out", &source_ops); avimux->IQualityControl_iface.lpVtbl = &AviMuxOut_QualityControlVtbl; avimux->cur_stream = 0; avimux->cur_time = 0; diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index c377471ed7d..c67fe263d8d 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -315,7 +315,6 @@ static const IAMFilterMiscFlagsVtbl misc_flags_vtbl = HRESULT file_writer_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n',0}; struct file_writer *object; if (!(object = heap_alloc_zero(sizeof(*object)))) @@ -325,7 +324,7 @@ HRESULT file_writer_create(IUnknown *outer, IUnknown **out) object->IFileSinkFilter_iface.lpVtbl = &filesinkfilter_vtbl; object->IAMFilterMiscFlags_iface.lpVtbl = &misc_flags_vtbl; - strmbase_sink_init(&object->sink, &object->filter, sink_name, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"in", &sink_ops, NULL); TRACE("Created file writer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index e211b74dada..2c7c1216996 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -229,9 +229,6 @@ static const REGFILTER2 reg_file_writer = */ HRESULT WINAPI DllRegisterServer(void) { - static const WCHAR avi_muxW[] = {'A','V','I',' ','M','u','x',0}; - static const WCHAR file_writerW[] = {'F','i','l','e',' ','w','r','i','t','e','r',0}; - static const WCHAR smart_teeW[] = {'S','m','a','r','t',' ','T','e','e',0}; IFilterMapper2 *mapper; HRESULT hr; @@ -242,11 +239,11 @@ HRESULT WINAPI DllRegisterServer(void) &IID_IFilterMapper2, (void **)&mapper))) return hr; - IFilterMapper2_RegisterFilter(mapper, &CLSID_AviDest, avi_muxW, + IFilterMapper2_RegisterFilter(mapper, &CLSID_AviDest, L"AVI Mux", NULL, NULL, NULL, &reg_avi_mux); - IFilterMapper2_RegisterFilter(mapper, &CLSID_FileWriter, file_writerW, + IFilterMapper2_RegisterFilter(mapper, &CLSID_FileWriter, L"File writer", NULL, NULL, NULL, &reg_file_writer); - IFilterMapper2_RegisterFilter(mapper, &CLSID_SmartTee, smart_teeW, + IFilterMapper2_RegisterFilter(mapper, &CLSID_SmartTee, L"Smart Tee", NULL, NULL, NULL, &reg_smart_tee); IFilterMapper2_Release(mapper); diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 2f6f3ab2b79..4e23e6ee467 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -316,9 +316,6 @@ static const struct strmbase_source_ops preview_ops = HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) { - static const WCHAR captureW[] = {'C','a','p','t','u','r','e',0}; - static const WCHAR previewW[] = {'P','r','e','v','i','e','w',0}; - static const WCHAR inputW[] = {'I','n','p','u','t',0}; SmartTeeFilter *object; HRESULT hr; @@ -327,7 +324,7 @@ HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) memset(object, 0, sizeof(*object)); strmbase_filter_init(&object->filter, outer, &CLSID_SmartTee, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, inputW, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"Input", &sink_ops, NULL); hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)&object->sink.pAllocator); if (FAILED(hr)) @@ -337,8 +334,8 @@ HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) return hr; } - strmbase_source_init(&object->capture, &object->filter, captureW, &capture_ops); - strmbase_source_init(&object->preview, &object->filter, previewW, &preview_ops); + strmbase_source_init(&object->capture, &object->filter, L"Capture", &capture_ops); + strmbase_source_init(&object->preview, &object->filter, L"Preview", &preview_ops); TRACE("Created smart tee %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7b8787ef99f..ae6a9a055d1 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -530,7 +530,6 @@ static HRESULT WINAPI PPB_InitNew(IPersistPropertyBag * iface) static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *bag, IErrorLog *error_log) { - static const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; struct vfw_capture *filter = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; @@ -538,7 +537,7 @@ static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *bag, IE TRACE("filter %p, bag %p, error_log %p.\n", filter, bag, error_log); V_VT(&var) = VT_I4; - if (FAILED(hr = IPropertyBag_Read(bag, VFWIndex, &var, error_log))) + if (FAILED(hr = IPropertyBag_Read(bag, L"VFWIndex", &var, error_log))) return hr; if (!(filter->device = capture_funcs->create(V_I4(&var)))) @@ -848,7 +847,6 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) { - static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; struct vfw_capture *object; if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL) || !capture_funcs) @@ -866,7 +864,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) object->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; object->init = FALSE; - strmbase_source_init(&object->source, &object->filter, source_name, &source_ops); + strmbase_source_init(&object->source, &object->filter, L"Output", &source_ops); object->IKsPropertySet_iface.lpVtbl = &IKsPropertySet_VTable;

1 0

Zebediah Figura : qcap: Make video capture functions CDECL.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 786d81d802a5e90497ff6421156a66d15b98df97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=786d81d802a5e90497ff6421… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:32 2020 -0600 qcap: Make video capture functions CDECL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 26 ++++++++++++++------------ dlls/qcap/v4l.c | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 046821142d2..7c27c689677 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -44,21 +44,23 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; struct video_capture_funcs { - struct video_capture_device *(*create)(USHORT index); - void (*destroy)(struct video_capture_device *device); - HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); - HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); - void (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); - HRESULT (*get_media_type)(struct video_capture_device *device, + struct video_capture_device *(CDECL *create)(USHORT index); + void (CDECL *destroy)(struct video_capture_device *device); + HRESULT (CDECL *check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); + HRESULT (CDECL *set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); + void (CDECL *get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); + HRESULT (CDECL *get_media_type)(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); - void (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, + void (CDECL *get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *caps); - LONG (*get_caps_count)(struct video_capture_device *device); - HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, + LONG (CDECL *get_caps_count)(struct video_capture_device *device); + HRESULT (CDECL *get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags); - HRESULT (*get_prop)(struct video_capture_device *device, VideoProcAmpProperty property, LONG *value, LONG *flags); - HRESULT (*set_prop)(struct video_capture_device *device, VideoProcAmpProperty property, LONG value, LONG flags); - BOOL (*read_frame)(struct video_capture_device *device, BYTE *data); + HRESULT (CDECL *get_prop)(struct video_capture_device *device, + VideoProcAmpProperty property, LONG *value, LONG *flags); + HRESULT (CDECL *set_prop)(struct video_capture_device *device, + VideoProcAmpProperty property, LONG value, LONG flags); + BOOL (CDECL *read_frame)(struct video_capture_device *device, BYTE *data); }; #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fd2c087640f..da09b2b26d6 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -119,7 +119,7 @@ static int xioctl(int fd, int request, void * arg) return r; } -static void v4l_device_destroy(struct video_capture_device *device) +static void CDECL v4l_device_destroy(struct video_capture_device *device) { if (device->fd != -1) video_close(device->fd); @@ -149,7 +149,7 @@ static const struct caps *find_caps(struct video_capture_device *device, const A return NULL; } -static HRESULT v4l_device_check_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) +static HRESULT CDECL v4l_device_check_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) { TRACE("device %p, mt %p.\n", device, mt); @@ -203,7 +203,7 @@ static HRESULT set_caps(struct video_capture_device *device, const struct caps * return S_OK; } -static HRESULT v4l_device_set_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) +static HRESULT CDECL v4l_device_set_format(struct video_capture_device *device, const AM_MEDIA_TYPE *mt) { const struct caps *caps; @@ -217,13 +217,13 @@ static HRESULT v4l_device_set_format(struct video_capture_device *device, const return set_caps(device, caps); } -static void v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) +static void CDECL v4l_device_get_format(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) { *mt = device->current_caps->media_type; *format = device->current_caps->video_info; } -static HRESULT v4l_device_get_media_type(struct video_capture_device *device, +static HRESULT CDECL v4l_device_get_media_type(struct video_capture_device *device, unsigned int index, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format) { unsigned int caps_count = (device->current_caps) ? 1 : device->caps_count; @@ -262,7 +262,7 @@ static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) } } -static HRESULT v4l_device_get_prop_range(struct video_capture_device *device, VideoProcAmpProperty property, +static HRESULT CDECL v4l_device_get_prop_range(struct video_capture_device *device, VideoProcAmpProperty property, LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) { struct v4l2_queryctrl ctrl; @@ -283,7 +283,7 @@ static HRESULT v4l_device_get_prop_range(struct video_capture_device *device, Vi return S_OK; } -static HRESULT v4l_device_get_prop(struct video_capture_device *device, +static HRESULT CDECL v4l_device_get_prop(struct video_capture_device *device, VideoProcAmpProperty property, LONG *value, LONG *flags) { struct v4l2_control ctrl; @@ -302,7 +302,7 @@ static HRESULT v4l_device_get_prop(struct video_capture_device *device, return S_OK; } -static HRESULT v4l_device_set_prop(struct video_capture_device *device, +static HRESULT CDECL v4l_device_set_prop(struct video_capture_device *device, VideoProcAmpProperty property, LONG value, LONG flags) { struct v4l2_control ctrl; @@ -338,7 +338,7 @@ static void reverse_image(struct video_capture_device *device, LPBYTE output, co } } -static BOOL v4l_device_read_frame(struct video_capture_device *device, BYTE *data) +static BOOL CDECL v4l_device_read_frame(struct video_capture_device *device, BYTE *data) { while (video_read(device->fd, device->image_data, device->image_size) < 0) { @@ -389,7 +389,7 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, caps->pixelformat = pixelformat; } -static void v4l_device_get_caps(struct video_capture_device *device, LONG index, +static void CDECL v4l_device_get_caps(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE *type, VIDEOINFOHEADER *format, VIDEO_STREAM_CONFIG_CAPS *vscc) { *vscc = device->caps[index].config; @@ -397,12 +397,12 @@ static void v4l_device_get_caps(struct video_capture_device *device, LONG index, *format = device->caps[index].video_info; } -static LONG v4l_device_get_caps_count(struct video_capture_device *device) +static LONG CDECL v4l_device_get_caps_count(struct video_capture_device *device) { return device->caps_count; } -struct video_capture_device *v4l_device_create(USHORT index) +struct video_capture_device * CDECL v4l_device_create(USHORT index) { struct v4l2_frmsizeenum frmsize = {0}; struct video_capture_device *device;

1 0

Zebediah Figura : qcap: Move v4l2 support to a new Unix library.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: d4ded92b024441e98b0ec80db6a11c074c2ed494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ded92b024441e98b0ec80d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 22:34:31 2020 -0600 qcap: Move v4l2 support to a new Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_main.c | 2 +- dlls/qcap/qcap_private.h | 4 ++-- dlls/qcap/v4l.c | 25 ++++++++++++++----------- dlls/qcap/vfwcapture.c | 5 +++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 411ef41ea20..e211b74dada 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); -static HINSTANCE qcap_instance; +HINSTANCE qcap_instance; static LONG objects_ref = 0; diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 379d9908637..046821142d2 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -30,6 +30,8 @@ #include "wine/strmbase.h" #include "wine/unicode.h" +extern HINSTANCE qcap_instance DECLSPEC_HIDDEN; + extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; @@ -59,6 +61,4 @@ struct video_capture_funcs BOOL (*read_frame)(struct video_capture_device *device, BYTE *data); }; -extern const struct video_capture_funcs v4l_funcs; - #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 2ba423ea0e5..fd2c087640f 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -19,6 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD /* work around ioctl breakage on Android */ #include "config.h" @@ -47,7 +51,11 @@ #include <unistd.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "initguid.h" #include "qcap_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); @@ -558,17 +566,12 @@ const struct video_capture_funcs v4l_funcs = .read_frame = v4l_device_read_frame, }; -#else - -static struct video_capture_device *v4l_device_create(USHORT index) +NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - ERR("v4l2 was not present at compilation time.\n"); - return NULL; -} + if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; -const struct video_capture_funcs v4l_funcs = -{ - .create = v4l_device_create, -}; + *(const struct video_capture_funcs **)ptr_out = &v4l_funcs; + return STATUS_SUCCESS; +} -#endif /* defined(VIDIOCMCAPTURE) */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 8123dc4f6f7..7b8787ef99f 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -19,6 +19,7 @@ */ #include "qcap_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); @@ -839,7 +840,7 @@ static const IAMVideoControlVtbl IAMVideoControl_VTable = static BOOL WINAPI load_capture_funcs(INIT_ONCE *once, void *param, void **context) { - capture_funcs = &v4l_funcs; + __wine_init_unix_lib(qcap_instance, DLL_PROCESS_ATTACH, NULL, &capture_funcs); return TRUE; } @@ -850,7 +851,7 @@ HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; struct vfw_capture *object; - if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL)) + if (!InitOnceExecuteOnce(&init_once, load_capture_funcs, NULL, NULL) || !capture_funcs) return E_FAIL; if (!(object = CoTaskMemAlloc(sizeof(*object))))

1 0

Alexandre Julliard : msvcp: Use a constant string as fprintf format.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 375278ccb7693a946b8ff5f79e8c4c489f9d9c56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=375278ccb7693a946b8ff5f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 11:37:21 2020 +0100 msvcp: Use a constant string as fprintf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 2 +- dlls/msvcp90/tests/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index dc4700d518b..806090b9667 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1467,7 +1467,7 @@ static void test_istream_tellg(void) /* filebuf */ file = fopen(testfile, "wt"); - fprintf(file, tests[i].str); + fprintf(file, "%s", tests[i].str); fclose(file); /* fstream<char> version */ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index d9066fedd8d..6957f4ccba9 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1969,7 +1969,7 @@ static void test_istream_tellg(void) /* filebuf */ file = fopen(testfile, "wt"); - fprintf(file, tests[i].str); + fprintf(file, "%s", tests[i].str); fclose(file); /* fstream<char> version */

1 0