June 2021 - Wine-commits - list.winehq.org

Ziqing Hui : windowscodecs/tests: Use winetest_push_context for DDS tests.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 6f57297c4acf52f3cf053b7155f592f402d33e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f57297c4acf52f3cf053b71… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 15 09:59:50 2021 +0800 windowscodecs/tests: Use winetest_push_context for DDS tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 291 ++++++++++++++++++----------------- 1 file changed, 151 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f57297c4acf52f3cf05…

1 0

Paul Gofman : jscript: Parse 'let' and 'const' variable declarations.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: b3569629979e7fae612adc407ba37c292c7dffd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3569629979e7fae612adc40… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 15 18:07:34 2021 +0300 jscript: Parse 'let' and 'const' variable declarations. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 5 +++++ dlls/jscript/lex.c | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 37 ++++++++++++++++++++++++++++++++----- dlls/jscript/tests/lang.js | 34 ++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 6 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9bb9ff13d14..2a17639641f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1138,6 +1138,11 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + if (iter->block_scope) + FIXME("Block scope variables are not supported.\n"); + if (iter->constant) + FIXME("Constant variables are not supported.\n"); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efed1038a95..695615721a7 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -41,6 +41,7 @@ static const struct { {L"break", kBREAK, TRUE}, {L"case", kCASE}, {L"catch", kCATCH}, + {L"const", kCONST}, {L"continue", kCONTINUE, TRUE}, {L"default", kDEFAULT}, {L"delete", kDELETE}, @@ -54,6 +55,7 @@ static const struct { {L"if", kIF}, {L"in", kIN}, {L"instanceof", kINSTANCEOF}, + {L"let", kLET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {L"new", kNEW}, {L"null", kNULL}, {L"return", kRETURN, TRUE}, diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index b88a52af242..c4dd0752ee9 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -95,6 +95,7 @@ literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; typedef struct _variable_declaration_t { const WCHAR *identifier; + BOOL block_scope, constant; expression_t *expr; struct _variable_declaration_t *next; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f11119143b8..6de39e43fac 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -87,7 +87,7 @@ static variable_list_t *variable_list_add(parser_ctx_t*,variable_list_t*,variabl static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); static statement_t *new_block_statement(parser_ctx_t*,unsigned,statement_list_t*); -static statement_t *new_var_statement(parser_ctx_t*,unsigned,variable_list_t*); +static statement_t *new_var_statement(parser_ctx_t*,BOOL,BOOL,unsigned,variable_list_t*); static statement_t *new_expression_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_if_statement(parser_ctx_t*,unsigned,expression_t*,statement_t*,statement_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,BOOL,expression_t*,statement_t*); @@ -168,8 +168,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET -%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONST kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR +%token <identifier> kGET kIN kLET kSET kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE +%token <identifier> kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL /* tokens */ @@ -182,6 +183,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <source_elements> FunctionBody %type <statement> Statement %type <statement> Block +%type <statement> LexicalDeclaration %type <statement> VariableStatement %type <statement> EmptyStatement %type <statement> ExpressionStatement @@ -291,6 +293,7 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } + | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -322,10 +325,25 @@ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, @2, $2); } | '{' '}' { $$ = new_block_statement(ctx, @$, NULL); } +/* ECMA-262 10th Edition 13.3.1, TODO: BindingList*/ +LexicalDeclaration + : kLET VariableDeclarationList semicolon_opt + { $$ = new_var_statement(ctx, TRUE, FALSE, @$, $2); } + | kCONST VariableDeclarationList semicolon_opt + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("const var declaration %s in legacy mode.\n", + debugstr_w($1)); + set_error(ctx, @$, JS_E_SYNTAX); + YYABORT; + } + $$ = new_var_statement(ctx, TRUE, TRUE, @$, $2); + } + /* ECMA-262 3rd Edition 12.2 */ VariableStatement : kVAR VariableDeclarationList semicolon_opt - { $$ = new_var_statement(ctx, @$, $2); } + { $$ = new_var_statement(ctx, FALSE, FALSE, @$, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationList @@ -834,6 +852,7 @@ ReservedAsIdentifier : kBREAK { $$ = $1; } | kCASE { $$ = $1; } | kCATCH { $$ = $1; } + | kCONST { $$ = $1; } | kCONTINUE { $$ = $1; } | kDEFAULT { $$ = $1; } | kDELETE { $$ = $1; } @@ -847,6 +866,7 @@ ReservedAsIdentifier | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } + | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } @@ -1144,8 +1164,10 @@ static variable_list_t *variable_list_add(parser_ctx_t *ctx, variable_list_t *li return list; } -static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_list_t *variable_list) +static statement_t *new_var_statement(parser_ctx_t *ctx, BOOL block_scope, BOOL constant, unsigned loc, + variable_list_t *variable_list) { + variable_declaration_t *var; var_statement_t *ret; ret = new_statement(ctx, STAT_VAR, sizeof(*ret), loc); @@ -1153,6 +1175,11 @@ static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_ return NULL; ret->variable_list = variable_list->head; + for (var = ret->variable_list; var; var = var->next) + { + var->block_scope = block_scope; + var->constant = constant; + } return &ret->stat; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9e6e6ad239f..0db86c89985 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -2030,3 +2030,37 @@ Math = 6; ok(Math === 6, "NaN !== 6"); reportSuccess(); + +function test_es5_keywords() { + var let = 1 + var tmp + ok(let == 1, "let != 1"); + + tmp = false + try { + eval('var var = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var var = 1;'"); + + tmp = false + try { + eval('var const = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var const = 1;'"); + + tmp = false + try { + eval('const c1 = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'const c1 = 1;'"); +} +test_es5_keywords(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7e46848d40e..24906de5231 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1207,3 +1207,20 @@ sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); }); + + +sync_test("declaration_let", function() { + ok(a === undefined, "a is not undefined"); + var a = 3; + + { + let a = 2; + + ok(a == 2, "a != 2"); + + a = 4; + ok(a == 4, "a != 4"); + } + + todo_wine.ok(a == 3, "a != 3"); +});

1 0

Dmitry Timoshkov : include: Add IAuthenticateEx interface definition.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 53286c3528380ae6a587a016ac9eda90cff064ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=53286c3528380ae6a587a016… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 16 18:58:46 2021 +0300 include: Add IAuthenticateEx interface definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/urlmon.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 867d3ebc959..0aab6588658 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -404,6 +404,37 @@ interface IAuthenticate : IUnknown [out] LPWSTR *pszPassword); } +/***************************************************************************** + * IAuthenticateEx interface + */ +[ + object, + uuid(2ad1edaf-d83d-48b5-9adf-03dbe19f53bd), + pointer_default(unique) +] + +interface IAuthenticateEx : IAuthenticate +{ + typedef [unique] IAuthenticateEx *LPAUTHENTICATIONEX; + + typedef enum { + AUTHENTICATEF_PROXY = 0x00000001, + AUTHENTICATEF_BASIC = 0x00000002, + AUTHENTICATEF_HTTP = 0x00000004 + } AUTHENTICATEF; + + typedef struct _tagAUTHENTICATEINFO { + DWORD dwFlags; + DWORD dwReserved; + } AUTHENTICATEINFO; + + HRESULT AuthenticateEx( + [out] HWND *phwnd, + [out] LPWSTR *pszUsername, + [out] LPWSTR *pszPassword, + [in] AUTHENTICATEINFO *pauthinfo); +} + /***************************************************************************** * IHttpNegotiate interface */

1 0

Paul Gofman : shell32: Don't specify the startup directory for CreateProcessW() in SHELL_ExecuteW().
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 6b0b6a093f2c5d19fd04b017852ceddb475a2b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b0b6a093f2c5d19fd04b017… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 16 21:15:41 2021 +0300 shell32: Don't specify the startup directory for CreateProcessW() in SHELL_ExecuteW(). Doing so fails process creation for relative current directory as the directory already made current. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlexec.c | 17 ++++++----------- dlls/shell32/tests/shlexec.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ee1e832df33..49f7867ef7e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -318,7 +318,6 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, UINT gcdret = 0; WCHAR curdir[MAX_PATH]; DWORD dwCreationFlags; - const WCHAR *lpDirectory = NULL; TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory)); @@ -326,17 +325,13 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, * a bad working directory */ if (psei->lpDirectory && psei->lpDirectory[0]) { - DWORD attr = GetFileAttributesW(psei->lpDirectory); - if (attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) - lpDirectory = psei->lpDirectory; + /* ShellExecute specifies the command from psei->lpDirectory + * if present. Not from the current dir as CreateProcess does */ + if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir ))) + if( !SetCurrentDirectoryW( psei->lpDirectory )) + ERR("cannot set directory %s\n", debugstr_w(psei->lpDirectory )); } - /* ShellExecute specifies the command from psei->lpDirectory - * if present. Not from the current dir as CreateProcess does */ - if( lpDirectory ) - if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) - if( !SetCurrentDirectoryW( lpDirectory)) - ERR("cannot set directory %s\n", debugstr_w(lpDirectory)); ZeroMemory(&startup,sizeof(STARTUPINFOW)); startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -345,7 +340,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, - lpDirectory, &startup, &info)) + NULL, &startup, &info)) { /* Give 30 seconds to the app to come up, if desired. Probably only needed when starting app immediately before making a DDE connection. */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 2481fb6faa2..968953f9abb 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2816,6 +2816,7 @@ static void test_directory(void) char path[MAX_PATH + 10], curdir[MAX_PATH]; char params[1024], dirpath[1024]; INT_PTR rc; + BOOL ret; sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); @@ -2876,7 +2877,18 @@ static void test_directory(void) okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); + + SetCurrentDirectoryA(tmpdir); + ret = CreateDirectoryA( "tmp", NULL ); + ok(ret || GetLastError() == ERROR_ALREADY_EXISTS, "Failed to create 'tmp' err %u\n", GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path, params, "tmp", NULL); + okShell(rc > 32, "returned %lu\n", rc); + DeleteFileA(path); + + RemoveDirectoryA("tmp"); + SetCurrentDirectoryA(curdir); } START_TEST(shlexec)

1 0

Vijay Kiran Kamuju : msdrm: Add stub DRMRegisterContent function.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: afd5550b07f6d55e56738f61d829085d6bc82888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd5550b07f6d55e56738f61… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 19 14:02:32 2021 +0100 msdrm: Add stub DRMRegisterContent function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdrm/Makefile.in | 5 ++++- dlls/msdrm/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msdrm/msdrm.spec | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/msdrm/Makefile.in b/dlls/msdrm/Makefile.in index 07d04d4f861..32167468eba 100644 --- a/dlls/msdrm/Makefile.in +++ b/dlls/msdrm/Makefile.in @@ -1,3 +1,6 @@ MODULE = msdrm.dll -EXTRADLLFLAGS = -Wb,--prefer-native +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/msdrm/main.c b/dlls/msdrm/main.c new file mode 100644 index 00000000000..db77f791311 --- /dev/null +++ b/dlls/msdrm/main.c @@ -0,0 +1,34 @@ +/* + * Windows Rights Management Client + * + * Copyright 2021 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdrm); + +HRESULT WINAPI DRMRegisterContent(BOOL value) +{ + FIXME("(%u): stub\n", value); + + return S_OK; +} diff --git a/dlls/msdrm/msdrm.spec b/dlls/msdrm/msdrm.spec index 8b85f3b53a4..5a83307ee05 100644 --- a/dlls/msdrm/msdrm.spec +++ b/dlls/msdrm/msdrm.spec @@ -70,7 +70,7 @@ @ stub DRMIsWindowProtected @ stub DRMLoadLibrary @ stub DRMParseUnboundLicense -@ stub DRMRegisterContent +@ stdcall DRMRegisterContent(long) @ stub DRMRegisterProtectedWindow @ stub DRMRegisterRevocationList @ stub DRMRepair

1 0

Zhiyi Zhang : clock: Enable visual styles.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: af242e43cb31d355a53937b1f31d024e330a1e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af242e43cb31d355a53937b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:31:42 2021 +0800 clock: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/clock/Makefile.in | 2 +- programs/clock/clock.manifest | 16 ++++++++++++++++ programs/clock/clock.rc | 3 +++ programs/clock/clock_res.h | 1 + programs/clock/main.c | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 060e2ff0881..ad1681aeef0 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -1,5 +1,5 @@ MODULE = clock.exe -IMPORTS = comdlg32 shell32 user32 gdi32 +IMPORTS = comdlg32 shell32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest new file mode 100644 index 00000000000..4a9f38c4ff8 --- /dev/null +++ b/programs/clock/clock.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Clock" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/clock/clock.rc b/programs/clock/clock.rc index 8e3b9ef4b7c..0d19369b9f4 100644 --- a/programs/clock/clock.rc +++ b/programs/clock/clock.rc @@ -49,3 +49,6 @@ STRINGTABLE { IDS_CLOCK, "Clock" } + +/* @makedep: clock.manifest */ +1 RT_MANIFEST clock.manifest diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h index b7abf1c35d3..32fd9ff8a0f 100644 --- a/programs/clock/clock_res.h +++ b/programs/clock/clock_res.h @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #define MAIN_MENU 0x100 #define IDM_ANALOG 0x101 diff --git a/programs/clock/main.c b/programs/clock/main.c index 43364745ea5..e64e66dffe6 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -26,6 +26,7 @@ #include <stdio.h> #include "windows.h" +#include "commctrl.h" #include "commdlg.h" #include "shellapi.h" @@ -389,6 +390,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; + InitCommonControls(); + /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE;

1 0

Zhiyi Zhang : uninstaller: Enable visual styles.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 1a47d1b96fd0abd276a892acc7101a883094aa53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a47d1b96fd0abd276a892ac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:33:21 2021 +0800 uninstaller: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/Makefile.in | 2 +- programs/uninstaller/main.c | 3 +++ programs/uninstaller/resource.h | 1 + programs/uninstaller/uninstaller.manifest | 16 ++++++++++++++++ programs/uninstaller/uninstaller.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 146e6204baa..d37316c14c7 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,6 +1,6 @@ MODULE = uninstaller.exe IMPORTS = advapi32 -DELAYIMPORTS = shlwapi shell32 user32 gdi32 +DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 42aa53631f1..8941d3a47ad 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -23,6 +23,7 @@ #include <string.h> #include <windows.h> +#include <commctrl.h> #include <shlwapi.h> #include "resource.h" #include "regstr.h" @@ -176,6 +177,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) Wow64RevertWow64FsRedirection( redir ); } + InitCommonControls(); + while( i<argc ) { token = argv[i++]; diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h index 72ba160d5bd..35ac91f01a2 100644 --- a/programs/uninstaller/resource.h +++ b/programs/uninstaller/resource.h @@ -19,6 +19,7 @@ */ #include <windef.h> +#include <winuser.h> #define IDS_APPNAME 1000 #define IDS_UNINSTALLFAILED 1001 diff --git a/programs/uninstaller/uninstaller.manifest b/programs/uninstaller/uninstaller.manifest new file mode 100644 index 00000000000..ee41796562e --- /dev/null +++ b/programs/uninstaller/uninstaller.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Uninstaller" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/uninstaller/uninstaller.rc b/programs/uninstaller/uninstaller.rc index 4afc6845bc0..631f81e0f77 100644 --- a/programs/uninstaller/uninstaller.rc +++ b/programs/uninstaller/uninstaller.rc @@ -41,3 +41,6 @@ STRINGTABLE { \t\t Use '--list' to determine the application GUID.\n\ \ [no option] Launch the graphical version of this program.\n\n" } + +/* @makedep: uninstaller.manifest */ +1 RT_MANIFEST uninstaller.manifest

1 0

Zhiyi Zhang : winedbg: Enable visual styles.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 7aa1d1cbe1bd7c39895a87ad8bf889a15f8598e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa1d1cbe1bd7c39895a87ad… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:33:41 2021 +0800 winedbg: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.manifest | 16 ++++++++++++++++ programs/winedbg/winedbg.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest new file mode 100644 index 00000000000..5061d141f16 --- /dev/null +++ b/programs/winedbg/winedbg.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winedbg" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 7ad7686d28a..af0018c3cf2 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -75,3 +75,6 @@ BEGIN DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END + +/* @makedep: winedbg.manifest */ +1 RT_MANIFEST winedbg.manifest

1 0

Zhiyi Zhang : winetest: Enable visual styles.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: b527c13c546a9343945fe7cb5d9cf297153409b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b527c13c546a9343945fe7cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 16 10:33:57 2021 +0800 winetest: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 3 +++ programs/winetest/winetest.manifest | 16 ++++++++++++++++ programs/winetest/winetest.rc | 3 +++ 3 files changed, 22 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a05c8f9939b..64a807b6c73 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <assert.h> #include <windows.h> +#include <commctrl.h> #include <winternl.h> #include <mshtml.h> @@ -1265,6 +1266,8 @@ int __cdecl main( int argc, char *argv[] ) int interactive = 1; int i; + InitCommonControls(); + if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0; pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsWow64Process"); diff --git a/programs/winetest/winetest.manifest b/programs/winetest/winetest.manifest new file mode 100644 index 00000000000..a3b110b5eda --- /dev/null +++ b/programs/winetest/winetest.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winetest" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index a3898b6ce01..4571a752f66 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -88,6 +88,9 @@ BEGIN DEFPUSHBUTTON "Close", IDCANCEL, 55, 40, 40, 14 END +/* @makedep: winetest.manifest */ +1 RT_MANIFEST winetest.manifest + /* @makedep: winetest.ico */ IDI_WINE ICON "winetest.ico"

1 0

Zebediah Figura : ws2_32/tests: Add a couple more tests for getsockname().
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 533fd1b127dd46f2e805178e68aa5a6072ed1254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533fd1b127dd46f2e805178e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 15 23:13:26 2021 -0500 ws2_32/tests: Add a couple more tests for getsockname(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 76d0a3f3b19..c8ac0d0ad8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3592,6 +3592,7 @@ static void test_getsockname(void) ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); sa_get = sa_set; + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); ok(ret == SOCKET_ERROR, "expected failure\n"); ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); @@ -3600,12 +3601,21 @@ static void test_getsockname(void) ret = bind(sock, (struct sockaddr *) &sa_set, sa_set_len); ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ok(!ret, "got %d\n", ret); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); + sa_get_len = sizeof(sa_get) - 1; + WSASetLastError(0xdeadbeef); + ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(sa_get_len == sizeof(sa_get) - 1, "got size %d\n", sa_get_len); + closesocket(sock); h = gethostbyname(""); @@ -5546,11 +5556,11 @@ todo_wine static void test_WSASendTo(void) { SOCKET s; - struct sockaddr_in addr; + struct sockaddr_in addr, ret_addr; char buf[12] = "hello world"; WSABUF data_buf; DWORD bytesSent; - int ret; + int ret, len; addr.sin_family = AF_INET; addr.sin_port = htons(139); @@ -5566,6 +5576,11 @@ static void test_WSASendTo(void) ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK, "WSASendTo() failed: %d/%d\n", ret, WSAGetLastError()); + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + WSASetLastError(12345); ret = WSASendTo(s, &data_buf, 1, NULL, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL); ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, @@ -5575,6 +5590,12 @@ static void test_WSASendTo(void) ret = WSASendTo(s, &data_buf, 1, &bytesSent, 0, (struct sockaddr *)&addr, sizeof(addr), NULL, NULL); ok(!ret, "expected success\n"); ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr.sin_family == AF_INET, "got family %u\n", ret_addr.sin_family); + ok(ret_addr.sin_port, "expected nonzero port\n"); } static DWORD WINAPI recv_thread(LPVOID arg)

1 0