May 2018 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Add ID3D11Device2 stub.
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: bf293b70c915060b4a7e465440495001aad4369e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf293b70c915060b4a7e4654… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 16 11:55:27 2018 +0200 d3d11: Add ID3D11Device2 stub. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 11 +-- dlls/d3d11/buffer.c | 11 +-- dlls/d3d11/d3d11_private.h | 48 ++++----- dlls/d3d11/device.c | 238 ++++++++++++++++++++++++++------------------- dlls/d3d11/inputlayout.c | 10 +- dlls/d3d11/shader.c | 65 ++++++------- dlls/d3d11/state.c | 46 +++++---- dlls/d3d11/tests/d3d11.c | 4 - dlls/d3d11/texture.c | 32 +++--- dlls/d3d11/view.c | 41 ++++---- 10 files changed, 264 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf293b70c915060b4a7e…

1 0

Pablo Martin : d3d11: Partially implement d3d11_immediate_context_CopySubresourceRegion1().
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 34e7f7f99e3739e3a80792b3be7fde1d80c002f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34e7f7f99e3739e3a80792b3… Author: Pablo Martin <pmart-wine(a)riseup.net> Date: Wed May 16 11:30:32 2018 +0200 d3d11: Partially implement d3d11_immediate_context_CopySubresourceRegion1(). Forwards calls to CopySubresourceRegion ignoring copy flags. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5bc5018..c0e9b0d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2606,12 +2606,19 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_FinishCommandList(ID3D1 } static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, UINT dst_x, UINT dst_y, UINT dst_z, ID3D11Resource *src_resource, - UINT src_subresource, const D3D11_BOX *src_box, UINT flags) + ID3D11Resource *dst_resource, UINT dst_subresource_idx, UINT dst_x, UINT dst_y, UINT dst_z, + ID3D11Resource *src_resource, UINT src_subresource_idx, const D3D11_BOX *src_box, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, dst_x %u, dst_y %u, dst_z %u, src_resource %p, src_subresource %u, " - "src_box %p, flags %#x stub!\n", iface, resource, subresource, dst_x, dst_y, dst_z, src_resource, - src_subresource, src_box, flags); + TRACE("iface %p, dst_resource %p, dst_subresource_idx %u, dst_x %u, dst_y %u, dst_z %u, " + "src_resource %p, src_subresource_idx %u, src_box %p, flags %#x.\n", + iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, + src_resource, src_subresource_idx, src_box, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + d3d11_immediate_context_CopySubresourceRegion(iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, + src_resource, src_subresource_idx, src_box); } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface,

1 0

Zebediah Figura : msi: Avoid using awstring in MsiGetPropertyA/W().
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 389ad808d2ac1a443d4a4190928e665b25214c1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=389ad808d2ac1a443d4a4190… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 15 23:03:36 2018 -0500 msi: Avoid using awstring in MsiGetPropertyA/W(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 109 ++++++++++++++++++++---------------------------- dlls/msi/tests/custom.c | 6 +++ 2 files changed, 51 insertions(+), 64 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 133bfd8..ab6c3dd 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2345,84 +2345,76 @@ int msi_get_property_int( MSIDATABASE *db, LPCWSTR prop, int def ) return val; } -static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, - awstring *szValueBuf, LPDWORD pchValueBuf ) +UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD *sz) { + const WCHAR *value = szEmpty; MSIPACKAGE *package; - MSIRECORD *row = NULL; - UINT r = ERROR_FUNCTION_FAILED; - LPCWSTR val = NULL; - DWORD len = 0; - - TRACE("%u %s %p %p\n", handle, debugstr_w(name), - szValueBuf->str.w, pchValueBuf ); + MSIRECORD *row; + WCHAR *nameW; + int len = 0; + UINT r; if (!name) return ERROR_INVALID_PARAMETER; - package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ); + if (!(nameW = strdupAtoW(name))) + return ERROR_OUTOFMEMORY; + + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); if (!package) { - LPWSTR value = NULL, buffer; + WCHAR *value = NULL, *tmp; MSIHANDLE remote; + DWORD len; - if (!(remote = msi_get_remote(handle))) + if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetProperty(remote, name, &value, &len); - if (r != ERROR_SUCCESS) - return r; - - /* String might contain embedded nulls. - * Native returns the correct size but truncates the string. */ - buffer = heap_alloc_zero((len + 1) * sizeof(WCHAR)); - if (!buffer) + r = remote_GetProperty(remote, nameW, &value, &len); + if (!r) { - midl_user_free(value); - return ERROR_OUTOFMEMORY; - } - strcpyW(buffer, value); - - r = msi_strcpy_to_awstring(buffer, len, szValueBuf, pchValueBuf); + /* String might contain embedded nulls. + * Native returns the correct size but truncates the string. */ + tmp = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + if (!tmp) + { + midl_user_free(value); + return ERROR_OUTOFMEMORY; + } + strcpyW(tmp, value); - /* Bug required by Adobe installers */ - if (pchValueBuf && !szValueBuf->unicode && !szValueBuf->str.a) - *pchValueBuf *= sizeof(WCHAR); + r = msi_strncpyWtoA(tmp, len, buf, sz, TRUE); - heap_free(buffer); + heap_free(tmp); + } midl_user_free(value); + heap_free(nameW); return r; } - row = msi_get_property_row( package->db, name ); + row = msi_get_property_row(package->db, nameW); if (row) - val = msi_record_get_string( row, 1, (int *)&len ); - - if (!val) - val = szEmpty; + value = msi_record_get_string(row, 1, &len); - r = msi_strcpy_to_awstring( val, len, szValueBuf, pchValueBuf ); - - if (row) - msiobj_release( &row->hdr ); - msiobj_release( &package->hdr ); + r = msi_strncpyWtoA(value, len, buf, sz, FALSE); + heap_free(nameW); + if (row) msiobj_release(&row->hdr); + msiobj_release(&package->hdr); return r; } -UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD *sz) +UINT WINAPI MsiGetPropertyW(MSIHANDLE hinst, const WCHAR *name, WCHAR *buf, DWORD *sz) { + const WCHAR *value = szEmpty; MSIPACKAGE *package; - awstring val; - WCHAR *nameW; + MSIRECORD *row; + int len = 0; UINT r; if (!name) return ERROR_INVALID_PARAMETER; - if (!(nameW = strdupAtoW(name))) - return ERROR_OUTOFMEMORY; - package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); if (!package) { @@ -2433,7 +2425,7 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD if (!(remote = msi_get_remote(hinst))) return ERROR_INVALID_HANDLE; - r = remote_GetProperty(remote, nameW, &value, &len); + r = remote_GetProperty(remote, name, &value, &len); if (!r) { /* String might contain embedded nulls. @@ -2446,36 +2438,25 @@ UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD } strcpyW(tmp, value); - r = msi_strncpyWtoA(tmp, len, buf, sz, TRUE); + r = msi_strncpyW(tmp, len, buf, sz); heap_free(tmp); } midl_user_free(value); - heap_free(nameW); return r; } - val.unicode = FALSE; - val.str.a = buf; + row = msi_get_property_row(package->db, name); + if (row) + value = msi_record_get_string(row, 1, &len); - r = MSI_GetProperty(hinst, nameW, &val, sz); + r = msi_strncpyW(value, len, buf, sz); - heap_free(nameW); + if (row) msiobj_release(&row->hdr); msiobj_release(&package->hdr); return r; } -UINT WINAPI MsiGetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, - LPWSTR szValueBuf, LPDWORD pchValueBuf ) -{ - awstring val; - - val.unicode = TRUE; - val.str.w = szValueBuf; - - return MSI_GetProperty( hInstall, szName, &val, pchValueBuf ); -} - MSIHANDLE __cdecl s_remote_GetActiveDatabase(MSIHANDLE hinst) { return MsiGetActiveDatabase(hinst); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 96344eb..d240964 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -191,6 +191,12 @@ static void test_props(MSIHANDLE hinst) ok(hinst, !strcmp(buffer, "xyz"), "got \"%s\"\n", buffer); ok(hinst, sz == 3, "got size %u\n", sz); + r = MsiGetPropertyW(hinst, booW, NULL, NULL); + ok(hinst, !r, "got %u\n", r); + + r = MsiGetPropertyW(hinst, booW, bufferW, NULL ); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + sz = 0; r = MsiGetPropertyW(hinst, booW, NULL, &sz); ok(hinst, !r, "got %u\n", r);

1 0

Hans Leidekker : msi/tests: Break out of the loop if both components are found in test_MsiEnumComponentsEx.
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: f5b1a6b5c507fd2766725251af00efa5eb8431ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5b1a6b5c507fd2766725251… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 16 10:23:38 2018 +0200 msi/tests: Break out of the loop if both components are found in test_MsiEnumComponentsEx. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 21a0358..62afa6e 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13392,6 +13392,7 @@ static void test_MsiEnumComponentsEx(void) ok( !sid[0], "got \"%s\"\n", sid ); ok( !len, "unexpected length %u\n", len ); found1 = TRUE; + if (found2) break; } if (!strcmp( comp2, guid )) { @@ -13399,6 +13400,7 @@ static void test_MsiEnumComponentsEx(void) ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); found2 = TRUE; + if (found1) break; } index++; guid[0] = 0;

1 0

Zebediah Figura : msi: Avoid using awstring in MsiFormatRecordW().
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 6b54a4bc2eadd0b5cbc2553e2969ff572ff042d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b54a4bc2eadd0b5cbc2553e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 15 23:03:34 2018 -0500 msi: Avoid using awstring in MsiFormatRecordW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 12 +++--------- dlls/msi/install.c | 19 +++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 11 +++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index d34fb2b..9356c9e 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -916,22 +916,16 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, { LPWSTR value = NULL; MSIHANDLE remote; - awstring wstr; if ((remote = msi_get_remote(hInstall))) { r = remote_FormatRecord(remote, (struct wire_record *)&record->count, &value); - if (r) - { - midl_user_free(value); - return r; - } - wstr.unicode = TRUE; - wstr.str.w = szResult; - r = msi_strcpy_to_awstring(value, -1, &wstr, sz); + if (!r) + r = msi_strncpyW(value, -1, szResult, sz); midl_user_free(value); + msiobj_release(&record->hdr); return r; } } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index ca277d3..b54daff 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -191,6 +191,25 @@ UINT msi_strncpyWtoA(const WCHAR *str, int lenW, char *buf, DWORD *sz, BOOL remo return r; } +UINT msi_strncpyW(const WCHAR *str, int len, WCHAR *buf, DWORD *sz) +{ + UINT r = ERROR_SUCCESS; + + if (!sz) + return buf ? ERROR_INVALID_PARAMETER : ERROR_SUCCESS; + + if (len < 0) len = strlenW(str); + if (buf) + memcpy(buf, str, min(len + 1, *sz) * sizeof(WCHAR)); + if (buf && len >= *sz) + { + if (*sz) buf[*sz - 1] = 0; + r = ERROR_MORE_DATA; + } + *sz = len; + return r; +} + const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) { MSIFOLDER *folder = msi_get_loaded_folder( package, name ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5c6cd40..707144f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1046,6 +1046,7 @@ extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_get_error_message(MSIDATABASE *, int) DECLSPEC_HIDDEN; extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; +extern UINT msi_strncpyW(const WCHAR *str, int len, WCHAR *buf, DWORD *sz) DECLSPEC_HIDDEN; /* media */ diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 320aa6f..723b2b5 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -815,6 +815,17 @@ static void test_format_record(MSIHANDLE hinst) ok(hinst, !strcmp(buffer, "foo 123"), "got \"%s\"\n", buffer); ok(hinst, sz == 7, "got size %u\n", sz); + r = MsiFormatRecordW(hinst, rec, NULL, NULL); + ok(hinst, !r, "got %u\n", r); + + r = MsiFormatRecordW(hinst, rec, bufferW, NULL); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + sz = 0; + r = MsiFormatRecordW(hinst, rec, NULL, &sz); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == 7, "got size %u\n", sz); + sz = 0; bufferW[0] = 'q'; r = MsiFormatRecordW(hinst, rec, bufferW, &sz);

1 0

Zebediah Figura : msi: Handle the remote case directly in MsiFormatRecordA ().
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 75aa132b521f426fa670c05774a50c87247e9834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75aa132b521f426fa670c057… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 15 23:03:33 2018 -0500 msi: Handle the remote case directly in MsiFormatRecordA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 59 ++++++++++++++++++++++++++----------------------- dlls/msi/install.c | 23 +++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 8 +++---- 4 files changed, 59 insertions(+), 32 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 0533cc0..d34fb2b 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -952,52 +952,55 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, return r; } -UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord, - LPSTR szResult, LPDWORD sz ) +UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD *sz) { - UINT r; - DWORD len, save; + MSIPACKAGE *package; + MSIRECORD *rec; LPWSTR value; + DWORD len; + UINT r; - TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz); + TRACE("%d %d %p %p\n", hinst, hrec, buf, sz); - if (!hRecord) + rec = msihandle2msiinfo(hrec, MSIHANDLETYPE_RECORD); + if (!rec) return ERROR_INVALID_HANDLE; - if (!sz) + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) { - if (szResult) - return ERROR_INVALID_PARAMETER; - else - return ERROR_SUCCESS; + LPWSTR value = NULL; + MSIHANDLE remote; + + if ((remote = msi_get_remote(hinst))) + { + r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + + if (!r) + r = msi_strncpyWtoA(value, -1, buf, sz, TRUE); + + midl_user_free(value); + msiobj_release(&rec->hdr); + return r; + } } - r = MsiFormatRecordW( hInstall, hRecord, NULL, &len ); + r = MSI_FormatRecordW(package, rec, NULL, &len); if (r != ERROR_SUCCESS) return r; value = msi_alloc(++len * sizeof(WCHAR)); if (!value) - return ERROR_OUTOFMEMORY; - - r = MsiFormatRecordW( hInstall, hRecord, value, &len ); - if (r != ERROR_SUCCESS) goto done; - save = len + 1; - len = WideCharToMultiByte(CP_ACP, 0, value, len + 1, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, value, len, szResult, *sz, NULL, NULL); - - if (szResult && len > *sz) - { - if (*sz) szResult[*sz - 1] = '\0'; - r = ERROR_MORE_DATA; - } + r = MSI_FormatRecordW(package, rec, value, &len); + if (!r) + r = msi_strncpyWtoA(value, len, buf, sz, FALSE); - *sz = save - 1; - -done: msi_free(value); +done: + msiobj_release(&rec->hdr); + if (package) msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 45c5537..ca277d3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -168,6 +168,29 @@ UINT msi_strcpy_to_awstring( const WCHAR *str, int len, awstring *awbuf, DWORD * return r; } +UINT msi_strncpyWtoA(const WCHAR *str, int lenW, char *buf, DWORD *sz, BOOL remote) +{ + UINT r = ERROR_SUCCESS; + DWORD lenA; + + if (!sz) + return buf ? ERROR_INVALID_PARAMETER : ERROR_SUCCESS; + + if (lenW < 0) lenW = strlenW(str); + lenA = WideCharToMultiByte(CP_ACP, 0, str, lenW + 1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str, lenW + 1, buf, *sz, NULL, NULL); + lenA--; + if (buf && lenA >= *sz) + { + if (*sz) buf[*sz - 1] = 0; + r = ERROR_MORE_DATA; + } + if (remote && lenA >= *sz) + lenA *= 2; + *sz = lenA; + return r; +} + const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) { MSIFOLDER *folder = msi_get_loaded_folder( package, name ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 46cbb43..5c6cd40 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1045,6 +1045,7 @@ extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_get_error_message(MSIDATABASE *, int) DECLSPEC_HIDDEN; +extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; /* media */ diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 04946d9..320aa6f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -785,28 +785,28 @@ static void test_format_record(MSIHANDLE hinst) sz = 0; r = MsiFormatRecordA(hinst, rec, NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 7; strcpy(buffer,"x"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "foo 12"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 8; strcpy(buffer,"x");

1 0

Gijs Vermeulen : msvcp: Add a trailing '\n' to a FIXME().
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 68d2419af7436b596efc8bd7a98bae1e66f70c23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d2419af7436b596efc8bd7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed May 16 14:57:29 2018 +0200 msvcp: Add a trailing '\n' to a FIXME(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 576bed1..701b233 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1725,7 +1725,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_resize( MSVCP_size_t len3, void (__cdecl *clear)(void*, MSVCP_size_t), void (__cdecl *copy)(void*, const void*, MSVCP_size_t), const void *v) { - FIXME("(%p %ld %ld %ld %p %p %p) stub", this, len1, len2, len3, clear, copy, v); + FIXME("(%p %ld %ld %ld %p %p %p) stub\n", this, len1, len2, len3, clear, copy, v); } /* ?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z */

1 0

Zebediah Figura : d3d11/tests: Add test for depth clip.
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 97bb1c894b928389851c68ea0b288d18a8838cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=97bb1c894b928389851c68ea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 15 11:21:38 2018 -0500 d3d11/tests: Add test for depth clip. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9c12a76..c6509ca 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26580,6 +26580,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26717,4 +26790,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); }

1 0

Zebediah Figura : msi: Handle the remote case directly in MsiGetPropertyA( ).
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: wine Branch: master Commit: 84d972010fcf7bc94534c7bb20890ce88381f943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84d972010fcf7bc94534c7bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 15 23:03:35 2018 -0500 msi: Handle the remote case directly in MsiGetPropertyA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 54 ++++++++++++++++++++++++++++++++++++++++--------- dlls/msi/tests/custom.c | 6 +++--- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a290904..133bfd8 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2410,22 +2410,58 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, return r; } -UINT WINAPI MsiGetPropertyA( MSIHANDLE hInstall, LPCSTR szName, - LPSTR szValueBuf, LPDWORD pchValueBuf ) +UINT WINAPI MsiGetPropertyA(MSIHANDLE hinst, const char *name, char *buf, DWORD *sz) { + MSIPACKAGE *package; awstring val; - LPWSTR name; + WCHAR *nameW; UINT r; - val.unicode = FALSE; - val.str.a = szValueBuf; + if (!name) + return ERROR_INVALID_PARAMETER; - name = strdupAtoW( szName ); - if (szName && !name) + if (!(nameW = strdupAtoW(name))) return ERROR_OUTOFMEMORY; - r = MSI_GetProperty( hInstall, name, &val, pchValueBuf ); - msi_free( name ); + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) + { + WCHAR *value = NULL, *tmp; + MSIHANDLE remote; + DWORD len; + + if (!(remote = msi_get_remote(hinst))) + return ERROR_INVALID_HANDLE; + + r = remote_GetProperty(remote, nameW, &value, &len); + if (!r) + { + /* String might contain embedded nulls. + * Native returns the correct size but truncates the string. */ + tmp = heap_alloc_zero((len + 1) * sizeof(WCHAR)); + if (!tmp) + { + midl_user_free(value); + return ERROR_OUTOFMEMORY; + } + strcpyW(tmp, value); + + r = msi_strncpyWtoA(tmp, len, buf, sz, TRUE); + + heap_free(tmp); + } + midl_user_free(value); + heap_free(nameW); + return r; + } + + val.unicode = FALSE; + val.str.a = buf; + + r = MSI_GetProperty(hinst, nameW, &val, sz); + + heap_free(nameW); + msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 723b2b5..96344eb 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -168,21 +168,21 @@ static void test_props(MSIHANDLE hinst) r = MsiGetPropertyA(hinst, "boo", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiGetPropertyA(hinst, "boo", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 3; strcpy(buffer,"x"); r = MsiGetPropertyA(hinst, "boo", buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "xy"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 6, "got size %u\n", sz); + ok(hinst, sz == 6, "got size %u\n", sz); sz = 4; strcpy(buffer,"x");

1 0

Francois Gouget : testbot: Detect VM revert loops.
by Alexandre Julliard May 16, 2018

May 16, 2018

Module: tools Branch: master Commit: 02681e7b8fd3186f446add2391e69c87ca3a00df URL: https://source.winehq.org/git/tools.git/?a=commit;h=02681e7b8fd3186f446add2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 16 11:22:10 2018 +0200 testbot: Detect VM revert loops. VM revert loops typically happen when a VM is misconfigured such that the TestBot fails to access the TestAgent daemon after reverting it. This results in the VM being put offline until it is accessible again through Libvirt which is the case so that it is immediately put back online and reverted again leading to a new error. With this patch the VM is put in maintenance mode for an administrator to look at if it has too many consecutive errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 30 +++++++++++++++++++++++++----- testbot/ddl/update33.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 1 + testbot/web/admin/VMDetails.pl | 4 +++- 7 files changed, 63 insertions(+), 8 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f9a43bb..91fe053 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -193,23 +193,42 @@ sub FatalError($) my ($ErrMessage) = @_; Error $ErrMessage; - # Put the VM offline if nobody else modified its status before us + # Put the VM offline or mark it for maintenance + my $Errors = ($VM->Errors || 0) + 1; + my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; + $VM = CreateVMs()->GetItem($VMKey); - $VM->Status("offline") if ($VM->Status eq $CurrentStatus); - $VM->ChildDeadline(undef); - $VM->ChildPid(undef); + # Put the VM offline if nobody else modified its status before us + if ($VM->Status eq $CurrentStatus) + { + $VM->Status($NewStatus); + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + $VM->Errors($Errors); + } + else + { + $NewStatus = ""; + } my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) { LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; } - elsif ($VM->Status eq "offline") + elsif ($NewStatus eq "offline") { NotifyAdministrator("Putting the $VMKey VM offline", "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". "The VM has been put offline and the TestBot will try to regain access to it."); } + elsif ($NewStatus eq "maintenance") + { + NotifyAdministrator("The $VMKey VM needs maintenance", + "Got ". $VM->Errors ." consecutive errors working on the $VMKey VM:\n". + "\n$ErrMessage\n". + "An administrator needs to look at it and to put it back online."); + } exit 1; } @@ -244,6 +263,7 @@ sub ChangeStatus($$;$) $VM->Status($To); if ($Done) { + $VM->Errors(undef) if ($To eq "idle"); $VM->ChildDeadline(undef); $VM->ChildPid(undef); } diff --git a/testbot/ddl/update33.sql b/testbot/ddl/update33.sql new file mode 100644 index 0000000..7239f1d --- /dev/null +++ b/testbot/ddl/update33.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE VMs + ADD Errors INT(2) NULL + AFTER Status; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 89810dd..32eab4e 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -49,6 +49,7 @@ CREATE TABLE VMs Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, + Errors INT(2) NULL, ChildPid INT(5) NULL, ChildDeadline DATETIME NULL, VirtURI VARCHAR(64) NOT NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 61a722a..2c720f2 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2454,6 +2454,29 @@ </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> + <dia:string>#Errors#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> <dia:string>#ChildPid#</dia:string> </dia:attribute> <dia:attribute name="type"> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 2eb4f45..4f4c8d8 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer @@ -43,7 +43,7 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList @@ -82,6 +82,9 @@ $SleepAfterRevert = 0; # Take into account $WaitForToolsInVM and $SleepAfterRevert $VMToolTimeout = 6 * 60; +# After three consecutive failures to revert a VM, put it in maintenance mode. +$MaxVMErrors = 3; + # How many times to run a test that fails before giving up. $MaxTaskTries = 3; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 9f5a2c7..a29eebb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -667,6 +667,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), + CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 93e9276..0571471 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,7 +40,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline)$/); + return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); return $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -53,6 +53,8 @@ sub Save($) if ($OldStatus ne $self->{Item}->Status) { + # The administrator action resets the consecutive error count + $self->{Item}->Errors(undef); my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); if (!defined $ErrMessage) {

1 0