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

Michael Stefaniuc : wordpad: Use InflateRect() instead of open coding it.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 098adff646f7c5d639a974924f9294787db17bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098adff646f7c5d639a974924… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:55:39 2016 +0200 wordpad: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 3b78ffa..6c7c4f6 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -881,10 +881,7 @@ static LRESULT print_preview(HWND hwndPreview) draw_margin_lines(hdc, x, y, preview.zoomratio); } else { - background.left += 2; - background.right -= 2; - background.top += 2; - background.bottom -= 2; + InflateRect(&background, -2, -2); FillRect(hdc, &background, GetStockObject(WHITE_BRUSH)); } }

1 0

Alexandre Julliard : tools: Update all makefiles in a single pass.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c6cded7460539e77a00938d7bf769020066d994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6cded7460539e77a00938d7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 4 11:04:49 2016 +0900 tools: Update all makefiles in a single pass. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_makefiles | 106 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 1a01666..4f1d882 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -51,10 +51,28 @@ my %ignored_source_files = ( "dlls/wineps.drv/afm2c.c" => 1, "dlls/wineps.drv/mkagl.c" => 1, "include/config.h.in" => 1, + "include/stamp-h.in" => 1, "programs/winetest/dist.rc" => 1, "tools/makedep.c" => 1, ); +my @source_vars = ( + "BISON_SRCS", + "C_SRCS", + "FONT_SRCS", + "HEADER_SRCS", + "IDL_SRCS", + "IN_SRCS", + "LEX_SRCS", + "MANPAGES", + "MC_SRCS", + "OBJC_SRCS", + "PO_SRCS", + "RC_SRCS", + "SVG_SRCS", + "XTEMPLATE_SRCS" +); + my (@makefiles, %makefiles); sub dirname($) @@ -123,64 +141,79 @@ sub replace_in_file($$$@) return update_file($file); } -# replace a variable in a makefile -sub replace_makefile_variable($$) +# replace all source variables in a makefile +sub replace_makefile_variables($) { - my ($file, $var) = @_; + my $file = shift; my $make = $makefiles{$file}; - my $replaced = 0; - my @values; - - if (defined ${$make}{"=$var"}) - { - @values = @{${$make}{"=$var"}}; - ${$make}{$var} = \@values; - } - else - { - return unless defined ${$make}{$var}; - undef ${$make}{$var}; - } + 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"; open OLD_FILE, "$file.in" or die "cannot open $file.in"; while (<OLD_FILE>) { - if (/^\s*($var\s*)=/) + if (/^\s*($source_vars_regexp)(\s*)=/) { # try to preserve formatting - my $prefix = $1; + my $var = $1; + my $spaces = $2; + my $replaced = 0; + my @values; + + if (defined ${$make}{"=$var"}) + { + @values = @{${$make}{"=$var"}}; + ${$make}{$var} = \@values; + } + else + { + undef ${$make}{$var}; + } my $multiline = /\\$/ || (@values > 1); + my $old_str = $_; while (/\\$/) { $_ = <OLD_FILE>; last unless $_; + $old_str .= $_; } + my $new_str = ""; if (!@values) { # nothing } elsif ($multiline) { - print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + $new_str = "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + print NEW_FILE $new_str; } else { - print NEW_FILE "$prefix= @values\n"; + $new_str = "$var$spaces= @values\n"; + print NEW_FILE $new_str; } - $replaced = 1; + $modified = 1 if ($old_str ne $new_str); + $replaced{$var} = 1; next; } - if (/^\@MAKE/ && !$replaced && @values) - { - print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; - } print NEW_FILE $_; } + foreach my $var (@source_vars) + { + next if defined $replaced{$var}; + 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; + } close OLD_FILE; close NEW_FILE; - return update_file("$file.in"); + return update_file("$file.in") if $modified; + unlink "$file.in.new"; } # parse the specified makefile and load the variables @@ -211,7 +244,8 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PO_SRCS|PROGRAMS|EXTRA_TARGETS|MANPAGES|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) + my $source_vars_regexp = join "|", @source_vars; + if (/^\s*($source_vars_regexp|PROGRAMS|EXTRA_TARGETS|EXTRA_OBJS|INSTALL_LIB|INSTALL_DEV)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -510,23 +544,7 @@ sub update_makefiles(@) # update the source variables in all the makefiles - foreach my $file (sort @_) - { - replace_makefile_variable( $file, "LEX_SRCS" ); - replace_makefile_variable( $file, "BISON_SRCS" ); - replace_makefile_variable( $file, "MC_SRCS" ); - replace_makefile_variable( $file, "SVG_SRCS" ); - replace_makefile_variable( $file, "FONT_SRCS" ); - replace_makefile_variable( $file, "C_SRCS" ); - replace_makefile_variable( $file, "OBJC_SRCS" ); - replace_makefile_variable( $file, "RC_SRCS" ); - replace_makefile_variable( $file, "IDL_SRCS" ); - replace_makefile_variable( $file, "HEADER_SRCS" ); - replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); - replace_makefile_variable( $file, "PO_SRCS" ); - replace_makefile_variable( $file, "IN_SRCS" ); - replace_makefile_variable( $file, "MANPAGES" ); - } + foreach my $file (sort @_) { replace_makefile_variables( $file ); } push @lines, "dnl End of auto-generated output commands\n"; replace_in_file( "configure.ac", '^WINE_CONFIG_DLL', '^dnl End of auto-generated output commands\n$', @lines);

1 0

Michael Stefaniuc : msxml3: Don't cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 158e7e26fc18614bcf07a15c2a2d070289bb03b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158e7e26fc18614bcf07a15c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 29 09:52:29 2016 +0200 msxml3: Don't cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e0f08ea..e0b6e1c 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1560,19 +1560,19 @@ static HRESULT WINAPI httprequest_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppvObject ); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, ppvObject); } static ULONG WINAPI httprequest_ObjectWithSite_AddRef( IObjectWithSite* iface ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); } static ULONG WINAPI httprequest_ObjectWithSite_Release( IObjectWithSite* iface ) { httprequest *This = impl_from_IObjectWithSite(iface); - return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); } static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface, REFIID iid, void **ppvSite ) @@ -1656,19 +1656,19 @@ static const IObjectWithSiteVtbl ObjectWithSiteVtbl = static HRESULT WINAPI httprequest_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_QueryInterface( (IXMLHTTPRequest *)This, riid, ppv ); + return IXMLHTTPRequest_QueryInterface(&This->IXMLHTTPRequest_iface, riid, ppv); } static ULONG WINAPI httprequest_Safety_AddRef(IObjectSafety *iface) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_AddRef((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_AddRef(&This->IXMLHTTPRequest_iface); } static ULONG WINAPI httprequest_Safety_Release(IObjectSafety *iface) { httprequest *This = impl_from_IObjectSafety(iface); - return IXMLHTTPRequest_Release((IXMLHTTPRequest *)This); + return IXMLHTTPRequest_Release(&This->IXMLHTTPRequest_iface); } static HRESULT WINAPI httprequest_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid,

1 0

Michael Stefaniuc : riched20/tests: Use InflateRect() instead of open coding it.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: fe2f34a5c78762b924569723244fbf1db41a3a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f34a5c78762b9245697232… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:36:17 2016 +0200 riched20/tests: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 200ce53..fd5bcc4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7057,10 +7057,7 @@ static void test_format_rect(void) for (n = -3; n <= 3; n++) { rc = clientRect; - rc.top += n; - rc.left += n; - rc.bottom -= n; - rc.right -= n; + InflateRect(&rc, -n, -n); SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = rc; @@ -7206,10 +7203,7 @@ static void test_format_rect(void) expected.top, expected.left, expected.bottom, expected.right); rc = clientRect; - rc.top += 5; - rc.left += 5; - rc.bottom -= 5; - rc.right -= 5; + InflateRect(&rc, -5, -5); expected = rc; expected.top -= 1; expected.left -= 1;

1 0

Michael Stefaniuc : comctl32: Use InflateRect() instead of open coding it.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 1f74c0a0d16f68d2759779199dd0ad7b74d604bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f74c0a0d16f68d2759779199… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:40:37 2016 +0200 comctl32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tab.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index fb999ce..d228c07 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1609,12 +1609,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect } } else - { - drawRect->left += 2; - drawRect->top += 2; - drawRect->right -= 2; - drawRect->bottom -= 2; - } + InflateRect(drawRect, -2, -2); } else {

1 0

Michael Stefaniuc : comdlg32: Use InflateRect() instead of open coding it.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 3ad882ff24d5bc12e8b37573ed46091f4f43a811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad882ff24d5bc12e8b37573e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:43:35 2016 +0200 comdlg32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/printdlg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index a389e53..83335a9 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3617,11 +3617,8 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) default_page_paint_hook(hWnd, WM_PSD_MARGINRECT, (WPARAM)hdc, (LPARAM)&rcMargin, data); /* give text a bit of a space from the frame */ - rcMargin.left += 2; - rcMargin.top += 2; - rcMargin.right -= 2; - rcMargin.bottom -= 2; - + InflateRect(&rcMargin, -2, -2); + /* if the space is too small then we make sure to not draw anything */ rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.top = min(rcMargin.top, rcMargin.bottom);

1 0

Michael Stefaniuc : pstorec: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 14d3dfde67705f09d2c88013c97bd6ca45fff3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d3dfde67705f09d2c88013c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:27:53 2016 +0200 pstorec: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/pstorec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index b100a08..269ebca 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -364,7 +364,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider, ips->IPStore_iface.lpVtbl = &pstores_vtbl; ips->ref = 1; - *ppProvider = (IPStore*) ips; + *ppProvider = &ips->IPStore_iface; return S_OK; }

1 0

Michael Stefaniuc : dispex/tests: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c9acabe1ddcfa2953fb0de1fb9368471be6af030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9acabe1ddcfa2953fb0de1fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:28:45 2016 +0200 dispex/tests: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/tests/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 0211cd7..c4917c6 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -356,7 +356,7 @@ static IDispatchEx *dispex_create(void) if (!This) return NULL; This->IDispatchEx_iface.lpVtbl = &dispex_vtable; This->refs = 1; - return (IDispatchEx *)This; + return &This->IDispatchEx_iface; } static void test_dispex(void)

1 0

Michael Stefaniuc : msimtf: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c65325c584a5cecec49721ba7e0f643075bc6321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65325c584a5cecec49721ba7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:29:06 2016 +0200 msimtf: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimtf/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index daae817..78c26cb 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -141,7 +141,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) ActiveIMMApp_Constructor, }; - return IClassFactory_QueryInterface((IClassFactory*)&cf, riid, ppv); + return IClassFactory_QueryInterface(&cf.IClassFactory_iface, riid, ppv); } FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);

1 0

Michael Stefaniuc : msctf: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 8e2db1dfe1201c5387771094e3708ce3dbf2fc25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2db1dfe1201c5387771094e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:29:56 2016 +0200 msctf: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/threadmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index e645619..528414f 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1488,8 +1488,8 @@ static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentM This->head = head; This->index = list_head(This->head); - TRACE("returning %p\n", This); - *ppOut = (IEnumTfDocumentMgrs*)This; + TRACE("returning %p\n", &This->IEnumTfDocumentMgrs_iface); + *ppOut = &This->IEnumTfDocumentMgrs_iface; return S_OK; }

1 0