wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Hans Leidekker : winhttp/tests: Fix an intermittent test failure on Windows XP/Vista.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 05cf71be99bcb02a1cdaeb779a1fc4e1a349c0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05cf71be99bcb02a1cdaeb77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 22 16:52:51 2017 +0100 winhttp/tests: Fix an intermittent test failure on Windows XP/Vista. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ec33b56..4fc9c2c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -319,7 +319,7 @@ static void test_SendRequest (void) static CHAR post_data[] = "mode=Test"; static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; - DWORD header_len, optional_len, total_len, bytes_rw, size, err; + DWORD header_len, optional_len, total_len, bytes_rw, size, err, disable; DWORD_PTR context; BOOL ret; CHAR buffer[256]; @@ -350,6 +350,12 @@ static void test_SendRequest (void) ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + /* writing more data than promised by the content-length header causes an error when the connection + is resued, so disable keep-alive */ + disable = WINHTTP_DISABLE_KEEP_ALIVE; + ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); + ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); err = GetLastError();

1 0

Zebediah Figura : regedit/tests: Skip tests if running as non-elevated admin.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 0875bf8974561712f377fcccb17bd780a1290f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0875bf8974561712f377fccc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 22 09:43:12 2017 -0600 regedit/tests: Skip tests if running as non-elevated admin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d558f2b..d67c57b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3635,6 +3635,12 @@ START_TEST(regedit) return; } + if (!run_regedit_exe("regedit.exe /s test.reg") && GetLastError() == ERROR_ELEVATION_REQUIRED) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + test_basic_import(); test_basic_import_unicode(); test_basic_import_31();

1 0

Andrey Gusev : winhttp/tests: Fix typos in ok() messages.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: 72052ca6c7c442e7059123a9154a361673f0dbba URL: https://source.winehq.org/git/wine.git/?a=commit;h=72052ca6c7c442e7059123a9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 22 17:25:28 2017 +0200 winhttp/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 702c6a1..da8f8e9 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -944,7 +944,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons WaitForSingleObject( info->wait, INFINITE ); len = strlen(expected_data); - ok(!memcmp(buffer, expected_data, len), "unexpeceted data\n"); + ok(!memcmp(buffer, expected_data, len), "unexpected data\n"); } static void test_persistent_connection(int port) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 469b882..ec33b56 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -568,7 +568,7 @@ static void test_WinHttpAddHeaders(void) SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); err = GetLastError(); - ok(ret, "WinHttpAddRequestHeader failed to add new header, got %d with error %u.\n", ret, err); + ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %u.\n", ret, err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); index = 0;

1 0

Andrey Gusev : msi/tests: Fix typos in ok() messages.
by Alexandre Julliard 22 Dec '17

22 Dec '17

Module: wine Branch: master Commit: d91985b279bdf4f49319ac5bf65cbb9c4f030928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91985b279bdf4f49319ac5b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 22 17:25:04 2017 +0200 msi/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/record.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6713bc0..3cbb9b3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4777,7 +4777,7 @@ static void test_update(void) MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - ok(r == ERROR_NO_MORE_ITEMS, "Expectd ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(view); MsiCloseHandle(view); diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 5caaefc..777f1f7 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -510,7 +510,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -529,7 +529,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -548,7 +548,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -558,7 +558,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf); - ok(sz == 7, "Expectd 7, got %d\n", sz); + ok(sz == 7, "Expected 7, got %d\n", sz); MsiCloseHandle(rec); @@ -599,7 +599,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf); - ok(sz == 5, "Expectd 5, got %d\n", sz); + ok(sz == 5, "Expected 5, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r);

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

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

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

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

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

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

← Newer
1
2
3
4
5
6
7
8
...
45
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 December 2017