wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

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 : 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 : 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 : 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 : 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

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 : 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

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

04 Jul '16

Module: wine Branch: master Commit: 8e05ddb1f89f81803993d3d0e2b113979318f842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e05ddb1f89f81803993d3d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:54:38 2016 +0200 wordpad: Use SetRect() 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 | 46 ++++++++++++--------------------------------- programs/wordpad/registry.c | 7 +------ 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index b3ee579..3b78ffa 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -88,12 +88,7 @@ void registry_read_pagemargins(HKEY hKey) if(!hKey || RegQueryValueExW(hKey, var_pagemargin, 0, NULL, (LPBYTE)&margins, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - margins.top = 1417; - margins.bottom = 1417; - margins.left = 1757; - margins.right = 1757; - } + SetRect(&margins, 1757, 1417, 1757, 1417); } void registry_set_previewpages(HKEY hKey) @@ -201,10 +196,7 @@ static RECT get_print_rect(HDC hdc) height = centmm_to_twips(27000); } - rc.left = margins.left; - rc.right = width - margins.right; - rc.top = margins.top; - rc.bottom = height - margins.bottom; + SetRect(&rc, margins.left, margins.top, width - margins.right, height - margins.bottom); return rc; } @@ -452,10 +444,7 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) fr.hdcTarget = pd->hDC; fr.rc = get_print_rect(fr.hdc); - fr.rcPage.left = 0; - fr.rcPage.right = fr.rc.right + margins.right; - fr.rcPage.top = 0; - fr.rcPage.bottom = fr.rc.bottom + margins.bottom; + SetRect(&fr.rcPage, 0, 0, fr.rc.right + margins.right, fr.rc.bottom + margins.bottom); ZeroMemory(&di, sizeof(di)); di.cbSize = sizeof(di); @@ -512,19 +501,15 @@ void dialog_printsetup(HWND hMainWnd) ps.lStructSize = sizeof(ps); ps.hwndOwner = hMainWnd; ps.Flags = PSD_INHUNDREDTHSOFMILLIMETERS | PSD_MARGINS; - ps.rtMargin.left = twips_to_centmm(margins.left); - ps.rtMargin.right = twips_to_centmm(margins.right); - ps.rtMargin.top = twips_to_centmm(margins.top); - ps.rtMargin.bottom = twips_to_centmm(margins.bottom); + SetRect(&ps.rtMargin, twips_to_centmm(margins.left), twips_to_centmm(margins.top), + twips_to_centmm(margins.right), twips_to_centmm(margins.bottom)); ps.hDevMode = devMode; ps.hDevNames = devNames; if(PageSetupDlgW(&ps)) { - margins.left = centmm_to_twips(ps.rtMargin.left); - margins.right = centmm_to_twips(ps.rtMargin.right); - margins.top = centmm_to_twips(ps.rtMargin.top); - margins.bottom = centmm_to_twips(ps.rtMargin.bottom); + SetRect(&margins, centmm_to_twips(ps.rtMargin.left), centmm_to_twips(ps.rtMargin.top), + centmm_to_twips(ps.rtMargin.right), centmm_to_twips(ps.rtMargin.bottom)); devMode = ps.hDevMode; devNames = ps.hDevNames; update_ruler(get_ruler_wnd(hMainWnd)); @@ -713,10 +698,8 @@ static void draw_margin_lines(HDC hdc, int x, int y, float ratio) dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); - page_margin.left = preview.rcPage.left + margins.left; - page_margin.top = preview.rcPage.top + margins.top; - page_margin.bottom = preview.rcPage.bottom - margins.bottom; - page_margin.right = preview.rcPage.right - margins.right; + SetRect(&page_margin, preview.rcPage.left + margins.left, preview.rcPage.top + margins.top, + preview.rcPage.right - margins.right, preview.rcPage.bottom - margins.bottom); page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); @@ -860,10 +843,8 @@ static LRESULT print_preview(HWND hwndPreview) /* draw page outlines */ hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); oldPen = SelectObject(hdc, hPen); - background.left = x - 2; - background.right = x + preview.bmScaledSize.cx + 2; - background.top = y - 2; - background.bottom = y + preview.bmScaledSize.cy + 2; + SetRect(&background, x - 2, y - 2, x + preview.bmScaledSize.cx + 2, + y + preview.bmScaledSize.cy + 2); Rectangle(hdc, background.left, background.top, background.right, background.bottom); excl_rgn = CreateRectRgnIndirect(&background); @@ -956,10 +937,7 @@ static void update_preview(HWND hMainWnd) fr.chrg.cpMin = 0; fr.chrg.cpMax = preview.textlength; - paper.left = 0; - paper.right = preview.bmSize.cx; - paper.top = 0; - paper.bottom = preview.bmSize.cy; + SetRect(&paper, 0, 0, preview.bmSize.cx, preview.bmSize.cy); if (!preview.hdc) { preview.hdc = CreateCompatibleDC(hdc); diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index d53b747..6f7f14b 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -114,12 +114,7 @@ void registry_read_winrect(RECT* rc) if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - rc->top = 0; - rc->left = 0; - rc->bottom = 300; - rc->right = 600; - } + SetRect(rc, 0, 0, 600, 300); RegCloseKey(hKey); }

1 0

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

04 Jul '16

Module: wine Branch: master Commit: 925217b8578472f66d70480d167e15049f670f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925217b8578472f66d70480d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:53:46 2016 +0200 winemine: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 706e208..71ff75e 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -313,10 +313,8 @@ static void CreateBoard( BOARD *p_board ) p_board->face_bmp = SMILE_BMP; p_board->time = 0; - wnd_rect.left = p_board->pos.x; - wnd_rect.right = p_board->pos.x + p_board->width; - wnd_rect.top = p_board->pos.y; - wnd_rect.bottom = p_board->pos.y + p_board->height; + SetRect(&wnd_rect, p_board->pos.x, p_board->pos.y, p_board->pos.x + p_board->width, + p_board->pos.y + p_board->height); AdjustWindowRect(&wnd_rect, wnd_style, TRUE); /* Make sure the window is completely on the screen */

1 0

Francois Gouget : kernel32: Fix typos in a couple of comments.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c8d1fbc6d2170d935301e7c54244af5ab873c7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1fbc6d2170d935301e7c54… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 12:00:39 2016 +0200 kernel32: Fix typos in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/volume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 39769ff..fefa373 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -915,7 +915,7 @@ void LOCALE_InitRegistry(void) /*********************************************************************** * get_mac_locale * - * Return a locale identifer string reflecting the Mac locale, in a form + * Return a locale identifier string reflecting the Mac locale, in a form * that parse_locale_name() will understand. So, strip out unusual * things like script, variant, etc. Or, rather, just construct it as * <lang>[_<country>].UTF-8. diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4f01c99..68cc762 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -416,7 +416,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /* Check UDF first as UDF and ISO9660 structures can coexist on the same medium * Starting from sector 16, we may find : * - a CD-ROM Volume Descriptor Set (ISO9660) containing one or more Volume Descriptors - * - an Extented Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 + * - an Extended Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 * There is no explicit end so read 16 sectors and then give up */ for( i=16; i<16+16; i++) {

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016