November 2020 - Wine-Commits

Piotr Caban : msvcrt: Remove MSVCRT_lconv type.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 70c06601e6bc44aa7b78f440b43c5accbcf32038 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c06601e6bc44aa7b78f440… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:19:05 2020 +0100 msvcrt: Remove MSVCRT_lconv type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- dlls/msvcrt/math.c | 1 + dlls/msvcrt/msvcrt.h | 33 +-------------------------------- dlls/msvcrt/string.c | 1 + dlls/msvcrt/wcs.c | 1 + include/msvcrt/locale.h | 10 ++++++++++ 6 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 52fbd9cf9c7..cca1cb9391b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -199,7 +199,7 @@ static char cloc_dec_point[] = "."; static MSVCRT_wchar_t emptyW[] = {0}; static MSVCRT_wchar_t cloc_dec_pointW[] = {'.', 0}; #endif -static struct MSVCRT_lconv cloc_lconv = +static struct lconv cloc_lconv = { cloc_dec_point, empty, empty, empty, empty, empty, empty, empty, empty, empty, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, @@ -1006,7 +1006,7 @@ BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, /********************************************************************* * localeconv (MSVCRT.@) */ -struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) +struct lconv* CDECL MSVCRT_localeconv(void) { return get_locinfo()->lconv; } @@ -1511,7 +1511,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, if(locinfo->lconv_intl_refcount) InterlockedIncrement(locinfo->lconv_intl_refcount); } else if(lcid[MSVCRT_LC_MONETARY] || lcid[MSVCRT_LC_NUMERIC]) { - locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); + locinfo->lconv = MSVCRT_malloc(sizeof(struct lconv)); locinfo->lconv_intl_refcount = MSVCRT_malloc(sizeof(int)); if(!locinfo->lconv || !locinfo->lconv_intl_refcount) { MSVCRT_free(locinfo->lconv); @@ -1521,7 +1521,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, free_locinfo(locinfo); return NULL; } - memset(locinfo->lconv, 0, sizeof(struct MSVCRT_lconv)); + memset(locinfo->lconv, 0, sizeof(struct lconv)); *locinfo->lconv_intl_refcount = 1; } else { locinfo->lconv = &cloc_lconv; diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dd00cc212c6..ff5654495fc 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -39,6 +39,7 @@ #include <stdio.h> #include <fenv.h> #include <fpieee.h> +#include <locale.h> #include <math.h> #include "msvcrt.h" diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 52aafcff869..f19c37ee2eb 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -148,7 +148,7 @@ typedef struct MSVCRT_threadlocaleinfostruct { int *lconv_intl_refcount; int *lconv_num_refcount; int *lconv_mon_refcount; - struct MSVCRT_lconv *lconv; + struct lconv *lconv; int *ctype1_refcount; unsigned short *ctype1; #if _MSVCR_VER < 140 @@ -382,37 +382,6 @@ typedef struct _iobuf MSVCRT_FILE; extern MSVCRT_FILE MSVCRT__iob[]; -struct MSVCRT_lconv { - char* decimal_point; - char* thousands_sep; - char* grouping; - char* int_curr_symbol; - char* currency_symbol; - char* mon_decimal_point; - char* mon_thousands_sep; - char* mon_grouping; - char* positive_sign; - char* negative_sign; - char int_frac_digits; - char frac_digits; - char p_cs_precedes; - char p_sep_by_space; - char n_cs_precedes; - char n_sep_by_space; - char p_sign_posn; - char n_sign_posn; -#if _MSVCR_VER >= 100 - MSVCRT_wchar_t* _W_decimal_point; - MSVCRT_wchar_t* _W_thousands_sep; - MSVCRT_wchar_t* _W_int_curr_symbol; - MSVCRT_wchar_t* _W_currency_symbol; - MSVCRT_wchar_t* _W_mon_decimal_point; - MSVCRT_wchar_t* _W_mon_thousands_sep; - MSVCRT_wchar_t* _W_positive_sign; - MSVCRT_wchar_t* _W_negative_sign; -#endif -}; - struct MSVCRT__exception { int type; char* name; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a2e45089d8a..3c394f0a3ca 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <math.h> #include <limits.h> +#include <locale.h> #include <errno.h> #include "msvcrt.h" #include "bnum.h" diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c46c09bedfa..0f4e72ac0f5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -20,6 +20,7 @@ */ #include <limits.h> +#include <locale.h> #include <stdio.h> #include <math.h> #include <assert.h> diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index a5af1720b97..ee0d99b8e7e 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -53,6 +53,16 @@ struct lconv char n_sep_by_space; char p_sign_posn; char n_sign_posn; +#if _MSVCR_VER >= 100 + wchar_t* _W_decimal_point; + wchar_t* _W_thousands_sep; + wchar_t* _W_int_curr_symbol; + wchar_t* _W_currency_symbol; + wchar_t* _W_mon_decimal_point; + wchar_t* _W_mon_thousands_sep; + wchar_t* _W_positive_sign; + wchar_t* _W_negative_sign; +#endif }; #endif /* _LCONV_DEFINED */

1 0

Piotr Caban : msvcrt: Move btowc implementation to mbcs.c file.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 3073097d29e381dedf0a3f2c5d2480dc53edbd75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3073097d29e381dedf0a3f2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:18:57 2020 +0100 msvcrt: Move btowc implementation to mbcs.c file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 19 ------------------- dlls/msvcrt/mbcs.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4afdf0ff9b6..25df4c9e17e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1642,7 +1642,7 @@ @ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f69896c8307..9c70d32c539 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1999,7 +1999,7 @@ @ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index eb4fab5391a..77021438cb9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2035,7 +2035,7 @@ @ cdecl -ret64 atoll(str) MSVCRT_atoll @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ stub cabs @ stub cabsf @ stub cabsl diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5b3680a503a..56542cbf273 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1325,7 +1325,7 @@ @ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9021a6dc65..b39a72725d9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1297,7 +1297,7 @@ @ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 73138bfd306..1bc540b717b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -988,25 +988,6 @@ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, MSVCRT_wchar_t } #endif -/********************************************************************* - * btowc(MSVCRT.@) - */ -MSVCRT_wint_t CDECL MSVCRT_btowc(int c) -{ - unsigned char letter = c; - MSVCRT_wchar_t ret; - - if(c == MSVCRT_EOF) - return MSVCRT_WEOF; - if(!get_locinfo()->lc_codepage) - return c & 255; - if(!MultiByteToWideChar(get_locinfo()->lc_codepage, - MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) - return MSVCRT_WEOF; - - return ret; -} - /********************************************************************* * __crtGetStringTypeW(MSVCRT.@) * diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d4434209a43..89372b145a4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2436,6 +2436,25 @@ int CDECL MSVCRT_mbtowc(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n) return MSVCRT_mbtowc_l(dst, str, n, NULL); } +/********************************************************************* + * btowc(MSVCRT.@) + */ +MSVCRT_wint_t CDECL btowc(int c) +{ + unsigned char letter = c; + MSVCRT_wchar_t ret; + + if(c == MSVCRT_EOF) + return MSVCRT_WEOF; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; + + return ret; +} + /********************************************************************* * mbrtowc(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 21fe7330113..ea53da539ba 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1258,7 +1258,7 @@ @ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 02bcad8cc8f..1f8fce6a016 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1582,7 +1582,7 @@ @ cdecl -ret64 _o_atoll(str) MSVCRT_atoll @ cdecl _o_bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl _o_bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl _o_btowc(long) MSVCRT_btowc +@ cdecl _o_btowc(long) btowc @ cdecl _o_calloc(long long) MSVCRT_calloc @ cdecl _o_cbrt(double) MSVCR120_cbrt @ cdecl _o_cbrtf(float) MSVCR120_cbrtf @@ -2176,7 +2176,7 @@ @ cdecl -ret64 atoll(str) MSVCRT_atoll @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -@ cdecl btowc(long) MSVCRT_btowc +@ cdecl btowc(long) @ stub c16rtomb @ stub c32rtomb @ stub cabs

1 0

Paul Gofman : server: Allow client pipe creation with server pipe as root directory.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 1f3064c5d5ac851c6fdfb85bc8ff5ea046f32acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f3064c5d5ac851c6fdfb85b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 25 21:42:45 2020 +0300 server: Allow client pipe creation with server pipe as root directory. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 13 +++++-------- dlls/ntdll/tests/pipe.c | 31 ++++++++++++++++++++----------- server/named_pipe.c | 25 +++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9327d0319dd..2814ab194b2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4565,17 +4565,14 @@ static void test_ReOpenFile(void) ok(file != INVALID_HANDLE_VALUE, "failed to create pipe, error %u\n", GetLastError()); new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); - todo_wine ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); ret = WriteFile(file, "foo", 4, &size, NULL); - todo_wine ok(ret, "failed to write file, error %u\n", GetLastError()); + ok(ret, "failed to write file, error %u\n", GetLastError()); ret = ReadFile(new, buffer, sizeof(buffer), &size, NULL); - todo_wine ok(ret, "failed to read file, error %u\n", GetLastError()); - if (ret) - { - ok(size == 4, "got size %u\n", size); - ok(!strcmp(buffer, "foo"), "got wrong data\n"); - } + ok(ret, "failed to read file, error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "foo"), "got wrong data\n"); CloseHandle(new); CloseHandle(file); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 1230fecfda7..42bd825dc3c 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -2487,39 +2487,48 @@ static void test_empty_name(void) todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "Got unexpected status %#x.\n", status); attr.RootDirectory = hpipe; + pRtlInitUnicodeString(&name, L"a"); status = NtCreateFile(&hwrite, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); - todo_wine ok(!status, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); + + name.Buffer = NULL; + name.Length = 0; + name.MaximumLength = 0; + attr.RootDirectory = hpipe; + status = NtCreateFile(&hwrite, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + ok(!status, "Got unexpected status %#x.\n", status); type_info->TypeName.Buffer = NULL; status = pNtQueryObject(hwrite, ObjectTypeInformation, type_info, sizeof(buffer), NULL); - todo_wine ok(!status, "Got unexpected status %#x.\n", status); - todo_wine ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + ok(!status, "Got unexpected status %#x.\n", status); + ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); status = pNtQueryObject(hwrite, ObjectNameInformation, name_info, sizeof(buffer), NULL); - todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); attr.RootDirectory = hpipe; status = NtCreateFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); - todo_wine ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); + ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); attr.RootDirectory = hpipe; status = NtCreateFile(&handle, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); - todo_wine ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); + ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); data = 0xdeadbeef; ret = WriteFile(hwrite, &data, sizeof(data), &length, NULL); - todo_wine ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); - todo_wine ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(length == sizeof(data), "Got unexpected length %#x.\n", length); data = 0; ret = ReadFile(hpipe, &data, sizeof(data), &length, NULL); - todo_wine ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); - todo_wine ok(length == sizeof(data), "Got unexpected length %#x.\n", length); - todo_wine ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); CloseHandle(hwrite); CloseHandle(hpipe); diff --git a/server/named_pipe.c b/server/named_pipe.c index 5adfd444ada..ff1fdbe3f07 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -152,6 +152,10 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); +static struct object *pipe_server_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); +static struct object *pipe_server_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -170,10 +174,10 @@ static const struct object_ops pipe_server_ops = pipe_end_get_sd, /* get_sd */ pipe_end_set_sd, /* set_sd */ pipe_end_get_full_name, /* get_full_name */ - no_lookup_name, /* lookup_name */ + pipe_server_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ - no_open_file, /* open_file */ + pipe_server_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ fd_close_handle, /* close_handle */ pipe_server_destroy /* destroy */ @@ -449,6 +453,23 @@ static void pipe_end_destroy( struct object *obj ) if (pipe_end->pipe) release_object( pipe_end->pipe ); } +static struct object *pipe_server_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) +{ + if (name && name->len) + set_error( STATUS_OBJECT_NAME_INVALID ); + + return NULL; +} + +static struct object *pipe_server_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + struct pipe_server *server = (struct pipe_server *)obj; + + return server->pipe_end.pipe->obj.ops->open_file( &server->pipe_end.pipe->obj, access, sharing, options ); +} + static void pipe_server_destroy( struct object *obj ) { struct pipe_server *server = (struct pipe_server *)obj;

1 0

Paul Gofman : server: Allow named pipes creation with device file as root directory.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: a2ffa8ef7e178a374b6ac6dc39b11f64952cf316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ffa8ef7e178a374b6ac6dc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 25 21:42:43 2020 +0300 server: Allow named pipes creation with device file as root directory. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 34 ++++++++++++++++++++++++++++++++-- server/named_pipe.c | 2 +- server/request.c | 3 ++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9e8b623d75b..bfc8dc0b3be 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -65,6 +65,7 @@ typedef struct { #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); +static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *); static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, POBJECT_ATTRIBUTES attr, PIO_STATUS_BLOCK iosb, ULONG sharing, ULONG dispo, ULONG options, @@ -73,6 +74,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, ULONG inbound_quota, ULONG outbound_quota, PLARGE_INTEGER timeout); static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE handle, PIO_STATUS_BLOCK io, void *buffer, ULONG length, FS_INFORMATION_CLASS info_class); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); @@ -94,8 +96,10 @@ static BOOL init_func_ptrs(void) } loadfunc(NtFsControlFile) + loadfunc(NtCreateDirectoryObject) loadfunc(NtCreateNamedPipeFile) loadfunc(NtQueryInformationFile) + loadfunc(NtQueryObject) loadfunc(NtQueryVolumeInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) @@ -2405,14 +2409,20 @@ static void test_security_info(void) static void test_empty_name(void) { HANDLE hdirectory, hpipe, hwrite, handle; + OBJECT_TYPE_INFORMATION *type_info; + OBJECT_NAME_INFORMATION *name_info; OBJECT_ATTRIBUTES attr; LARGE_INTEGER timeout; UNICODE_STRING name; IO_STATUS_BLOCK io; DWORD data, length; + char buffer[1024]; NTSTATUS status; BOOL ret; + type_info = (OBJECT_TYPE_INFORMATION *)buffer; + name_info = (OBJECT_NAME_INFORMATION *)buffer; + hpipe = hwrite = NULL; attr.Length = sizeof(attr); @@ -2438,13 +2448,17 @@ static void test_empty_name(void) &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, 0, 0, 0, 3, 4096, 4096, &timeout); todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); - + if (!status) + CloseHandle(hpipe); CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); attr.RootDirectory = 0; attr.ObjectName = &name; + status = pNtCreateDirectoryObject(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr); + todo_wine ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + status = NtCreateFile(&hdirectory, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); @@ -2454,10 +2468,18 @@ static void test_empty_name(void) name.MaximumLength = 0; attr.RootDirectory = hdirectory; + hpipe = NULL; status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, 0, 0, 0, 3, 4096, 4096, &timeout); - todo_wine ok(!status, "Got unexpected status %#x.\n", status); + ok(!status, "Got unexpected status %#x.\n", status); + type_info->TypeName.Buffer = NULL; + status = pNtQueryObject(hpipe, ObjectTypeInformation, type_info, sizeof(buffer), NULL); + ok(!status, "Got unexpected status %#x.\n", status); + ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); + status = pNtQueryObject(hpipe, ObjectNameInformation, name_info, sizeof(buffer), NULL); + todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); status = pNtCreateNamedPipeFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, @@ -2469,6 +2491,14 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); todo_wine ok(!status, "Got unexpected status %#x.\n", status); + type_info->TypeName.Buffer = NULL; + status = pNtQueryObject(hwrite, ObjectTypeInformation, type_info, sizeof(buffer), NULL); + todo_wine ok(!status, "Got unexpected status %#x.\n", status); + todo_wine ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), + "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); + status = pNtQueryObject(hwrite, ObjectNameInformation, name_info, sizeof(buffer), NULL); + todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); + attr.RootDirectory = hpipe; status = NtCreateFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, diff --git a/server/named_pipe.c b/server/named_pipe.c index 14868fad63a..6e65f3e364a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1371,7 +1371,7 @@ DECL_HANDLER(create_named_pipe) set_error( STATUS_OBJECT_PATH_SYNTAX_BAD ); return; } - if (!(root = get_directory_obj( current->process, objattr->rootdir ))) return; + if (!(root = get_handle_obj( current->process, objattr->rootdir, 0, NULL ))) return; } pipe = create_named_object( root, &named_pipe_ops, &name, objattr->attributes | OBJ_OPENIF, NULL ); diff --git a/server/request.c b/server/request.c index 97bf1a746d2..24cfda26110 100644 --- a/server/request.c +++ b/server/request.c @@ -66,6 +66,7 @@ #include "process.h" #include "thread.h" #include "security.h" +#include "handle.h" #define WANT_REQUEST_HANDLERS #include "request.h" @@ -205,7 +206,7 @@ const struct object_attributes *get_req_object_attributes( const struct security } if (root && attr->rootdir && attr->name_len) { - if (!(*root = get_directory_obj( current->process, attr->rootdir ))) return NULL; + if (!(*root = get_handle_obj( current->process, attr->rootdir, 0, NULL ))) return NULL; } *sd = attr->sd_len ? (const struct security_descriptor *)(attr + 1) : NULL; name->len = attr->name_len;

1 0

Alexandre Julliard : shell32: Silence buffer overflow compiler warnings.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 6624cabbb7cfe33c179a02238b4c9b91d3c3297e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6624cabbb7cfe33c179a0223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 17:31:53 2020 +0100 shell32: Silence buffer overflow compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/cpanelfolder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index ea5e9e2c3b6..114eb6babd3 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -259,9 +259,9 @@ static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName, memcpy(pidl->mkid.abID, &tmp, 2+size0); p = &((PIDLDATA*)pidl->mkid.abID)->u.cpanel; - strcpy(p->szName, name); - strcpy(p->szName+tmp.u.cpanel.offsDispName, displayName); - strcpy(p->szName+tmp.u.cpanel.offsComment, comment); + memcpy(p->szName, name, strlen(name) + 1); + memcpy(p->szName+tmp.u.cpanel.offsDispName, displayName, strlen(displayName) + 1); + memcpy(p->szName+tmp.u.cpanel.offsComment, comment, strlen(comment) + 1); *(WORD*)((char*)pidl+(size+2)) = 0; @@ -1077,7 +1077,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA *iface, return E_INVALIDARG; path[0] = '\"'; - lstrcpyA(path+1, pcpanel->szName); + memcpy(path+1, pcpanel->szName, strlen(pcpanel->szName) + 1); /* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */ lstrcatA(path, "\" ");

1 0

Paul Gofman : server: Return STATUS_OBJECT_PATH_INVALID for noname pipe name query.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: aa5c1e871b9a3f0521c1249e45d31d38c705ea60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa5c1e871b9a3f0521c1249e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 25 21:42:44 2020 +0300 server: Return STATUS_OBJECT_PATH_INVALID for noname pipe name query. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index bfc8dc0b3be..1230fecfda7 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -2479,7 +2479,7 @@ static void test_empty_name(void) ok(type_info->TypeName.Buffer && !wcscmp(type_info->TypeName.Buffer, L"File"), "Got unexpected type %s.\n", debugstr_w(type_info->TypeName.Buffer)); status = pNtQueryObject(hpipe, ObjectNameInformation, name_info, sizeof(buffer), NULL); - todo_wine ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); + ok(status == STATUS_OBJECT_PATH_INVALID, "Got unexpected status %#x.\n", status); status = pNtCreateNamedPipeFile(&handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, diff --git a/server/named_pipe.c b/server/named_pipe.c index 6e65f3e364a..5adfd444ada 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -105,6 +105,7 @@ struct named_pipe_device_file static void named_pipe_dump( struct object *obj, int verbose ); static unsigned int named_pipe_map_access( struct object *obj, unsigned int access ); +static WCHAR *named_pipe_get_full_name( struct object *obj, data_size_t *ret_len ); static int named_pipe_link_name( struct object *obj, struct object_name *name, struct object *parent ); static struct object *named_pipe_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -124,7 +125,7 @@ static const struct object_ops named_pipe_ops = named_pipe_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - default_get_full_name, /* get_full_name */ + named_pipe_get_full_name, /* get_full_name */ no_lookup_name, /* lookup_name */ named_pipe_link_name, /* link_name */ default_unlink_name, /* unlink_name */ @@ -328,6 +329,15 @@ static unsigned int named_pipe_map_access( struct object *obj, unsigned int acce return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static WCHAR *named_pipe_get_full_name( struct object *obj, data_size_t *ret_len ) +{ + WCHAR *ret; + + if (!(ret = default_get_full_name( obj, ret_len ))) + set_error( STATUS_OBJECT_PATH_INVALID ); + return ret; +} + static void pipe_server_dump( struct object *obj, int verbose ) { struct pipe_server *server = (struct pipe_server *) obj;

1 0

Alexandre Julliard : winemenubuilder: Silence out of bounds compiler warning.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 981d69ada607848b34917b947971c16489856fe4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=981d69ada607848b34917b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 20:45:02 2020 +0100 winemenubuilder: Silence out of bounds compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0ae1383d4bf..fe4998fb373 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2902,7 +2902,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) szArgs[0] = '"'; lstrcpyW(szArgs + 1, szPath); - p[-1] = '"'; + szArgs[lstrlenW(szArgs)] = '"'; GetWindowsDirectoryW(szPath, MAX_PATH); lstrcatW(szPath, startW);

1 0

Zebediah Figura : mp3dmod/tests: Add more tests for GetInputSizeInfo() and GetOutputSizeInfo().
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 325248830767e959ae8b19d3b1d3023a0f673c31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=325248830767e959ae8b19d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 26 10:52:42 2020 -0600 mp3dmod/tests: Add more tests for GetInputSizeInfo() and GetOutputSizeInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/tests/mp3dmod.c | 72 +++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 61002d59661..7bc691e2aa4 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -377,9 +377,8 @@ static void test_aggregation(void) static void test_stream_info(void) { - static const MPEGLAYER3WAVEFORMAT input_format = + MPEGLAYER3WAVEFORMAT input_format = { - .wfx.nChannels = 2, .wfx.nSamplesPerSec = 48000, }; DMO_MEDIA_TYPE input_mt = @@ -391,13 +390,9 @@ static void test_stream_info(void) .pbFormat = (BYTE *)&input_format, }; - static const WAVEFORMATEX output_format = + WAVEFORMATEX output_format = { - .nChannels = 1, .nSamplesPerSec = 48000, - .nAvgBytesPerSec = 2 * 48000, - .nBlockAlign = 2, - .wBitsPerSample = 16, }; DMO_MEDIA_TYPE output_mt = { @@ -407,6 +402,7 @@ static void test_stream_info(void) }; DWORD input_count, output_count, flags, size, lookahead, alignment; + WORD channels, depth; IMediaObject *dmo; HRESULT hr; @@ -434,29 +430,49 @@ static void test_stream_info(void) hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); - hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); - hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); - - hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + for (channels = 1; channels <= 2; ++channels) + { + input_format.wfx.nChannels = channels; + output_format.nChannels = channels; - size = lookahead = alignment = 0xdeadbeef; - hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!size, "Got size %u.\n", size); - ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); - ok(alignment == 1, "Got alignment %u.\n", alignment); + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); - size = alignment = 0xdeadbeef; - hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size == 1152 * 4, "Got size %u.\n", size); - ok(alignment == 1, "Got alignment %u.\n", alignment); + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + + for (depth = 8; depth <= 16; depth += 8) + { + output_format.wBitsPerSample = depth; + output_format.nBlockAlign = channels * depth / 8; + output_format.nAvgBytesPerSec = 48000 * output_format.nBlockAlign; + + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + size = lookahead = alignment = 0xdeadbeef; + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!size || broken(size == output_format.nBlockAlign) /* Vista */, + "Got size %u for %u channels, depth %u.\n", size, channels, depth); + ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); + ok(alignment == 1, "Got alignment %u.\n", alignment); + + size = alignment = 0xdeadbeef; + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Vista returns the expected size; all later versions act as if + * channels == 2 for some reason. */ + ok(size >= channels * 1152 * depth / 8, + "Got size %u for %u channels, depth %u.\n", size, channels, depth); + ok(alignment == 1, "Got alignment %u.\n", alignment); + } + + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_CLEAR); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } IMediaObject_Release(dmo); }

1 0

Alexandre Julliard : ntdll/tests: Fix a trace format on ARM64.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: ce5e1c12c37cffd403c6f2b0042a9239d07d6af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5e1c12c37cffd403c6f2b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 17:12:08 2020 +0100 ntdll/tests: Fix a trace format on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b2331b739ac..3451a7d6465 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5360,7 +5360,7 @@ static void test_thread_context(void) /* Pc is somewhere close to the NtGetContextThread implementation */ ok( (char *)context.Pc >= (char *)pNtGetContextThread - 0x40000 && (char *)context.Pc <= (char *)pNtGetContextThread + 0x40000, - "wrong Pc %08x/%08x\n", context.Pc, (DWORD)pNtGetContextThread ); + "wrong Pc %p/%p\n", (void *)context.Pc, pNtGetContextThread ); #undef COMPARE }

1 0

Matteo Bruni : wined3d: Add a trace to wined3d_context_gl_bind_fbo().
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 22c633465652ba9c949dfc9d31d74f02a92d1378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c633465652ba9c949dfc9d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 25 18:11:30 2020 +0100 wined3d: Add a trace to wined3d_context_gl_bind_fbo(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 1f9003ed16e..f2b5e8697b6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -91,6 +91,8 @@ static void wined3d_context_gl_bind_fbo(struct wined3d_context_gl *context_gl, G { const struct wined3d_gl_info *gl_info = context_gl->gl_info; + TRACE("context_gl %p, target %#x, fbo %u.\n", context_gl, target, fbo); + switch (target) { case GL_READ_FRAMEBUFFER:

1 0