January 2015 - Wine-commits

André Hentschel : Add WWN 384
by Jeremy Newman 30 Jan '15

30 Jan '15

Module: website Branch: master Commit: f6f3adff6f8bffa53f1f239170f2732c4198aabe URL: http://source.winehq.org/git/website.git/?a=commit;h=f6f3adff6f8bffa53f1f23… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 30 23:04:36 2015 +0100 Add WWN 384 --- news/de/2015013001.xml | 11 + news/en/2015013001.xml | 11 + wwn/en/wn20150130_384.xml | 720 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 742 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=f6f3adff6f8bffa53f…

1 0

Nikolay Sivov : kernel32/tests: Make loader tests independent from each other.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: f670be8ec8883943151373f640ab4532e5605d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f670be8ec8883943151373f64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 28 01:02:58 2015 +0300 kernel32/tests: Make loader tests independent from each other. --- dlls/kernel32/tests/loader.c | 49 ++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index af43779..afa90fd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -78,7 +78,7 @@ static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) static IMAGE_DOS_HEADER dos_header; -static IMAGE_NT_HEADERS nt_header = +static const IMAGE_NT_HEADERS nt_header_template = { IMAGE_NT_SIGNATURE, /* Signature */ { @@ -123,8 +123,8 @@ static IMAGE_NT_HEADERS nt_header = 4, /* MajorSubsystemVersion */ 0, /* MinorSubsystemVersion */ 0, /* Win32VersionValue */ - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, /* SizeOfImage */ - sizeof(dos_header) + sizeof(nt_header), /* SizeOfHeaders */ + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, /* SizeOfImage */ + sizeof(dos_header) + sizeof(nt_header_template), /* SizeOfHeaders */ 0, /* CheckSum */ IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ 0, /* DllCharacteristics */ @@ -266,14 +266,14 @@ static void test_Loader(void) }, { sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x1000, 0x1000, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0xe00, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0xe00, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER), { ERROR_BAD_EXE_FORMAT } /* XP doesn't like too small image size */ }, { sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x1000, 0x1000, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER), { ERROR_SUCCESS } }, { sizeof(dos_header), @@ -284,25 +284,25 @@ static void test_Loader(void) }, { sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x200, 0x200, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x200, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x200, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER), { ERROR_SUCCESS, ERROR_INVALID_ADDRESS } /* vista is more strict */ }, { sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x200, 0x1000, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER), { ERROR_BAD_EXE_FORMAT } /* XP doesn't like alignments */ }, { sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x1000, 0x200, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER), + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER), { ERROR_SUCCESS } }, { sizeof(dos_header), 1, sizeof(IMAGE_OPTIONAL_HEADER), 0x1000, 0x200, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, 0x200, { ERROR_SUCCESS } }, @@ -363,7 +363,7 @@ static void test_Loader(void) /* the following data mimics the PE image which upack creates */ { 0x10, 1, 0x148, 0x1000, 0x200, - sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, + sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000, 0x200, { ERROR_SUCCESS } }, @@ -384,7 +384,8 @@ static void test_Loader(void) SIZE_T size; BOOL ret; NTSTATUS status; - WORD orig_machine = nt_header.FileHeader.Machine; + WORD orig_machine = nt_header_template.FileHeader.Machine; + IMAGE_NT_HEADERS nt_header; /* prevent displaying of the "Unable to load this DLL" message box */ SetErrorMode(SEM_FAILCRITICALERRORS); @@ -395,6 +396,7 @@ static void test_Loader(void) { GetTempFileNameA(temp_path, "ldr", 0, dll_name); + nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = td[i].number_of_sections; nt_header.FileHeader.SizeOfOptionalHeader = td[i].size_of_optional_header; @@ -589,13 +591,14 @@ todo_wine ok(ret, "DeleteFile error %d\n", GetLastError()); } + nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt_header.OptionalHeader.SectionAlignment = page_size; nt_header.OptionalHeader.FileAlignment = page_size; nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); - nt_header.OptionalHeader.SizeOfImage = nt_header.OptionalHeader.SizeOfImage + page_size; + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + page_size; status = map_image_section( &nt_header ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); @@ -1054,6 +1057,8 @@ static void test_section_access(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + IMAGE_NT_HEADERS nt_header; + GetTempFileNameA(temp_path, "ldr", 0, dll_name); /*trace("creating %s\n", dll_name);*/ @@ -1068,6 +1073,7 @@ static void test_section_access(void) ret = WriteFile(hfile, &dos_header, sizeof(dos_header), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); + nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL | IMAGE_FILE_RELOCS_STRIPPED; @@ -1235,11 +1241,13 @@ static void test_import_resolution(void) for (test = 0; test < 3; test++) { #define DATA_RVA(ptr) (page_size + ((char *)(ptr) - (char *)&data)) - nt = nt_header; + nt = nt_header_template; nt.FileHeader.NumberOfSections = 1; nt.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_32BIT_MACHINE | IMAGE_FILE_RELOCS_STRIPPED; if (test != 2) nt.FileHeader.Characteristics |= IMAGE_FILE_DLL; + nt.OptionalHeader.SectionAlignment = page_size; + nt.OptionalHeader.FileAlignment = 0x200; nt.OptionalHeader.ImageBase = 0x12340000; nt.OptionalHeader.SizeOfImage = 2 * page_size; nt.OptionalHeader.SizeOfHeaders = nt.OptionalHeader.FileAlignment; @@ -2015,6 +2023,7 @@ static void test_ExitProcess(void) void *addr; LARGE_INTEGER offset; SIZE_T size; + IMAGE_NT_HEADERS nt_header; #if !defined(__i386__) && !defined(__x86_64__) skip("x86 specific ExitProcess test\n"); @@ -2055,6 +2064,7 @@ static void test_ExitProcess(void) ret = WriteFile(file, &dos_header, sizeof(dos_header), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); + nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL | IMAGE_FILE_RELOCS_STRIPPED; @@ -2510,6 +2520,8 @@ static void test_ResolveDelayLoadedAPI(void) DWORD dummy, file_size, i; WORD hint = 0; BOOL ret; + IMAGE_NT_HEADERS nt_header; + static const struct test_data { BOOL func; @@ -2569,6 +2581,7 @@ static void test_ResolveDelayLoadedAPI(void) ret = WriteFile(hfile, &dos_header, sizeof(dos_header), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); + nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = 2; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER);

1 0

Nikolay Sivov : kernel32/tests: Remove todo_wine that doesn' t work anymore.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: 8f2b5653a78ff791b9d1097be87a5f0ac6686c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2b5653a78ff791b9d1097be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 28 01:29:20 2015 +0300 kernel32/tests: Remove todo_wine that doesn't work anymore. --- dlls/kernel32/tests/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index afa90fd..3a15087 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2548,7 +2548,7 @@ static void test_ResolveDelayLoadedAPI(void) if (!pResolveDelayLoadedAPI) { - todo_wine win_skip("ResolveDelayLoadedAPI is not available\n"); + win_skip("ResolveDelayLoadedAPI is not available\n"); return; }

1 0

Nikolay Sivov : kernel32: Fix writing resource section as a last section in UpdateResource().
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: fdda480df5269574221b1f1b55df66fb2cc687da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdda480df5269574221b1f1b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 28 16:46:31 2015 +0300 kernel32: Fix writing resource section as a last section in UpdateResource(). --- dlls/kernel32/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 8d9009c..c88c921 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -1545,7 +1545,8 @@ static BOOL write_raw_resources( QUEUEDUPDATES *updates ) int delta = section_size - (sec->SizeOfRawData + (-sec->SizeOfRawData) % PeFileAlignment); int rva_delta = virtual_section_size - (sec->Misc.VirtualSize + (-sec->Misc.VirtualSize) % PeSectionAlignment); - BOOL rsrc_is_last = sec->PointerToRawData + sec->SizeOfRawData == old_size; + /* when new section is added it could end past current mapping size */ + BOOL rsrc_is_last = sec->PointerToRawData + sec->SizeOfRawData >= old_size; /* align .rsrc size when possible */ DWORD mapping_size = rsrc_is_last ? sec->PointerToRawData + section_size : old_size + delta;

1 0

Jacek Caban : mshtml: Added support for _self target in IHTMLWindow2:: open.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: 679ddf24d442885ff5dc943d6239278fb9f5f3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=679ddf24d442885ff5dc943d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 28 15:30:10 2015 +0100 mshtml: Added support for _self target in IHTMLWindow2::open. --- dlls/mshtml/htmlwindow.c | 19 +++++++++++++++++++ dlls/mshtml/tests/nav_test.html | 24 +++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a18fc6d..6f3cbd4 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -932,6 +932,8 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, IUri *uri; HRESULT hres; + static const WCHAR _selfW[] = {'_','s','e','l','f',0}; + TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); @@ -939,6 +941,23 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return E_UNEXPECTED; if(name && *name == '_') { + if(!strcmpW(name, _selfW)) { + if((features && *features) || replace) + FIXME("Unsupported arguments for _self target\n"); + + hres = IHTMLWindow2_navigate(&This->IHTMLWindow2_iface, url); + if(FAILED(hres)) + return hres; + + if(pomWindowResult) { + FIXME("Returning this window for _self target\n"); + *pomWindowResult = &This->IHTMLWindow2_iface; + IHTMLWindow2_AddRef(*pomWindowResult); + } + + return S_OK; + } + FIXME("Unsupported name %s\n", debugstr_w(name)); return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index 11c4c0c..1021444 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -5,7 +5,7 @@ function ok(b,m) { return external.ok(b, m); } -function nav_back_test() { +function nav_parent_test() { external.trace("Running _parent navigation tests..."); var iframe = document.getElementById("testframe"); @@ -29,7 +29,7 @@ function nav_back_test() { } function window_navigate_test() { - external.trace("Runnint window.navigate() tests..."); + external.trace("Running window.navigate() tests..."); var iframe = document.getElementById("testframe"); @@ -43,6 +43,23 @@ function window_navigate_test() { iframe.contentWindow.navigate("about:blank"); } +function window_open_self_test() { + external.trace("Running window.open(_self) tests..."); + + var iframe = document.getElementById("testframe"); + var iframe_window = iframe.contentWindow; + + iframe.onload = function() { + iframe.onload = null; + var href = iframe.contentWindow.location.href; + ok(/.*blank.html\?window_open_self/.test(href), "Unexpected href " + href); + ok(iframe.contentWindow === iframe_window, "iframe.contentWindow !== iframe_window"); + next_test(); + } + + iframe_window.open("blank.html?window_open_self", "_self"); +} + function detached_src_test() { var iframe = document.createElement("iframe"); var onload_called = false; @@ -58,8 +75,9 @@ function detached_src_test() { } var tests = [ - nav_back_test, + nav_parent_test, window_navigate_test, + window_open_self_test, detached_src_test, function() { external.reportSuccess(); } ];

1 0

Jacek Caban : vbscript: Allow omitting optional function parameters in call expressions.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: 3873c938911c1775acf909385c3d56827d1f1c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3873c938911c1775acf909385… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 28 19:28:17 2015 +0100 vbscript: Allow omitting optional function parameters in call expressions. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 11 ++++++++--- dlls/vbscript/tests/run.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 1 + 6 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 73f0615..c8189d6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -522,6 +522,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_nequal); case EXPR_NEW: return push_instr_str(ctx, OP_new, ((string_expression_t*)expr)->value); + case EXPR_NOARG: + return push_instr_int(ctx, OP_hres, DISP_E_PARAMNOTFOUND); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NOTHING: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7c66096..4b45006 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1366,6 +1366,18 @@ static HRESULT interp_nothing(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_hres(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->instr->arg1.uint; + VARIANT v; + + TRACE("%d\n", arg); + + V_VT(&v) = VT_ERROR; + V_ERROR(&v) = arg; + return stack_push(ctx, &v); +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 2a49703..f0479b5 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -42,6 +42,7 @@ typedef enum { EXPR_NEG, EXPR_NEQUAL, EXPR_NEW, + EXPR_NOARG, /* not a real expression */ EXPR_NOT, EXPR_NOTHING, EXPR_NULL, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index fb95dfb..9606592 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -128,7 +128,7 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList_opt Step_opt ExpressionList +%type <expression> Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList %type <boolean> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl @@ -279,11 +279,16 @@ CaseClausules Arguments_opt : EmptyBrackets_opt { $$ = NULL; } - | '(' ExpressionList ')' { $$ = $2; } + | '(' ArgumentList ')' { $$ = $2; } ArgumentList_opt : EmptyBrackets_opt { $$ = NULL; } - | ExpressionList { $$ = $1; } + | ArgumentList { $$ = $1; } + +ArgumentList + : Expression { $$ = $1; } + | Expression ',' ArgumentList { $1->next = $3; $$ = $1; } + | ',' ArgumentList { $$ = new_expression(ctx, EXPR_NOARG, 0); CHECK_ERROR; $$->next = $2; } EmptyBrackets_opt : /* empty */ diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 33cf0cd..c916382 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -92,6 +92,7 @@ DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); +DEFINE_EXPECT(global_testoptionalarg_i); DEFINE_EXPECT(collectionobj_newenum_i); DEFINE_EXPECT(Next); DEFINE_EXPECT(GetWindow); @@ -115,6 +116,7 @@ DEFINE_EXPECT(EnableModeless); #define DISPID_GLOBAL_DOUBLEASSTRING 1014 #define DISPID_GLOBAL_TESTARRAY 1015 #define DISPID_GLOBAL_THROWINT 1016 +#define DISPID_GLOBAL_TESTOPTIONALARG 1017 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1007,6 +1009,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_THROWINT; return S_OK; } + if(!strcmp_wa(bstrName, "testOptionalArg")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTOPTIONALARG; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -1044,7 +1051,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; } - case DISPID_GLOBAL_TRACE: + case DISPID_GLOBAL_TRACE: ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); @@ -1320,6 +1327,30 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return hres; } + + case DISPID_GLOBAL_TESTOPTIONALARG: { + VARIANT *v; + int opt; + + CHECK_EXPECT(global_testoptionalarg_i); + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + opt = V_I2(pdp->rgvarg); + ok(opt == 1 || opt == 2, "opt = %d\n", opt); + v = pdp->rgvarg+pdp->cArgs-opt; + ok(V_VT(v) == VT_ERROR, "V_VT(v) = %d\n", V_VT(v)); + ok(V_ERROR(v) == DISP_E_PARAMNOTFOUND, "V_ERROR(v) = %08x\n", V_ERROR(v)); + return S_OK; + } } ok(0, "unexpected call %d\n", id); @@ -2075,6 +2106,18 @@ static void run_tests(void) hres = parse_script_ar("throwInt(&h80004001&)"); ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres); + SET_EXPECT(global_testoptionalarg_i); + parse_script_a("call testOptionalArg(1,,2)"); + CHECK_CALLED(global_testoptionalarg_i); + + SET_EXPECT(global_testoptionalarg_i); + parse_script_a("call testOptionalArg(,1,1)"); + CHECK_CALLED(global_testoptionalarg_i); + + SET_EXPECT(global_testoptionalarg_i); + parse_script_a("testOptionalArg 1,,2"); + CHECK_CALLED(global_testoptionalarg_i); + strict_dispid_check = FALSE; SET_EXPECT(testobj_value_i); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d21e80a..d1f35be 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -234,6 +234,7 @@ typedef enum { X(empty, 1, 0, 0) \ X(enumnext, 0, ARG_ADDR, ARG_BSTR) \ X(equal, 1, 0, 0) \ + X(hres, 1, ARG_UINT, 0) \ X(errmode, 1, ARG_INT, 0) \ X(eqv, 1, 0, 0) \ X(exp, 1, 0, 0) \

1 0

Stefan Dösinger : wined3d: Pass WM_SYSCOMMAND( SC_RESTORE) to DefWindowProc.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: 3ef1d6bcd9a51e3d26c3f9414a74a2589e9f87da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef1d6bcd9a51e3d26c3f9414… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 26 16:03:56 2015 +0100 wined3d: Pass WM_SYSCOMMAND(SC_RESTORE) to DefWindowProc. --- dlls/d3d8/directx.c | 2 +- dlls/d3d8/tests/device.c | 4 ++-- dlls/d3d9/directx.c | 2 +- dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- dlls/wined3d/device.c | 10 ++++++++++ include/wine/wined3d.h | 1 + 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7270881..23100f2 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -404,7 +404,7 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { - DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; + DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 73970c1..235dc73 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2622,7 +2622,7 @@ static void test_wndproc(void) expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); - todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; flush_events(); @@ -2699,7 +2699,7 @@ static void test_wndproc(void) expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); - todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; flush_events(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index dc36be1..6059890 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -636,7 +636,7 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { - DWORD flags = WINED3D_PRESENT_CONVERSION; + DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index fef80f4..106bc3e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2172,7 +2172,7 @@ static void test_wndproc(void) expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); - todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); expect_messages = NULL; flush_events(); @@ -2249,7 +2249,7 @@ static void test_wndproc(void) expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); - todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); expect_messages = NULL; flush_events(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ffd3c11..6cf4a81 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3606,7 +3606,7 @@ static void test_wndproc(void) expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); - todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); expect_messages = NULL; flush_events(); @@ -3690,7 +3690,7 @@ static void test_wndproc(void) expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); - todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); expect_messages = NULL; flush_events(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f640c9e..bd57d61 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5018,6 +5018,16 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL device->device_parent->ops->activate(device->device_parent, wparam); } + else if (message == WM_SYSCOMMAND) + { + if (wparam == SC_RESTORE && device->wined3d->flags & WINED3D_HANDLE_RESTORE) + { + if (unicode) + DefWindowProcW(window, message, wparam, lparam); + else + DefWindowProcA(window, message, wparam, lparam); + } + } if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 987e19e..2d3336a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1243,6 +1243,7 @@ enum wined3d_display_rotation #define WINED3D_PRESENT_CONVERSION 0x00000008 #define WINED3D_RESTORE_MODE_ON_ACTIVATE 0x00000010 #define WINED3D_FOCUS_MESSAGES 0x00000020 +#define WINED3D_HANDLE_RESTORE 0x00000040 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Stefan Dösinger : d3d/tests: Show that WM_SYSCOMMAND( SC_RESTORE) is delivered only once.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: 63d52c7317d3e1c429471b4330ee3d7c92ceb138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d52c7317d3e1c429471b433… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 26 16:03:57 2015 +0100 d3d/tests: Show that WM_SYSCOMMAND(SC_RESTORE) is delivered only once. --- dlls/d3d8/tests/device.c | 19 +++++++++++++++---- dlls/d3d9/tests/d3d9ex.c | 19 +++++++++++++++---- dlls/d3d9/tests/device.c | 21 ++++++++++++++++----- 3 files changed, 46 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d52c7317d3e1c429471…

1 0

Austin English : kernel32: Sync spec file with windowss 7.
by Alexandre Julliard 28 Jan '15

28 Jan '15

Module: wine Branch: master Commit: ae98c9a42b69bb29f3347388b0faeb31411ff12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae98c9a42b69bb29f3347388b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 27 17:28:08 2015 -0600 kernel32: Sync spec file with windowss 7. --- dlls/kernel32/kernel32.spec | 306 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 304 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae98c9a42b69bb29f3347…

1 0

Charles Davis : configure: Check that we can link to QuickTime.framework before using it.
by Alexandre Julliard 27 Jan '15

27 Jan '15

Module: wine Branch: master Commit: b218e81de352e3cf457b08ad358ea42028358c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b218e81de352e3cf457b08ad3… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Jan 26 16:28:10 2015 -0700 configure: Check that we can link to QuickTime.framework before using it. --- configure | 34 +++++++++++++++++++++++++++++++--- configure.ac | 17 ++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 7413f28..0431209 100755 --- a/configure +++ b/configure @@ -7949,10 +7949,38 @@ done fi if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" then - QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the QuickTime framework" >&5 +$as_echo_n "checking for the QuickTime framework... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <QuickTime/ImageCompression.h> +int +main () +{ +CodecManagerVersion(NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} - else + enable_wineqtdecoder=${enable_wineqtdecoder:-yes} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ac_cv_header_QuickTime_ImageCompression_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_save_LIBS" + fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + then as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes" diff --git a/configure.ac b/configure.ac index 95c230b..a931730 100644 --- a/configure.ac +++ b/configure.ac @@ -813,9 +813,20 @@ uninstall:: fi if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" then - AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} - else + dnl Make sure we can actually use the QuickTime framework + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + AC_MSG_CHECKING([for the QuickTime framework]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], + [AC_MSG_RESULT([yes]) + AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") + enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], + [AC_MSG_RESULT([no]) + ac_cv_header_QuickTime_ImageCompression_h=no]) + LIBS="$ac_save_LIBS" + fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + then WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes"

1 0