wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Francois Gouget : testbot/src: Standardize the makefiles.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: tools Branch: master Commit: f815b0545e26b5d4d0aa35a3edac7eaea029b180 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f815b0545e26b5d4d0aa35a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:19:36 2012 +0200 testbot/src: Standardize the makefiles. Use the standard MinGW compiler names. Also strip the TestLauncher binaries. --- testbot/src/GenFixEnv/Makefile | 15 ++++++++------- testbot/src/TestLauncher/Makefile | 21 +++++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile index e51d650..c80a5c3 100644 --- a/testbot/src/GenFixEnv/Makefile +++ b/testbot/src/GenFixEnv/Makefile @@ -1,9 +1,10 @@ -CROSSCC32=i686-pc-mingw32-gcc -CROSSSTRIP=i686-pc-mingw32-strip -BINDIR=../../bin +bindir = ../../bin -all: ${BINDIR}/GenFixEnv.exe +CROSSCC32 = i686-w64-mingw32-gcc +CROSSSTRIP32 = i686-w64-mingw32-strip -${BINDIR}/GenFixEnv.exe: GenFixEnv.c - ${CROSSCC32} -o ${BINDIR}/GenFixEnv.exe -O2 -D_WIN32_IE=0x0500 GenFixEnv.c - ${CROSSSTRIP} ${BINDIR}/GenFixEnv.exe +all: $(bindir)/GenFixEnv.exe + +$(bindir)/GenFixEnv.exe: GenFixEnv.c + $(CROSSCC32) -o $@ $< + $(CROSSSTRIP32) $@ diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 5260e50..822aef7 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -1,11 +1,16 @@ -CROSSCC32=i686-pc-mingw32-gcc -CROSSCC64=x86_64-w64-mingw32-gcc -BINDIR=../../bin +bindir = ../../bin -all: ${BINDIR}/TestLauncher32.exe ${BINDIR}/TestLauncher64.exe +CROSSCC32 = i686-w64-mingw32-gcc +CROSSSTRIP32 = i686-w64-mingw32-strip +CROSSCC64 = x86_64-w64-mingw32-gcc +CROSSSTRIP64 = x86_64-w64-mingw32-strip -${BINDIR}/TestLauncher32.exe: TestLauncher.c - ${CROSSCC32} -o ${BINDIR}/TestLauncher32.exe TestLauncher.c +all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe -${BINDIR}/TestLauncher64.exe: TestLauncher.c - ${CROSSCC64} -o ${BINDIR}/TestLauncher64.exe TestLauncher.c +$(bindir)/TestLauncher32.exe: TestLauncher.c + $(CROSSCC32) -o $@ $< + $(CROSSSTRIP32) $@ + +$(bindir)/TestLauncher64.exe: TestLauncher.c + $(CROSSCC64) -o $@ $< + $(CROSSSTRIP64) $@

1 0

Francois Gouget : testbot/src: Fix the GenFixEnv and TestLauncher purpose documentation statement.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: tools Branch: master Commit: fe1b5e549739ab55161669acb7c98c36195bd799 URL: http://source.winehq.org/git/tools.git/?a=commit;h=fe1b5e549739ab55161669ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:19:20 2012 +0200 testbot/src: Fix the GenFixEnv and TestLauncher purpose documentation statement. --- testbot/src/GenFixEnv/GenFixEnv.c | 4 +++- testbot/src/TestLauncher/TestLauncher.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/src/GenFixEnv/GenFixEnv.c b/testbot/src/GenFixEnv/GenFixEnv.c index 5c5bdb7..f2d4c0f 100644 --- a/testbot/src/GenFixEnv/GenFixEnv.c +++ b/testbot/src/GenFixEnv/GenFixEnv.c @@ -1,5 +1,7 @@ /* - * GenFixEnv.cpp : Defines the entry point for the console application. + * Generates a batch file that sets up the environment. + * This can be used in case the mechanism for running a process in the VM + * does not properly set up the environment for the currently logged in user. * * Copyright 2009 Ge van Geldorp * diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 973df04..855b773 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -1,5 +1,5 @@ /* - * TestLauncher.cpp : Defines the entry point for the console application. + * Verifies that the dlls needed for the test are present. * * Copyright 2009 Ge van Geldorp *

1 0

Francois Gouget : testbot/VMs: Put the default type and status values first .
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: tools Branch: master Commit: 34cd98d673174ddd64b8b9591a1b0187cb4851b6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=34cd98d673174ddd64b8b959… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:19:00 2012 +0200 testbot/VMs: Put the default type and status values first. This way these will be the default in both MySQL and the GUI. New VMs are usually added as 'extra' and get promoted to 'base' when they have been tested. They should also initially be in the 'dirty' state so WineTestBot knows to put them it a clean state before using them. --- testbot/ddl/winetestbot.sql | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 5e59321..5f885c4 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -45,10 +45,10 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE VMs ( Name VARCHAR(20) NOT NULL, - Type ENUM('base', 'extra', 'build', 'retired') NOT NULL, + Type ENUM('extra', 'base', 'build', 'retired') NOT NULL, SortOrder INT(3) NOT NULL, Bits ENUM('32', '64') NOT NULL, - Status ENUM('reverting', 'sleeping', 'idle', 'running', 'dirty', 'offline') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline') NOT NULL, VmxHost VARCHAR(64) NULL, VmxFilePath VARCHAR(64) NOT NULL, IdleSnapshot VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6e1145e..ef03889 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -558,10 +558,10 @@ BEGIN { @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "VM name", 1, 1, "A", 20), - CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['base', 'extra', 'build', 'retired']), + CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['extra', 'base', 'build', 'retired']), CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Bits", "32 or 64 bits", !1, 1, ['32', '64']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['idle', 'reverting', 'sleeping', 'running', 'dirty', 'offline']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline']), CreateBasicPropertyDescriptor("VmxHost", "Host where VM is located", !1, !1, "A", 64), CreateBasicPropertyDescriptor("VmxFilePath", "Path to .vmx file", !1, 1, "A", 64), CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32),

1 0

Francois Gouget : testbot/lib: Add an EnumPropertyDescriptor class for enum properties.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: tools Branch: master Commit: 0a1c694864960d69355fb98b7a755ce0cf5de44f URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a1c694864960d69355fb98b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:18:07 2012 +0200 testbot/lib: Add an EnumPropertyDescriptor class for enum properties. This lets us display the right options in the web interface, thus avoiding the risk of incorrect entry. This also lets us validate the values before trying to store them in the database. In particular this avoids silently dropping an incorrect 'Type' value when modifying a VM. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 18 +++++ testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 +- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 86 +++++++++++++++++++++ testbot/lib/ObjectModel/Item.pm | 4 +- testbot/lib/WineTestBot/Jobs.pm | 4 +- testbot/lib/WineTestBot/Steps.pm | 8 +- testbot/lib/WineTestBot/Tasks.pm | 4 +- testbot/lib/WineTestBot/VMs.pm | 8 +- testbot/web/admin/VMDetails.pl | 26 +------ 9 files changed, 127 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=0a1c694864960d69355f…

1 0

Francois Gouget : testbot/web: Limit the width of edit fields so they fit in the page.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: tools Branch: master Commit: 272e20d5fee513499fbc5aa5e342d1dcbd30e649 URL: http://source.winehq.org/git/tools.git/?a=commit;h=272e20d5fee513499fbc5aa5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:17:40 2012 +0200 testbot/web: Limit the width of edit fields so they fit in the page. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index a3d2a8d..93edc40 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -272,9 +272,10 @@ sub GenerateField } else { + my $Size=$PropertyDescriptor->GetMaxLength(); + $Size=45 if ($Size > 45); print "<input type='$InputType' name='", $PropertyDescriptor->GetName(), - "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='", - $PropertyDescriptor->GetMaxLength(), "'"; + "' maxlength='", $PropertyDescriptor->GetMaxLength(), "' size='$Size'"; if ($Value && $InputType ne "password") { print " value='", $self->CGI->escapeHTML($Value), "'";

1 0

Francois Gouget : testbot/web: Vertically center the property label with its edit field.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: tools Branch: master Commit: 182e2fe422b4fa3cfd8710b5abf9f4df296d07b7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=182e2fe422b4fa3cfd8710b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 17:17:22 2012 +0200 testbot/web: Vertically center the property label with its edit field. The edit field is typically higher than the label so it looks better if the latter is centered vertically. --- testbot/web/WineTestBot.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index c3e13c9..29902ff 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -191,7 +191,7 @@ h2 { width: 45%; display: inline-block; - vertical-align: top; + vertical-align: center; text-align: right; padding-right: 6px; }

1 0

Erich Hoover : hhctrl.ocx: Create a special structure for holding non-const unicode strings.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: d39801bef35232e37f61f6d59e9aa046c42c3efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39801bef35232e37f61f6d59… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Aug 29 19:45:27 2012 -0600 hhctrl.ocx: Create a special structure for holding non-const unicode strings. --- dlls/hhctrl.ocx/chm.c | 26 +++++++++++++------------- dlls/hhctrl.ocx/help.c | 28 ++++++++++++++++------------ dlls/hhctrl.ocx/hhctrl.c | 4 ++-- dlls/hhctrl.ocx/hhctrl.h | 28 ++++++++++++++++------------ 4 files changed, 47 insertions(+), 39 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 6c2904d..4b2f36e 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -283,16 +283,16 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info) * modified by the user. rcHTML and rcMinSize are not currently supported, so don't bother to copy them. */ - dst->pszType = MergeChmString(src->pszType, &info->pszType); - dst->pszFile = MergeChmString(src->pszFile, &info->pszFile); - dst->pszToc = MergeChmString(src->pszToc, &info->pszToc); - dst->pszIndex = MergeChmString(src->pszIndex, &info->pszIndex); - dst->pszCaption = MergeChmString(src->pszCaption, &info->pszCaption); - dst->pszHome = MergeChmString(src->pszHome, &info->pszHome); - dst->pszJump1 = MergeChmString(src->pszJump1, &info->pszJump1); - dst->pszJump2 = MergeChmString(src->pszJump2, &info->pszJump2); - dst->pszUrlJump1 = MergeChmString(src->pszUrlJump1, &info->pszUrlJump1); - dst->pszUrlJump2 = MergeChmString(src->pszUrlJump2, &info->pszUrlJump2); + dst->pszType = MergeChmString(src->pszType, &info->stringsW.pszType); + dst->pszFile = MergeChmString(src->pszFile, &info->stringsW.pszFile); + dst->pszToc = MergeChmString(src->pszToc, &info->stringsW.pszToc); + dst->pszIndex = MergeChmString(src->pszIndex, &info->stringsW.pszIndex); + dst->pszCaption = MergeChmString(src->pszCaption, &info->stringsW.pszCaption); + dst->pszHome = MergeChmString(src->pszHome, &info->stringsW.pszHome); + dst->pszJump1 = MergeChmString(src->pszJump1, &info->stringsW.pszJump1); + dst->pszJump2 = MergeChmString(src->pszJump2, &info->stringsW.pszJump2); + dst->pszUrlJump1 = MergeChmString(src->pszUrlJump1, &info->stringsW.pszUrlJump1); + dst->pszUrlJump2 = MergeChmString(src->pszUrlJump2, &info->stringsW.pszUrlJump2); /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case @@ -381,11 +381,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info); if (!info->WinType.pszFile) - info->WinType.pszFile = info->pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); + info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); if (!info->WinType.pszToc) - info->WinType.pszToc = info->pszToc = FindHTMLHelpSetting(info, toc_extW); + info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); if (!info->WinType.pszIndex) - info->WinType.pszIndex = info->pszIndex = FindHTMLHelpSetting(info, index_extW); + info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); heap_free(pszType); heap_free(pszFile); diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index ed5528c..29751ea 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -278,7 +278,7 @@ static void DoSync(HHInfo *info) } /* If we're not currently viewing a page in the active .chm file, abort */ - if ((!AppendFullPathURL(info->pszFile, buf, NULL)) || (len = lstrlenW(buf) > lstrlenW(url))) + if ((!AppendFullPathURL(info->WinType.pszFile, buf, NULL)) || (len = lstrlenW(buf) > lstrlenW(url))) { SysFreeString(url); return; @@ -1742,6 +1742,20 @@ static BOOL CreateViewer(HHInfo *pHHInfo) return TRUE; } +void wintype_stringsW_free(struct wintype_stringsW *stringsW) +{ + heap_free(stringsW->pszType); + heap_free(stringsW->pszCaption); + heap_free(stringsW->pszToc); + heap_free(stringsW->pszIndex); + heap_free(stringsW->pszFile); + heap_free(stringsW->pszHome); + heap_free(stringsW->pszJump1); + heap_free(stringsW->pszJump2); + heap_free(stringsW->pszUrlJump1); + heap_free(stringsW->pszUrlJump2); +} + void ReleaseHelpViewer(HHInfo *info) { TRACE("(%p)\n", info); @@ -1751,17 +1765,7 @@ void ReleaseHelpViewer(HHInfo *info) list_remove(&info->entry); - /* Free allocated strings */ - heap_free(info->pszType); - heap_free(info->pszCaption); - heap_free(info->pszToc); - heap_free(info->pszIndex); - heap_free(info->pszFile); - heap_free(info->pszHome); - heap_free(info->pszJump1); - heap_free(info->pszJump2); - heap_free(info->pszUrlJump1); - heap_free(info->pszUrlJump2); + wintype_stringsW_free(&info->stringsW); if (info->pCHMInfo) CloseCHM(info->pCHMInfo); diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index bda435a..5244e10 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -191,8 +191,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if(!index) index = info->WinType.pszFile; - if(!info->pszType) - info->WinType.pszType = info->pszType = window; + if(!info->WinType.pszType) + info->WinType.pszType = info->stringsW.pszType = window; else heap_free(window); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 4009f8f..4cacbb3 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -140,6 +140,20 @@ typedef struct { HIMAGELIST hImageList; } ContentsTab; +struct wintype_stringsW { + WCHAR *pszType; + WCHAR *pszCaption; + WCHAR *pszToc; + WCHAR *pszIndex; + WCHAR *pszFile; + WCHAR *pszHome; + WCHAR *pszJump1; + WCHAR *pszJump2; + WCHAR *pszUrlJump1; + WCHAR *pszUrlJump2; + WCHAR *pszCustomTabs; +}; + typedef struct { IOleClientSite *client_site; IWebBrowser2 *web_browser; @@ -147,17 +161,7 @@ typedef struct { HH_WINTYPEW WinType; - LPWSTR pszType; - LPWSTR pszCaption; - LPWSTR pszToc; - LPWSTR pszIndex; - LPWSTR pszFile; - LPWSTR pszHome; - LPWSTR pszJump1; - LPWSTR pszJump2; - LPWSTR pszUrlJump1; - LPWSTR pszUrlJump2; - LPWSTR pszCustomTabs; + struct wintype_stringsW stringsW; struct list entry; CHMInfo *pCHMInfo; @@ -204,7 +208,7 @@ void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; - +void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN; WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); /* memory allocation functions */

1 0

Francois Gouget : usbd.sys: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: 1af160117703569c6ea178cfacac214085d5bbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af160117703569c6ea178cfa… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 30 16:29:05 2012 +0200 usbd.sys: Add a trailing '\n' to a Wine trace. --- dlls/usbd.sys/usbd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index daf49cf..485a24c 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -225,7 +225,7 @@ USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor( PUCHAR *offset, ULONG tag ) { - FIXME( "(%p, %u, %u, %p, %u) partial stub!", descr, length, level, offset, tag ); + FIXME( "(%p, %u, %u, %p, %u) partial stub!\n", descr, length, level, offset, tag ); if (offset) *offset = 0;

1 0

Dmitry Timoshkov : gdiplus: Print some additional information about device and image being drawn.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: e0fd87aea19acd4d37b1fc387a85dc209a5ec3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fd87aea19acd4d37b1fc387… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 30 18:42:47 2012 +0900 gdiplus: Print some additional information about device and image being drawn. --- dlls/gdiplus/graphics.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 383965a..640603a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3092,6 +3092,12 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GpBitmap* bitmap = (GpBitmap*)image; int use_software=0; + TRACE("graphics: %.2fx%.2f dpi, fmt %#x, scale %f, image: %.2fx%.2f dpi, fmt %#x, color %08x\n", + graphics->xres, graphics->yres, + graphics->image && graphics->image->type == ImageTypeBitmap ? ((GpBitmap *)graphics->image)->format : 0, + graphics->scale, image->xres, image->yres, bitmap->format, + imageAttributes ? imageAttributes->outside_color : 0); + if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X ||

1 0

Alexandre Julliard : winex11: Always paint to the whole window.
by Alexandre Julliard 30 Aug '12

30 Aug '12

Module: wine Branch: master Commit: 044f790bcb46161bc91d16c75e7260d339e0919c URL: http://source.winehq.org/git/wine.git/?a=commit;h=044f790bcb46161bc91d16c75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 14:40:31 2012 +0200 winex11: Always paint to the whole window. --- dlls/winex11.drv/window.c | 14 ++++++-------- server/window.c | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7e886dd..52c18cf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2218,10 +2218,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, { escape.drawable = data->icon_window; } - else if (flags & DCX_WINDOW) - escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); - else - escape.drawable = escape.gl_drawable; + else escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); if (escape.gl_drawable) escape.gl_type = DC_GL_WINDOW; /* special case: when repainting the root window, clip out top-level windows */ @@ -2231,21 +2228,22 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, { /* find the first ancestor that has a drawable */ for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT )) - if ((escape.drawable = X11DRV_get_client_window( parent ))) break; + if ((escape.drawable = X11DRV_get_whole_window( parent ))) break; if (escape.drawable) { POINT pt = { 0, 0 }; - MapWindowPoints( top, parent, &pt, 1 ); + MapWindowPoints( 0, parent, &pt, 1 ); + escape.dc_rect = *win_rect; OffsetRect( &escape.dc_rect, pt.x, pt.y ); + if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; } - else escape.drawable = X11DRV_get_client_window( top ); + else escape.drawable = X11DRV_get_whole_window( top ); escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); if (escape.gl_drawable) escape.gl_type = escape.pixmap ? DC_GL_PIXMAP_WIN : DC_GL_CHILD_WIN; - if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; } ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); diff --git a/server/window.c b/server/window.c index cc4b07b..fefe1ac 100644 --- a/server/window.c +++ b/server/window.c @@ -2311,7 +2311,7 @@ DECL_HANDLER(get_visible_region) if (data) set_reply_data_ptr( data, reply->total_size ); } reply->top_win = top->handle; - reply->top_rect = (top == win && (req->flags & DCX_WINDOW)) ? top->visible_rect : top->client_rect; + reply->top_rect = top->visible_rect; if (!is_desktop_window(win)) {

1 0

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 August 2012