wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Serge Gautherie : advapi32: Use standard refcount in CRYPTPROV.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 62df03af96822bda36aef398d00bf5998f490e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62df03af96822bda36aef398… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Mar 17 14:48:17 2020 +0100 advapi32: Use standard refcount in CRYPTPROV. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 5 ++--- dlls/advapi32/crypt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 14acceb100..f49a4973d7 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -636,7 +636,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl return FALSE; } - pProv->refcount++; + InterlockedIncrement(&pProv->refcount); return TRUE; } @@ -672,8 +672,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) return FALSE; } - pProv->refcount--; - if (pProv->refcount <= 0) + if (InterlockedDecrement(&pProv->refcount) == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index afee3e2e29..a4429642d2 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -63,7 +63,7 @@ typedef struct tagPROVFUNCS typedef struct tagCRYPTPROV { DWORD dwMagic; - UINT refcount; + LONG refcount; HMODULE hModule; PPROVFUNCS pFuncs; HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/

1 0

Serge Gautherie : advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 9cc8b501eea8dc3bd589ab3e5df3b750e43699d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc8b501eea8dc3bd589ab3e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Mar 17 14:47:57 2020 +0100 advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385299..14acceb100 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985da1b..28bebf8dc4 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

1 0

Jacek Caban : ucrtbase/tests: Link to _o_* functions directly.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 90ae76e93c5f819607640569e33573dca2bd0a0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ae76e93c5f819607640569… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:55:54 2020 +0100 ucrtbase/tests: Link to _o_* functions directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index abf406e7bb..299f817275 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -125,9 +125,11 @@ typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static HMODULE module; static LONGLONG crt_init_end; -static int (CDECL *p_o__initialize_onexit_table)(_onexit_table_t *table); -static int (CDECL *p_o__register_onexit_function)(_onexit_table_t *table, _onexit_t func); -static int (CDECL *p_o__execute_onexit_table)(_onexit_table_t *table); +_ACRTIMP int __cdecl _o__initialize_onexit_table(_onexit_table_t *table); +_ACRTIMP int __cdecl _o__register_onexit_function(_onexit_table_t *table, _onexit_t func); +_ACRTIMP int __cdecl _o__execute_onexit_table(_onexit_table_t *table); +_ACRTIMP void *__cdecl _o_malloc(size_t); + static int (CDECL *p___fpe_flt_rounds)(void); static _invalid_parameter_handler (CDECL *p__set_invalid_parameter_handler)(_invalid_parameter_handler); static _invalid_parameter_handler (CDECL *p__get_invalid_parameter_handler)(void); @@ -148,7 +150,6 @@ static size_t (__cdecl *p__Strftime)(char*, size_t, const char*, const struct tm static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); static void (__cdecl *p_quick_exit)(int exitcode); -static void* (__cdecl *p__o_malloc)(size_t); static size_t (__cdecl *p__msize)(void*); static void test__initialize_onexit_table(void) @@ -173,7 +174,7 @@ static void test__initialize_onexit_table(void) ok(table2._end == table._end, "got %p, %p\n", table2._end, table._end); memset(&table2, 0, sizeof(table2)); - ret = p_o__initialize_onexit_table(&table2); + ret = _o__initialize_onexit_table(&table2); ok(ret == 0, "got %d\n", ret); ok(table2._first == table._first, "got %p, %p\n", table2._first, table._first); ok(table2._last == table._last, "got %p, %p\n", table2._last, table._last); @@ -258,12 +259,12 @@ static void test__register_onexit_function(void) ok(f != table._last, "got %p, initial %p\n", table._last, f); f = table._last; - ret = p_o__register_onexit_function(&table, NULL); + ret = _o__register_onexit_function(&table, NULL); ok(ret == 0, "got %d\n", ret); ok(f != table._last, "got %p, initial %p\n", table._last, f); f = table._last; - ret = p_o__register_onexit_function(&table, onexit_func); + ret = _o__register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); ok(f != table._last, "got %p, initial %p\n", table._last, f); @@ -297,7 +298,7 @@ static void test__execute_onexit_table(void) ret = _register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); - ret = p_o__register_onexit_function(&table, onexit_func); + ret = _o__register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); ok(table._first != table._end, "got %p, %p\n", table._first, table._end); @@ -316,12 +317,12 @@ static void test__execute_onexit_table(void) ret = _register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); - ret = p_o__register_onexit_function(&table, onexit_func); + ret = _o__register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); ok(table._first != table._end, "got %p, %p\n", table._first, table._end); g_onexit_called = 0; - ret = p_o__execute_onexit_table(&table); + ret = _o__execute_onexit_table(&table); ok(ret == 0, "got %d\n", ret); ok(g_onexit_called == 3, "got %d\n", g_onexit_called); ok(table._first == table._end, "got %p, %p\n", table._first, table._end); @@ -479,9 +480,6 @@ static BOOL init(void) module = GetModuleHandleW(L"ucrtbase.dll"); - p_o__initialize_onexit_table = (void*)GetProcAddress(module, "_o__initialize_onexit_table"); - p_o__register_onexit_function = (void*)GetProcAddress(module, "_o__register_onexit_function"); - p_o__execute_onexit_table = (void*)GetProcAddress(module, "_o__execute_onexit_table"); p___fpe_flt_rounds = (void*)GetProcAddress(module, "__fpe_flt_rounds"); p__set_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_invalid_parameter_handler"); p__get_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_invalid_parameter_handler"); @@ -502,7 +500,6 @@ static BOOL init(void) p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); - p__o_malloc = (void*)GetProcAddress(module, "_o_malloc"); p__msize = (void*)GetProcAddress(module, "_msize"); return TRUE; @@ -1353,7 +1350,7 @@ static void test__o_malloc(void) void *m; size_t s; - m = p__o_malloc(1); + m = _o_malloc(1); ok(m != NULL, "p__o_malloc(1) returned NULL\n"); s = p__msize(m);

1 0

Jacek Caban : msvcrt: Use public onexit table declarations in importlib.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 6735dcc376d783ec4052724148b55e7381e36d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6735dcc376d783ec40527241… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:54 2020 +0100 msvcrt: Use public onexit table declarations in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/onexit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/onexit.c b/dlls/msvcrt/onexit.c index 62d884f3ac..18b935b88d 100644 --- a/dlls/msvcrt/onexit.c +++ b/dlls/msvcrt/onexit.c @@ -24,6 +24,7 @@ #endif #define _CRTIMP +#include <process.h> #include "msvcrt.h" #include "mtdll.h" @@ -31,7 +32,7 @@ /********************************************************************* * _initialize_onexit_table (UCRTBASE.@) */ -int CDECL _initialize_onexit_table(MSVCRT__onexit_table_t *table) +int __cdecl _initialize_onexit_table(_onexit_table_t *table) { if (!table) return -1; @@ -45,7 +46,7 @@ int CDECL _initialize_onexit_table(MSVCRT__onexit_table_t *table) /********************************************************************* * _register_onexit_function (UCRTBASE.@) */ -int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func) +int __cdecl _register_onexit_function(_onexit_table_t *table, _onexit_t func) { if (!table) return -1; @@ -67,7 +68,7 @@ int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi if (table->_last == table->_end) { int len = table->_end - table->_first; - MSVCRT__onexit_t *tmp = HeapReAlloc(GetProcessHeap(), 0, table->_first, 2 * len * sizeof(void *)); + _PVFV *tmp = HeapReAlloc(GetProcessHeap(), 0, table->_first, 2 * len * sizeof(void *)); if (!tmp) { _munlock(_EXIT_LOCK1); @@ -78,7 +79,7 @@ int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi table->_last = table->_first + len; } - *table->_last = func; + *table->_last = (_PVFV)func; table->_last++; _munlock(_EXIT_LOCK1); return 0; @@ -88,10 +89,10 @@ int CDECL _register_onexit_function(MSVCRT__onexit_table_t *table, MSVCRT__onexi /********************************************************************* * _execute_onexit_table (UCRTBASE.@) */ -int CDECL _execute_onexit_table(MSVCRT__onexit_table_t *table) +int __cdecl _execute_onexit_table(_onexit_table_t *table) { - MSVCRT__onexit_t *func; - MSVCRT__onexit_table_t copy; + _PVFV *func; + _onexit_table_t copy; if (!table) return -1;

1 0

Jacek Caban : ucrtbase/tests: Use public onexit table declarations.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: aa16d0adf1aaa75e1e9c052786a18864ac07f91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16d0adf1aaa75e1e9c0527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:37 2020 +0100 ucrtbase/tests: Use public onexit table declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 88 +++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa16d0adf1aaa75e1e9c…

1 0

Jacek Caban : corecrt_startup.h: Add onexit table declarations.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 0a9ca2d3f23baa8b245a91993a27aebe81655fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a9ca2d3f23baa8b245a9199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:01:17 2020 +0100 corecrt_startup.h: Add onexit table declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_startup.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/msvcrt/corecrt_startup.h b/include/msvcrt/corecrt_startup.h index cd374ec10b..fd238b9757 100644 --- a/include/msvcrt/corecrt_startup.h +++ b/include/msvcrt/corecrt_startup.h @@ -22,6 +22,18 @@ typedef enum _crt_app_type _crt_gui_app } _crt_app_type; +typedef void (__cdecl *_PVFV)(void); +typedef int (__cdecl *_PIFV)(void); +typedef void (__cdecl *_PVFI)(int); + +typedef struct _onexit_table_t { + _PVFV *_first; + _PVFV *_last; + _PVFV *_end; +} _onexit_table_t; + +typedef int (__cdecl *_onexit_t)(void); + #ifdef __cplusplus extern "C" { #endif @@ -34,10 +46,13 @@ _ACRTIMP void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int * _ACRTIMP errno_t __cdecl _configure_narrow_argv(_crt_argv_mode); _ACRTIMP errno_t __cdecl _configure_wide_argv(_crt_argv_mode); +_ACRTIMP int __cdecl _execute_onexit_table(_onexit_table_t*); _ACRTIMP char **__cdecl _get_initial_narrow_environment(void); _ACRTIMP wchar_t **__cdecl _get_initial_wide_environment(void); _ACRTIMP int __cdecl _initialize_narrow_environment(void); +_ACRTIMP int __cdecl _initialize_onexit_table(_onexit_table_t*); _ACRTIMP int __cdecl _initialize_wide_environment(void); +_ACRTIMP int __cdecl _register_onexit_function(_onexit_table_t*,_onexit_t); _ACRTIMP void __cdecl _set_app_type(_crt_app_type); #ifdef __cplusplus

1 0

Jacek Caban : ucrtbase/tests: Fix clock tests.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 618b0736fecd1367067a0b702361ab01ccb25d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=618b0736fecd1367067a0b70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 17 15:55:24 2020 +0100 ucrtbase/tests: Fix clock tests. crt_init_start no longer makes sense since ucrtbase.dll is directly linked to test executable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ada3a52eb6..46389edf25 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -131,7 +131,7 @@ typedef struct { typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static HMODULE module; -static LONGLONG crt_init_start, crt_init_end; +static LONGLONG crt_init_end; static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); @@ -485,16 +485,10 @@ static BOOL init(void) { FILETIME cur; - GetSystemTimeAsFileTime(&cur); - crt_init_start = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; - module = LoadLibraryA("ucrtbase.dll"); GetSystemTimeAsFileTime(&cur); crt_init_end = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; - if(!module) { - win_skip("ucrtbase.dll not available\n"); - return FALSE; - } + module = GetModuleHandleW(L"ucrtbase.dll"); p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); @@ -1384,17 +1378,16 @@ static void test__o_malloc(void) static void test_clock(void) { - static const int thresh = 100; - int c, expect_min, expect_max; + static const int thresh = 100, max_load_delay = 1000; + int c, expect_min; FILETIME cur; GetSystemTimeAsFileTime(&cur); c = clock(); expect_min = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_end) / 10000; - expect_max = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_start) / 10000; - ok(c > expect_min-thresh && c < expect_max+thresh, "clock() = %d, expected range [%d, %d]\n", - c, expect_min, expect_max); + ok(c >= expect_min - thresh && c < expect_min + max_load_delay, "clock() = %d, expected range [%d, %d]\n", + c, expect_min - thresh, expect_min + max_load_delay); } START_TEST(misc)

1 0

Hans Leidekker : webservices: Add support for WS_FIELD_NILLABLE_ITEM.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 0f911b7aa4555d8298e84be155648ec166978ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f911b7aa4555d8298e84be1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:45 2020 +0100 webservices: Add support for WS_FIELD_NILLABLE_ITEM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 61 ++++++++++++++++++++++++++++++++++++++--- dlls/webservices/writer.c | 7 +++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 4fb9f44733..d66c2e4319 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3050,12 +3050,12 @@ static void test_datetime(void) static void test_repeating_element(void) { - WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}; - WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}; + WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {0, NULL}, data = {4, (BYTE *)"data"}; + WS_XML_STRING val = {3, (BYTE *)"val"}, wrapper = {7, (BYTE *)"wrapper"}, structval = {9, (BYTE *)"structval"}; HRESULT hr; WS_XML_WRITER *writer; - WS_STRUCT_DESCRIPTION s; - WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; WS_ITEM_RANGE range; struct test { @@ -3067,6 +3067,15 @@ static void test_repeating_element(void) INT32 *val; ULONG count; } *test2; + struct value + { + INT32 data; + } value; + struct test3 + { + const struct value **val; + ULONG count; + } *test3; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3153,6 +3162,50 @@ static void test_repeating_element(void) check_output( writer, "<test><val>1</val><val>2</val></test>", __LINE__ ); HeapFree( GetProcessHeap(), 0, test2 ); + /* nillable item */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.localName = &data; + f2.ns = &ns; + f2.type = WS_INT32_TYPE; + fields2[0] = &f2; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(struct test3); + s2.alignment = TYPE_ALIGNMENT(struct test3); + s2.typeLocalName = &structval; + s2.typeNs = &ns; + s2.fields = fields2; + s2.fieldCount = 1; + + f.type = WS_STRUCT_TYPE; + f.typeDescription = &s2; + f.localName = &wrapper; + f.ns = &ns; + f.itemRange = NULL; + f.options = WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM; + + value.data = -1; + test3 = HeapAlloc( GetProcessHeap(), 0, sizeof(*test3) + 2 * sizeof(const struct value *) ); + test3->val = (const struct value **)(test3 + 1); + test3->val[0] = &value; + test3->val[1] = NULL; + test3->count = 2; + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test3, sizeof(test3), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<test><wrapper><val><data>-1</data></val><val a:nil=\"true\" " + "xmlns:a=\"http://www.w3.org/2001/XMLSchema-instance\"/></wrapper></test>", __LINE__ ); + HeapFree( GetProcessHeap(), 0, test3 ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 021c961c94..53489786cd 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3607,7 +3607,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) { if (options & WS_FIELD_POINTER) { - if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) return WS_WRITE_NILLABLE_POINTER; return WS_WRITE_REQUIRED_POINTER; } @@ -3754,7 +3754,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI ULONG count, size, field_options = desc->options; const char *ptr = buf + offset; - if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) + if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { FIXME( "options 0x%x not supported\n", desc->options ); return E_NOTIMPL; @@ -3771,7 +3771,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI if (is_nil_value( ptr, size )) { if (field_options & WS_FIELD_OPTIONAL) return S_OK; - if (field_options & WS_FIELD_NILLABLE) + if (field_options & (WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) { if (field_options & WS_FIELD_POINTER) option = WS_WRITE_NILLABLE_POINTER; else option = WS_WRITE_NILLABLE_VALUE; @@ -3867,6 +3867,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; + if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); for (i = 0; i < desc->fieldCount; i++) {

1 0

Hans Leidekker : webservices: Handle WS_XML_TEXT_TYPE_INT32 in text_to_uint64.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: 084d5ac2b1bc0b87e1f89fcdcca14dd14971096f URL: https://source.winehq.org/git/wine.git/?a=commit;h=084d5ac2b1bc0b87e1f89fcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:44 2020 +0100 webservices: Handle WS_XML_TEXT_TYPE_INT32 in text_to_uint64. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b328bb779e..bf29990923 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5051,6 +5051,13 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) hr = str_to_uint64( text_utf8->value.bytes, text_utf8->value.length, MAX_UINT64, val ); break; } + case WS_XML_TEXT_TYPE_INT32: + { + const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; + *val = text_int32->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_INT64: { const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text;

1 0

Hans Leidekker : webservices/tests: Use wide character string literals.
by Alexandre Julliard 17 Mar '20

17 Mar '20

Module: wine Branch: master Commit: f735ffbfe29cdd9763fe4c0575d8bd1ca616341c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f735ffbfe29cdd9763fe4c05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 17 15:35:43 2020 +0100 webservices/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 51 ++++------- dlls/webservices/tests/msg.c | 34 +++----- dlls/webservices/tests/proxy.c | 28 +++--- dlls/webservices/tests/reader.c | 57 +++++-------- dlls/webservices/tests/url.c | 178 +++++++++++++++++---------------------- dlls/webservices/tests/writer.c | 77 +++++++---------- 6 files changed, 172 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f735ffbfe29cdd9763fe…

1 0

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