wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Piotr Caban : ucrtbase: Fix wrong function calls in misc tests.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 78ef7515832fc266cbfbecc7a8048d1dad8584d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ef7515832fc266cbfbecc7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 01:00:36 2018 +0100 ucrtbase: Fix wrong function calls in misc tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2251863..65e308c 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -118,6 +118,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static int (WINAPIV *p__open)(const char*, int, ...); static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); @@ -134,6 +135,7 @@ 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 int (__cdecl *p__stat32)(const char*, struct _stat32 *buf); +static int (__cdecl *p__close)(int); static void test__initialize_onexit_table(void) { @@ -476,6 +478,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p__open = (void*)GetProcAddress(module, "_open"); p_lldiv = (void*)GetProcAddress(module, "lldiv"); p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); @@ -492,6 +495,7 @@ static BOOL init(void) p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); p__stat32 = (void*)GetProcAddress(module, "_stat32"); + p__close = (void*)GetProcAddress(module, "_close"); return TRUE; } @@ -507,7 +511,7 @@ static void test__sopen_dispatch(void) ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 0); ok(!ret, "got %d\n", ret); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); p__set_invalid_parameter_handler(global_invalid_parameter_handler); @@ -520,7 +524,7 @@ static void test__sopen_dispatch(void) CHECK_CALLED(global_invalid_parameter_handler); if (fd > 0) { - _close(fd); + p__close(fd); unlink(tempf); } @@ -540,13 +544,13 @@ static void test__sopen_s(void) ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0); ok(!ret, "got %d\n", ret); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); /* _open() does not validate pmode */ - fd = _open(tempf, _O_CREAT, 0xff); + fd = p__open(tempf, _O_CREAT, 0xff); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); p__set_invalid_parameter_handler(global_invalid_parameter_handler);

1 0

Piotr Caban : ucrtbase: Fix leaks in misc tests.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 7b196a9d14fc4795c7f46f63b92911833dac1637 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b196a9d14fc4795c7f46f63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 01:00:32 2018 +0100 ucrtbase: Fix leaks in misc tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 8a708da..2251863 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -250,6 +250,9 @@ static void test__register_onexit_function(void) ret = p_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); + + ret = p_execute_onexit_table(&table); + ok(ret == 0, "got %d\n", ret); } static void test__execute_onexit_table(void) @@ -444,6 +447,8 @@ static void test__get_narrow_winmain_command_line(char *path) CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); winetest_wait_child_process(proc.hProcess); + CloseHandle(proc.hProcess); + CloseHandle(proc.hThread); } static BOOL init(void)

1 0

Piotr Caban : ucrtbase: Add _o__*_onexit_table implementation.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 4df6425a349ab193b14ac1ecdb50073b959b77fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df6425a349ab193b14ac1ec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 01:00:27 2018 +0100 ucrtbase: Add _o__*_onexit_table implementation. Used by unofficial libcef build. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 6 +-- dlls/ucrtbase/tests/misc.c | 51 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 6 +-- 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 7cf4201..9fc7723 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -226,7 +226,7 @@ @ stub _o__eof @ stub _o__errno @ stub _o__except1 -@ stub _o__execute_onexit_table +@ cdecl _o__execute_onexit_table(ptr) ucrtbase._o__execute_onexit_table @ stub _o__execv @ stub _o__execve @ stub _o__execvp @@ -345,7 +345,7 @@ @ stub _o__i64toa_s @ stub _o__i64tow @ stub _o__i64tow_s -@ stub _o__initialize_onexit_table +@ cdecl _o__initialize_onexit_table(ptr) ucrtbase._o__initialize_onexit_table @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -630,7 +630,7 @@ @ stub _o__read @ stub _o__realloc_base @ stub _o__recalloc -@ stub _o__register_onexit_function +@ cdecl _o__register_onexit_function(ptr ptr) ucrtbase._o__register_onexit_function @ stub _o__resetstkoflw @ stub _o__rmdir @ stub _o__rmtmp diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index bd8034e..8a708da 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -105,6 +105,9 @@ static HMODULE module; 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); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); +static int (CDECL *p_o__initialize_onexit_table)(MSVCRT__onexit_table_t *table); +static int (CDECL *p_o__register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); +static int (CDECL *p_o__execute_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p___fpe_flt_rounds)(void); static unsigned int (CDECL *p__controlfp)(unsigned int, unsigned int); static _invalid_parameter_handler (CDECL *p__set_invalid_parameter_handler)(_invalid_parameter_handler); @@ -150,6 +153,15 @@ static void test__initialize_onexit_table(void) ret = p_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); + 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); + 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); + ok(table2._end == table._end, "got %p, %p\n", table2._end, table._end); /* uninitialized table */ table._first = table._last = table._end = (void*)0x123; @@ -228,6 +240,16 @@ static void test__register_onexit_function(void) ret = p_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); + + f = table._last; + ret = p_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); + ok(ret == 0, "got %d\n", ret); + ok(f != table._last, "got %p, initial %p\n", table._last, f); } static void test__execute_onexit_table(void) @@ -246,7 +268,7 @@ static void test__execute_onexit_table(void) ret = p_execute_onexit_table(&table); ok(ret == 0, "got %d\n", ret); - /* same functions registered twice */ + /* same function registered multiple times */ ret = p_register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); @@ -256,11 +278,33 @@ static void test__execute_onexit_table(void) ret = p_register_onexit_function(&table, onexit_func); ok(ret == 0, "got %d\n", ret); + ret = p_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_execute_onexit_table(&table); ok(ret == 0, "got %d\n", ret); - ok(g_onexit_called == 2, "got %d\n", g_onexit_called); + ok(g_onexit_called == 3, "got %d\n", g_onexit_called); + ok(table._first == table._end, "got %p, %p\n", table._first, table._end); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, NULL); + ok(ret == 0, "got %d\n", ret); + + ret = p_register_onexit_function(&table, onexit_func); + ok(ret == 0, "got %d\n", ret); + + ret = p_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); + 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); /* execute again, table is already empty */ @@ -414,6 +458,9 @@ static BOOL init(void) p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); + 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__controlfp = (void*)GetProcAddress(module, "_controlfp"); p__set_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_invalid_parameter_handler"); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1f0975d..34e6b0e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -906,7 +906,7 @@ @ stub _o__eof @ stub _o__errno @ stub _o__except1 -@ stub _o__execute_onexit_table +@ cdecl _o__execute_onexit_table(ptr) MSVCRT__execute_onexit_table @ stub _o__execv @ stub _o__execve @ stub _o__execvp @@ -1029,7 +1029,7 @@ @ stub _o__i64tow @ stub _o__i64tow_s @ stub _o__initialize_narrow_environment -@ stub _o__initialize_onexit_table +@ cdecl _o__initialize_onexit_table(ptr) MSVCRT__initialize_onexit_table @ stub _o__initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @@ -1316,7 +1316,7 @@ @ stub _o__read @ stub _o__realloc_base @ stub _o__recalloc -@ stub _o__register_onexit_function +@ cdecl _o__register_onexit_function(ptr ptr) MSVCRT__register_onexit_function @ stub _o__resetstkoflw @ stub _o__rmdir @ stub _o__rmtmp

1 0

Zebediah Figura : rpcrt4: Fix handling of FC_ALIGNM* directives.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: f848d03f95e9d4d722dd8ee86b895913aadea3af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f848d03f95e9d4d722dd8ee8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 10:02:00 2018 -0600 rpcrt4: Fix handling of FC_ALIGNM* directives. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 41 ++++++++++++++++++++++++++++------------ dlls/rpcrt4/tests/ndr_marshall.c | 1 - 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 38ead96..77bbf98 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -108,6 +108,19 @@ static inline void align_pointer_clear( unsigned char **ptr, unsigned int align *ptr = (unsigned char *)(((ULONG_PTR)*ptr + mask) & ~mask); } +static inline void align_pointer_offset( unsigned char **ptr, unsigned char *base, unsigned int align ) +{ + ULONG_PTR mask = align - 1; + *ptr = base + (((ULONG_PTR)(*ptr - base) + mask) & ~mask); +} + +static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned char *base, unsigned int align ) +{ + ULONG_PTR mask = align - 1; + memset( *ptr, 0, (align - (ULONG_PTR)(*ptr - base)) & mask ); + *ptr = base + (((ULONG_PTR)(*ptr - base) + mask) & ~mask); +} + #define STD_OVERFLOW_CHECK(_Msg) do { \ TRACE("buffer=%d/%d\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ @@ -2834,6 +2847,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_MARSHALL m; ULONG size; @@ -2937,13 +2951,13 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, break; } case FC_ALIGNM2: - align_pointer(&pMemory, 2); + align_pointer_offset(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer(&pMemory, 4); + align_pointer_offset(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer(&pMemory, 8); + align_pointer_offset(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: @@ -2993,6 +3007,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pPointer, unsigned char fMustAlloc) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_UNMARSHALL m; ULONG size; @@ -3105,13 +3120,13 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, break; } case FC_ALIGNM2: - align_pointer_clear(&pMemory, 2); + align_pointer_offset_clear(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer_clear(&pMemory, 4); + align_pointer_offset_clear(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer_clear(&pMemory, 8); + align_pointer_offset_clear(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: @@ -3168,6 +3183,7 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_BUFFERSIZE m; ULONG size; @@ -3238,13 +3254,13 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pMemory += sizeof(void*); break; case FC_ALIGNM2: - align_pointer(&pMemory, 2); + align_pointer_offset(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer(&pMemory, 4); + align_pointer_offset(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer(&pMemory, 8); + align_pointer_offset(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: @@ -3292,6 +3308,7 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_FREE m; ULONG size; @@ -3339,13 +3356,13 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, pMemory += sizeof(void *); break; case FC_ALIGNM2: - align_pointer(&pMemory, 2); + align_pointer_offset(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer(&pMemory, 4); + align_pointer_offset(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer(&pMemory, 8); + align_pointer_offset(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d77e8b5..2187a08 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1230,7 +1230,6 @@ static void test_struct_align(void) StubMsg.Buffer = StubMsg.BufferStart; ptr = NdrComplexStructUnmarshall(&StubMsg, (unsigned char **)&mem, fmtstr, 0); ok(ptr == NULL, "ret %p\n", ptr); -todo_wine ok(!memcmp(mem, memsrc, sizeof(*memsrc)), "struct wasn't unmarshalled correctly\n"); StubMsg.pfnFree(mem);

1 0

Zebediah Figura : rpcrt4/tests: Add a test for FC_ALIGNM* directives.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 9a46a1fc9e123cddb2f00fce89e7505c04867105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a46a1fc9e123cddb2f00fce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 10:01:59 2018 -0600 rpcrt4/tests: Add a test for FC_ALIGNM* directives. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 67 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d436b42..d77e8b5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -25,7 +25,6 @@ #include <stdarg.h> -#include "wine/test.h" #include <windef.h> #include <winbase.h> #include <winnt.h> @@ -38,6 +37,9 @@ #include "midles.h" #include "ndrtypes.h" +#include "wine/heap.h" +#include "wine/test.h" + static int my_alloc_called; static int my_free_called; static void * CALLBACK my_alloc(SIZE_T size) @@ -1174,6 +1176,68 @@ static void test_simple_struct(void) test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct"); } +struct aligned +{ + int a; + LONGLONG b; +}; + +static void test_struct_align(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + struct aligned *memsrc_orig, *memsrc, *mem; + + /* force bogus struct so that members are marshalled individually */ + static const unsigned char fmtstr[] = + { + 0x1a, /* FC_BOGUS_STRUCT */ + 0x7, /* alignment 8 */ + NdrFcShort(0x10), /* memory size 16 */ + NdrFcShort(0x0), + NdrFcShort(0x0), + 0x08, /* FC_LONG */ + 0x39, /* FC_ALIGNM8 */ + 0x0b, /* FC_HYPER */ + 0x5b, /* FC_END */ + }; + + memsrc_orig = heap_alloc_zero(sizeof(struct aligned) + 8); + /* intentionally mis-align memsrc */ + memsrc = (struct aligned *)((((ULONG_PTR)memsrc_orig + 7) & ~7) + 4); + + memsrc->a = 0xdeadbeef; + memsrc->b = ((ULONGLONG) 0xbadefeed << 32) | 0x2468ace0; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr; + NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0); + + StubMsg.BufferLength = 0; + NdrComplexStructBufferSize(&StubMsg, (unsigned char *)memsrc, fmtstr); + + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = heap_alloc(StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrComplexStructMarshall(&StubMsg, (unsigned char *)memsrc, fmtstr); + ok(ptr == NULL, "ret %p\n", ptr); + + /* Server */ + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + ptr = NdrComplexStructUnmarshall(&StubMsg, (unsigned char **)&mem, fmtstr, 0); + ok(ptr == NULL, "ret %p\n", ptr); +todo_wine + ok(!memcmp(mem, memsrc, sizeof(*memsrc)), "struct wasn't unmarshalled correctly\n"); + StubMsg.pfnFree(mem); + + heap_free(StubMsg.RpcMsg->Buffer); + heap_free(memsrc_orig); +} + struct testiface { IPersist IPersist_iface; @@ -2908,6 +2972,7 @@ START_TEST( ndr_marshall ) test_simple_types(); test_nontrivial_pointer_types(); test_simple_struct(); + test_struct_align(); test_iface_ptr(); test_fullpointer_xlat(); test_client_init();

1 0

Zebediah Figura : dbghelp: Only check process architecture if we are actually given a process.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 63ef9854fb6fc91a8c956a9d91abc07e906a4a33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ef9854fb6fc91a8c956a9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 19 12:17:03 2018 -0600 dbghelp: Only check process architecture if we are actually given a process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45407 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a085cd1..ed4d5f4 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -310,7 +310,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP IsWow64Process(GetCurrentProcess(), &wow64); - if (!IsWow64Process(hProcess, &child_wow64)) + if (GetProcessId(hProcess) && !IsWow64Process(hProcess, &child_wow64)) return FALSE; pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs));

1 0

Dmitry Timoshkov : crypt32: Make sure that the provider supports the specified public key algorithm.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: a9baa25c8c43f6cf9b0373f273ba01d533ae53fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9baa25c8c43f6cf9b0373f2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 11:06:18 2018 +0300 crypt32: Make sure that the provider supports the specified public key algorithm. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index faf70de..2d7ef42 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1329,7 +1329,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, TRACE("public key algid %#x (%s)\n", info->u.Algid, debugstr_a(pPublicKey->Algorithm.pszObjId)); - ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(0), dwCertEncodingType, pPublicKey, &key); + ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(info->u.Algid), dwCertEncodingType, pPublicKey, &key); if (ret) { size = sizeof(len);

1 0

Nikolay Sivov : dwrite/tests: Add CreateFontFaceFromHdc() test for in-memory font.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 5ac5154c3df7b14c28497b3fc355d7249641414f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ac5154c3df7b14c28497b3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 12:27:36 2018 +0300 dwrite/tests: Add CreateFontFaceFromHdc() test for in-memory font. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 158 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 29fa2f3..2ac8157 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3711,16 +3711,52 @@ static void test_GetGdiInterop(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void *map_font_file(const WCHAR *filename, DWORD *file_size) +{ + HANDLE file, mapping; + void *ptr; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) return NULL; + + *file_size = GetFileSize(file, NULL); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + { + CloseHandle(file); + return NULL; + } + + ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + + CloseHandle(file); + CloseHandle(mapping); + return ptr; +} + static void test_CreateFontFaceFromHdc(void) { + IDWriteFontFileStream *stream, *stream2; + void *font_data, *fragment_context; + const void *refkey, *fragment; + IDWriteFontFileLoader *loader; + DWORD data_size, num_fonts; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFactory *factory; + UINT64 size, writetime; + IDWriteFontFile *file; HFONT hfont, oldhfont; LOGFONTW logfont; + HANDLE resource; + IUnknown *unk; + UINT32 count; LOGFONTA lf; + WCHAR *path; HRESULT hr; ULONG ref; + BOOL ret; HDC hdc; factory = create_factory(); @@ -3771,8 +3807,91 @@ static void test_CreateFontFaceFromHdc(void) ok(fontface == NULL, "got %p\n", fontface); DeleteObject(SelectObject(hdc, oldhfont)); - DeleteDC(hdc); + /* Memory resource font */ + path = create_testfontfile(test_fontfile); + + data_size = 0; + font_data = map_font_file(path, &data_size); + + num_fonts = 0; + resource = AddFontMemResourceEx(font_data, data_size, NULL, &num_fonts); + ok(resource != NULL, "Failed to add memory resource font, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts.\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -12; + strcpy(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "Failed to create a font.\n"); + oldhfont = SelectObject(hdc, hfont); + + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); +todo_wine + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + +if (fontface) +{ + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "Failed to get font files, hr %#x.\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "Failed to get file loader, hr %#x.\n", hr); + + hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IDWriteFontFile_GetReferenceKey(file, &refkey, &count); + ok(hr == S_OK, "Failed to get ref key, hr %#x.\n", hr); + ok(count > 0, "Unexpected key length %u.\n", count); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream2); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + ok(stream2 != stream, "Unexpected stream instance.\n"); + IDWriteFontFileStream_Release(stream2); + + hr = IDWriteFontFileStream_GetFileSize(stream, &size); + ok(hr == S_OK, "Failed to get stream size, hr %#x.\n", hr); + ok(size == data_size, "Unexpected stream size.\n"); + + hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + fragment_context = NULL; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, size, &fragment_context); + ok(hr == S_OK, "Failed to read fragment, hr %#x.\n", hr); + ok(fragment_context != NULL, "Unexpected context %p.\n", fragment_context); + ok(fragment == fragment_context, "Unexpected data pointer %p, context %p.\n", fragment, fragment_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, fragment_context); + + IDWriteFontFileStream_Release(stream); + + IDWriteFontFileLoader_Release(loader); + IDWriteFontFile_Release(file); + + IDWriteFontFace_Release(fontface); +} + ret = RemoveFontMemResourceEx(resource); + ok(ret, "Failed to remove memory resource font, %d.\n", GetLastError()); + + UnmapViewOfFile(font_data); + + DELETE_FONTFILE(path); + + DeleteObject(SelectObject(hdc, oldhfont)); + DeleteDC(hdc); IDWriteGdiInterop_Release(interop); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); @@ -7935,6 +8054,7 @@ static void test_inmemory_file_loader(void) hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, &ref_key, sizeof(ref_key), &stream2); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* With owner object. */ hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory, data, file_size, &ownerobject.IUnknown_iface, &file); ok(hr == S_OK, "Failed to create in-memory file reference, hr %#x.\n", hr); @@ -7946,7 +8066,7 @@ static void test_inmemory_file_loader(void) context2 = (void *)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream2, &frag_start, 0, file_size, &context2); ok(hr == S_OK, "Failed to read a fragment, hr %#x.\n", hr); - ok(context == NULL, "Unexpected context %p.\n", context2); + ok(context2 == NULL, "Unexpected context %p.\n", context2); ok(frag_start == data, "Unexpected fragment pointer %p.\n", frag_start); hr = IDWriteFontFileStream_GetFileSize(stream2, &size); @@ -7962,6 +8082,36 @@ static void test_inmemory_file_loader(void) IDWriteFontFileStream_Release(stream2); + /* Without owner object. */ + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory, data, + file_size, NULL, &file2); + ok(hr == S_OK, "Failed to create in-memory file reference, hr %#x.\n", hr); + + ref_key = 1; + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, &ref_key, sizeof(ref_key), &stream2); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + context2 = (void *)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream2, &frag_start, 0, file_size, &context2); + ok(hr == S_OK, "Failed to read a fragment, hr %#x.\n", hr); + ok(context2 == NULL, "Unexpected context %p.\n", context2); + ok(frag_start != data, "Unexpected fragment pointer %p.\n", frag_start); + + hr = IDWriteFontFileStream_GetFileSize(stream2, &size); + ok(hr == S_OK, "Failed to get file size, hr %#x.\n", hr); + ok(size == file_size, "Unexpected file size.\n"); + + IDWriteFontFileStream_ReleaseFileFragment(stream2, context2); + + writetime = 1; + hr = IDWriteFontFileStream_GetLastWriteTime(stream2, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(writetime == 0, "Unexpected writetime.\n"); + + IDWriteFontFileStream_Release(stream2); + IDWriteFontFile_Release(file2); + + /* Key size validation. */ ref_key = 0; hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, NULL, sizeof(ref_key) - 1, &stream2); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -7975,7 +8125,7 @@ static void test_inmemory_file_loader(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); count = IDWriteInMemoryFontFileLoader_GetFileCount(inmemory); - ok(count == 1, "Unexpected file count %u.\n", count); + ok(count == 2, "Unexpected file count %u.\n", count); hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); ok(hr == S_OK, "Failed to get reference key, hr %#x.\n", hr); @@ -7986,7 +8136,7 @@ static void test_inmemory_file_loader(void) IDWriteFontFile_Release(file); count = IDWriteInMemoryFontFileLoader_GetFileCount(inmemory); - ok(count == 1, "Unexpected file count %u.\n", count); + ok(count == 2, "Unexpected file count %u.\n", count); hr = IDWriteFactory5_UnregisterFontFileLoader(factory, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "Failed to unregister loader, hr %#x.\n", hr);

1 0

Roberto Pungartnik : po: Update Portuguese (Brazil) translation.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 0c38f7348691ac842b858268d8ea74145129ca29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c38f7348691ac842b858268… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Nov 18 00:19:08 2018 -0200 po: Update Portuguese (Brazil) translation. Signed-off-by: Roberto Augusto Pungartnik <rpungartik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 213 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 110 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c38f7348691ac842b85…

1 0

Andrey Gusev : slc: Add SLOpen stub.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 4de47f180f14efeacc24f6d94c7e7835d5958e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4de47f180f14efeacc24f6d9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 17 13:54:11 2018 +0200 slc: Add SLOpen stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46156 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/slc.c | 7 +++++++ dlls/slc/slc.spec | 2 +- include/slpublic.h | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index a0d8999..7b7a6c6 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -62,6 +62,13 @@ HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwVa return status ? E_FAIL : S_OK; } +HRESULT WINAPI SLOpen(HSLC *handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + /*********************************************************************** * DllMain (CLUSAPI.@) * diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index af5545c..e4289d3 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -30,7 +30,7 @@ @ stub SLInstallLicense @ stub SLInstallProofOfPurchase @ stub SLInstallSAMLicense -@ stub SLOpen +@ stdcall SLOpen(ptr) @ stub SLReArmWindows @ stub SLRegisterEvent @ stub SLRegisterWindowsEvent diff --git a/include/slpublic.h b/include/slpublic.h index c8bb559..dc02f3c 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,6 +29,8 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif +typedef PVOID HSLC; + typedef enum _tagSLDATATYPE { SL_DATA_NONE = REG_NONE, @@ -41,7 +43,7 @@ typedef enum _tagSLDATATYPE SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); - +SLCAPI HRESULT WINAPI SLOpen(HSLC*); #ifdef __cplusplus }

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018