December 2017 - Wine-commits

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 5815aa05884a7e3a0cb3ca9fd7d9eea83f54fc52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5815aa05884a7e3a0cb3ca9f… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Dec 22 04:27:04 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/po/nb_NO.po b/po/nb_NO.po index d00e67a..20b2b66 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10591,6 +10591,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Opprett en symbolsk lenke.\n" +"\n" +"Syntaks: MKLINK [alternativer] lenke_navn mål\n" +"\n" +"Alternativer:\n" +"/d Opprett en symbolsk lenke til en katalog.\n" +"/h Opprett en hard lenke.\n" +"/j Opprett et katalog-knutepunkt.\n" +"lenke_navn er navnet på den nye symbolske lenken.\n" +"mål er stien som lenke_navn peker til.\n" #: cmd.rc:312 msgid ""

1 0

Kim Malmo : po: Update Simplified Chinese translation.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 09208f7e6217212c836a127bfc7abd46443b4f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09208f7e6217212c836a127b… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Dec 22 00:49:00 2017 +0000 po: Update Simplified Chinese translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e1e92d2..d3baf01 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10402,7 +10402,7 @@ msgstr "" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" -"link_nam 为符号链接的名称。\n" +"link_name 为符号链接的名称。\n" "target 为 link_name 指向的路径。\n" #: cmd.rc:312

1 0

Jacek Caban : ntdll/tests: Add NtQueryInformationFile(FileNameInformation) on named pipes tests.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 514a15754109a38b05d9ae983736c5de6fbba2d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=514a15754109a38b05d9ae98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 21 16:04:26 2017 +0100 ntdll/tests: Add NtQueryInformationFile(FileNameInformation) on named pipes tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 824eed7..b0863ea 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1142,6 +1142,76 @@ static void test_volume_info(void) CloseHandle( write ); } +#define test_file_name_fail(a,b) _test_file_name_fail(__LINE__,a,b) +static void _test_file_name_fail(unsigned line, HANDLE pipe, NTSTATUS expected_status) +{ + char buffer[512]; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + status = NtQueryInformationFile( pipe, &iosb, buffer, sizeof(buffer), FileNameInformation ); + ok_(__FILE__,line)( status == expected_status, "NtQueryInformationFile failed: %x, expected %x\n", + status, expected_status ); +} + +#define test_file_name(a) _test_file_name(__LINE__,a) +static void _test_file_name(unsigned line, HANDLE pipe) +{ + char buffer[512]; + FILE_NAME_INFORMATION *name_info = (FILE_NAME_INFORMATION*)buffer; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + static const WCHAR nameW[] = + {'\\','n','t','d','l','l','_','t','e','s','t','s','_','p','i','p','e','.','c'}; + + memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); + status = NtQueryInformationFile( pipe, &iosb, buffer, sizeof(buffer), FileNameInformation ); + todo_wine + ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryInformationFile failed: %x\n", status ); + if (status) return; + ok_(__FILE__,line)( iosb.Status == STATUS_SUCCESS, "Status = %x\n", iosb.Status ); + ok_(__FILE__,line)( iosb.Information == sizeof(name_info->FileNameLength) + sizeof(nameW), + "Information = %lu\n", iosb.Information ); + ok( name_info->FileNameLength == sizeof(nameW), "FileNameLength = %u\n", name_info->FileNameLength ); + ok( !memcmp(name_info->FileName, nameW, sizeof(nameW)), "FileName = %s\n", wine_dbgstr_w(name_info->FileName) ); + + /* too small buffer */ + memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); + status = NtQueryInformationFile( pipe, &iosb, buffer, 20, FileNameInformation ); + ok( status == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile failed: %x\n", status ); + ok( iosb.Status == STATUS_BUFFER_OVERFLOW, "Status = %x\n", iosb.Status ); + ok( iosb.Information == 20, "Information = %lu\n", iosb.Information ); + ok( name_info->FileNameLength == sizeof(nameW), "FileNameLength = %u\n", name_info->FileNameLength ); + ok( !memcmp(name_info->FileName, nameW, 16), "FileName = %s\n", wine_dbgstr_w(name_info->FileName) ); + + /* too small buffer */ + memset( buffer, 0xaa, sizeof(buffer) ); + memset( &iosb, 0xaa, sizeof(iosb) ); + status = NtQueryInformationFile( pipe, &iosb, buffer, 4, FileNameInformation ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile failed: %x\n", status ); +} + +static void test_file_info(void) +{ + HANDLE server, client; + + if (!create_pipe_pair( &server, &client, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_INBOUND, + PIPE_TYPE_MESSAGE, 4096 )) return; + + test_file_name( client ); + test_file_name( server ); + + DisconnectNamedPipe( server ); + todo_wine + test_file_name_fail( client, STATUS_PIPE_DISCONNECTED ); + + CloseHandle( server ); + CloseHandle( client ); +} + START_TEST(pipe) { if (!init_func_ptrs()) @@ -1185,4 +1255,5 @@ START_TEST(pipe) read_pipe_test(PIPE_ACCESS_OUTBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE); test_volume_info(); + test_file_info(); }

1 0

Jacek Caban : server: Introduce get_file_info request for server-side NtQueryInformationFile implementation.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 6b08e60f034ba5c7afa197394f66981d2ba11e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b08e60f034ba5c7afa19739… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 21 16:12:01 2017 +0100 server: Introduce get_file_info request for server-side NtQueryInformationFile implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 21 ++++++++++++++++++++- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/change.c | 1 + server/console.c | 1 + server/device.c | 1 + server/fd.c | 18 ++++++++++++++++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/protocol.def | 10 +++++++++- server/request.h | 6 ++++++ server/serial.c | 1 + server/sock.c | 2 ++ server/trace.c | 14 ++++++++++++++ 16 files changed, 102 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b08e60f034ba5c7afa1…

1 0

Jacek Caban : server: Add support for querying FileNameInformation on named pipes.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: d4d6330f0a9eb244b52edd25e0b6998223eb5417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4d6330f0a9eb244b52edd25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 21 16:12:12 2017 +0100 server: Add support for querying FileNameInformation on named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 3 --- server/named_pipe.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index b0863ea..a878d8a 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1168,9 +1168,7 @@ static void _test_file_name(unsigned line, HANDLE pipe) memset( buffer, 0xaa, sizeof(buffer) ); memset( &iosb, 0xaa, sizeof(iosb) ); status = NtQueryInformationFile( pipe, &iosb, buffer, sizeof(buffer), FileNameInformation ); - todo_wine ok_(__FILE__,line)( status == STATUS_SUCCESS, "NtQueryInformationFile failed: %x\n", status ); - if (status) return; ok_(__FILE__,line)( iosb.Status == STATUS_SUCCESS, "Status = %x\n", iosb.Status ); ok_(__FILE__,line)( iosb.Information == sizeof(name_info->FileNameLength) + sizeof(nameW), "Information = %lu\n", iosb.Information ); @@ -1205,7 +1203,6 @@ static void test_file_info(void) test_file_name( server ); DisconnectNamedPipe( server ); - todo_wine test_file_name_fail( client, STATUS_PIPE_DISCONNECTED ); CloseHandle( server ); diff --git a/server/named_pipe.c b/server/named_pipe.c index febf2e3..c6b37ce 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -152,6 +152,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_server_dump( struct object *obj, int verbose ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ); static const struct object_ops pipe_server_ops = { @@ -183,7 +184,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + pipe_server_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ no_fd_queue_async, /* queue_async */ @@ -194,6 +195,7 @@ static const struct fd_ops pipe_server_fd_ops = static void pipe_client_dump( struct object *obj, int verbose ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ); static const struct object_ops pipe_client_ops = { @@ -225,7 +227,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + pipe_client_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ no_fd_queue_async, /* queue_async */ @@ -545,6 +547,55 @@ static int pipe_end_flush( struct fd *fd, struct async *async ) return 1; } +static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsigned int info_class ) +{ + switch (info_class) + { + case FileNameInformation: + { + FILE_NAME_INFORMATION *name_info; + data_size_t name_len, reply_size; + const WCHAR *name; + + if (get_reply_max_size() < sizeof(*name_info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + + name = get_object_name( &pipe->obj, &name_len ); + reply_size = offsetof( FILE_NAME_INFORMATION, FileName[name_len/sizeof(WCHAR) + 1] ); + if (reply_size > get_reply_max_size()) + { + reply_size = get_reply_max_size(); + set_error( STATUS_BUFFER_OVERFLOW ); + } + + if (!(name_info = set_reply_data_size( reply_size ))) return; + name_info->FileNameLength = name_len + sizeof(WCHAR); + name_info->FileName[0] = '\\'; + reply_size -= offsetof( FILE_NAME_INFORMATION, FileName[1] ); + if (reply_size) memcpy( &name_info->FileName[1], name, reply_size ); + break; + } + default: + no_fd_get_file_info( fd, info_class ); + } +} + +static void pipe_server_get_file_info( struct fd *fd, unsigned int info_class ) +{ + struct pipe_server *server = get_fd_user( fd ); + pipe_end_get_file_info( fd, server->pipe, info_class ); +} + +static void pipe_client_get_file_info( struct fd *fd, unsigned int info_class ) +{ + struct pipe_client *client = get_fd_user( fd ); + if (client->server) pipe_end_get_file_info( fd, client->server->pipe, info_class ); + else set_error( STATUS_PIPE_DISCONNECTED ); +} + static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) { switch (info_class)

1 0

Akihiro Sagawa : include: Fix a typo in newly added edit control message.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: b26579eb7e5e4269d430b65d3f0815011c18382c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b26579eb7e5e4269d430b65d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 22 22:04:02 2017 +0900 include: Fix a typo in newly added edit control message. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index e3c166b..6890b50 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5220,7 +5220,7 @@ typedef struct _tagEDITBALLOONTIP INT ttiIcon; } EDITBALLOONTIP, *PEDITBALLOONTIP; -#define ECM_FIRSP 0x1500 +#define ECM_FIRST 0x1500 #define EM_SETCUEBANNER (ECM_FIRST + 1) #define EM_GETCUEBANNER (ECM_FIRST + 2) #define EM_SHOWBALLOONTIP (ECM_FIRST + 3)

1 0

Nikolay Sivov : comctl32/tests: Make sure v6 module is used when running tests, run more tests with v6 module.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 3eea7ff3d2b8407132723cee990cd6142ad28ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eea7ff3d2b8407132723cee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 22 15:30:47 2017 +0300 comctl32/tests: Make sure v6 module is used when running tests, run more tests with v6 module. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 619 +++++++++++++++++++--------------------- 1 file changed, 291 insertions(+), 328 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eea7ff3d2b840713272…

1 0

Alexandre Julliard : gdi32: Fix clipping to the DIB rectangle in GetPixel( ).
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 90273a6e811417a6cd57207fb572d3bd1f5439d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90273a6e811417a6cd57207f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 22 16:29:03 2017 +0100 gdi32: Fix clipping to the DIB rectangle in GetPixel(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index a39f1e2..07ff72d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1108,6 +1108,7 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); DC *dc = get_physdev_dc( dev ); POINT pt; + RECT rect; DWORD pixel; TRACE( "(%p, %d, %d)\n", dev, x, y ); @@ -1115,10 +1116,11 @@ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) pt.x = x; pt.y = y; lp_to_dp( dc, &pt, 1 ); - - if (pt.x < 0 || pt.x >= pdev->dib.rect.right - pdev->dib.rect.left || - pt.y < 0 || pt.y >= pdev->dib.rect.bottom - pdev->dib.rect.top) - return CLR_INVALID; + rect.left = pt.x; + rect.top = pt.y; + rect.right = rect.left + 1; + rect.bottom = rect.top + 1; + if (!clip_rect_to_dib( &pdev->dib, &rect )) return CLR_INVALID; pixel = pdev->dib.funcs->get_pixel( &pdev->dib, pt.x, pt.y ); return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel );

1 0

Andrey Gusev : comctl32/tests: Fix a typo in ok() message.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 4a197cf7b0e6947789bc47bb144c3c2e178b043d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a197cf7b0e6947789bc47bb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 22 17:24:04 2017 +0200 comctl32/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index a6939bd..46bb431 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -194,7 +194,7 @@ static void test_Alloc(void) /* reallocate a NULL ptr */ p = pReAlloc(NULL, 2); - ok(p != NULL, "Expectd non-NULL ptr\n"); + ok(p != NULL, "Expected non-NULL ptr\n"); res = pFree(p); ok(res == TRUE, "Expected TRUE, got %d\n", res);

1 0

Andrey Gusev : kernel32/tests: Fix a typo in ok() message.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: c49e306cac098cc483a57405c4134fb191b6a3eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49e306cac098cc483a57405… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 22 17:24:36 2017 +0200 kernel32/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 91eb162..365e38c 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -260,7 +260,7 @@ static void test_GetVolumeNameForVolumeMountPointW(void) } ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); - ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ "wrong error, last=%d\n", GetLastError());

1 0