January 2020 - Wine-Commits

Zebediah Figura : include: Add more NTSTATUS codes.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 9f8935d823cd554856e15015bf6225bfcee8db82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f8935d823cd554856e15015… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 14 12:01:00 2020 -0600 include: Add more NTSTATUS codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 5 +++++ include/winnt.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index a91ce97731..682db7a566 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -868,6 +868,10 @@ #define STATUS_DRIVER_DATABASE_ERROR ((NTSTATUS) 0xC000036D) #define STATUS_SYSTEM_HIVE_TOO_LARGE ((NTSTATUS) 0xC000036E) #define STATUS_INVALID_IMPORT_OF_NON_DLL ((NTSTATUS) 0xC000036F) +#define STATUS_NO_SECRETS ((NTSTATUS) 0xC0000371) +#define STATUS_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY ((NTSTATUS) 0xC0000372) +#define STATUS_FAILED_STACK_SWITCH ((NTSTATUS) 0xC0000373) +#define STATUS_HEAP_CORRUPTION ((NTSTATUS) 0xC0000374) #define STATUS_SMARTCARD_WRONG_PIN ((NTSTATUS) 0xC0000380) #define STATUS_SMARTCARD_CARD_BLOCKED ((NTSTATUS) 0xC0000381) #define STATUS_SMARTCARD_CARD_NOT_AUTHENTICATED ((NTSTATUS) 0xC0000382) @@ -1411,6 +1415,7 @@ #define DBG_RIPEXCEPTION ((NTSTATUS) 0x40010007) #define DBG_CONTROL_BREAK ((NTSTATUS) 0x40010008) #define DBG_COMMAND_EXCEPTION ((NTSTATUS) 0x40010009) +#define DBG_PRINTEXCEPTION_WIDE_C ((NTSTATUS) 0x4001000A) #define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS) 0x80010001) #endif /* WIN32_NO_STATUS */ diff --git a/include/winnt.h b/include/winnt.h index 56734f178d..41fb6a8289 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -607,10 +607,13 @@ typedef DWORD FLONG; #define STATUS_TIMEOUT ((DWORD) 0x00000102) #define STATUS_PENDING ((DWORD) 0x00000103) #define STATUS_SEGMENT_NOTIFICATION ((DWORD) 0x40000005) +#define STATUS_FATAL_APP_EXIT ((DWORD) 0x40000015) #define STATUS_GUARD_PAGE_VIOLATION ((DWORD) 0x80000001) #define STATUS_DATATYPE_MISALIGNMENT ((DWORD) 0x80000002) #define STATUS_BREAKPOINT ((DWORD) 0x80000003) #define STATUS_SINGLE_STEP ((DWORD) 0x80000004) +#define STATUS_LONGJUMP ((DWORD) 0x80000026) +#define STATUS_UNWIND_CONSOLIDATE ((DWORD) 0x80000029) #define STATUS_ACCESS_VIOLATION ((DWORD) 0xC0000005) #define STATUS_IN_PAGE_ERROR ((DWORD) 0xC0000006) #define STATUS_INVALID_HANDLE ((DWORD) 0xC0000008) @@ -630,10 +633,18 @@ typedef DWORD FLONG; #define STATUS_INTEGER_OVERFLOW ((DWORD) 0xC0000095) #define STATUS_PRIVILEGED_INSTRUCTION ((DWORD) 0xC0000096) #define STATUS_STACK_OVERFLOW ((DWORD) 0xC00000FD) +#define STATUS_DLL_NOT_FOUND ((DWORD) 0xC0000135) +#define STATUS_ORDINAL_NOT_FOUND ((DWORD) 0xC0000138) +#define STATUS_ENTRYPOINT_NOT_FOUND ((DWORD) 0xC0000139) #define STATUS_CONTROL_C_EXIT ((DWORD) 0xC000013A) +#define STATUS_DLL_INIT_FAILED ((DWORD) 0xC0000142) #define STATUS_FLOAT_MULTIPLE_FAULTS ((DWORD) 0xC00002B4) #define STATUS_FLOAT_MULTIPLE_TRAPS ((DWORD) 0xC00002B5) #define STATUS_REG_NAT_CONSUMPTION ((DWORD) 0xC00002C9) +#define STATUS_HEAP_CORRUPTION ((DWORD) 0xC0000374) +#define STATUS_STACK_BUFFER_OVERRUN ((DWORD) 0xC0000409) +#define STATUS_INVALID_CRUNTIME_PARAMETER ((DWORD) 0xC0000417) +#define STATUS_ASSERTION_FAILURE ((DWORD) 0xC0000420) #define STATUS_SXS_EARLY_DEACTIVATION ((DWORD) 0xC015000F) #define STATUS_SXS_INVALID_DEACTIVATION ((DWORD) 0xC0150010) @@ -647,6 +658,7 @@ typedef DWORD FLONG; #define DBG_RIPEXCEPTION ((DWORD) 0x40010007) #define DBG_CONTROL_BREAK ((DWORD) 0x40010008) #define DBG_COMMAND_EXCEPTION ((DWORD) 0x40010009) +#define DBG_PRINTEXCEPTION_WIDE_C ((DWORD) 0x4001000A) #define DBG_EXCEPTION_NOT_HANDLED ((DWORD) 0x80010001) #endif /* WIN32_NO_STATUS */

1 0

Jacek Caban : kernel32/tests: Skip instruction pointer check of the last exception in exception race tests.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 9b44422a49f2d1a79d6dea3c6d0d462a7a16551b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b44422a49f2d1a79d6dea3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 14 18:46:31 2020 +0100 kernel32/tests: Skip instruction pointer check of the last exception in exception race tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e6ba746248..a2b5d1f410 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1343,6 +1343,8 @@ static void test_debugger(const char *argv0) if (sizeof(loop_code) > 1) { + struct debuggee_thread *prev_thread; + memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); @@ -1356,7 +1358,7 @@ static void test_debugger(const char *argv0) thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); - next_event(&ctx, 20000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ret = CloseHandle(thread); @@ -1370,10 +1372,8 @@ static void test_debugger(const char *argv0) expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; - debuggee_thread = ctx.current_thread; + prev_thread = ctx.current_thread; fetch_process_context(&ctx); - ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", - get_ip(&ctx.current_thread->ctx)); byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); @@ -1387,20 +1387,25 @@ static void test_debugger(const char *argv0) ret = WaitForDebugEvent(&ev, 10); ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); - next_event(&ctx, 100); + next_event(&ctx, POLL_EVENT_TIMEOUT); if (ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) break; trace("exception at %p in thread %04x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress, ctx.ev.dwThreadId); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); - ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 - || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ - "unexpected instruction pointer %p\n", - get_ip(&ctx.current_thread->ctx)); + ok(get_ip(&prev_thread->ctx) == thread_proc + 2 + || broken(get_ip(&prev_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); + prev_thread = ctx.current_thread; exception_cnt++; } + /* for some reason sometimes on Windows one thread has a different address. this is always the thread + * with the last reported exception, so we simply skip the check for the last exception unless it's the only one. */ + if (exception_cnt == 1) + ok(get_ip(&prev_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); + trace("received %u exceptions\n", exception_cnt); for (;;) @@ -1409,7 +1414,7 @@ static void test_debugger(const char *argv0) || broken(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT), /* sometimes happens on vista */ "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); if (ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT && !--worker_cnt) break; - next_event(&ctx, 2000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); } }

1 0

Nikolay Sivov : comctl32/tests: Add some more ListView customdraw tests.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: e9b51970698e6b5421d0cee9715393891a07717a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9b51970698e6b5421d0cee9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 14 14:01:28 2020 +0300 comctl32/tests: Add some more ListView customdraw tests. Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 51 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 87f644abd1..20b9873d30 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1916,6 +1916,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM NMHDR *nmhdr = (NMHDR*)lParam; if(nmhdr->code == NM_CUSTOMDRAW) { NMLVCUSTOMDRAW *nmlvcd = (NMLVCUSTOMDRAW*)nmhdr; + BOOL showsel_always = !!(GetWindowLongA(nmlvcd->nmcd.hdr.hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS); + BOOL is_selected = !!(nmlvcd->nmcd.uItemState & CDIS_SELECTED); struct message msg; msg.message = message; @@ -1931,21 +1933,40 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM SetBkColor(nmlvcd->nmcd.hdc, c0ffee); return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: + clr = GetBkColor(nmlvcd->nmcd.hdc); + todo_wine_if(nmlvcd->iSubItem) + ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); nmlvcd->clrTextBk = CLR_DEFAULT; nmlvcd->clrText = RGB(0, 255, 0); return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); + todo_wine_if(showsel_always && is_selected && nmlvcd->iSubItem) + { + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); + } + if (showsel_always && is_selected && nmlvcd->iSubItem) + ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); + else todo_wine_if(nmlvcd->iSubItem) ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); + if (showsel_always && is_selected) + ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); + else + { + todo_wine + ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); + } + + todo_wine_if(showsel_always) + { + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); + } return CDRF_DODEFAULT; } return CDRF_DODEFAULT; @@ -1959,6 +1980,7 @@ static void test_customdraw(void) { HWND hwnd; WNDPROC oldwndproc; + LVITEMA item; hwnd = create_listview_control(LVS_REPORT); @@ -1978,6 +2000,25 @@ static void test_customdraw(void) UpdateWindow(hwnd); ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE); + /* Check colors when item is selected. */ + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, + "parent customdraw, item selected, LVS_REPORT, selection", FALSE); + + SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, + "parent customdraw, item selected, LVS_SHOWSELALWAYS, LVS_REPORT", FALSE); + DestroyWindow(hwnd); hwnd = create_listview_control(LVS_LIST);

1 0

Alexandre Julliard : winecfg: Fix list of configurable dlls to account for PE files.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: d8848e74727a338341c9cc0c98508ac5793208da URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8848e74727a338341c9cc0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 12:20:23 2020 +0100 winecfg: Fix list of configurable dlls to account for PE files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 50 +++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index a8c3e809af..15c308c77e 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -69,9 +69,6 @@ static const char * const builtin_only[] = "user32", "vdmdbg", "w32skrnl", - "wined3d", - "winedos", - "wineps", "winmm", "wintab32", "wnaspi32", @@ -208,6 +205,7 @@ static inline BOOL is_builtin_only( const char *name ) !strcmp( ext, ".tlb" )) return TRUE; } + if (!strncmp( name, "wine", 4 )) return TRUE; return bsearch( &name, builtin_only, ARRAY_SIZE(builtin_only), sizeof(builtin_only[0]), compare_dll ) != NULL; } @@ -224,6 +222,8 @@ static BOOL show_dll_in_list( const char *name ) /* skip exes */ if (!strcmp( ext, ".exe" )) return FALSE; } + /* skip api set placeholders */ + if (!strncmp( name, "api-ms-", 7 ) || !strncmp( name, "ext-ms-", 7 )) return FALSE; /* skip dlls that should always be builtin */ return !is_builtin_only( name ); } @@ -253,7 +253,9 @@ static void clear_settings(HWND dialog) /* load the list of available libraries from a given dir */ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int check_subdirs ) { + static const char * const ext[] = { ".dll", ".dll.so", ".so", "" }; char *buffer = NULL, name[256]; + unsigned int i; struct dirent *de; DIR *dir = opendir( dir_path ); @@ -266,30 +268,36 @@ static void load_library_list_from_dir( HWND dialog, const char *dir_path, int c { size_t len = strlen(de->d_name); if (len > sizeof(name)) continue; - if (len > 3 && !strcmp( de->d_name + len - 3, ".so")) - { - len -= 3; - if (len > 4 && !strcmp( de->d_name + len - 4, ".dll.so")) len -= 4; - memcpy( name, de->d_name, len ); - name[len] = 0; - if (!show_dll_in_list( name )) continue; - SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); - } - else if (check_subdirs) + if (check_subdirs) { struct stat st; + + if (!strcmp( de->d_name, "." )) continue; + if (!strcmp( de->d_name, ".." )) continue; if (!show_dll_in_list( de->d_name )) continue; - sprintf( buffer, "%s/%s/%s.dll.so", dir_path, de->d_name, de->d_name ); - if (!stat( buffer, &st )) + for (i = 0; i < ARRAY_SIZE( ext ); i++) { - SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); - continue; + sprintf( buffer, "%s/%s/%s%s", dir_path, de->d_name, de->d_name, ext[i] ); + if (!stat( buffer, &st )) + { + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); + break; + } } - sprintf( buffer, "%s/%s/%s.so", dir_path, de->d_name, de->d_name ); - if (!stat( buffer, &st )) + } + else + { + for (i = 0; i < ARRAY_SIZE( ext ); i++) { - SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)de->d_name ); - continue; + if (!ext[i][0]) continue; + if (len > strlen(ext[i]) && !strcmp( de->d_name + len - strlen(ext[i]), ext[i])) + { + len -= strlen( ext[i] ); + memcpy( name, de->d_name, len ); + name[len] = 0; + if (!show_dll_in_list( name )) continue; + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); + } } } }

1 0

Jacek Caban : jscript/tests: Use wide char strings in a few more places.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: c2f94b84880459e962122d4568c72c67b8a6b307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f94b84880459e962122d45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 14 15:50:36 2020 +0100 jscript/tests: Use wide char strings in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index b927acd6f2..dd671ed640 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -167,10 +167,6 @@ DEFINE_EXPECT(BindHandler); #define JS_E_OUT_OF_MEMORY 0x800a03ec #define JS_E_INVALID_CHAR 0x800a03f6 -static const WCHAR testW[] = {'t','e','s','t',0}; -static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; -static const WCHAR emptyW[] = {0}; - static BOOL strict_dispid_check, testing_expr; static const char *test_name = "(null)"; static IDispatch *script_disp; @@ -1673,9 +1669,9 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - if(!lstrcmpW(pstrName, test_valW)) + if(!lstrcmpW(pstrName, L"testVal")) CHECK_EXPECT(GetItemInfo_testVal); - else if(lstrcmpW(pstrName, testW)) + else if(lstrcmpW(pstrName, L"test")) ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; @@ -1820,7 +1816,7 @@ static HRESULT parse_script(DWORD flags, const WCHAR *script_str) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -1871,7 +1867,7 @@ static HRESULT invoke_procedure(const WCHAR *args, const WCHAR *source, DISPPARA hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); - hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, source, args, emptyW, NULL, NULL, NULL, 0, 0, + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, source, args, L"", NULL, NULL, NULL, 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); @@ -1916,7 +1912,7 @@ static HRESULT parse_htmlscript(const WCHAR *script_str) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2044,7 +2040,7 @@ static void parse_script_with_error(DWORD flags, const WCHAR *script_str, SCODE hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite_CheckError); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|flags); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2205,7 +2201,7 @@ static void test_isvisible(BOOL global_members) if(global_members) SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScript_AddNamedItem(engine, test_valW, + hres = IActiveScript_AddNamedItem(engine, L"testVal", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE| (global_members ? SCRIPTITEM_GLOBALMEMBERS : 0)); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); @@ -2249,7 +2245,7 @@ static void test_start(void) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); str = SysAllocString(L"ok(getScriptState() === 5, \"getScriptState = \" + getScriptState());\n" @@ -2290,7 +2286,7 @@ static void test_automagic(void) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); str = SysAllocString(L"function bindEventHandler::eventName() {}\n" @@ -2333,7 +2329,7 @@ static HRESULT parse_script_expr(const WCHAR *expr, VARIANT *res, IActiveScript ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScript_AddNamedItem(engine, test_valW, + hres = IActiveScript_AddNamedItem(engine, L"testVal", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); CHECK_CALLED(GetItemInfo_testVal); @@ -2375,7 +2371,7 @@ static void test_retval(void) ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScript_AddNamedItem(engine, test_valW, + hres = IActiveScript_AddNamedItem(engine, L"testVal", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); CHECK_CALLED(GetItemInfo_testVal); @@ -2558,7 +2554,7 @@ static void test_eval(void) ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScript_AddNamedItem(engine, test_valW, + hres = IActiveScript_AddNamedItem(engine, L"testVal", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); CHECK_CALLED(GetItemInfo_testVal); @@ -3211,7 +3207,7 @@ static void run_benchmark(const char *script_name) hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); - hres = IActiveScript_AddNamedItem(engine, testW, + hres = IActiveScript_AddNamedItem(engine, L"test", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE); ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres);

1 0

André Hentschel : d3dx9: Fix some spec file entries.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 96dab5abeedbb0908ac11915464f71eb74383bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96dab5abeedbb0908ac11915… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 12 17:04:25 2020 +0100 d3dx9: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 28 ++++++++++++++-------------- dlls/d3dx9_25/d3dx9_25.spec | 28 ++++++++++++++-------------- dlls/d3dx9_26/d3dx9_26.spec | 28 ++++++++++++++-------------- dlls/d3dx9_27/d3dx9_27.spec | 28 ++++++++++++++-------------- dlls/d3dx9_28/d3dx9_28.spec | 28 ++++++++++++++-------------- dlls/d3dx9_29/d3dx9_29.spec | 28 ++++++++++++++-------------- dlls/d3dx9_30/d3dx9_30.spec | 28 ++++++++++++++-------------- dlls/d3dx9_31/d3dx9_31.spec | 28 ++++++++++++++-------------- dlls/d3dx9_32/d3dx9_32.spec | 28 ++++++++++++++-------------- dlls/d3dx9_33/d3dx9_33.spec | 28 ++++++++++++++-------------- dlls/d3dx9_34/d3dx9_34.spec | 28 ++++++++++++++-------------- dlls/d3dx9_35/d3dx9_35.spec | 28 ++++++++++++++-------------- dlls/d3dx9_36/d3dx9_36.spec | 28 ++++++++++++++-------------- dlls/d3dx9_37/d3dx9_37.spec | 28 ++++++++++++++-------------- dlls/d3dx9_38/d3dx9_38.spec | 28 ++++++++++++++-------------- dlls/d3dx9_39/d3dx9_39.spec | 28 ++++++++++++++-------------- dlls/d3dx9_40/d3dx9_40.spec | 28 ++++++++++++++-------------- dlls/d3dx9_41/d3dx9_41.spec | 28 ++++++++++++++-------------- dlls/d3dx9_42/d3dx9_42.spec | 28 ++++++++++++++-------------- dlls/d3dx9_43/d3dx9_43.spec | 28 ++++++++++++++-------------- 20 files changed, 280 insertions(+), 280 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96dab5abeedbb0908ac1…

1 0

Jacek Caban : jscript/tests: Use wide char string literals instead of parse_script_with_error_a.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 3fc0c965127e9ebfab907fd1f9d4fcc53828de11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc0c965127e9ebfab907fd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 14 15:49:57 2020 +0100 jscript/tests: Use wide char string literals instead of parse_script_with_error_a. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 81 +++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index d8c74d4b17..76b0bdae87 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1959,7 +1959,8 @@ static HRESULT parse_htmlscript(BSTR script_str) return hres; } -static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ULONG line, LONG pos, BSTR script_source, BSTR description, BSTR line_text) +static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ULONG line, LONG pos, const WCHAR *script_source, + const WCHAR *description, const WCHAR *line_text) { HRESULT hres; DWORD source_context; @@ -2047,7 +2048,8 @@ static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, SysFreeString(excep.bstrHelpFile); } -static void parse_script_with_error(DWORD flags, BSTR script_str, SCODE errorcode, ULONG line, LONG pos, BSTR script_source, BSTR description, BSTR line_text) +static void parse_script_with_error(DWORD flags, const WCHAR *script_str, SCODE errorcode, ULONG line, LONG pos, const WCHAR *script_source, + const WCHAR *description, const WCHAR *line_text) { IActiveScriptParse *parser; IActiveScript *engine; @@ -2128,23 +2130,6 @@ static void parse_script_ae(const char *src, HRESULT exhres) ok(hres == exhres, "parse_script failed: %08x, expected %08x\n", hres, exhres); } -static void parse_script_with_error_a(const char *src, SCODE errorcode, ULONG line, LONG pos, LPCSTR source, LPCSTR desc, LPCSTR linetext) -{ - BSTR tmp, script_source, description, line_text; - - tmp = a2bstr(src); - script_source = a2bstr(source); - description = a2bstr(desc); - line_text = a2bstr(linetext); - - parse_script_with_error(SCRIPTITEM_GLOBALMEMBERS, tmp, errorcode, line, pos, script_source, description, line_text); - - SysFreeString(line_text); - SysFreeString(description); - SysFreeString(script_source); - SysFreeString(tmp); -} - static HRESULT parse_htmlscript_a(const char *src) { HRESULT hres; @@ -3117,46 +3102,52 @@ static BOOL run_tests(void) test_invokeex(); test_eval(); - parse_script_with_error_a( - "?", + parse_script_with_error( + SCRIPTITEM_GLOBALMEMBERS, + L"?", 0x800a03ea, 0, 0, - "Microsoft JScript compilation error", - "Syntax error", - "?"); + L"Microsoft JScript compilation error", + L"Syntax error", + L"?"); - parse_script_with_error_a( - "var a=1;\nif(a\n-->0) a=5;\n", + parse_script_with_error( + SCRIPTITEM_GLOBALMEMBERS, + L"var a=1;\nif(a\n-->0) a=5;\n", 0x800a03ee, 2, 0, - "Microsoft JScript compilation error", - "Expected ')'", - "-->0) a=5;"); + L"Microsoft JScript compilation error", + L"Expected ')'", + L"-->0) a=5;"); - parse_script_with_error_a( - "new 3;", + parse_script_with_error( + SCRIPTITEM_GLOBALMEMBERS, + L"new 3;", 0x800a01bd, 0, 0, - "Microsoft JScript runtime error", - "Object doesn't support this action", + L"Microsoft JScript runtime error", + L"Object doesn't support this action", NULL); - parse_script_with_error_a( - "new null;", + parse_script_with_error( + SCRIPTITEM_GLOBALMEMBERS, + L"new null;", 0x800a138f, 0, 0, - "Microsoft JScript runtime error", - "Object expected", + L"Microsoft JScript runtime error", + L"Object expected", NULL); - parse_script_with_error_a( - "var a;\nnew null;", + parse_script_with_error( + SCRIPTITEM_GLOBALMEMBERS, + L"var a;\nnew null;", 0x800a138f, 1, 0, - "Microsoft JScript runtime error", - "Object expected", + L"Microsoft JScript runtime error", + L"Object expected", NULL); - parse_script_with_error_a( - "var a; new null;", + parse_script_with_error( + SCRIPTITEM_GLOBALMEMBERS, + L"var a; new null;", 0x800a138f, 0, 7, - "Microsoft JScript runtime error", - "Object expected", + L"Microsoft JScript runtime error", + L"Object expected", NULL); run_bom_tests();

1 0

Jacek Caban : jscript/tests: Use wide char string literals instead of parse_htmlscript_a.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 2a6119814a2425940d69efd392d3d1cae55ccf0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6119814a2425940d69efd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 14 15:50:08 2020 +0100 jscript/tests: Use wide char string literals instead of parse_htmlscript_a. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 76b0bdae87..1862a3334d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1918,7 +1918,7 @@ static HRESULT invoke_procedure(const char *argsa, const char *sourcea, DISPPARA return hres; } -static HRESULT parse_htmlscript(BSTR script_str) +static HRESULT parse_htmlscript(const WCHAR *script_str) { IActiveScriptParse *parser; IActiveScript *engine; @@ -2130,16 +2130,6 @@ static void parse_script_ae(const char *src, HRESULT exhres) ok(hres == exhres, "parse_script failed: %08x, expected %08x\n", hres, exhres); } -static HRESULT parse_htmlscript_a(const char *src) -{ - HRESULT hres; - BSTR tmp = a2bstr(src); - hres = parse_htmlscript(tmp); - SysFreeString(tmp); - - return hres; -} - static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -3085,17 +3075,17 @@ static BOOL run_tests(void) parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "(function () { test.testThis2(this); })();"); - hres = parse_htmlscript_a(""); + hres = parse_htmlscript(L"-->"); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); - hres = parse_htmlscript_a("\n"); + hres = parse_htmlscript(L"\n"); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); - hres = parse_htmlscript_a("\n"); + hres = parse_htmlscript(L"\n"); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); - hres = parse_htmlscript_a("var a=1;\nif(a-->0) a=5;\n"); + hres = parse_htmlscript(L"var a=1;\nif(a-->0) a=5;\n"); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); - hres = parse_htmlscript_a("var a=1;\nif(a\n-->0) a=5;\n"); + hres = parse_htmlscript(L"var a=1;\nif(a\n-->0) a=5;\n"); ok(hres != S_OK, "ParseScriptText have not failed\n"); test_script_exprs();

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 541e254beaf90f0d6e6af745fa060585374bcc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=541e254beaf90f0d6e6af745… Author: Can Taşan <betax34(a)hotmail.com> Date: Tue Jan 14 09:03:52 2020 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 428 ++++++++++++++++----------------------------------------------- 1 file changed, 106 insertions(+), 322 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=541e254beaf90f0d6e6a…

1 0

Paul Gofman : d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate.
by Alexandre Julliard Jan. 14, 2020

Jan. 14, 2020

Module: wine Branch: master Commit: 13880f8e6a0a972382de7de04b56bd1a414bef67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13880f8e6a0a972382de7de0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 14 18:18:19 2020 +0100 d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate. Manual testing shows that the backward compatible compilation is used in d3dx9 versions below 37. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d7adc18ff6..376b97f5ea 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -424,6 +424,9 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), flags, shader, error_msgs, constant_table); + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -504,6 +507,9 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return D3DXERR_INVALIDDATA; } + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_messages);

1 0