March 2019 - Wine-Devel - list.winehq.org

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras March 27, 2019

March 27, 2019

1 0

[PATCH 1/3] msi/tests: Separate and expand tests for MsiViewGetError().
by Zebediah Figura March 27, 2019

March 27, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/db.c | 176 +++++++++++++++++++++++++++++++++----------- 1 file changed, 132 insertions(+), 44 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9fbf43eaee..16b20e530b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -879,45 +879,17 @@ static void test_viewmodify(void) r = run_query( hdb, 0, query ); ok(r == ERROR_SUCCESS, "query failed\n"); - /* check what the error function reports without doing anything */ - sz = 0; - /* passing NULL as the 3rd param make function to crash on older platforms */ - err = MsiViewGetErrorA( 0, NULL, &sz ); - ok(err == MSIDBERROR_INVALIDARG, "MsiViewGetError return\n"); - - /* open a view */ query = "SELECT * FROM `phone`"; r = MsiDatabaseOpenViewA(hdb, query, &hview); ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); - /* see what happens with a good hview and bad args */ - err = MsiViewGetErrorA( hview, NULL, NULL ); - ok(err == MSIDBERROR_INVALIDARG || err == MSIDBERROR_NOERROR, - "MsiViewGetError returns %u (expected -3)\n", err); - err = MsiViewGetErrorA( hview, buffer, NULL ); - ok(err == MSIDBERROR_INVALIDARG, "MsiViewGetError return\n"); - - /* see what happens with a zero length buffer */ - sz = 0; - buffer[0] = 'x'; - err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_MOREDATA, "MsiViewGetError return\n"); - ok(buffer[0] == 'x', "buffer cleared\n"); - ok(sz == 0, "size not zero\n"); - - /* ok this one is strange */ - sz = 0; - err = MsiViewGetErrorA( hview, NULL, &sz ); - ok(err == MSIDBERROR_NOERROR, "MsiViewGetError return\n"); - ok(sz == 0, "size not zero\n"); - - /* see if it really has an error */ - sz = sizeof buffer; - buffer[0] = 'x'; + /* check what the error function reports without doing anything */ + sz = sizeof(buffer); + strcpy(buffer, "x"); err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_NOERROR, "MsiViewGetError return\n"); - ok(buffer[0] == 0, "buffer not cleared\n"); - ok(sz == 0, "size not zero\n"); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); @@ -933,12 +905,12 @@ static void test_viewmodify(void) r = MsiViewModify(hview, -1, hrec ); ok(r == ERROR_INVALID_DATA, "MsiViewModify failed\n"); - sz = sizeof buffer; - buffer[0] = 'x'; + sz = sizeof(buffer); + strcpy(buffer, "x"); err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_NOERROR, "MsiViewGetError return\n"); - ok(buffer[0] == 0, "buffer not cleared\n"); - ok(sz == 0, "size not zero\n"); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -965,12 +937,12 @@ static void test_viewmodify(void) r = MsiViewModify(hview, MSIMODIFY_VALIDATE_NEW, hrec ); ok(r == ERROR_INVALID_DATA, "MsiViewModify failed %u\n", r); - sz = sizeof buffer; - buffer[0] = 'x'; + sz = sizeof(buffer); + strcpy(buffer, "x"); err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_DUPLICATEKEY, "MsiViewGetError returned %u\n", err); - ok(!strcmp(buffer, "id"), "expected \"id\" c, got \"%s\"\n", buffer); - ok(sz == 2, "size not 2\n"); + ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); + ok(!strcmp(buffer, "id"), "got \"%s\"\n", buffer); + ok(sz == 2, "got size %u\n", sz); /* insert the same thing again */ r = MsiViewExecute(hview, 0); @@ -9109,6 +9081,121 @@ static void test_viewmodify_insert(void) DeleteFileA(msifile); } +static void test_view_get_error(void) +{ + MSIHANDLE view, rec, db = create_db(); + MSIDBERROR err; + char buffer[5]; + DWORD sz; + UINT r; + + r = run_query(db, 0, "CREATE TABLE `T` (`A` SHORT, `B` SHORT NOT NULL PRIMARY KEY `A`)"); + ok(!r, "got %u\n", r); + r = run_query(db, 0, "INSERT INTO `T` (`A`, `B`) VALUES (1, 2)"); + r = run_query(db, 0, "CREATE TABLE `_Validation` (" + "`Table` CHAR(32) NOT NULL, `Column` CHAR(32) NOT NULL, " + "`Nullable` CHAR(4) NOT NULL, `MinValue` INT, `MaxValue` INT, " + "`KeyTable` CHAR(255), `KeyColumn` SHORT, `Category` CHAR(32), " + "`Set` CHAR(255), `Description` CHAR(255) PRIMARY KEY `Table`, `Column`)"); + ok(!r, "got %u\n", r); + r = run_query(db, 0, "INSERT INTO `_Validation` (`Table`, `Column`, `Nullable`) VALUES ('T', 'A', 'N')"); + ok(!r, "got %u\n", r); + r = run_query(db, 0, "INSERT INTO `_Validation` (`Table`, `Column`, `Nullable`) VALUES ('T', 'B', 'N')"); + ok(!r, "got %u\n", r); + + r = MsiDatabaseOpenViewA(db, "SELECT * FROM `T`", &view); + ok(!r, "got %u\n", r); + + r = MsiViewExecute(view, 0); + ok(!r, "got %u\n", r); + + sz = 0; + err = MsiViewGetErrorA(0, NULL, &sz); + ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err); + ok(sz == 0, "got size %u\n", sz); + + err = MsiViewGetErrorA(view, NULL, NULL); + ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err); + + sz = 0; + err = MsiViewGetErrorA(view, NULL, &sz); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(sz == 0, "got size %u\n", sz); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); + + rec = MsiCreateRecord(2); + MsiRecordSetInteger(rec, 1, 1); + MsiRecordSetInteger(rec, 2, 2); + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 2; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); + ok(!strcmp(buffer, "A"), "got \"%s\"\n", buffer); + ok(sz == 1, "got size %u\n", sz); + + sz = 2; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + todo_wine ok(sz == 0, "got size %u\n", sz); + + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 1, "got size %u\n", sz); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + todo_wine ok(sz == 0, "got size %u\n", sz); + + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(sz == 1, "got size %u\n", sz); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); + todo_wine ok(sz == 0, "got size %u\n", sz); + + MsiCloseHandle(rec); + MsiCloseHandle(view); + MsiCloseHandle(db); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9167,4 +9254,5 @@ START_TEST(db) test_primary_keys(); test_viewmodify_merge(); test_viewmodify_insert(); + test_view_get_error(); } -- 2.17.1

3 7

[PATCH] wer: Fix WER_REOPORT_TYPE failures on recent win10
by Detlef Riekenberg March 27, 2019

March 27, 2019

Recent win10 (1709 or older) added checks for WER_REPORT_TYPE and reject invalid values WerReportCreate always succeeded in older dll versions. Example failures (full report with 90 failures after upgrading from win7 to win10) http://test.winehq.org/queue/errksCfJ/report cw1 (1709): http://test.winehq.org/data/829170f3d6b875f7a6f065072cc3334a20ff805e/win10_… Patch was tested: https://testbot.winehq.org/JobDetails.pl?Key=49979 -- ... bye bye Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/wer/main.c | 2 +- dlls/wer/tests/main.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 75a22a51d0..e4bda46b7d 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -278,7 +278,7 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE } if (phandle) *phandle = NULL; - if (!eventtype || !eventtype[0] || !phandle) { + if (!eventtype || !eventtype[0] || !phandle || (reporttype >= WerReportInvalid)) { return E_INVALIDARG; } diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 11a02fb18e..8be1e8721c 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -1,7 +1,7 @@ /* * Unit test suite for windows error reporting in Vista and above * - * Copyright 2010 Detlef Riekenberg + * Copyright 2010,2019 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -207,8 +207,8 @@ static void test_WerReportCreate(void) hr = WerReportCreate(empty, WerReportCritical, NULL, &report); ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); - /* WER_REPORT_TYPE is not checked during WerReportCreate */ - for (i = 0; i <= WerReportInvalid + 1; i++) { + /* a valid WER_REPORT_TYPE works */ + for (i = 0; i < WerReportInvalid; i++) { report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, i, NULL, &report); ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); @@ -217,9 +217,26 @@ static void test_WerReportCreate(void) ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); } + + /* values for WER_REPORT_TYPE are checked and invalid values are rejected since recent win10, + but older windows versions did not check the report type and WerReportCreate always succeeded */ + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportInvalid, NULL, &report); + ok((hr == E_INVALIDARG) | broken(hr == S_OK), + "%d: got 0x%x and %p (expected E_INVALIDARG or a broken S_OK)\n", i, hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } + report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, 42, NULL, &report); ok(hr == S_OK, "42: got 0x%x and %p (expected S_OK)\n", hr, report); + if (hr == S_OK) { + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + } /* multiple active reports are possible */ memset(table, 0, sizeof(table)); -- 2.21.0.windows.1

2 1

[PATCH] mfplat: Use current stream position when async request is made.
by Nikolay Sivov March 27, 2019

March 27, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 83eaee9b97..c6cf4717ec 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2013,6 +2013,7 @@ struct async_stream_op const BYTE *src; BYTE *dest; } u; + QWORD position; ULONG requested_length; ULONG actual_length; IMFAsyncResult *caller; @@ -2087,6 +2088,7 @@ static HRESULT bytestream_create_io_request(struct bytestream *stream, enum asyn op->IUnknown_iface.lpVtbl = &async_stream_op_vtbl; op->refcount = 1; op->u.src = data; + op->position = stream->position; op->requested_length = size; op->type = type; if (FAILED(hr = MFCreateAsyncResult((IUnknown *)&stream->IMFByteStream_iface, callback, state, &op->caller))) @@ -2645,7 +2647,7 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i op = impl_async_stream_op_from_IUnknown(object); - position.QuadPart = stream->position; + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { if (SUCCEEDED(hr = IStream_Read(stream->stream, op->u.dest, op->requested_length, &op->actual_length))) @@ -2676,7 +2678,7 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * op = impl_async_stream_op_from_IUnknown(object); - position.QuadPart = stream->position; + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { if (SUCCEEDED(hr = IStream_Write(stream->stream, op->u.src, op->requested_length, &op->actual_length))) -- 2.20.1

2 1

[PATCH v2] taskmgr/affinity: Replace repeated code with for loops.
by Isira Seneviratne March 27, 2019

March 27, 2019

1 0

Fwd: [PATCH] taskmgr/affinity: Replace repeated code with for loops.
by Isira Seneviratne March 27, 2019

March 27, 2019

-- Isira Seneviratne isirasen96(a)gmail.com ---------- Forwarded message --------- From: Isira Seneviratne <isirasen96(a)gmail.com> Date: Wed, Mar 27, 2019 at 8:25 AM Subject: Re: [PATCH] taskmgr/affinity: Replace repeated code with for loops. To: Alex Henrie <alexhenrie24(a)gmail.com> On Wed, Mar 27, 2019 at 8:12 AM Alex Henrie <alexhenrie24(a)gmail.com> wrote: > +int cpus[] = { IDC_CPU0, IDC_CPU1, IDC_CPU2, IDC_CPU3, IDC_CPU4, > IDC_CPU5, IDC_CPU6, IDC_CPU7, > + IDC_CPU8, IDC_CPU9, IDC_CPU10, IDC_CPU11, > IDC_CPU12, IDC_CPU13, IDC_CPU14, IDC_CPU15, > + IDC_CPU16, IDC_CPU17, IDC_CPU18, IDC_CPU19, > IDC_CPU20, IDC_CPU21, IDC_CPU22, IDC_CPU23, > + IDC_CPU24, IDC_CPU25, IDC_CPU26, IDC_CPU27, > IDC_CPU28, IDC_CPU29, IDC_CPU30, IDC_CPU31 }; > > I think that you can just change IDC_CPU31 from 1051 to 1050 in > resource.h and then write "IDC_CPU0 + i" instead of "cpus[i]" in > affinity.c. > > -Alex > Okay, thank you for the tip.

1 0

[PATCH] taskmgr/affinity: Replace repeated code with for loops.
by Isira Seneviratne March 27, 2019

March 27, 2019

2 1

[PATCH 2/2] start: Correct capitalization of "Windows Explorer".
by Isira Seneviratne March 27, 2019

March 27, 2019

1 0

[PATCH 1/2] cmd: Correct capitalization of "Windows Explorer".
by Isira Seneviratne March 27, 2019

March 27, 2019

1 0

[PATCH 1/3] include: Fix D3DXF_FILELOADMEMORY definition.
by Matteo Bruni March 26, 2019

March 26, 2019

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- include/d3dx9xof.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 35019f26d4e..227f3a57ba2 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -49,7 +49,7 @@ typedef struct _D3DXF_FILELOADRESOURCE typedef struct _D3DXF_FILELOADMEMORY { - void *lpMemory; + const void *lpMemory; SIZE_T dSize; } D3DXF_FILELOADMEMORY; -- 2.19.2

2 3