July 2016 - Wine-commits - list.winehq.org

Jacek Caban : wininet: Free all cookie data in free_cookie.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 8332d8066574e98690101b4523e3afc00ae9f352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8332d8066574e98690101b452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:43:35 2016 +0200 wininet: Free all cookie data in free_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 38f69e0..3240633 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -684,6 +684,33 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) return res; } +static void free_cookie_domain_list(struct list *list) +{ + cookie_container_t *container; + cookie_domain_t *domain; + + while(!list_empty(list)) { + domain = LIST_ENTRY(list_next(list, list), cookie_domain_t, entry); + + free_cookie_domain_list(&domain->subdomain_list); + + while(!list_empty(&domain->path_list)) { + container = LIST_ENTRY(list_next(&domain->path_list, &domain->path_list), cookie_container_t, entry); + + while(!list_empty(&container->cookie_list)) + delete_cookie(LIST_ENTRY(list_next(&container->cookie_list, &container->cookie_list), cookie_t, entry)); + + heap_free(container->cookie_url); + list_remove(&container->entry); + heap_free(container); + } + + heap_free(domain->domain); + list_remove(&domain->entry); + heap_free(domain); + } +} + /*********************************************************************** * InternetGetCookieExW (WININET.@) * @@ -1239,5 +1266,9 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci void free_cookie(void) { - DeleteCriticalSection(&cookie_cs); + EnterCriticalSection(&cookie_cs); + + free_cookie_domain_list(&domain_list); + + LeaveCriticalSection(&cookie_cs); }

1 0

Jacek Caban : wininet: Always set returned size in InternetGetCookieExA.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: b53b717dadcaf5fb4e2af1985a42e5ca7f495062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b717dadcaf5fb4e2af1985… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:44:01 2016 +0200 wininet: Always set returned size in InternetGetCookieExA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 4 ++-- dlls/wininet/tests/internet.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 3240633..5421fe1 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -808,7 +808,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR *url, *name; - DWORD len, size; + DWORD len, size = 0; BOOL r; TRACE("(%s %s %p %p(%u) %x %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), @@ -841,12 +841,12 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, r = FALSE; } } - *lpdwSize = size; } heap_free( szCookieData ); } } + *lpdwSize = size; heap_free( name ); heap_free( url ); return r; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9b0a2e7..ac8e9b3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -360,11 +360,13 @@ static void test_get_cookie(void) DWORD len; BOOL ret; + len = 1024; SetLastError(0xdeadbeef); ret = InternetGetCookieA("http://www.example.com", NULL, NULL, &len); ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie should have failed with %s and error %d\n", ret ? "TRUE" : "FALSE", GetLastError()); + ok(!len, "len = %u\n", len); }

1 0

Jacek Caban : wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 27ea3804ddc8077fedb7a0ea81ac96910f78a26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ea3804ddc8077fedb7a0ea8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:44:15 2016 +0200 wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 ++- dlls/wininet/tests/internet.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d3d6a38..19cf470 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2805,7 +2805,8 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, FIXME("Option INTERNET_OPTION_RESET_URLCACHE_SESSION: STUB\n"); break; case INTERNET_OPTION_END_BROWSER_SESSION: - FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: STUB\n"); + FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: semi-stub\n"); + free_cookie(); break; case INTERNET_OPTION_CONNECTED_STATE: FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n"); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index ac8e9b3..5408af8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1173,6 +1173,28 @@ static void test_InternetSetOption(void) ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); } +static void test_end_browser_session(void) +{ + DWORD len; + BOOL ret; + + ret = InternetSetCookieA("http://www.example.com/test_end", NULL, "A=B"); + ok(ret == TRUE, "InternetSetCookie failed\n"); + + len = 1024; + ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len != 0, "len = 0\n"); + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "InternetSetOptio(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + + len = 1024; + ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie returned %x (%u)\n", ret, GetLastError()); + ok(!len, "len = %u\n", len); +} + #define verifyProxyEnable(e) r_verifyProxyEnable(__LINE__, e) static void r_verifyProxyEnable(LONG l, DWORD exp) { @@ -1805,4 +1827,5 @@ START_TEST(internet) win_skip("Privacy[SG]etZonePreferenceW are not available\n"); test_InternetSetOption(); + test_end_browser_session(); }

1 0

Jacek Caban : mshtml: Use callback to register additional IDispatch interfaces.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: f6a00dbd25d009aebc0f300b9039537ecc255ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a00dbd25d009aebc0f300b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:48:20 2016 +0200 mshtml: Use callback to register additional IDispatch interfaces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 15 ++++++++++++--- dlls/mshtml/htmlwindow.c | 7 ++++++- dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 9a2cebd..791f361 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -343,6 +343,15 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp return S_OK; } +void dispex_info_add_interface(dispex_data_t *info, tid_t tid) +{ + HRESULT hres; + + hres = process_interface(info, tid, NULL); + if(FAILED(hres)) + ERR("process_interface failed: %08x\n", hres); +} + static int dispid_cmp(const void *p1, const void *p2) { return ((const func_info_t*)p1)->id - ((const func_info_t*)p2)->id; @@ -386,15 +395,15 @@ static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc) } list_add_tail(&dispex_data_list, &data->entry); + if(desc->init_info) + desc->init_info(data); + for(tid = desc->iface_tids; *tid; tid++) { hres = process_interface(data, *tid, dti); if(FAILED(hres)) break; } - if(desc->additional_tid) - process_interface(data, desc->additional_tid, NULL); - if(!data->func_cnt) { heap_free(data->funcs); data->name_table = NULL; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b75c9ba..54cd078 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2936,6 +2936,11 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); } +static void HTMLWindow_init_dispex_info(dispex_data_t *info) +{ + dispex_info_add_interface(info, IHTMLWindow5_tid); +} + static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, NULL, @@ -2957,7 +2962,7 @@ static dispex_static_data_t HTMLWindow_dispex = { &HTMLWindow_dispex_vtbl, DispHTMLWindow2_tid, HTMLWindow_iface_tids, - IHTMLWindow5_tid + HTMLWindow_init_dispex_info }; static void *alloc_window(size_t size) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 04a1ccf..412db24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -265,7 +265,7 @@ typedef struct { const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; const tid_t* const iface_tids; - const tid_t additional_tid; + void (*init_info)(dispex_data_t*); dispex_data_t *data; } dispex_static_data_t; @@ -317,6 +317,7 @@ void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; +void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN; typedef enum { DISPEXPROP_CUSTOM,

1 0

Ken Thomases : winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 10065d2acd0a9e1e852a8151c95569b99d1b3294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10065d2acd0a9e1e852a8151c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 27 15:34:07 2016 -0500 winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK. The cupsGetPPD() function was moved there from <cups/cups.h> because it's deprecated. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++++++++ configure.ac | 3 ++- dlls/winspool.drv/info.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0e1694c..6379e31 100755 --- a/configure +++ b/configure @@ -13054,6 +13054,18 @@ _ACEOF CUPS_CFLAGS="$ac_cups_cflags" fi + for ac_header in cups/ppd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default" +if test "x$ac_cv_header_cups_ppd_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CUPS_PPD_H 1 +_ACEOF + +fi + +done + fi done diff --git a/configure.ac b/configure.ac index 7f234b2..e7c1dd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1543,7 +1543,8 @@ then AC_CHECK_HEADERS(cups/cups.h, [WINE_CHECK_SONAME(cups,cupsGetDefault, [CUPS_CFLAGS="$ac_cups_cflags"],, - [$ac_cups_libs])]) + [$ac_cups_libs]) + AC_CHECK_HEADERS(cups/ppd.h)]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 95f397c..4dea531 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -44,6 +44,9 @@ #ifdef HAVE_CUPS_CUPS_H # include <cups/cups.h> #endif +#ifdef HAVE_CUPS_PPD_H +# include <cups/ppd.h> +#endif #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H #define GetCurrentProcess GetCurrentProcess_Mac diff --git a/include/config.h.in b/include/config.h.in index 8cffef9..6fd84bf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -89,6 +89,9 @@ /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H +/* Define to 1 if you have the <cups/ppd.h> header file. */ +#undef HAVE_CUPS_PPD_H + /* Define to 1 if you have the <curses.h> header file. */ #undef HAVE_CURSES_H

1 0

Andrey Gusev : pstorec: Fix a typo in PStore_fnOpenItem declaration.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 7691a18476e7f24388915a92601f932aeb737a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7691a18476e7f24388915a926… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 16:10:31 2016 +0300 pstorec: Fix a typo in PStore_fnOpenItem declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/pstorec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 269ebca..593629b 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -294,10 +294,10 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, */ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, - PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pProomptInfo, DWORD dwFlags ) + PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags ) { FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), - debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); + debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pPromptInfo, dwFlags); return E_NOTIMPL; }

1 0

Andrey Gusev : include: Fix a typo in IPStore interface.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: ca5d6c73fe593c8fa357939ef6d8fd7fc61a5c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5d6c73fe593c8fa357939ef… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jul 5 16:10:32 2016 +0300 include: Fix a typo in IPStore interface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/pstore.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pstore.idl b/include/pstore.idl index 4f9623e..a963b25 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -255,7 +255,7 @@ interface IPStore : IUnknown [in] const GUID* pItemSubtype, [in] LPCWSTR szItemName, [in] PST_ACCESSMODE ModeFlags, - [in] PPST_PROMPTINFO pProomptInfo, + [in] PPST_PROMPTINFO pPromptInfo, [in] DWORD dwFlags ); HRESULT CloseItem(

1 0

Alexandre Julliard : tools: Compare file contents directly in Perl instead of invoking cmp.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: af91122caf39c22cbf635d79f39fa44f91f47541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af91122caf39c22cbf635d79f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 15:32:16 2016 +0900 tools: Compare file contents directly in Perl instead of invoking cmp. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 81 ++++++++++++++++++++++------------------------------ tools/make_specfiles | 30 +++++++++---------- 2 files changed, 47 insertions(+), 64 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 4f1d882..8411ecb 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -84,25 +84,21 @@ sub dirname($) } # update a file if changed -sub update_file($) +sub update_file($$) { my $file = shift; - my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null"; - if (!$ret) + my $new = shift; + + open FILE, ">$file.new" or die "cannot create $file.new"; + print FILE $new; + close FILE; + rename "$file.new", "$file"; + print "$file updated\n"; + if ($file eq "configure.ac") { - unlink "$file.new"; + system "autoconf"; + print "configure updated\n"; } - else - { - rename "$file.new", "$file"; - print "$file updated\n"; - if ($file eq "configure.ac") - { - system "autoconf"; - print "configure updated\n"; - } - } - return $ret; } # replace some lines in a file between two markers @@ -111,34 +107,28 @@ sub replace_in_file($$$@) my $file = shift; my $start = shift; my $end = shift; + my ($old, $new); - open NEW_FILE, ">$file.new" or die "cannot create $file.new"; - - if (defined($start)) + open OLD_FILE, "$file" or die "cannot open $file"; + while (<OLD_FILE>) { - open OLD_FILE, "$file" or die "cannot open $file"; - while (<OLD_FILE>) - { - last if /$start/; - print NEW_FILE $_; - } + $old .= $_; + last if /$start/; + $new .= $_; } - print NEW_FILE @_; + $new .= join "", @_; - if (defined($end)) + my $skip = 1; + while (<OLD_FILE>) { - my $skip=1; - while (<OLD_FILE>) - { - print NEW_FILE $_ unless $skip; - $skip = 0 if /$end/; - } + $old .= $_; + $new .= $_ unless $skip; + $skip = 0 if /$end/; } - close OLD_FILE if defined($start); - close NEW_FILE; - return update_file($file); + close OLD_FILE; + update_file($file, $new) if $old ne $new; } # replace all source variables in a makefile @@ -147,14 +137,14 @@ sub replace_makefile_variables($) my $file = shift; my $make = $makefiles{$file}; my $source_vars_regexp = join "|", @source_vars; - my $modified = 0; my %replaced; - - open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new"; + my $old; + my $new; open OLD_FILE, "$file.in" or die "cannot open $file.in"; while (<OLD_FILE>) { + $old .= $_; if (/^\s*($source_vars_regexp)(\s*)=/) { # try to preserve formatting @@ -178,6 +168,7 @@ sub replace_makefile_variables($) { $_ = <OLD_FILE>; last unless $_; + $old .= $_; $old_str .= $_; } my $new_str = ""; @@ -188,18 +179,17 @@ sub replace_makefile_variables($) elsif ($multiline) { $new_str = "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; - print NEW_FILE $new_str; + $new .= $new_str; } else { $new_str = "$var$spaces= @values\n"; - print NEW_FILE $new_str; + $new .= $new_str; } - $modified = 1 if ($old_str ne $new_str); $replaced{$var} = 1; next; } - print NEW_FILE $_; + $new .= $_; } foreach my $var (@source_vars) { @@ -207,13 +197,10 @@ sub replace_makefile_variables($) next unless defined ${$make}{"=$var"}; my @values = @{${$make}{"=$var"}}; next unless @values; - print NEW_FILE "\n$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; - $modified = 1; + $new .= "\n$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; } close OLD_FILE; - close NEW_FILE; - return update_file("$file.in") if $modified; - unlink "$file.in.new"; + update_file("$file.in", $new) if $old ne $new; } # parse the specified makefile and load the variables diff --git a/tools/make_specfiles b/tools/make_specfiles index 85d39d8..b0cc3f4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -263,21 +263,17 @@ foreach my $arg (@ARGV) elsif ($arg eq "-d") { $show_duplicates = 1; } } -sub update_file($) +# update a file if changed +sub update_file($$) { my $file = shift; - my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null"; - if (!$ret) - { - unlink "$file.new"; - } - else - { - #system "diff -u $file $file.new"; - rename "$file.new", "$file"; - print "$file updated\n"; - } - return $ret; + my $new = shift; + + open FILE, ">$file.new" or die "cannot create $file.new"; + print FILE $new; + close FILE; + rename "$file.new", "$file"; + print "$file updated\n"; } # parse a spec file line @@ -319,11 +315,12 @@ sub update_spec_file($) my $name = shift; my $file = "dlls/$name/$name.spec"; my %stubs; + my ($old, $new); open SPEC, "<$file" or die "cannot open $file"; - open NEW, ">$file.new" or die "cannot create $file.new"; while (<SPEC>) { + $old .= $_; chomp; my $commented_out = 0; @@ -389,11 +386,10 @@ sub update_spec_file($) $_ .= $descr{comment} || ""; done: - print NEW "$_\n"; + $new .= "$_\n"; } close SPEC; - close NEW; - update_file( $file ); + update_file( $file, $new ) if $old ne $new; } sub sync_spec_files(@)

1 0

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: a1f0d09ab3c408907b3098b7e12a7a24528f6cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f0d09ab3c408907b3098b7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:57:04 2016 +0200 user32/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 21 ++++++--------------- dlls/user32/tests/win.c | 3 +-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 7691af3..0bda5dd 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -222,11 +222,8 @@ static void test_GetScrollBarInfo(void) ok( ret, "The GetWindowRect() call should not fail.\n" ); ok( !(sbi.rgstate[0] & (STATE_SYSTEM_INVISIBLE|STATE_SYSTEM_OFFSCREEN)), "unexpected rgstate(0x%x)\n", sbi.rgstate[0]); - ok( EqualRect(&rect, &sbi.rcScrollBar), - "WindowRect(%d, %d, %d, %d) != rcScrollBar(%d, %d, %d, %d)\n", - rect.top, rect.left, rect.bottom, rect.right, - sbi.rcScrollBar.top, sbi.rcScrollBar.left, - sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + ok(EqualRect(&rect, &sbi.rcScrollBar), "WindowRect %s != rcScrollBar %s\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&sbi.rcScrollBar)); /* Test windows horizontal and vertical scrollbar to make sure rcScrollBar * is still returned in screen coordinates by moving the window, and @@ -243,11 +240,8 @@ static void test_GetScrollBarInfo(void) OffsetRect(&rect, 5, 5); ret = pGetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); - ok( EqualRect(&rect, &sbi.rcScrollBar), - "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", - rect.top, rect.left, rect.bottom, rect.right, - sbi.rcScrollBar.top, sbi.rcScrollBar.left, - sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + ok(EqualRect(&rect, &sbi.rcScrollBar), "PreviousRect %s != CurrentRect %s\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&sbi.rcScrollBar)); sbi.cbSize = sizeof(sbi); ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); @@ -260,11 +254,8 @@ static void test_GetScrollBarInfo(void) OffsetRect(&rect, 5, 5); ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); - ok( EqualRect(&rect, &sbi.rcScrollBar), - "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", - rect.top, rect.left, rect.bottom, rect.right, - sbi.rcScrollBar.top, sbi.rcScrollBar.left, - sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); + ok(EqualRect(&rect, &sbi.rcScrollBar), "PreviousRect %s != CurrentRect %s\n", + wine_dbgstr_rect(&rect), wine_dbgstr_rect(&sbi.rcScrollBar)); DestroyWindow(hScroll); DestroyWindow(hMainWnd); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8505983..7195102 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2504,8 +2504,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd_desktop, 0, 0, 0, 0, 0); ok(!ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", - rc1.top, rc1.left, rc1.bottom, rc1.right, rc2.top, rc2.left, rc2.bottom, rc2.right); + ok(EqualRect(&rc1, &rc2), "%s != %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); check_active_state(hwnd2, hwnd2, hwnd2); ret = SetWindowPos(hwnd_desktop, hwnd_child, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);

1 0

Michael Stefaniuc : ole32: Avoid casts from the IMultiQI iface to the COM object.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 08e571cf95c50fe2be7d4ad07c3d288f014fbca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e571cf95c50fe2be7d4ad07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:46:56 2016 +0200 ole32: Avoid casts from the IMultiQI iface to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index e0a3c3d..b39dac0 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -73,6 +73,11 @@ struct proxy_manager void *dest_context_data; /* reserved context value (LOCK) */ }; +static inline struct proxy_manager *impl_from_IMultiQI( IMultiQI *iface ) +{ + return CONTAINING_RECORD(iface, struct proxy_manager, IMultiQI_iface); +} + static inline struct proxy_manager *impl_from_IMarshal( IMarshal *iface ) { return CONTAINING_RECORD(iface, struct proxy_manager, IMarshal_iface); @@ -231,16 +236,16 @@ static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID rii return hr; } -static ULONG WINAPI ClientIdentity_AddRef(IMultiQI * iface) +static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); TRACE("%p - before %d\n", iface, This->refs); return InterlockedIncrement(&This->refs); } -static ULONG WINAPI ClientIdentity_Release(IMultiQI * iface) +static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); ULONG refs = InterlockedDecrement(&This->refs); TRACE("%p - after %d\n", iface, refs); if (!refs) @@ -250,7 +255,7 @@ static ULONG WINAPI ClientIdentity_Release(IMultiQI * iface) static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, ULONG cMQIs, MULTI_QI *pMQIs) { - struct proxy_manager * This = (struct proxy_manager *)iface; + struct proxy_manager *This = impl_from_IMultiQI(iface); REMQIRESULT *qiresults = NULL; ULONG nonlocal_mqis = 0; ULONG i;

1 0