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

Alex Henrie : kernel32: Fix memory leak in WCEL_MoveToHist.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 16c51fbe176cb3fa20318a2801306ddfe06f990c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c51fbe176cb3fa20318a280… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 23 01:25:23 2016 -0600 kernel32: Fix memory leak in WCEL_MoveToHist. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index b436a50..bcfdece 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -428,9 +428,9 @@ static void WCEL_MoveToHist(WCEL_Context* ctx, int idx) if (WCEL_Grow(ctx, len)) { WCEL_InsertString(ctx, data); - HeapFree(GetProcessHeap(), 0, data); ctx->histPos = idx; } + HeapFree(GetProcessHeap(), 0, data); } static void WCEL_FindPrevInHist(WCEL_Context* ctx)

1 0

Alex Henrie : kernel32: Fix memory leak in WCEL_FindPrevInHist.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: d44ec680dad72338ed832dafdcebfbeb0606d099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44ec680dad72338ed832dafd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 23 01:25:24 2016 -0600 kernel32: Fix memory leak in WCEL_FindPrevInHist. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index bcfdece..e685e1e 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -469,6 +469,7 @@ static void WCEL_FindPrevInHist(WCEL_Context* ctx) return; } } + HeapFree(GetProcessHeap(), 0, data); } while (ctx->histPos != startPos); return;

1 0

Hugh McMaster : regedit: Parse command-line input using Unicode.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 256290f74f9d51fce5bdf2b48e93e65f42fc2588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256290f74f9d51fce5bdf2b48… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 5 05:15:22 2016 +0000 regedit: Parse command-line input using Unicode. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/Makefile.in | 2 +- programs/regedit/main.c | 9 +-- programs/regedit/regedit.c | 165 +++++++++++++------------------------------ 3 files changed, 53 insertions(+), 123 deletions(-) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index acbfbd4..54f00f7 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,5 +1,5 @@ MODULE = regedit.exe -APPMODE = -mwindows -mno-cygwin +APPMODE = -mwindows -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 593ffef..8f82580 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -30,7 +30,7 @@ WCHAR g_pszDefaultValueName[64]; -BOOL ProcessCmdLine(LPSTR lpCmdLine); +BOOL ProcessCmdLine(WCHAR *cmdline); static const WCHAR hkey_local_machine[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; static const WCHAR hkey_users[] = {'H','K','E','Y','_','U','S','E','R','S',0}; @@ -134,15 +134,12 @@ static BOOL TranslateChildTabMessage(MSG *msg) return TRUE; } -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) { MSG msg; HACCEL hAccel; - if (ProcessCmdLine(lpCmdLine)) { + if (ProcessCmdLine(GetCommandLineW())) { return 0; } diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index cbe3616..ae268b6 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <windows.h> +#include <shellapi.h> +#include "wine/unicode.h" #include "regproc.h" static const char *usage = @@ -59,43 +60,41 @@ typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; -static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) +static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) { switch (action) { case ACTION_ADD: { - char *filename = argv[*i]; + WCHAR *filename = argv[*i]; + WCHAR hyphen[] = {'-',0}; FILE *reg_file; - if (filename[0]) { - char* realname = NULL; + if (!strcmpW(filename, hyphen)) + reg_file = stdin; + else + { + int size; + WCHAR *realname = NULL; + WCHAR rb_mode[] = {'r','b',0}; - if (strcmp(filename, "-") == 0) + size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); + if (size > 0) { - reg_file = stdin; + realname = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + size = SearchPathW(NULL, filename, NULL, size, realname, NULL); } - else + if (size == 0) { - int size; - - size = SearchPathA(NULL, filename, NULL, 0, NULL, NULL); - if (size > 0) - { - realname = HeapAlloc(GetProcessHeap(), 0, size); - size = SearchPathA(NULL, filename, NULL, size, realname, NULL); - } - if (size == 0) - { - fprintf(stderr, "regedit: File not found \"%s\" (%d)\n", - filename, GetLastError()); - exit(1); - } - reg_file = fopen(realname, "rb"); - if (reg_file == NULL) - { - perror(""); - fprintf(stderr, "regedit: Can't open file \"%s\"\n", filename); - exit(1); - } + fprintf(stderr, "regedit: File not found \"%ls\" (%d)\n", + filename, GetLastError()); + exit(1); + } + reg_file = _wfopen(realname, rb_mode); + if (reg_file == NULL) + { + WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; + _wperror(regedit); + fprintf(stderr, "regedit: Can't open file \"%ls\"\n", filename); + exit(1); } import_registry_file(reg_file); if (realname) @@ -106,29 +105,17 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) } break; } - case ACTION_DELETE: { - WCHAR *reg_key_nameW = GetWideString(argv[*i]); - - delete_registry_key(reg_key_nameW); - HeapFree(GetProcessHeap(), 0, reg_key_nameW); + case ACTION_DELETE: + delete_registry_key(argv[*i]); break; - } case ACTION_EXPORT: { - char *filename = argv[*i]; - WCHAR* filenameW; - - filenameW = GetWideString(filename); - if (filenameW[0]) { - char *reg_key_name = argv[++(*i)]; - WCHAR* reg_key_nameW; + WCHAR *filename = argv[*i]; + WCHAR *key_name = argv[++(*i)]; - reg_key_nameW = GetWideString(reg_key_name); - export_registry_key(filenameW, reg_key_nameW, REG_FORMAT_4); - HeapFree(GetProcessHeap(), 0, reg_key_nameW); - } else { - export_registry_key(filenameW, NULL, REG_FORMAT_4); - } - HeapFree(GetProcessHeap(), 0, filenameW); + if (key_name && *key_name) + export_registry_key(filename, key_name, REG_FORMAT_4); + else + export_registry_key(filename, NULL, REG_FORMAT_4); break; } default: @@ -139,76 +126,24 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) return TRUE; } -static char *get_token(char *input, char **next) -{ - char *ch = input; - char *str; - - while (*ch && isspace(*ch)) - ch++; - - str = ch; - - if (*ch == '"') { - ch++; - str = ch; - for (;;) { - while (*ch && (*ch != '"')) - ch++; - - if (!*ch) - break; - - if (*(ch - 1) == '\\') { - ch++; - continue; - } - break; - } - } - else { - while (*ch && !isspace(*ch)) - ch++; - } - - if (*ch) { - *ch = 0; - ch++; - } - - *next = ch; - return str; -} - -BOOL ProcessCmdLine(LPSTR lpCmdLine) +BOOL ProcessCmdLine(WCHAR *cmdline) { - char *s = lpCmdLine; - char **argv; - char *tok; - int argc = 0, i = 1; + WCHAR **argv; + int argc, i; REGEDIT_ACTION action = ACTION_ADD; - if (!*lpCmdLine) - return FALSE; + argv = CommandLineToArgvW(cmdline, &argc); - while (*s) { - if (isspace(*s)) - i++; - s++; - } - - s = lpCmdLine; - argv = HeapAlloc(GetProcessHeap(), 0, i * sizeof(char *)); + if (!argv) + return FALSE; - for (i = 0; *s; i++) + if (argc == 1) { - tok = get_token(s, &s); - argv[i] = HeapAlloc(GetProcessHeap(), 0, strlen(tok) + 1); - strcpy(argv[i], tok); - argc++; + LocalFree(argv); + return FALSE; } - for (i = 0; i < argc; i++) + for (i = 1; i < argc; i++) { if (argv[i][0] != '/' && argv[i][0] != '-') break; /* No flags specified. */ @@ -219,7 +154,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) if (argv[i][1] && argv[i][2] && argv[i][2] != ':') break; /* This is a file path beginning with '/'. */ - switch (toupper(argv[i][1])) + switch (toupperW(argv[i][1])) { case '?': fprintf(stderr, usage); @@ -241,7 +176,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) /* ignored */; break; default: - fprintf(stderr, "regedit: Invalid switch [%s]\n", argv[i]); + fprintf(stderr, "regedit: Invalid switch [%ls]\n", argv[i]); exit(1); } } @@ -265,9 +200,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) for (; i < argc; i++) PerformRegAction(action, argv, &i); - for (i = 0; i < argc; i++) - HeapFree(GetProcessHeap(), 0, argv[i]); - HeapFree(GetProcessHeap(), 0, argv); + LocalFree(argv); return TRUE; }

1 0

Hugh McMaster : regedit: Use WINAPI functions for better internationalization.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 221bb0f7694403644294d3dbd8d4fba9e2f0b03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=221bb0f7694403644294d3dbd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 5 05:15:35 2016 +0000 regedit: Use WINAPI functions for better internationalization. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 65 +++++++++++++++++++++++++++ po/bg.po | 59 ++++++++++++++++++++++++ po/ca.po | 73 ++++++++++++++++++++++++++++++ po/cs.po | 63 ++++++++++++++++++++++++++ po/da.po | 65 +++++++++++++++++++++++++++ po/de.po | 75 +++++++++++++++++++++++++++++++ po/el.po | 59 ++++++++++++++++++++++++ po/en.po | 86 +++++++++++++++++++++++++++++++++++ po/en_US.po | 86 +++++++++++++++++++++++++++++++++++ po/eo.po | 59 ++++++++++++++++++++++++ po/es.po | 65 +++++++++++++++++++++++++++ po/fa.po | 59 ++++++++++++++++++++++++ po/fi.po | 75 +++++++++++++++++++++++++++++++ po/fr.po | 73 ++++++++++++++++++++++++++++++ po/he.po | 62 ++++++++++++++++++++++++++ po/hi.po | 59 ++++++++++++++++++++++++ po/hr.po | 63 ++++++++++++++++++++++++++ po/hu.po | 65 +++++++++++++++++++++++++++ po/it.po | 65 +++++++++++++++++++++++++++ po/ja.po | 73 ++++++++++++++++++++++++++++++ po/ko.po | 65 +++++++++++++++++++++++++++ po/lt.po | 75 +++++++++++++++++++++++++++++++ po/ml.po | 59 ++++++++++++++++++++++++ po/nb_NO.po | 73 ++++++++++++++++++++++++++++++ po/nl.po | 65 +++++++++++++++++++++++++++ po/or.po | 59 ++++++++++++++++++++++++ po/pa.po | 59 ++++++++++++++++++++++++ po/pl.po | 73 ++++++++++++++++++++++++++++++ po/pt_BR.po | 71 +++++++++++++++++++++++++++++ po/pt_PT.po | 65 +++++++++++++++++++++++++++ po/rm.po | 59 ++++++++++++++++++++++++ po/ro.po | 64 ++++++++++++++++++++++++++ po/ru.po | 75 +++++++++++++++++++++++++++++++ po/sk.po | 63 ++++++++++++++++++++++++++ po/sl.po | 65 +++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 60 +++++++++++++++++++++++++ po/sr_RS(a)latin.po | 60 +++++++++++++++++++++++++ po/sv.po | 65 +++++++++++++++++++++++++++ po/te.po | 59 ++++++++++++++++++++++++ po/th.po | 59 ++++++++++++++++++++++++ po/tr.po | 73 ++++++++++++++++++++++++++++++ po/uk.po | 71 +++++++++++++++++++++++++++++ po/wa.po | 59 ++++++++++++++++++++++++ po/wine.pot | 59 ++++++++++++++++++++++++ po/zh_CN.po | 67 ++++++++++++++++++++++++++++ po/zh_TW.po | 65 +++++++++++++++++++++++++++ programs/regedit/regedit.c | 106 ++++++++++++++++++++++++++++---------------- programs/regedit/regedit.rc | 37 ++++++++++++++++ programs/regedit/resource.h | 10 +++++ 49 files changed, 3150 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=221bb0f7694403644294d…

1 0

Piotr Caban : msvcrt: Remove unused call_dtor function.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 4facdec6863bcb46a7f4f73b59fb6bb9d9689855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4facdec6863bcb46a7f4f73b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 4 11:04:47 2016 +0200 msvcrt: Remove unused call_dtor function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index f7f486d..c939585 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -161,12 +161,6 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); } -/* call the destructor of the exception object */ -static inline void call_dtor( void *func, void *object ) -{ - __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); -} - /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) {

1 0

Michael Stefaniuc : qedit: Avoid casting a COM object to an iface.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 9525b1e2cfc16152e6cf6d77d2af5858d573c57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9525b1e2cfc16152e6cf6d77d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 09:54:00 2016 +0200 qedit: Avoid casting 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/qedit/samplegrabber.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 151827e..7cbc0f8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1300,7 +1300,8 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) else obj->outer_unk = &obj->IUnknown_inner; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&obj->seekthru_unk); if(hr) return hr; IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);

1 0

Michael Stefaniuc : ole32: Standardize COM aggregation for the FreeThreadedMarshaler.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: a60b1897871ca895c6a8abb9294b7ea7f55818ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60b1897871ca895c6a8abb92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 09:54:38 2016 +0200 ole32: Standardize COM aggregation for the FreeThreadedMarshaler. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ftmarshal.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 21d9c9a..3eb7f87 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -39,16 +39,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct _FTMarshalImpl { - IUnknown IUnknown_iface; - LONG ref; + IUnknown IUnknown_inner; IMarshal IMarshal_iface; - - IUnknown *pUnkOuter; + IUnknown *outer_unk; + LONG ref; } FTMarshalImpl; static inline FTMarshalImpl *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_iface); + return CONTAINING_RECORD(iface, FTMarshalImpl, IUnknown_inner); } static inline FTMarshalImpl *impl_from_IMarshal( IMarshal *iface ) @@ -67,7 +66,7 @@ IiFTMUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppv) *ppv = NULL; if (IsEqualIID (&IID_IUnknown, riid)) - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; else if (IsEqualIID (&IID_IMarshal, riid)) *ppv = &This->IMarshal_iface; else { @@ -113,7 +112,7 @@ FTMarshalImpl_QueryInterface (LPMARSHAL iface, REFIID riid, LPVOID * ppv) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppv); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI @@ -123,7 +122,7 @@ FTMarshalImpl_AddRef (LPMARSHAL iface) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("\n"); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI @@ -133,7 +132,7 @@ FTMarshalImpl_Release (LPMARSHAL iface) FTMarshalImpl *This = impl_from_IMarshal(iface); TRACE ("\n"); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI @@ -342,12 +341,12 @@ HRESULT WINAPI CoCreateFreeThreadedMarshaler (LPUNKNOWN punkOuter, LPUNKNOWN * p if (!ftm) return E_OUTOFMEMORY; - ftm->IUnknown_iface.lpVtbl = &iunkvt; + ftm->IUnknown_inner.lpVtbl = &iunkvt; ftm->IMarshal_iface.lpVtbl = &ftmvtbl; ftm->ref = 1; - ftm->pUnkOuter = punkOuter ? punkOuter : &ftm->IUnknown_iface; + ftm->outer_unk = punkOuter ? punkOuter : &ftm->IUnknown_inner; - *ppunkMarshal = &ftm->IUnknown_iface; + *ppunkMarshal = &ftm->IUnknown_inner; return S_OK; }

1 0

Michael Stefaniuc : gdi32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 8acdf5e7bf4cc567c69ed0354f1b3854a7c03aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8acdf5e7bf4cc567c69ed0354… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 10:03:52 2016 +0200 gdi32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index cab30e9..cffac37 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2382,8 +2382,7 @@ BOOL WINAPI EnumEnhMetaFile( double xSrcPixSize, ySrcPixSize, xscale, yscale; XFORM xform; - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + TRACE("rect: %s. rclFrame: (%d,%d)-(%d,%d)\n", wine_dbgstr_rect(lpRect), emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, emh->rclFrame.bottom);

1 0

Huw Davies : gdi32: Use the add_rect() helper to add a rectangle.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 0e93387d9bc7cab85631efcc4dbc00c810c0221a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e93387d9bc7cab85631efcc4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 09:05:43 2016 +0100 gdi32: Use the add_rect() helper to add a rectangle. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 47daab9..55bd04d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2592,18 +2592,15 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re RECT *rects; POINT *pts; struct point_block *pb; - int i; + int i, size; RECT *extents; - INT numRects; extents = &reg->extents; - for (pb = FirstPtBlock, numRects = 0; pb; pb = pb->next) numRects += pb->count; - if (!init_region( reg, numRects )) return FALSE; + for (pb = FirstPtBlock, size = 0; pb; pb = pb->next) size += pb->count; + if (!init_region( reg, size )) return FALSE; - reg->size = numRects; rects = reg->rects - 1; - numRects = 0; extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE; for (pb = FirstPtBlock; pb; pb = pb->next) @@ -2613,34 +2610,31 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re for (pts = pb->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; - if (numRects && pts->x == rects->left && pts->y == rects->bottom && + if (reg->numRects && pts->x == rects->left && pts->y == rects->bottom && pts[1].x == rects->right && - (numRects == 1 || rects[-1].top != rects->top) && + (reg->numRects == 1 || rects[-1].top != rects->top) && (i && pts[2].y > pts[1].y)) { rects->bottom = pts[1].y + 1; continue; } - numRects++; + add_rect( reg, pts[0].x, pts[0].y, pts[1].x, pts[1].y + 1 ); rects++; - rects->left = pts->x; rects->top = pts->y; - rects->right = pts[1].x; rects->bottom = pts[1].y + 1; - if (rects->left < extents->left) - extents->left = rects->left; - if (rects->right > extents->right) - extents->right = rects->right; + if (pts[0].x < extents->left) + extents->left = pts[0].x; + if (pts[1].x > extents->right) + extents->right = pts[1].x; } } - if (numRects) { - extents->top = reg->rects->top; - extents->bottom = rects->bottom; + if (reg->numRects) { + extents->top = reg->rects[0].top; + extents->bottom = reg->rects[reg->numRects-1].bottom; } else { extents->left = 0; extents->top = 0; extents->right = 0; extents->bottom = 0; } - reg->numRects = numRects; return(TRUE); }

1 0

Huw Davies : gdi32: Try to coalesce into wider bands.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 27375d847680ff68a1a5526a2ab6de042d3cef23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27375d847680ff68a1a5526a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 09:05:44 2016 +0100 gdi32: Try to coalesce into wider bands. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 55bd04d..834e6be 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2589,10 +2589,9 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) */ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *reg ) { - RECT *rects; POINT *pts; struct point_block *pb; - int i, size; + int i, size, cur_band = 0, prev_band = 0; RECT *extents; extents = &reg->extents; @@ -2600,7 +2599,6 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re for (pb = FirstPtBlock, size = 0; pb; pb = pb->next) size += pb->count; if (!init_region( reg, size )) return FALSE; - rects = reg->rects - 1; extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE; for (pb = FirstPtBlock; pb; pb = pb->next) @@ -2610,15 +2608,14 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re for (pts = pb->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; - if (reg->numRects && pts->x == rects->left && pts->y == rects->bottom && - pts[1].x == rects->right && - (reg->numRects == 1 || rects[-1].top != rects->top) && - (i && pts[2].y > pts[1].y)) { - rects->bottom = pts[1].y + 1; - continue; - } + + if (reg->numRects && pts[0].y != reg->rects[cur_band].top) + { + prev_band = REGION_Coalesce( reg, prev_band, cur_band ); + cur_band = reg->numRects; + } + add_rect( reg, pts[0].x, pts[0].y, pts[1].x, pts[1].y + 1 ); - rects++; if (pts[0].x < extents->left) extents->left = pts[0].x; if (pts[1].x > extents->right) @@ -2627,6 +2624,7 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re } if (reg->numRects) { + REGION_Coalesce( reg, prev_band, cur_band ); extents->top = reg->rects[0].top; extents->bottom = reg->rects[reg->numRects-1].bottom; } else {

1 0