April 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/tab: Use dpa to store item data.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 82258f4f2580a591d7a9940204b194b7f833c09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82258f4f2580a591d7a994020… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 9 19:46:59 2011 +0400 comctl32/tab: Use dpa to store item data. --- dlls/comctl32/tab.c | 154 +++++++++++++++++++++------------------------------ 1 files changed, 64 insertions(+), 90 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f86fd0f..6744ed7 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -52,6 +52,7 @@ * */ +#include <assert.h> #include <stdarg.h> #include <string.h> @@ -110,7 +111,6 @@ typedef struct INT iSelected; /* the currently selected item */ INT iHotTracked; /* the highlighted item under the mouse */ INT uFocus; /* item which has the focus */ - TAB_ITEM* items; /* pointer to an array of TAB_ITEM's */ BOOL DoRedraw; /* flag for redrawing when tab contents is changed*/ BOOL needsScrolling; /* TRUE if the size of the tabs is greater than * the size of the control */ @@ -122,6 +122,8 @@ typedef struct DWORD exStyle; /* Extended style used, currently: TCS_EX_FLATSEPARATORS, TCS_EX_REGISTERDROP */ DWORD dwStyle; /* the cached window GWL_STYLE */ + + HDPA items; /* dynamic array of TAB_ITEM* pointers */ } TAB_INFO; /****************************************************************************** @@ -141,9 +143,6 @@ typedef struct #define EXTRA_ICON_PADDING 3 #define TAB_GetInfoPtr(hwnd) ((TAB_INFO *)GetWindowLongPtrW(hwnd,0)) -/* Since items are variable sized, cannot directly access them */ -#define TAB_GetItem(info,i) \ - ((TAB_ITEM*)((LPBYTE)info->items + (i) * TAB_ITEM_SIZE(info))) #define GET_DEFAULT_MIN_TAB_WIDTH(infoPtr) (DEFAULT_MIN_TAB_WIDTH - (DEFAULT_PADDING_X - (infoPtr)->uHItemPadding) * 2) @@ -155,6 +154,12 @@ typedef struct static const WCHAR themeClass[] = { 'T','a','b',0 }; +static inline TAB_ITEM* TAB_GetItem(const TAB_INFO *infoPtr, INT i) +{ + assert(i >= 0 && i < infoPtr->uNumItem); + return DPA_GetPtr(infoPtr->items, i); +} + /****************************************************************************** * Prototypes */ @@ -209,9 +214,8 @@ static void TAB_DumpItemInternal(const TAB_INFO *infoPtr, UINT iItem) { if (TRACE_ON(tab)) { - TAB_ITEM *ti; + TAB_ITEM *ti = TAB_GetItem(infoPtr, iItem); - ti = TAB_GetItem(infoPtr, iItem); TRACE("tab %d, dwState=0x%08x, pszText=%s, iImage=%d\n", iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage); TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n", @@ -2640,42 +2644,21 @@ TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode TAB_DumpItemExternalT(pti, iItem, bUnicode); - - if (infoPtr->uNumItem == 0) { - infoPtr->items = Alloc (TAB_ITEM_SIZE(infoPtr)); - infoPtr->uNumItem++; - infoPtr->iSelected = 0; + if (!(item = Alloc(sizeof(TAB_ITEM_SIZE(infoPtr))))) return FALSE; + if (DPA_InsertPtr(infoPtr->items, iItem, item) == -1) + { + Free(item); + return FALSE; } - else { - LPBYTE oldItems = (LPBYTE)infoPtr->items; - - infoPtr->uNumItem++; - infoPtr->items = Alloc (TAB_ITEM_SIZE(infoPtr) * infoPtr->uNumItem); - - /* pre insert copy */ - if (iItem > 0) { - memcpy (infoPtr->items, oldItems, - iItem * TAB_ITEM_SIZE(infoPtr)); - } - - /* post insert copy */ - if (iItem < infoPtr->uNumItem - 1) { - memcpy (TAB_GetItem(infoPtr, iItem + 1), - oldItems + iItem * TAB_ITEM_SIZE(infoPtr), - (infoPtr->uNumItem - iItem - 1) * TAB_ITEM_SIZE(infoPtr)); - } - - if (iItem <= infoPtr->iSelected) + if (infoPtr->uNumItem == 0) + infoPtr->iSelected = 0; + else if (iItem <= infoPtr->iSelected) infoPtr->iSelected++; - Free (oldItems); - } - - item = TAB_GetItem(infoPtr, iItem); + infoPtr->uNumItem++; item->pszText = NULL; - if (pti->mask & TCIF_TEXT) { if (bUnicode) @@ -2885,64 +2868,49 @@ TAB_GetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) { - BOOL bResult = FALSE; + TAB_ITEM *item; TRACE("(%p, %d)\n", infoPtr, iItem); - if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) - { - TAB_ITEM *item = TAB_GetItem(infoPtr, iItem); - LPBYTE oldItems = (LPBYTE)infoPtr->items; + if (iItem < 0 || iItem >= infoPtr->uNumItem) return FALSE; + + item = TAB_GetItem(infoPtr, iItem); + Free(item->pszText); + Free(item); + infoPtr->uNumItem--; + DPA_DeletePtr(infoPtr->items, iItem); - TAB_InvalidateTabArea(infoPtr); - Free(item->pszText); - infoPtr->uNumItem--; + TAB_InvalidateTabArea(infoPtr); - if (!infoPtr->uNumItem) + if (infoPtr->uNumItem == 0) + { + if (infoPtr->iHotTracked >= 0) { - infoPtr->items = NULL; - if (infoPtr->iHotTracked >= 0) - { - KillTimer(infoPtr->hwnd, TAB_HOTTRACK_TIMER); - infoPtr->iHotTracked = -1; - } + KillTimer(infoPtr->hwnd, TAB_HOTTRACK_TIMER); + infoPtr->iHotTracked = -1; } - else - { - infoPtr->items = Alloc(TAB_ITEM_SIZE(infoPtr) * infoPtr->uNumItem); - - if (iItem > 0) - memcpy(infoPtr->items, oldItems, iItem * TAB_ITEM_SIZE(infoPtr)); - - if (iItem < infoPtr->uNumItem) - memcpy(TAB_GetItem(infoPtr, iItem), - oldItems + (iItem + 1) * TAB_ITEM_SIZE(infoPtr), - (infoPtr->uNumItem - iItem) * TAB_ITEM_SIZE(infoPtr)); - if (iItem <= infoPtr->iHotTracked) - { - /* When tabs move left/up, the hot track item may change */ - FIXME("Recalc hot track\n"); - } - } - Free(oldItems); - - /* Readjust the selected index */ - if (iItem == infoPtr->iSelected) - infoPtr->iSelected = -1; - else if (iItem < infoPtr->iSelected) - infoPtr->iSelected--; - - if (infoPtr->uNumItem == 0) - infoPtr->iSelected = -1; + infoPtr->iSelected = -1; + } + else + { + if (iItem <= infoPtr->iHotTracked) + { + /* When tabs move left/up, the hot track item may change */ + FIXME("Recalc hot track\n"); + } + } - /* Reposition and repaint tabs */ - TAB_SetItemBounds(infoPtr); + /* adjust the selected index */ + if (iItem == infoPtr->iSelected) + infoPtr->iSelected = -1; + else if (iItem < infoPtr->iSelected) + infoPtr->iSelected--; - bResult = TRUE; - } + /* reposition and repaint tabs */ + TAB_SetItemBounds(infoPtr); - return bResult; + return TRUE; } static inline LRESULT TAB_DeleteAllItems (TAB_INFO *infoPtr) @@ -3063,7 +3031,7 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) infoPtr->uHItemPadding_s = 6; infoPtr->uVItemPadding_s = 3; infoPtr->hFont = 0; - infoPtr->items = 0; + infoPtr->items = DPA_Create(8); infoPtr->hcurArrow = LoadCursorW (0, (LPWSTR)IDC_ARROW); infoPtr->iSelected = -1; infoPtr->iHotTracked = -1; @@ -3147,16 +3115,22 @@ static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) static LRESULT TAB_Destroy (TAB_INFO *infoPtr) { - UINT iItem; + INT iItem; SetWindowLongPtrW(infoPtr->hwnd, 0, 0); - if (infoPtr->items) { - for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) { - Free (TAB_GetItem(infoPtr, iItem)->pszText); - } - Free (infoPtr->items); + for (iItem = infoPtr->uNumItem - 1; iItem >= 0; iItem--) + { + TAB_ITEM *tab = TAB_GetItem(infoPtr, iItem); + + DPA_DeletePtr(infoPtr->items, iItem); + infoPtr->uNumItem--; + + Free(tab->pszText); + Free(tab); } + DPA_Destroy(infoPtr->items); + infoPtr->items = NULL; if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip);

1 0

André Hentschel : Wine 1.2.3 freigegeben
by Jeremy Newman 11 Apr '11

11 Apr '11

Module: website Branch: master Commit: 89e0286684d9a8c82d057153826e48d1307565db URL: http://source.winehq.org/git/website.git/?a=commit;h=89e0286684d9a8c82d0571… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 9 16:05:09 2011 +0200 Wine 1.2.3 freigegeben --- news/de/2011040801.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2011040801.xml b/news/de/2011040801.xml new file mode 100644 index 0000000..647c1c7 --- /dev/null +++ b/news/de/2011040801.xml @@ -0,0 +1,13 @@ +<news> +<date>8. April 2011</date> +<title>Wine 1.2.3 freigegeben</title> +<body> + Die Wartungsversion 1.2.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.2.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.3.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.2.3
by Jeremy Newman 11 Apr '11

11 Apr '11

Module: website Branch: master Commit: e7df201b8f2ee63ef4257942fb0dd2bae2eaa7b4 URL: http://source.winehq.org/git/website.git/?a=commit;h=e7df201b8f2ee63ef42579… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Apr 10 15:22:14 2011 +0200 Polish translation for release 1.2.3 --- news/pl/2011040801.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/pl/2011040801.xml b/news/pl/2011040801.xml new file mode 100644 index 0000000..93cebd1 --- /dev/null +++ b/news/pl/2011040801.xml @@ -0,0 +1,13 @@ +<news> +<date>Kwiecień 8, 2011</date> +<title>Wydano Wine 1.2.3</title> +<body> + Poprawione wydanie Wine 1.2.3 jest już dostępne. + <a href="{$root}/announce/1.2.3">Co nowego</a> w tym wydaniu: +<ul> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.2.3
by Jeremy Newman 08 Apr '11

08 Apr '11

Module: website Branch: master Commit: e300eb3107cda79ea5a3a39eb917611dc0c244d8 URL: http://source.winehq.org/git/website.git/?a=commit;h=e300eb3107cda79ea5a3a3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 8 21:27:17 2011 +0200 French translation for release 1.2.3 --- news/fr/2011040801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2011040801.xml b/news/fr/2011040801.xml new file mode 100644 index 0000000..8f19826 --- /dev/null +++ b/news/fr/2011040801.xml @@ -0,0 +1,16 @@ +<news> +<date>8 avril 2011</date> +<title>Sortie de Wine 1.2.3</title> +<body> + La version de maintenance 1.2.3 de Wine est disponible. + <a href="{$root}/announce/1.2.3">Nouveautés</a> de cette version : +<ul> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.2.3.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.2.3
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: website Branch: master Commit: eb55418b936cdc9f392ff3bf679e330d07cd78af URL: http://source.winehq.org/git/website.git/?a=commit;h=eb55418b936cdc9f392ff3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 8 19:34:34 2011 +0200 Wine release 1.2.3 --- news/en/2011040801.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2011040801.xml b/news/en/2011040801.xml new file mode 100644 index 0000000..9cee91c --- /dev/null +++ b/news/en/2011040801.xml @@ -0,0 +1,13 @@ +<news> +<date>April 8, 2011</date> +<title>Wine 1.2.3 Released</title> +<body> + The Wine maintenance release 1.2.3 is now available. + <a href="{$root}/announce/1.2.3">What's new</a> in this release: +<ul> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Updated the authors list.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: stable Commit: db03a269ce2a921909e9802f05e5e3593aa4f790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db03a269ce2a921909e9802f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 7 14:42:50 2011 +0200 Updated the authors list. --- AUTHORS | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 69cff12..9cd60b2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -64,6 +64,7 @@ Ričardas Barkauskas Aaron Barnes Cesar Eduardo Barros Ismael Barros +David Bartley Guido Barzini Ilya Basin Jean-Claude Batista @@ -73,6 +74,7 @@ Michael Beach Francis Beaudet Tom Bech David Beck +Joshua Beck Ralf Beck Matthew Becker Nathan Beckmann @@ -251,6 +253,7 @@ Matthias Derer Andrei Derevyanko Raul Dias Robert Dickenson +Damian Dixon Darryl Dixon Jan Djarv Petar Djukic @@ -274,6 +277,7 @@ Jason Edmeades Steven Edwards Christian Eggers Rikhardur Egilsson +Igor Egorov Andrew Eikum Karsten Elfenbein John Elliot @@ -402,6 +406,7 @@ Albert den Haan Jess Haas David D. Hagood Hagop Hagopian +Janne Hakonen Robert W Hall Patrick Haller Stefan Haller @@ -631,6 +636,7 @@ Alex Villacís Lasso David Lassonde Jeff Latimer Paul Laufer +Alexander Law Klaus Layer Nicolas Le Cam Jerome Leclanche @@ -815,6 +821,7 @@ Jan Nieuwenhuizen Marko Nikolic Jan-Peter Nilsson Philip Nilsson +Nicholas Niro Nix N. Nix Muneyuki Noguchi Sami Nopanen @@ -892,6 +899,7 @@ Michael Ploujnikov Mariusz Pluciński William Poetra Yoga Hadisoesen Gracjan Polak +Albert Pool Michael Poole Andrzej Popowski Dmitry Potapov @@ -986,11 +994,13 @@ Carl van Schaik Florian Tobias Schandinat Peter Schauer Paul van Schayck +Peter Schellenbach Daniel Schepler Johannes E. Schindelin Christian Schlaile Peter Schlaile Michael Schlüter +Tristan Schmelcher Ulrich Schmid Axel Schmidt Bernd Schmidt @@ -1084,6 +1094,7 @@ William Stinson Markus Stockhausen Adam Stoelting Richard Stonehouse +Martin Storsjo Stefan Stranz Dominik Strasser Patrik Stridvall @@ -1139,6 +1150,7 @@ Luc Tourangeau Jeff Tranter Pavel Troller Gregory Trubetskoy +Rex Tsai Lauri Tulmin Petri Tuomola Sergey Turchanov

1 0

Alexandre Julliard : Release 1.2.3.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: stable Commit: 9dc5af175a5537b1f98af34cdcbdc22639b36d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc5af175a5537b1f98af34cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 8 19:09:51 2011 +0200 Release 1.2.3. --- ANNOUNCE | 540 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 314 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dc5af175a5537b1f98af…

1 0

Tag wine-1.2.3 : Alexandre Julliard : Release 1.2.3
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: refs/tags/wine-1.2.3 Tag: 296513d26c66aa96cc5f18fef5398be4023e5a33 URL: http://source.winehq.org/git/wine.git/?a=tag;h=296513d26c66aa96cc5f18fef539… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 8 19:09:52 2011 +0200 Release 1.2.3

1 0

Jacek Caban : kernel32: Moved GetProcessImageFileName implementation from psapi to kernel32.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 81aa05eab6915dd93cac15ebdf4ecda6ba255903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81aa05eab6915dd93cac15ebd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 14:17:45 2011 +0200 kernel32: Moved GetProcessImageFileName implementation from psapi to kernel32. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/process.c | 17 +++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 21 --------------------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d7edf1f..b3b8fd5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -767,6 +767,8 @@ @ stdcall IsValidLocale(long long) # @ stub IsValidUILanguage @ stdcall IsWow64Process(ptr ptr) +@ stdcall K32GetProcessImageFileNameA(long ptr long) +@ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog @ stdcall LCIDToLocaleName(long ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1956649..e039cad 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3439,6 +3439,23 @@ cleanup: } /*********************************************************************** + * K32GetProcessImageFileNameA (KERNEL32.@) + */ +DWORD WINAPI K32GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size ) +{ + FIXME("(%p, %p, %d) stub\n", process, file, size ); + return 0; +} + +/*********************************************************************** + * K32GetProcessImageFileNameW (KERNEL32.@) + */ +DWORD WINAPI K32GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size ) +{ + return QueryFullProcessImageNameW(process, PROCESS_NAME_NATIVE, file, &size) ? size : 0; +} + +/*********************************************************************** * ProcessIdToSessionId (KERNEL32.@) * This function is available on Terminal Server 4SP4 and Windows 2000 */ diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 0ae008d..aefe3e4 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -16,8 +16,8 @@ @ stdcall GetModuleFileNameExW(long long ptr long) @ stdcall GetModuleInformation(long long ptr long) @ stdcall GetPerformanceInfo(ptr long) -@ stdcall GetProcessImageFileNameA(long ptr long) -@ stdcall GetProcessImageFileNameW(long ptr long) +@ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA +@ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall GetProcessMemoryInfo(long ptr long) @ stdcall GetWsChanges(long ptr long) @ stdcall InitializeProcessForWsWatch(long) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 61ba8de..327005c 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -494,27 +494,6 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) } /*********************************************************************** - * GetProcessImageFileNameA (PSAPI.@) - */ -DWORD WINAPI GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size ) -{ - FIXME("(%p, %p, %d) stub\n", process, file, size ); - return 0; -} - -/*********************************************************************** - * GetProcessImageFileNameW (PSAPI.@) - */ -DWORD WINAPI GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size ) -{ - BOOL success = QueryFullProcessImageNameW(process, PROCESS_NAME_NATIVE, file, &size); - if (success) - return size; - else - return 0; -} - -/*********************************************************************** * GetProcessMemoryInfo (PSAPI.@) * * Retrieve memory usage information for a given process

1 0

Dmitry Timoshkov : winex11: Move the SendMessage(WM_SYSCOMMAND, SC_MAXIMIZE /SC_RESTORE) call after the window extents check.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 6eed4c4241ae30f9e0af2581555c5ce6c25623f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eed4c4241ae30f9e0af25815… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 5 18:31:27 2011 +0900 winex11: Move the SendMessage(WM_SYSCOMMAND, SC_MAXIMIZE/SC_RESTORE) call after the window extents check. --- dlls/winex11.drv/event.c | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 2fdc028..474e288 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -912,25 +912,6 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, event->x, event->y, event->width, event->height ); - if (is_net_wm_state_maximized( event->display, data )) - { - if (!IsZoomed( data->hwnd )) - { - TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); - return; - } - } - else - { - if (IsZoomed( data->hwnd )) - { - TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); - return; - } - } - X11DRV_X_to_window_rect( data, &rect ); if (root_coords) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); @@ -953,7 +934,11 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) data->window_rect.bottom - data->window_rect.top == cy) || (IsRectEmpty( &data->window_rect ) && event->width == 1 && event->height == 1)) { - if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */ + if (flags & SWP_NOMOVE) /* if nothing changed, don't do anything */ + { + TRACE( "Nothing has changed, ignoring event\n" ); + return; + } flags |= SWP_NOSIZE; } else @@ -961,6 +946,25 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, cx, cy ); + if (is_net_wm_state_maximized( event->display, data )) + { + if (!IsZoomed( data->hwnd )) + { + TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + return; + } + } + else + { + if (IsZoomed( data->hwnd )) + { + TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + return; + } + } + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); }

1 0