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

Andrew Eikum : ntdll: Fix memory region check in NtQueryVirtualMemory.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 12be24af8cab0e5f78795b164ec8847bafc30852 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12be24af8cab0e5f78795b16… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 27 11:33:25 2019 -0500 ntdll: Fix memory region check in NtQueryVirtualMemory. Patch by buggy(a)ifel.se. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45218 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 76dc6c2..fb6ede6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2756,7 +2756,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg ) MEMORY_BASIC_INFORMATION *info = arg; void *end = (char *)start + size; - if ((char *)info->BaseAddress + info->RegionSize < (char *)start) return 0; + if ((char *)info->BaseAddress + info->RegionSize <= (char *)start) return 0; if (info->BaseAddress >= end) {

1 0

Piotr Caban : Revert "kernel32: Restore C locale for LC_CTYPE category.".
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: f09f6865384a4ef0c6c4f590de7c45562cb54381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f09f6865384a4ef0c6c4f590… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:36 2019 +0100 Revert "kernel32: Restore C locale for LC_CTYPE category.". This reverts commit c8e195e1797bd513c91927743b3ed38fdfa86c2f. There's still lots of code that works incorrectly in tr_TR.UTF-8 locale but I think it's good to revert this patch before next release. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 00006d4..fe2129b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4226,7 +4226,6 @@ void LOCALE_Init(void) mac_cptable->info.codepage, unix_cp ); setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ - setlocale(LC_CTYPE, "C"); /* Fixes issues when tr_TR.UTF-8 locale is used */ } static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName)

1 0

Jacek Caban : mshtml: Alloc proper BSTR size in return_nscstr.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 9f4d05b11c32a5417ef31da8aa1041166d8cfe27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f4d05b11c32a5417ef31da8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:53:01 2019 +0100 mshtml: Alloc proper BSTR size in return_nscstr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xhr.js | 1 + dlls/mshtml/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index 8c42816..cb7e461 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -29,6 +29,7 @@ function test_xhr() { next_test(); } var onload_func = xhr.onload = function() { + ok(xhr.statusText === "OK", "statusText = " + xhr.statusText); if(complete_cnt++) next_test(); }; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index e235bf9..5f844d5 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -80,7 +80,7 @@ static HRESULT return_nscstr(nsresult nsres, nsACString *nscstr, BSTR *p) if(*str) { len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); - *p = SysAllocStringLen(NULL, len); + *p = SysAllocStringLen(NULL, len - 1); if(!*p) { nsACString_Finish(nscstr); return E_OUTOFMEMORY;

1 0

Michael Stefaniuc : d3d8: Actually test two return values.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 9936d9ec829c5a2d34dc20338ec3ecd89891263b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9936d9ec829c5a2d34dc2033… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 26 20:41:36 2019 +0100 d3d8: Actually test two return values. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 90b90e9..c5ec9aa 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9655,7 +9655,7 @@ static void test_get_display_mode(void) hr = IDirect3DDevice8_GetDisplayMode(device, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); @@ -9679,7 +9679,7 @@ static void test_get_display_mode(void) ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height); ok(mode.Format == D3DFMT_X8R8G8B8, "Unexpected format %#x.\n", mode.Format); - IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); + hr = IDirect3D8_GetAdapterDisplayMode(d3d, D3DADAPTER_DEFAULT, &mode); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(mode.Width == 640, "Unexpected width %u.\n", mode.Width); ok(mode.Height == 480, "Unexpected width %u.\n", mode.Height);

1 0

Isira Seneviratne : taskmgr: Replace repeated code with for loops.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: e0625660c8c076289e21d2fa80f3c2e4a5f33a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0625660c8c076289e21d2fa… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Mar 26 20:36:41 2019 +0530 taskmgr: Replace repeated code with for loops. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/affinity.c | 203 +++----------------------------------------- programs/taskmgr/resource.h | 2 +- 2 files changed, 12 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0625660c8c076289e21…

1 0

Alexandre Julliard : shell32: Load wine_get_build_id() dynamically.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: b80e7de8e047a9bf37f035145c36036be4bfb3b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b80e7de8e047a9bf37f03514… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 11:23:11 2019 +0100 shell32: Load wine_get_build_id() dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index a791966..99ee110 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -810,10 +810,12 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, { ABOUT_INFO *info = (ABOUT_INFO *)lParam; WCHAR template[512], buffer[512], version[64]; - extern const char *wine_get_build_id(void); + const char *(CDECL *wine_get_build_id)(void); if (info) { + wine_get_build_id = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), + "wine_get_build_id"); SendDlgItemMessageW(hWnd, stc1, STM_SETICON,(WPARAM)info->hIcon, 0); GetWindowTextW( hWnd, template, ARRAY_SIZE(template) ); sprintfW( buffer, template, info->szApp ); @@ -822,9 +824,12 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT2), info->szOtherStuff ); GetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), template, ARRAY_SIZE(template) ); - MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, version, ARRAY_SIZE(version) ); - sprintfW( buffer, template, version ); - SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), buffer ); + if (wine_get_build_id) + { + MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, version, ARRAY_SIZE(version) ); + sprintfW( buffer, template, version ); + SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), buffer ); + } hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); SendMessageW( hWndCtl, WM_SETREDRAW, 0, 0 ); SendMessageW( hWndCtl, WM_SETFONT, (WPARAM)info->hFont, 0 );

1 0

Zebediah Figura : msi: Handle the remote case in MsiViewGetError().
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 942964fdfbd0cb2af1ea6a1c681fc73d399bcce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=942964fdfbd0cb2af1ea6a1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 26 18:56:17 2019 -0500 msi: Handle the remote case in MsiViewGetError(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46830 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/msiquery.c | 80 +++++++++++++++++++++++++++++++++--- dlls/msi/tests/custom.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 15 +++++++ dlls/msi/winemsi.idl | 2 + 4 files changed, 195 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 3c22a21..2569d21 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -778,9 +778,35 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf if (!buflen) return MSIDBERROR_INVALIDARG; - query = msihandle2msiinfo( handle, MSIHANDLETYPE_VIEW ); - if( !query ) - return MSIDBERROR_INVALIDARG; + if (!(query = msihandle2msiinfo(handle, MSIHANDLETYPE_VIEW))) + { + WCHAR *remote_column = NULL; + MSIHANDLE remote; + + if (!(remote = msi_get_remote(handle))) + return MSIDBERROR_INVALIDARG; + + if (!*buflen) + return MSIDBERROR_FUNCTIONERROR; + + __TRY + { + r = remote_ViewGetError(remote, &remote_column); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY; + + if (msi_strncpyW(remote_column ? remote_column : szEmpty, -1, buffer, buflen) == ERROR_MORE_DATA) + r = MSIDBERROR_MOREDATA; + + if (remote_column) + midl_user_free(remote_column); + + return r; + } if ((r = query->view->error)) column = query->view->error_column; else column = szEmpty; @@ -803,9 +829,35 @@ MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD bufl if (!buflen) return MSIDBERROR_INVALIDARG; - query = msihandle2msiinfo( handle, MSIHANDLETYPE_VIEW ); - if (!query) - return MSIDBERROR_INVALIDARG; + if (!(query = msihandle2msiinfo(handle, MSIHANDLETYPE_VIEW))) + { + WCHAR *remote_column = NULL; + MSIHANDLE remote; + + if (!(remote = msi_get_remote(handle))) + return MSIDBERROR_INVALIDARG; + + if (!*buflen) + return MSIDBERROR_FUNCTIONERROR; + + __TRY + { + r = remote_ViewGetError(remote, &remote_column); + } + __EXCEPT(rpc_filter) + { + r = GetExceptionCode(); + } + __ENDTRY; + + if (msi_strncpyWtoA(remote_column ? remote_column : szEmpty, -1, buffer, buflen, FALSE) == ERROR_MORE_DATA) + r = MSIDBERROR_MOREDATA; + + if (remote_column) + midl_user_free(remote_column); + + return r; + } if ((r = query->view->error)) column = query->view->error_column; else column = szEmpty; @@ -1199,6 +1251,22 @@ UINT __cdecl s_remote_ViewGetColumnInfo(MSIHANDLE view, MSICOLINFO info, struct return r; } +MSIDBERROR __cdecl s_remote_ViewGetError(MSIHANDLE view, LPWSTR *column) +{ + WCHAR empty[1]; + DWORD size = 1; + UINT r; + + r = MsiViewGetErrorW(view, empty, &size); + if (r == MSIDBERROR_MOREDATA) + { + if (!(*column = midl_user_allocate(++size * sizeof(WCHAR)))) + return MSIDBERROR_FUNCTIONERROR; + r = MsiViewGetErrorW(view, *column, &size); + } + return r; +} + UINT __cdecl s_remote_ViewModify(MSIHANDLE view, MSIMODIFY mode, struct wire_record *remote_rec, struct wire_record **remote_refreshed) { diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 43b8369..3a189ef 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1159,6 +1159,109 @@ static void test_invalid_functions(MSIHANDLE hinst) MsiCloseHandle(db); } +static void test_view_get_error(MSIHANDLE hinst) +{ + MSIHANDLE db, view, rec; + char buffer[5]; + MSIDBERROR err; + DWORD sz; + UINT r; + + db = MsiGetActiveDatabase(hinst); + ok(hinst, db, "MsiGetActiveDatabase failed\n"); + + r = MsiDatabaseOpenViewA(db, "SELECT * FROM `test2`", &view); + ok(hinst, !r, "got %u\n", r); + + r = MsiViewExecute(view, 0); + ok(hinst, !r, "got %u\n", r); + + sz = 0; + err = MsiViewGetErrorA(0, NULL, &sz); + todo_wine ok(hinst, err == MSIDBERROR_FUNCTIONERROR, "got %d\n", err); + ok(hinst, sz == 0, "got size %u\n", sz); + + err = MsiViewGetErrorA(view, NULL, NULL); + ok(hinst, err == MSIDBERROR_INVALIDARG, "got %d\n", err); + + sz = 0; + err = MsiViewGetErrorA(view, NULL, &sz); + ok(hinst, err == MSIDBERROR_FUNCTIONERROR, "got %d\n", err); + ok(hinst, sz == 0, "got size %u\n", sz); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(hinst, err == MSIDBERROR_FUNCTIONERROR, "got %d\n", err); + ok(hinst, !strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(hinst, sz == 0, "got size %u\n", sz); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(hinst, err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + ok(hinst, 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(hinst, r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 2; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(hinst, err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); + ok(hinst, !strcmp(buffer, "A"), "got \"%s\"\n", buffer); + ok(hinst, sz == 1, "got size %u\n", sz); + + sz = 2; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + todo_wine ok(hinst, err == MSIDBERROR_NOERROR, "got %d\n", err); + todo_wine ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + todo_wine ok(hinst, sz == 0, "got size %u\n", sz); + + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(hinst, r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(hinst, err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + ok(hinst, sz == 1, "got size %u\n", sz); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + todo_wine ok(hinst, err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + todo_wine ok(hinst, sz == 0, "got size %u\n", sz); + + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(hinst, r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(hinst, err == MSIDBERROR_FUNCTIONERROR, "got %d\n", err); + ok(hinst, !strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(hinst, sz == 0, "got size %u\n", sz); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(hinst, err == MSIDBERROR_FUNCTIONERROR, "got %d\n", err); + ok(hinst, !strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(hinst, sz == 0, "got size %u\n", sz); + + MsiCloseHandle(rec); + MsiCloseHandle(view); + MsiCloseHandle(db); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) @@ -1186,6 +1289,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_format_record(hinst); test_costs(hinst); test_invalid_functions(hinst); + test_view_get_error(hinst); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 27dc83f..e348f32 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -700,6 +700,19 @@ static const CHAR ca1_test_seq_dat[] = "Action\tCondition\tSequence\n" "nested1\t\t1\n" "nested51\t\t2\n"; +static const CHAR ca1_test2_dat[] = + "A\tB\n" + "i2\ti2\n" + "test2\tA\n" + "1\t2\n"; + +static const CHAR ca1__validation_dat[] = + "Table\tColumn\tNullable\tMinValue\tMaxValue\tKeyTable\tKeyColumn\tCategory\tSet\tDescription\n" + "s32\ts32\ts4\tI4\tI4\tS255\tI2\tS32\tS255\tS255\n" + "_Validation\tTable\tColumn\n" + "test2\tA\tN\t\t\t\t\t\t\t\n" + "test2\tB\tN\t\t\t\t\t\t\t\n"; + static const CHAR ca51_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" @@ -1714,6 +1727,8 @@ static const msi_table ca1_tables[] = ADD_TABLE(ca1_install_exec_seq), ADD_TABLE(ca1_custom_action), ADD_TABLE(ca1_test_seq), + ADD_TABLE(ca1_test2), + ADD_TABLE(ca1__validation), }; static const msi_table ca51_tables[] = diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 1658603..7888b0c 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -32,6 +32,7 @@ typedef int INSTALLSTATE; typedef int MSICOLINFO; typedef int MSIMODIFY; typedef int MSICOSTTREE; +typedef int MSIDBERROR; #define MSIFIELD_NULL 0 #define MSIFIELD_INT 1 @@ -68,6 +69,7 @@ interface IWineMsiRemote UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record ); UINT remote_ViewGetColumnInfo( [in] MSIHANDLE view, [in] MSICOLINFO info, [out] struct wire_record **record ); + MSIDBERROR remote_ViewGetError( [in] MSIHANDLE view, [out, string] LPWSTR *column ); UINT remote_ViewModify( [in] MSIHANDLE view, [in] MSIMODIFY mode, [in] struct wire_record *record, [out] struct wire_record **refreshed );

1 0

Zebediah Figura : msi/tests: Separate and expand tests for MsiViewGetError ().
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: fac04043d93b9e24f9f68954c6688310ab424954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac04043d93b9e24f9f68954… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 26 18:56:15 2019 -0500 msi/tests: Separate and expand tests for MsiViewGetError(). 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/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 9fbf43e..16b20e5 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(); }

1 0

Michael Müller : d3dx9/tests: Add initial tests for dummy skin info interface.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: aec8e12a3d71272b31aa8b5b075fe1cd88517c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec8e12a3d71272b31aa8b5b… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 26 22:26:49 2019 +0100 d3dx9/tests: Add initial tests for dummy skin info interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e36ee0a..a33ed2c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -25,6 +25,9 @@ #include <limits.h> #include "wine/test.h" #include "d3dx9.h" +#include "initguid.h" +#include "rmxftmpl.h" +#include "rmxfguid.h" #ifndef NAN /* From wine/port.h */ @@ -11191,6 +11194,186 @@ static void test_D3DXFrameFind(void) ok(ret == &child3, "Unexpected frame, %p.\n", ret); } +static ID3DXFileData *get_mesh_data(const void *memory, SIZE_T length) +{ + ID3DXFileData *file_data, *ret = NULL; + ID3DXFileEnumObject *enum_obj = NULL; + D3DXF_FILELOADMEMORY source; + ID3DXFile *file; + SIZE_T i, count; + GUID guid; + + if (FAILED(D3DXFileCreate(&file))) + return NULL; + + if (FAILED(file->lpVtbl->RegisterTemplates(file, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES))) + goto cleanup; + + source.lpMemory = memory; + source.dSize = length; + if (FAILED(file->lpVtbl->CreateEnumObject(file, &source, D3DXF_FILELOAD_FROMMEMORY, &enum_obj))) + goto cleanup; + + if (FAILED(enum_obj->lpVtbl->GetChildren(enum_obj, &count))) + goto cleanup; + + for (i = 0; i < count; ++i) + { + if (FAILED(enum_obj->lpVtbl->GetChild(enum_obj, i, &file_data))) + goto cleanup; + + if (SUCCEEDED(file_data->lpVtbl->GetType(file_data, &guid)) + && IsEqualGUID(&guid, &TID_D3DRMMesh)) + { + ret = file_data; + break; + } + else + { + file_data->lpVtbl->Release(file_data); + } + } + +cleanup: + if (enum_obj) + enum_obj->lpVtbl->Release(enum_obj); + file->lpVtbl->Release(file); + + return ret; +} + +static void test_load_skin_mesh_from_xof(void) +{ + static const char simple_xfile[] = + "xof 0303txt 0032" + "Mesh {" + "3;" + "0.0; 0.0; 0.0;," + "0.0; 1.0; 0.0;," + "1.0; 1.0; 0.0;;" + "1;" + "3; 0, 1, 2;;" + "}"; + static const D3DVERTEXELEMENT9 expected_declaration[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END(), + }; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; + ID3DXBuffer *adjacency, *materials, *effects; + DWORD max_influences[3], count, fvf; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + ID3DXSkinInfo *skin_info; + ID3DXFileData *file_data; + const char *bone_name; + D3DXMATRIX *matrix; + float influence; + ID3DXMesh *mesh; + IDirect3D9 *d3d; + ULONG refcount; + HRESULT hr; + HWND hwnd; + + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Failed to create application window.\n"); + return; + } + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Failed to create d3d object.\n"); + DestroyWindow(hwnd); + return; + } + + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + IDirect3D9_Release(d3d); + if (FAILED(hr)) + { + skip("Failed to create device, hr %#x.\n", hr); + DestroyWindow(hwnd); + return; + } + + file_data = get_mesh_data(simple_xfile, sizeof(simple_xfile) - 1); + ok(!!file_data, "Failed to load mesh data.\n"); + + adjacency = materials = effects = (void *)0xdeadbeef; + count = ~0u; + skin_info = (void *)0xdeadbeef; + mesh = (void *)0xdeadbeef; + + hr = D3DXLoadSkinMeshFromXof(file_data, 0, device, &adjacency, &materials, &effects, &count, + &skin_info, &mesh); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!!adjacency, "Got unexpected value %p.\n", adjacency); + ok(!materials, "Got unexpected value %p.\n", materials); + ok(!effects, "Got unexpected value %p.\n", effects); + ok(!count, "Got unexpected value %u.\n", count); + todo_wine ok(!!skin_info, "Got unexpected value %p.\n", skin_info); + ok(!!mesh, "Got unexpected value %p.\n", mesh); + count = mesh->lpVtbl->GetNumVertices(mesh); + ok(count == 3, "Got unexpected value %u.\n", count); + count = mesh->lpVtbl->GetNumFaces(mesh); + ok(count == 1, "Got unexpected value %u.\n", count); + + if (skin_info) + { + hr = skin_info->lpVtbl->GetDeclaration(skin_info, declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + compare_elements(declaration, expected_declaration, __LINE__, 0); + + fvf = skin_info->lpVtbl->GetFVF(skin_info); + ok(fvf == D3DFVF_XYZ, "Got unexpected value %u.\n", fvf); + + count = skin_info->lpVtbl->GetNumBones(skin_info); + ok(!count, "Got unexpected value %u.\n", count); + + influence = skin_info->lpVtbl->GetMinBoneInfluence(skin_info); + ok(!influence, "Got unexpected value %.8e.\n", influence); + + memset(max_influences, 0x55, sizeof(max_influences)); + hr = skin_info->lpVtbl->GetMaxVertexInfluences(skin_info, max_influences); + ok(hr == D3D_OK, "Got unexpected value %#x.\n", hr); + ok(!max_influences[0], "Got unexpected value %u.\n", max_influences[0]); + ok(max_influences[1] == 0x55555555, "Got unexpected value %u.\n", max_influences[1]); + ok(max_influences[2] == 0x55555555, "Got unexpected value %u.\n", max_influences[2]); + + bone_name = skin_info->lpVtbl->GetBoneName(skin_info, 0); + ok(!bone_name, "Got unexpected value %p.\n", bone_name); + + count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 0); + ok(!count, "Got unexpected value %u.\n", count); + + count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 1); + ok(!count, "Got unexpected value %u.\n", count); + + matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, -1); + ok(!matrix, "Got unexpected value %p.\n", matrix); + + matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, 0); + ok(!matrix, "Got unexpected value %p.\n", matrix); + + skin_info->lpVtbl->Release(skin_info); + } + + mesh->lpVtbl->Release(mesh); + adjacency->lpVtbl->Release(adjacency); + file_data->lpVtbl->Release(file_data); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(hwnd); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -11222,4 +11405,5 @@ START_TEST(mesh) test_optimize_faces(); test_compute_normals(); test_D3DXFrameFind(); + test_load_skin_mesh_from_xof(); }

1 0

Alexandre Julliard : ntdll/tests: Mark as broken a test that fails on win2003.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 0dbca5803b90c236d32664c0f34ea9525e5d81d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbca5803b90c236d32664c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 08:50:33 2019 +0100 ntdll/tests: Mark as broken a test that fails on win2003. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 57ad30f..accb5d8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -400,7 +400,8 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok(rec->ExceptionAddress == (char *)code_mem + 0xb, "ExceptionAddress at %p instead of %p\n", rec->ExceptionAddress, (char *)code_mem + 0xb); - ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE), + ok( context->ContextFlags == CONTEXT_ALL || context->ContextFlags == (CONTEXT_ALL | CONTEXT_XSTATE) || + broken(context->ContextFlags == CONTEXT_FULL), /* win2003 */ "wrong context flags %x\n", context->ContextFlags ); /* check that context.Eip is fixed up only for EXCEPTION_BREAKPOINT

1 0