July 2014 - Wine-Commits - list.winehq.org

Jacek Caban : wscript: Added IActiveScriptSiteWindow implementation.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: e2fcd874e073d165e5e581fee8b0ce652f0ca881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2fcd874e073d165e5e581fee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 17:44:03 2014 +0200 wscript: Added IActiveScriptSiteWindow implementation. --- programs/wscript/main.c | 79 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index fe0a2ed..d354c90 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -56,23 +56,12 @@ WCHAR scriptFullName[MAX_PATH]; ITypeInfo *host_ti; ITypeInfo *arguments_ti; +static HRESULT query_interface(REFIID,void**); + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { - if(IsEqualGUID(riid, &IID_IUnknown)) { - WINE_TRACE("(IID_IUnknown %p)\n", ppv); - *ppv = iface; - }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { - WINE_TRACE("(IID_IActiveScriptSite %p)\n", ppv); - *ppv = iface; - }else { - *ppv = NULL; - WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return query_interface(riid, ppv); } static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) @@ -168,7 +157,67 @@ static IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; -IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; +static IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; + +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **ppv) +{ + return query_interface(riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + TRACE("(%p)\n", phwnd); + + *phwnd = NULL; + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + TRACE("(%x)\n", fEnable); + return S_OK; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + +static IActiveScriptSiteWindow script_site_window = { &ActiveScriptSiteWindowVtbl }; + +static HRESULT query_interface(REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { + TRACE("(IID_IActiveScriptSite %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSiteWindow)) { + TRACE("(IID_IActiveScriptSiteWindow %p)\n", ppv); + *ppv = &script_site_window; + }else { + *ppv = NULL; + TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} static BOOL load_typelib(void) {

1 0

Thomas Faber : include: Correctly spell STATUS_SMI_PRIMITIVE_INSTALLER_FAILED.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: b4c96633ea50ef9c8838619d833616765afb3f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c96633ea50ef9c8838619d8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Jul 23 14:46:54 2014 +0200 include: Correctly spell STATUS_SMI_PRIMITIVE_INSTALLER_FAILED. --- dlls/ntdll/error.c | 2 +- dlls/ntdll/tests/error.c | 2 +- include/ntstatus.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index bc52de6..5c42010 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -1482,7 +1482,7 @@ static const DWORD table_c0150001[39] = ERROR_SXS_MANIFEST_TOO_BIG, /* c0150022 (STATUS_SXS_MANIFEST_TOO_BIG) */ ERROR_SXS_SETTING_NOT_REGISTERED, /* c0150023 (STATUS_SXS_SETTING_NOT_REGISTERED) */ ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE, /* c0150024 (STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE) */ - ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SXS_PRIMITIVE_INSTALLER_FAILED) */ + ERROR_SMI_PRIMITIVE_INSTALLER_FAILED, /* c0150025 (STATUS_SMI_PRIMITIVE_INSTALLER_FAILED) */ ERROR_GENERIC_COMMAND_FAILED, /* c0150026 (STATUS_GENERIC_COMMAND_FAILED) */ ERROR_SXS_FILE_HASH_MISSING /* c0150027 (STATUS_SXS_FILE_HASH_MISSING) */ }; diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 862f0a9..718b8c5 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -963,7 +963,7 @@ static void run_error_tests(void) cmp2(STATUS_SXS_MANIFEST_TOO_BIG, ERROR_SXS_MANIFEST_TOO_BIG); cmp2(STATUS_SXS_SETTING_NOT_REGISTERED, ERROR_SXS_SETTING_NOT_REGISTERED); cmp2(STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE, ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE); - cmp2(STATUS_SXS_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); + cmp2(STATUS_SMI_PRIMITIVE_INSTALLER_FAILED, ERROR_SMI_PRIMITIVE_INSTALLER_FAILED); cmp2(STATUS_GENERIC_COMMAND_FAILED, ERROR_GENERIC_COMMAND_FAILED); cmp2(STATUS_SXS_FILE_HASH_MISSING, ERROR_SXS_FILE_HASH_MISSING); cmp2(STATUS_REDIRECTOR_STARTED, ERROR_SERVICE_ALREADY_RUNNING); diff --git a/include/ntstatus.h b/include/ntstatus.h index 325ce55..86dad85 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1202,7 +1202,7 @@ #define STATUS_SXS_MANIFEST_TOO_BIG ((NTSTATUS) 0xC0150022) #define STATUS_SXS_SETTING_NOT_REGISTERED ((NTSTATUS) 0xC0150023) #define STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE ((NTSTATUS) 0xC0150024) -#define STATUS_SXS_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) +#define STATUS_SMI_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025) #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027)

1 0

Bruno Jesus : rsaenh: Change the default AES chaining mode to CBC.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: e55dc350209e15ff9d8c05a12be01c93dbd3e318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55dc350209e15ff9d8c05a12… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 23 00:47:53 2014 -0300 rsaenh: Change the default AES chaining mode to CBC. --- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b5ab7a9..dd49618 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -900,7 +900,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK case CALG_AES_192: case CALG_AES_256: pCryptKey->dwBlockLen = 16; - pCryptKey->dwMode = CRYPT_MODE_ECB; + pCryptKey->dwMode = CRYPT_MODE_CBC; break; case CALG_RSA_KEYX: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 3e1dc59..dad6a27 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1140,7 +1140,9 @@ static void test_aes(int keylen) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, sizeof(pbData)); ok(result, "Expected OK, got last error %d\n", GetLastError()); ok(dwLen == 48, "Expected dwLen 48, got %d\n", dwLen); -todo_wine + if(i == 0) todo_wine + ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); + else ok(!memcmp(aes_cbc_enc[i], pbData, dwLen), "Expected equal data sequences\n"); result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); @@ -1161,7 +1163,6 @@ todo_wine dwLen = sizeof(dwMode); result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); ok(result, "%08x\n", GetLastError()); -todo_wine ok(dwMode == CRYPT_MODE_CBC, "Wrong default chaining\n"); dwLen = 13; @@ -3529,12 +3530,9 @@ static void test_key_derivation(const char *prov) memset(wine_broken, 0, sizeof(wine_broken)); wine_broken[8].mode = wine_broken[8].blen = 1; - wine_broken[9].mode = wine_broken[9].exp_data = 1; - wine_broken[10].mode = 1; + wine_broken[9].exp_data = 1; wine_broken[20] = wine_broken[32] = wine_broken[44] = wine_broken[8]; wine_broken[21] = wine_broken[33] = wine_broken[45] = wine_broken[9]; - wine_broken[22] = wine_broken[23] = wine_broken[34] = wine_broken[35] = wine_broken[10]; - wine_broken[46] = wine_broken[47] = wine_broken[11] = wine_broken[10]; for (i=0; i<sizeof(tests)/sizeof(tests[0]); i++) {

1 0

Alexandre Julliard : ntdll: Use the standard mcontext_t type for the signal context on Android.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: wine Branch: master Commit: 69d198a9eb95393851410be044245ed7b48a26f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d198a9eb95393851410be04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 19:30:14 2014 +0200 ntdll: Use the standard mcontext_t type for the signal context on Android. --- dlls/ntdll/signal_i386.c | 86 ++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 52aeb60..447e97c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -100,50 +100,58 @@ typedef struct * signal context platform-specific definitions */ -#ifdef __ANDROID__ +#ifdef __linux__ #ifndef HAVE_SYS_UCONTEXT_H + +enum +{ + REG_GS, REG_FS, REG_ES, REG_DS, REG_EDI, REG_ESI, REG_EBP, REG_ESP, + REG_EBX, REG_EDX, REG_ECX, REG_EAX, REG_TRAPNO, REG_ERR, REG_EIP, + REG_CS, REG_EFL, REG_UESP, REG_SS, NGREG +}; + +typedef int greg_t; +typedef greg_t gregset_t[NGREG]; + +struct _libc_fpreg +{ + unsigned short significand[4]; + unsigned short exponent; +}; + +struct _libc_fpstate +{ + unsigned long cw; + unsigned long sw; + unsigned long tag; + unsigned long ipoff; + unsigned long cssel; + unsigned long dataoff; + unsigned long datasel; + struct _libc_fpreg _st[8]; + unsigned long status; +}; + +typedef struct _libc_fpstate* fpregset_t; + +typedef struct +{ + gregset_t gregs; + fpregset_t fpregs; + unsigned long oldmask; + unsigned long cr2; +} mcontext_t; + typedef struct ucontext { unsigned long uc_flags; struct ucontext *uc_link; stack_t uc_stack; - struct sigcontext uc_mcontext; + mcontext_t uc_mcontext; sigset_t uc_sigmask; } ucontext_t; -#endif - -#define EAX_sig(context) ((context)->uc_mcontext.eax) -#define EBX_sig(context) ((context)->uc_mcontext.ebx) -#define ECX_sig(context) ((context)->uc_mcontext.ecx) -#define EDX_sig(context) ((context)->uc_mcontext.edx) -#define ESI_sig(context) ((context)->uc_mcontext.esi) -#define EDI_sig(context) ((context)->uc_mcontext.edi) -#define EBP_sig(context) ((context)->uc_mcontext.ebp) -#define ESP_sig(context) ((context)->uc_mcontext.esp) - -#define CS_sig(context) ((context)->uc_mcontext.cs) -#define DS_sig(context) ((context)->uc_mcontext.ds) -#define ES_sig(context) ((context)->uc_mcontext.es) -#define SS_sig(context) ((context)->uc_mcontext.ss) -#define FS_sig(context) ((context)->uc_mcontext.fs) -#define GS_sig(context) ((context)->uc_mcontext.gs) - -#define EFL_sig(context) ((context)->uc_mcontext.eflags) -#define EIP_sig(context) ((context)->uc_mcontext.eip) -#define TRAP_sig(context) ((context)->uc_mcontext.trapno) -#define ERROR_sig(context) ((context)->uc_mcontext.err) - -#define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpstate)) -#define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpstate->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) - -/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ -void rt_sigreturn(void); -__ASM_GLOBAL_FUNC( rt_sigreturn, - "movl $173,%eax\n\t" /* NR_rt_sigreturn */ - "int $0x80" ); - -#elif defined (__linux__) +#endif /* HAVE_SYS_UCONTEXT_H */ #define EAX_sig(context) ((context)->uc_mcontext.gregs[REG_EAX]) #define EBX_sig(context) ((context)->uc_mcontext.gregs[REG_EBX]) @@ -219,6 +227,14 @@ __ASM_GLOBAL_FUNC(vm86_enter, # define __HAVE_VM86 #endif +#ifdef __ANDROID__ +/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ +void rt_sigreturn(void); +__ASM_GLOBAL_FUNC( rt_sigreturn, + "movl $173,%eax\n\t" /* NR_rt_sigreturn */ + "int $0x80" ); +#endif + #elif defined (__BSDI__) #include <machine/frame.h>

1 0

André Hentschel : Add news for WWN 372
by Jeremy Newman July 23, 2014

July 23, 2014

Module: website Branch: master Commit: 84e03d9cc8f98a3099fb1d6bfe305a784419029f URL: http://source.winehq.org/git/website.git/?a=commit;h=84e03d9cc8f98a3099fb1d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 21:12:49 2014 +0200 Add news for WWN 372 --- news/de/2014072301.xml | 12 ++++++++++++ news/en/2014072301.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/news/de/2014072301.xml b/news/de/2014072301.xml new file mode 100644 index 0000000..66dc365 --- /dev/null +++ b/news/de/2014072301.xml @@ -0,0 +1,12 @@ +<news> + <date>23. Juli 2014</date> + <title>World Wine News Ausgabe 372</title> + <body> +<a href="{$root}/wwn/372">WWN Ausgabe 372 (en)</a> wurde heute veröffentlicht. +<ul> +<li><a href="{$root}/wwn/372#New WineHQ Server">Neuer WineHQ Server</a></li> +<li><a href="{$root}/wwn/372#Failing tests on test bots">Fehlschlagende Tests auf den Testbots</a></li> +<li><a href="{$root}/wwn/372#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +</ul> + </body> +</news> diff --git a/news/en/2014072301.xml b/news/en/2014072301.xml new file mode 100644 index 0000000..c4e5b73 --- /dev/null +++ b/news/en/2014072301.xml @@ -0,0 +1,12 @@ +<news> + <date>July 23, 2014</date> + <title>World Wine News Issue 372</title> + <body> +<a href="{$root}/wwn/372">WWN Issue 372</a> was released today. +<ul> +<li><a href="{$root}/wwn/372#New WineHQ Server">New WineHQ Server</a></li> +<li><a href="{$root}/wwn/372#Failing tests on test bots">Failing tests on test bots</a></li> +<li><a href="{$root}/wwn/372#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Status Changes</a></li> +</ul> + </body> +</news>

1 0

Francois Gouget : winetest: Consistently use strict and warnings in the main CGI scripts.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: tools Branch: master Commit: 18bebff012a0df99e8c555bfe733731c16d45c07 URL: http://source.winehq.org/git/tools.git/?a=commit;h=18bebff012a0df99e8c555bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:08:10 2014 +0200 winetest: Consistently use strict and warnings in the main CGI scripts. --- winetest/site | 3 +++ winetest/winetest.cgi | 1 + 2 files changed, 4 insertions(+) diff --git a/winetest/site b/winetest/site index f7996a6..a942491 100755 --- a/winetest/site +++ b/winetest/site @@ -5,6 +5,9 @@ # by Jeremy Newman <jnewman(a)codeweavers.com> # +use strict; +use warnings; + # load CGI object use CGI qw(:standard); my $q = new CGI; diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 8c72e02..2cc1190 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -17,6 +17,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; +use warnings; use vars qw/$queuedir $maxfilesize/; BEGIN {

1 0

Francois Gouget : winetest: Prefer 'use warnings' to 'perl -w'.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: tools Branch: master Commit: 346c06bbac8321b06b0a1dc9a9cdc1a0bbd90136 URL: http://source.winehq.org/git/tools.git/?a=commit;h=346c06bbac8321b06b0a1dc9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:07:29 2014 +0200 winetest: Prefer 'use warnings' to 'perl -w'. --- winetest/build-index | 3 ++- winetest/dissect | 4 +++- winetest/gather | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 186a2de..900b144 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> # @@ -20,6 +20,7 @@ # WineTest result data. use strict; +use warnings; use open ':utf8'; use CGI qw(:standard); diff --git a/winetest/dissect b/winetest/dissect index a243a23..bbd156b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard @@ -32,6 +32,8 @@ # 3 - fatal error, something went utterly wrong use strict; +use warnings; + use open ':utf8'; use CGI qw(:standard); charset("utf-8"); diff --git a/winetest/gather b/winetest/gather index 5023ac6..f469fb1 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner # @@ -31,6 +31,7 @@ # 3 - fatal error, something went utterly wrong use strict; +use warnings; use CGI qw(:standard); charset("utf-8");

1 0

Francois Gouget : winetest: Fix write_file() in service.cgi to close the right file handle.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: tools Branch: master Commit: bb1a1abb352aa65ee54637e4581437a9faa73b67 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bb1a1abb352aa65ee54637e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:09:26 2014 +0200 winetest: Fix write_file() in service.cgi to close the right file handle. --- winetest/service.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index de0b8e8..1ec83b6 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -290,7 +290,7 @@ sub write_file { open(GENERIC_FH, $filename) or ( &debug("Can't open $filename for writing.") && die ); print GENERIC_FH $content; - close(URL_FH); + close(GENERIC_FH); } # read the content of a file

1 0

Francois Gouget : winetest: 'my' variable lists must be enclosed in parentheses.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: tools Branch: master Commit: 0aa228a583b38a7ff435e55c6c2d31686f766b49 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0aa228a583b38a7ff435e55c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 22 16:09:07 2014 +0200 winetest: 'my' variable lists must be enclosed in parentheses. --- winetest/service.cgi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/service.cgi b/winetest/service.cgi index 9f34633..de0b8e8 100755 --- a/winetest/service.cgi +++ b/winetest/service.cgi @@ -49,7 +49,7 @@ $lynx="/usr/bin/lynx"; &main; sub main { - my $build, $urls, $cookies; + my ($build, $urls, $cookies); print "Content-type: text/plain\n\n"; @@ -121,12 +121,12 @@ sub releases_purge { # where the two maps are keyed by the full file name of the release sub releases_read { my ($project) = @_; - my %urls, %cookies, $thisrelease; + my (%urls, %cookies, $thisrelease); @files = split(/\n/, `ls $data_root/*/$project/*.url`); foreach $file (@files) { if (open(GENERIC_FH, $file)) { - my $cookiefile, $key, $url, $this_line; + my ($cookiefile, $key, $url, $this_line); $this_line = <GENERIC_FH>; close(GENERIC_FH); chomp $this_line; @@ -135,7 +135,7 @@ sub releases_read { $key = $2; $url = $this_line; if (open(GENERIC_FH, $cookiefile)) { - my $program, $release, @other; + my ($program, $release, @other); $this_line = <GENERIC_FH>; close(GENERIC_FH); chomp $this_line; @@ -156,9 +156,9 @@ sub releases_read { # try to add a new release to our portfolio sub releases_make { my ($url) = @_; - my $name, $program, $build, $publisher; - my $urls, $cookies, $current_build, @other; - my $build_path, $cookie, $program_ok; + my ($name, $program, $build, $publisher); + my ($urls, $cookies, $current_build, @other); + my ($build_path, $cookie, $program_ok); # parse out this release's information $url =~ /.*\/(.*)/; @@ -224,8 +224,8 @@ sub releases_make { sub send_upgrade { my ($urls, $history) = @_; - my @names, $name, $url, $program; - my $build, $publisher, $id, @other; + my (@names, $name, $url, $program); + my ($build, $publisher, $id, @other); # pick a release to send, the first will do @names = keys %$urls;

1 0

Francois Gouget : testbot/testagentd: Add a GetCwd RPC.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: tools Branch: master Commit: 2beaab04a36679838fe429c16106d92cdb87fa39 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2beaab04a36679838fe429c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 21 23:24:14 2014 +0200 testbot/testagentd: Add a GetCwd RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 18 ++++++++++++++++++ testbot/scripts/TestAgent | 12 +++++++++++- testbot/src/testagentd/testagentd.c | 18 +++++++++++++++++- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2cb61ff..5d03a18 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -40,6 +40,7 @@ my $RPC_SETTIME = 7; my $RPC_GETPROPERTIES = 8; my $RPC_UPGRADE = 9; my $RPC_RMCHILDPROC = 10; +my $RPC_GETCWD = 11; my %RpcNames=( $RPC_PING => 'ping', @@ -53,6 +54,7 @@ my %RpcNames=( $RPC_GETPROPERTIES => 'getproperties', $RPC_UPGRADE => 'upgrade', $RPC_RMCHILDPROC => 'rmchildproc', + $RPC_GETCWD => 'getcwd', ); my $Debug = 0; @@ -1407,4 +1409,20 @@ sub RemoveChildProcess($$) return $self->_RecvList(''); } +sub GetCwd($) +{ + my ($self) = @_; + debug("GetCwd\n"); + + # Send the command + if (!$self->_StartRPC($RPC_GETCWD) or + !$self->_SendListSize('ArgC', 0)) + { + return undef; + } + + # Get the reply + return $self->_RecvList('s'); +} + 1; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ec4504f..ced1165 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -198,6 +198,10 @@ while (@ARGV) @Rm = @ARGV; last; } + elsif ($arg eq "getcwd") + { + $Cmd = $arg; + } elsif ($arg eq "getversion") { set_cmd($arg); @@ -296,7 +300,7 @@ if (defined $Usage) print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; - print "or $name0 [options] <hostname> [ping|version]\n"; + print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; print "\n"; @@ -323,6 +327,7 @@ if (defined $Usage) print " getproperty <name> Retrieves and prints the specified server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; + print " getcwd Returns the server's current working directory.\n"; print " ping Makes sure the server is still alive.\n"; print " upgrade Replaces the server executable with the specified file and\n"; print " restarts it.\n"; @@ -440,6 +445,11 @@ elsif ($Cmd eq "upgrade") { $Result = $TA->Upgrade($LocalFilename); } +elsif ($Cmd eq "getcwd") +{ + $Result = $TA->GetCwd(); + print "Current directory: $Result\n" if (defined $Result); +} elsif ($Cmd eq "getversion") { $Result = $TA->GetVersion(); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index dc181a6..e776cc7 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,7 +37,7 @@ * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. * 1.4: Add the settime RPC. * 1.5: Add support for upgrading the server. - * 1.6: Add support for the rmchildproc RPC. + * 1.6: Add support for the rmchildproc and getcwd RPC. */ #define PROTOCOL_VERSION "testagentd 1.6" @@ -90,6 +90,7 @@ enum rpc_ids_t RPCID_GETPROPERTIES, RPCID_UPGRADE, RPCID_RMCHILDPROC, + RPCID_GETCWD, }; /* This is the RPC currently being processed */ @@ -111,6 +112,7 @@ static const char* rpc_name(uint32_t id) "getproperties", "upgrade", "rmchildproc", + "getcwd", }; if (id < sizeof(names) / sizeof(*names)) @@ -1037,7 +1039,19 @@ static void do_upgrade(SOCKET client) } else send_error(client); +} + +static void do_getcwd(SOCKET client) +{ + char curdir[261]; + if (expect_list_size(client, 0)) + { + send_list_size(client, 1); + send_string(client, getcwd(curdir, sizeof(curdir))); + } + else + send_error(client); } static void do_unknown(SOCKET client, uint32_t id) @@ -1109,6 +1123,8 @@ static void process_rpc(SOCKET client) break; case RPCID_UPGRADE: do_upgrade(client); + case RPCID_GETCWD: + do_getcwd(client); break; case RPCID_RMCHILDPROC: do_rmchildproc(client);

1 0

Francois Gouget : testbot/testagentd: Add a RemoveChildProc RPC.
by Alexandre Julliard July 23, 2014

July 23, 2014

Module: tools Branch: master Commit: 2d08b161f0244f05219dcee936491e140117ec3d URL: http://source.winehq.org/git/tools.git/?a=commit;h=2d08b161f0244f05219dcee9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 21 23:24:00 2014 +0200 testbot/testagentd: Add a RemoveChildProc RPC. The Wait RPC no longer causes the server to forget about the child process. That reponsibility is transferred to the RemoveChildProc RPC. This is to solve the case where the network connection breaks at just the time when the child process terminates which could cause the server to forget the child process exit status despite it not having reached the client process. --- testbot/lib/WineTestBot/TestAgent.pm | 26 ++++++++++++++++++++++++++ testbot/scripts/TestAgent | 12 ++++++++++-- testbot/src/testagentd/platform.h | 8 ++++++++ testbot/src/testagentd/platform_unix.c | 17 +++++++++++++++++ testbot/src/testagentd/platform_windows.c | 27 ++++++++++++++++++++++++--- testbot/src/testagentd/testagentd.c | 25 ++++++++++++++++++++++++- 6 files changed, 109 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 1acb0cd..2cb61ff 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -39,6 +39,7 @@ my $RPC_WAIT2 = 6; my $RPC_SETTIME = 7; my $RPC_GETPROPERTIES = 8; my $RPC_UPGRADE = 9; +my $RPC_RMCHILDPROC = 10; my %RpcNames=( $RPC_PING => 'ping', @@ -51,6 +52,7 @@ my %RpcNames=( $RPC_SETTIME => 'settime', $RPC_GETPROPERTIES => 'getproperties', $RPC_UPGRADE => 'upgrade', + $RPC_RMCHILDPROC => 'rmchildproc', ); my $Debug = 0; @@ -1381,4 +1383,28 @@ sub Upgrade($$) return $rc; } +sub RemoveChildProcess($$) +{ + my ($self, $Pid) = @_; + debug("RmChildProcess $Pid\n"); + + # Make sure we have the server version + return undef if (!$self->{agentversion} and !$self->_Connect()); + + # Up to 1.5 a seemingly successful Wait RPC automatically removes child + # processes. + return 1 if ($self->{agentversion} =~ / 1\.[0-5]$/); + + # Send the command + if (!$self->_StartRPC($RPC_RMCHILDPROC) or + !$self->_SendListSize('ArgC', 1) or + !$self->_SendUInt64('Pid', $Pid)) + { + return undef; + } + + # Get the reply + return $self->_RecvList(''); +} + 1; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ac2c914..ec4504f 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -376,14 +376,22 @@ elsif ($Cmd eq "run") if (!($RunFlags & $TestAgent::RUN_DNT)) { $Result = $TA->Wait($Pid, $Timeout, $Keepalive); - print "Child exit status: $Result\n" if (defined $Result); + if (defined $Result) + { + print "Child exit status: $Result\n"; + $TA->RemoveChildProcess($Pid); + } } } } elsif ($Cmd eq "wait") { $Result = $TA->Wait($WaitPid, $Timeout, $Keepalive); - print "Child exit status: $Result\n" if (defined $Result); + if (defined $Result) + { + print "Child exit status: $Result\n"; + $TA->RemoveChildProcess($WaitPid); + } } elsif ($Cmd eq "rm") { diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index c6c0f2e..46e4d37 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -74,11 +74,19 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects); /* If a command was started in the background, waits until either that command * terminates, the specified timeout (in seconds) expires, or the client * disconnects (typically because it got tired of waiting). + * Note that this does not cause the child process to be forgotten, even if it + * did exit. This is so that the client can retrieve the information again if + * needed (e.g. in case it did not receive it due to a network issue). * If no command was started in the background, then reports an error * immediately. */ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus); +/* Causes the given child process to be forgotten, which means it will no longer + * be possible to wait for it or retrieve its exit status. + */ +int platform_rmchildproc(SOCKET client, uint64_t pid); + /* Sets the system time to the specified Unix epoch. If the system time is * already within leeway seconds of the specified time, then consider that * the system clock is already correct. diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 75afc81..b27c016 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -194,6 +194,23 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child } debug("process " U64FMT " returned status %u\n", pid, child->status); *childstatus = child->status; + return 1; +} + +int platform_rmchildproc(SOCKET client, uint64_t pid) +{ + struct child_t *child; + + LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) + { + if (child->pid == pid) + break; + } + if (!child || child->pid != pid) + { + set_status(ST_ERROR, "the " U64FMT " process does not exist or is not a child process", pid); + return 0; + } list_remove(&child->entry); free(child); return 1; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index dd8da8e..8e00f09 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -204,9 +204,9 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError()); break; } - CloseHandle(child->handle); - list_remove(&child->entry); - free(child); + /* Don't close child->handle so we can retrieve the exit status again if + * needed. + */ cleanup: /* We must reset WSAEventSelect before we can make @@ -221,6 +221,27 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return success; } +int platform_rmchildproc(SOCKET client, uint64_t pid) +{ + struct child_t *child; + + LIST_FOR_EACH_ENTRY(child, &children, struct child_t, entry) + { + if (child->pid == pid) + break; + } + if (!child || child->pid != pid) + { + set_status(ST_ERROR, "the " U64FMT " process does not exist or is not a child process", pid); + return 0; + } + + CloseHandle(child->handle); + list_remove(&child->entry); + free(child); + return 1; +} + int platform_settime(uint64_t epoch, uint32_t leeway) { FILETIME filetime; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 292b1c7..dc181a6 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -37,8 +37,9 @@ * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. * 1.4: Add the settime RPC. * 1.5: Add support for upgrading the server. + * 1.6: Add support for the rmchildproc RPC. */ -#define PROTOCOL_VERSION "testagentd 1.5" +#define PROTOCOL_VERSION "testagentd 1.6" #define BLOCK_SIZE 65536 @@ -88,6 +89,7 @@ enum rpc_ids_t RPCID_SETTIME, RPCID_GETPROPERTIES, RPCID_UPGRADE, + RPCID_RMCHILDPROC, }; /* This is the RPC currently being processed */ @@ -108,6 +110,7 @@ static const char* rpc_name(uint32_t id) "settime", "getproperties", "upgrade", + "rmchildproc", }; if (id < sizeof(names) / sizeof(*names)) @@ -837,6 +840,23 @@ static void do_wait2(SOCKET client) send_error(client); } +static void do_rmchildproc(SOCKET client) +{ + uint64_t pid; + + if (!expect_list_size(client, 1) || + !recv_uint64(client, &pid)) + { + send_error(client); + return; + } + + if (platform_rmchildproc(client, pid)) + send_list_size(client, 0); + else + send_error(client); +} + static void do_rm(SOCKET client) { int got_errors; @@ -1090,6 +1110,9 @@ static void process_rpc(SOCKET client) case RPCID_UPGRADE: do_upgrade(client); break; + case RPCID_RMCHILDPROC: + do_rmchildproc(client); + break; default: do_unknown(client, rpcid); }

1 0

André Hentschel : Add WWN 372
by Jeremy Newman July 23, 2014

July 23, 2014

Module: website Branch: master Commit: 8e9bea1832c28a994b49ed552cca4d54422ff249 URL: http://source.winehq.org/git/website.git/?a=commit;h=8e9bea1832c28a994b49ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 19:57:11 2014 +0200 Add WWN 372 --- wwn/en/wn20140723_372.xml | 1098 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1098 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8e9bea1832c28a994b…

1 0

André Hentschel : Fix German news for 1.7.22
by Jeremy Newman July 23, 2014

July 23, 2014

Module: website Branch: master Commit: 2358895df30e78105c62664205eba539aa272256 URL: http://source.winehq.org/git/website.git/?a=commit;h=2358895df30e78105c6266… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 23 19:57:59 2014 +0200 Fix German news for 1.7.22 --- news/de/2014071101.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/news/de/2014071101.xml b/news/de/2014071101.xml index 8f5d33b..bc6b89f 100644 --- a/news/de/2014071101.xml +++ b/news/de/2014071101.xml @@ -11,6 +11,6 @@ <li>Anfängliche Unterstützung von Geografischen Informationen.</li> <li>Diverse Fehlerkorrekturen.</li> </ul> - <p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">verfügbar</a>. -15 Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.22.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. </p></body></news>

1 0

Nikolay Sivov : wshom.ocx: Implement get_Item() for IWshEnvironment.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: ac65c3fb18d9c9be4aa43f373b4096bba991a0c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac65c3fb18d9c9be4aa43f373… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 22 18:26:10 2014 +0400 wshom.ocx: Implement get_Item() for IWshEnvironment. --- dlls/wshom.ocx/shell.c | 18 ++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 09b3fa0..b7b819a 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -197,8 +197,22 @@ static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispI static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) { WshEnvironment *This = impl_from_IWshEnvironment(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_w(name), value); - return E_NOTIMPL; + DWORD len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); + + if (!value) + return E_POINTER; + + len = GetEnvironmentVariableW(name, NULL, 0); + *value = SysAllocStringLen(NULL, len); + if (!*value) + return E_OUTOFMEMORY; + + if (len) + GetEnvironmentVariableW(name, *value, len+1); + + return S_OK; } static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 5f6e79d..4c3581e 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -36,6 +36,9 @@ static void test_wshshell(void) static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + static const WCHAR path2W[] = {'P','A','T','H',0}; + IWshEnvironment *env; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -49,7 +52,7 @@ static void test_wshshell(void) DISPPARAMS dp; EXCEPINFO ei; VARIANT arg, res; - BSTR str; + BSTR str, ret; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -131,6 +134,43 @@ static void test_wshshell(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); SysFreeString(str); + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocString(sysW); + hr = IWshShell3_get_Environment(sh3, &arg, &env); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&arg); + + hr = IWshEnvironment_get_Item(env, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = (BSTR)0x1; + hr = IWshEnvironment_get_Item(env, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && !*ret, "got %p\n", ret); + SysFreeString(ret); + + /* invalid var name */ + str = SysAllocString(lnk1W); + hr = IWshEnvironment_get_Item(env, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = NULL; + hr = IWshEnvironment_get_Item(env, str, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(str); + + /* valid name */ + str = SysAllocString(path2W); + hr = IWshEnvironment_get_Item(env, str, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(str); + + IWshEnvironment_Release(env); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3);

1 0

Alexandre Julliard : riched20/tests: Fix test on 64-bit.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 35dd553038f69a46b553c16e193ea00e7529ed11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dd553038f69a46b553c16e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 20:38:33 2014 +0200 riched20/tests: Fix test on 64-bit. --- dlls/riched20/tests/richole.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 98ac50d..571e5cd 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -418,10 +418,7 @@ static void test_ITextSelection_GetText(void) static const WCHAR bufW4[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't', '\r', 0}; static const WCHAR bufW5[] = {'\r', 0}; - SYSTEM_INFO sysinfo; - int is64bit; - GetSystemInfo(&sysinfo); - is64bit = (sysinfo.wProcessorArchitecture & PROCESSOR_ARCHITECTURE_AMD64); + BOOL is64bit = sizeof(void *) > sizeof(int); create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); @@ -446,9 +443,7 @@ static void test_ITextSelection_GetText(void) ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); - if(is64bit) - win_skip("native 64bit riched20 can't support a NULL parameter\n"); - else + if (!is64bit) { hres = ITextSelection_GetText(txtSel, NULL); ok(hres == E_INVALIDARG, "ITextSelection_GetText\n");

1 0

Marcus Meissner : dmime: Remove useless NULL check (Coverity).
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: b20365ee29e67ea0f993eee927a1746836f4cef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20365ee29e67ea0f993eee92… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 09:08:33 2014 +0200 dmime: Remove useless NULL check (Coverity). --- dlls/dmime/performance.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 92e72fe..25e86f9 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -388,9 +388,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SendPMsg(IDirectMusicPerforma return E_POINTER; } pItem = DMUS_PMSGToItem(pPMSG); - if (NULL == pItem) { - return E_POINTER; - } if (pItem->bInUse) { return DMUS_E_ALREADY_SENT; } @@ -512,9 +509,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma return E_POINTER; } pItem = DMUS_PMSGToItem(pPMSG); - if (NULL == pItem) { - return E_POINTER; - } if (pItem->bInUse) { /** prevent for freeing PMsg in queue (ie to be processed) */ return DMUS_E_CANNOT_FREE;

1 0

Jacek Caban : mshtml: Fixed tests on IE11.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 1e191e031c812f23901f4f08a2b14fc5a14b28ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e191e031c812f23901f4f08a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 22 12:57:56 2014 +0200 mshtml: Fixed tests on IE11. --- dlls/mshtml/tests/htmldoc.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 11015e7..84b8806 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -978,6 +978,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000029: case 3000030: case 3000031: + case 3000032: /* TODO */ return S_OK; } @@ -2855,6 +2856,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID test_readyState(NULL); return S_OK; case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + case OLECMDID_PAGEAVAILABLE: case 6058: return E_FAIL; /* FIXME */ default: @@ -2864,7 +2866,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - if(nCmdID != 63 && (!is_refresh || nCmdID != 37)) + if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37)) test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); @@ -2976,9 +2978,11 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 83: case 102: + case 133: case 134: /* TODO */ case 135: case 136: /* TODO */ + case 137: case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ @@ -3293,13 +3297,15 @@ static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, v { static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}}; static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}}; + static const IID IID_unk_travellog2 = {0xf6d02767,0x9c80,0x428d,{0xb9,0x74,0x3f,0x17,0x29,0x45,0x3f,0xdb}}; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) { *ppv = iface; return S_OK; } - if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)) + if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid) + && !IsEqualGUID(&IID_unk_travellog2, riid)) ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; @@ -3433,7 +3439,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); - ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); if(!testing_submit) { ok(!pPostData, "pPostData = %p\n", pPostData); @@ -5294,7 +5300,7 @@ static void test_doscroll(IUnknown *unk) switch(load_state) { case LD_DOLOAD: case LD_NO: - if(!nav_url) + if(!nav_url && !editmode) ok(!elem, "elem != NULL\n"); default: break; @@ -5746,6 +5752,8 @@ static void test_download(DWORD flags) SET_EXPECT(NavigateWithBindCtx); SET_EXPECT(Exec_Explorer_38); /* todo_wine */ } + if(editmode || is_refresh) + SET_EXPECT(Exec_ShellDocView_138); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!*b && GetMessageW(&msg, NULL, 0, 0)) { @@ -5868,6 +5876,8 @@ static void test_download(DWORD flags) CHECK_CALLED(NavigateWithBindCtx); todo_wine CHECK_NOT_CALLED(Exec_Explorer_38); } + if(editmode || is_refresh) + CLEAR_CALLED(Exec_ShellDocView_138); /* IE11 */ if(!is_extern) load_state = LD_COMPLETE; @@ -5973,7 +5983,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre CHECK_CALLED(TranslateUrl); if(support_wbapp) { CHECK_CALLED(FireBeforeNavigate2); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ if(!is_hash) { CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -6039,7 +6049,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); CHECK_CALLED(TranslateUrl); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); @@ -6110,8 +6120,8 @@ static void test_load_history(IHTMLDocument2 *doc) hres = IPersistHistory_LoadHistory(per_hist, history_stream, NULL); ok(hres == S_OK, "LoadHistory failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Exec_ShellDocView_138); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_138); /* Not called by IE11 */ + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(FireBeforeNavigate2); CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -7834,11 +7844,11 @@ static void test_submit(void) CHECK_CALLED(TranslateUrl); CHECK_CALLED(FireBeforeNavigate2); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); - todo_wine CHECK_CALLED(Exec_ShellDocView_84); + CLEAR_CALLED(Exec_ShellDocView_84); /* Not called by IE11 */ CHECK_CALLED(CreateInstance); CHECK_CALLED(Start); CHECK_CALLED(Protocol_Read);

1 0

Bruno Jesus : crypt32: Fix conversion of multiple fields in CertStrToName.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 4a28977f38a33a99de9791e88366555dc1ff8ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a28977f38a33a99de9791e88… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 22 03:43:35 2014 -0300 crypt32: Fix conversion of multiple fields in CertStrToName. --- dlls/crypt32/str.c | 10 ++++++++-- dlls/crypt32/tests/cert.c | 12 ++---------- dlls/crypt32/tests/str.c | 19 ++++++++++++++++++- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index cf29c6f..7b52731 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -840,13 +840,14 @@ static BOOL CRYPT_GetNextKeyW(LPCWSTR str, struct X500TokenW *token, /* Assumes separators are characters in the 0-255 range */ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, - struct X500TokenW *token, LPCWSTR *ppszError) + WCHAR *separator_used, struct X500TokenW *token, LPCWSTR *ppszError) { BOOL ret = TRUE; TRACE("(%s, %s, %p, %p)\n", debugstr_w(str), debugstr_w(separators), token, ppszError); + *separator_used = 0; while (*str && isspaceW(*str)) str++; if (*str) @@ -886,6 +887,7 @@ static BOOL CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, while (*str && (*str >= 0xff || !map[*str])) str++; token->end = str; + if (map[*str]) *separator_used = *str; } } else @@ -1077,6 +1079,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, static const WCHAR allSepsWithoutPlus[] = { ',',';','\r','\n',0 }; static const WCHAR allSeps[] = { '+',',',';','\r','\n',0 }; LPCWSTR sep; + WCHAR sep_used; str++; if (dwStrType & CERT_NAME_STR_COMMA_FLAG) @@ -1089,11 +1092,14 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, sep = allSepsWithoutPlus; else sep = allSeps; - ret = CRYPT_GetNextValueW(str, dwStrType, sep, &token, + ret = CRYPT_GetNextValueW(str, dwStrType, sep, &sep_used, &token, ppszError); if (ret) { str = token.end; + /* if token.end points to the separator, skip it */ + if (str && sep_used && *str == sep_used) str++; + ret = CRYPT_ValueToRDN(dwCertEncodingType, &info, keyOID, &token, dwStrType, ppszError); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e16ca5d..a19ef1e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1711,23 +1711,14 @@ static void testGetIssuerCert(void) /* Self-sign a certificate, add to the store and test getting the issuer */ size = 0; -todo_wine ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, NULL, &size, NULL), "CertStrToName should have worked\n"); certencoded = HeapAlloc(GetProcessHeap(), 0, size); -todo_wine ok(CertStrToNameW(X509_ASN_ENCODING, certname, CERT_X500_NAME_STR, NULL, certencoded, &size, NULL), "CertStrToName should have worked\n"); certsubject.pbData = certencoded; certsubject.cbData = size; cert3 = CertCreateSelfSignCertificate(0, &certsubject, 0, NULL, NULL, NULL, NULL, NULL); - /* wine fails to create the certificate, this makes it crash later. - * Remove IF when wine is fixed, all windows versions must work */ - if(cert3 == NULL) - { - todo_wine ok(0, "Must work on windows\n"); - goto skiptest; - } ok(cert3 != NULL, "CertCreateSelfSignCertificate should have worked\n"); ret = CertAddCertificateContextToStore(store, cert3, CERT_STORE_ADD_REPLACE_EXISTING, 0); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); @@ -1737,10 +1728,11 @@ todo_wine SetLastError(0xdeadbeef); flags = 0; parent = CertGetIssuerCertificateFromStore(store, cert3, NULL, &flags); +todo_wine ok(!parent, "Expected NULL\n"); +todo_wine ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); -skiptest: CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index dd61888..cf7c2ef 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -450,6 +450,15 @@ static BYTE encodedSemiCN[] = { static BYTE encodedNewlineCN[] = { 0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03,0x55,0x04,0x03,0x1e,0x06,0x00,0x61, 0x00,0x0a,0x00,0x62 }; +static BYTE encodedDummyCN[] = { +0x30,0x1F,0x31,0x0E,0x30,0x0C,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x64,0x75, +0x6D,0x6D,0x79,0x31,0x0D,0x30,0x0B,0x06,0x03,0x55,0x04,0x0C,0x13,0x04,0x74, +0x65,0x73,0x74 }; +static BYTE encodedFields[] = { +0x30,0x2F,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x57,0x69, +0x6E,0x65,0x20,0x54,0x65,0x73,0x74,0x31,0x0C,0x30,0x0A,0x06,0x03,0x55,0x04, +0x0C,0x13,0x03,0x31,0x32,0x33,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06, +0x13,0x02,0x42,0x52 }; static void test_CertNameToStrA(void) { @@ -756,6 +765,8 @@ static const struct StrToNameA namesA[] = { { "CN=\">\"", sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { "CN=\"#\"", sizeof(encodedHashCN), encodedHashCN }, { "CN=\";\"", sizeof(encodedSemiCN), encodedSemiCN }, + { "CN=dummy,T=test", sizeof(encodedDummyCN), encodedDummyCN }, + { " CN = Wine Test,T = 123, C = BR", sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameA(void) @@ -849,6 +860,10 @@ static const WCHAR badlyQuotedCN_W[] = { 'C','N','=','"','"','1','"','"',0 }; static const WCHAR simpleCN2_W[] = { 'C','N','=','"','1','"',0 }; static const WCHAR simpleCN3_W[] = { 'C','N',' ','=',' ','"','1','"',0 }; static const WCHAR japaneseCN_W[] = { 'C','N','=',0x226f,0x575b,0 }; +static const WCHAR dummyCN_W[] = { 'C','N','=','d','u','m','m','y',',','T','=','t','e','s','t',0 }; +static const WCHAR encodedFields_W[] = { ' ','C','N',' ','=',' ',' ',' ','W','i','n','e',' ','T', + 'e','s','t',',','T',' ','=',' ','1','2','3',',',' ','C', + ' ','=',' ','B','R',0 }; static const BYTE encodedJapaneseCN[] = { 0x30,0x0f,0x31,0x0d,0x30,0x0b,0x06, 0x03,0x55,0x04,0x03,0x1e,0x04,0x22,0x6f,0x57,0x5b }; @@ -867,6 +882,8 @@ static const struct StrToNameW namesW[] = { { greaterThanCN_W, sizeof(encodedGreaterThanCN), encodedGreaterThanCN }, { hashCN_W, sizeof(encodedHashCN), encodedHashCN }, { semiCN_W, sizeof(encodedSemiCN), encodedSemiCN }, + { dummyCN_W, sizeof(encodedDummyCN), encodedDummyCN }, + { encodedFields_W, sizeof(encodedFields), encodedFields }, }; static void test_CertStrToNameW(void) @@ -922,7 +939,7 @@ static void test_CertStrToNameW(void) size); if (ret) ok(!memcmp(buf, namesW[i].encoded, size), - "Index %d: unexpected value\n", i); + "Index %d: unexpected value for string %s\n", i, wine_dbgstr_w(namesW[i].x500)); } }

1 0

Jacek Caban : atl: Added AtlAxCreateControlLic(Ex) stubs.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 062f92a99cd3ca3aa2c5cd73de018757fdb0e2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062f92a99cd3ca3aa2c5cd73d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 22 13:23:00 2014 +0200 atl: Added AtlAxCreateControlLic(Ex) stubs. --- dlls/atl/atl_ax.c | 26 ++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 4 ++-- dlls/atl110/atl110.spec | 4 ++-- dlls/atl80/atl80.spec | 4 ++-- dlls/atl90/atl90.spec | 4 ++-- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index c77071d..5bafbf1 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1382,3 +1382,29 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); return 0; } + +#if _ATL_VER >= _ATL_VER_80 + +/*********************************************************************** + * AtlAxCreateControlLic [atl100.59] + * + */ +HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) +{ + FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); + return E_NOTIMPL; +} + +/*********************************************************************** + * AtlAxCreateControlLicEx [atl100.60] + * + */ +HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) +{ + FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, + debugstr_guid(iidSink), punkSink, debugstr_w(lic)); + return E_NOTIMPL; +} + +#endif diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index fb5fae8..f313944 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -43,8 +43,8 @@ 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA

1 0

David Hedberg : comdlg32: Populate psia_results before making any callbacks.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 7311a9fc6e866116056c020281cdcd6dd98aaf98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7311a9fc6e866116056c02028… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Jul 21 23:56:46 2014 +0200 comdlg32: Populate psia_results before making any callbacks. --- dlls/comdlg32/itemdlg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 2313b0a..21cdf89 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -536,9 +536,6 @@ static HRESULT on_default_action(FileDialogImpl *This) break; case ONOPEN_OPEN: - if(events_OnFileOk(This) != S_OK) - break; - hr = SHGetDesktopFolder(&psf_desktop); if(SUCCEEDED(hr)) { @@ -547,10 +544,11 @@ static HRESULT on_default_action(FileDialogImpl *This) hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla, &This->psia_results); - if(SUCCEEDED(hr)) - ret = S_OK; IShellFolder_Release(psf_desktop); + + if(SUCCEEDED(hr) && events_OnFileOk(This) == S_OK) + ret = S_OK; } break;

1 0

Marcus Meissner : secur32: Removed superflous NULL check (Coverity).
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 877f1a759e9c9ef92e808dc85445c5299e1074fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=877f1a759e9c9ef92e808dc85… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 09:02:32 2014 +0200 secur32: Removed superflous NULL check (Coverity). --- dlls/secur32/ntlm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5914fbc..0fe64ed 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1171,12 +1171,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( goto asc_end; } - if(!phContext) - { - ret = SEC_E_INVALID_HANDLE; - goto asc_end; - } - helper = (PNegoHelper)phContext->dwLower; if(helper->mode != NTLM_SERVER)

1 0

Zhenbo Li : mshtml: Fixed get_target_window when no parent frame is found.
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: fbc4d3f1602e6ae28ae92e497f2e01ccbb9cb224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc4d3f1602e6ae28ae92e497… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:20:39 2014 +0800 mshtml: Fixed get_target_window when no parent frame is found. --- dlls/mshtml/htmlanchor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a9187a4..0de0585 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -98,8 +98,9 @@ HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_st if(!strcmpiW(target, _parentW)) { if(!window->parent) { - WARN("Window has no parent\n"); - return NULL; + WARN("Window has no parent, treat as self\n"); + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + return window; } IHTMLWindow2_AddRef(&window->parent->base.IHTMLWindow2_iface);

1 0

Henri Verbeet : wined3d: Avoid a compiler warning in context_stream_info_from_declaration().
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 96d845aa468bf09f32c03fbee584201df52a3fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d845aa468bf09f32c03fbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:24 2014 +0200 wined3d: Avoid a compiler warning in context_stream_info_from_declaration(). --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 622cca1..70b9b31 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2794,7 +2794,7 @@ void context_stream_info_from_declaration(struct wined3d_context *context, stream_info->elements[idx].format = element->format; stream_info->elements[idx].data.buffer_object = 0; - stream_info->elements[idx].data.addr = (BYTE *)stream->offset + element->offset; + stream_info->elements[idx].data.addr = (BYTE *)NULL + stream->offset + element->offset; stream_info->elements[idx].stride = stream->stride; stream_info->elements[idx].stream_idx = element->input_slot;

1 0

Henri Verbeet : dxgi: Implement dxgi_surface_GetDesc().
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: d17bd8d82136853867de39988dc9342d7afd5945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17bd8d82136853867de39988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 22 08:44:20 2014 +0200 dxgi: Implement dxgi_surface_GetDesc(). --- dlls/d3d10core/texture.c | 8 +++++++- dlls/dxgi/device.c | 3 +-- dlls/dxgi/dxgi_private.h | 5 ++++- dlls/dxgi/surface.c | 12 +++++++++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index f169190..80ac899 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -253,6 +253,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic if (desc->MipLevels == 1 && desc->ArraySize == 1) { + DXGI_SURFACE_DESC surface_desc; IWineDXGIDevice *wine_device; if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice, @@ -262,7 +263,12 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic return E_FAIL; } - hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, + surface_desc.Width = desc->Width; + surface_desc.Height = desc->Height; + surface_desc.Format = desc->Format; + surface_desc.SampleDesc = desc->SampleDesc; + + hr = IWineDXGIDevice_create_surface(wine_device, &surface_desc, 0, NULL, (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index e98a2c0..837c57f 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -276,8 +276,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); - if (FAILED(hr)) + if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, desc))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 24d9a26..75126cf 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -142,8 +142,11 @@ struct dxgi_surface IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; + + DXGI_SURFACE_DESC desc; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 2814742..10daff7 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -154,9 +154,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REF /* IDXGISurface methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface *iface, DXGI_SURFACE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_surface *surface = impl_from_IDXGISurface(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = surface->desc; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) @@ -200,13 +204,15 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, + IUnknown *outer, const DXGI_SURFACE_DESC *desc) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; + surface->desc = *desc; return S_OK; }

1 0

Marcus Meissner : d3dx9_36: Fixed typo in HeapAlloc return checking ( Coverity).
by Alexandre Julliard July 22, 2014

July 22, 2014

Module: wine Branch: master Commit: 20ef8d29911fdd6f63bdc95ff67482da2b0f9084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ef8d29911fdd6f63bdc95ff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jul 22 08:24:55 2014 +0200 d3dx9_36: Fixed typo in HeapAlloc return checking (Coverity). --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 4d11618..17c5d9c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3687,7 +3687,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, } HeapFree(GetProcessHeap(), 0, raw_outline); raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); - if (!glyphs) { + if (!raw_outline) { hr = E_OUTOFMEMORY; goto error; }

1 0