June 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Get rid of the explicit colormap management.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 9d53a1ae2bea737f5842dfcb53cfbeee5c8a8932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d53a1ae2bea737f5842dfcb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 16:21:32 2008 +0200 winex11: Get rid of the explicit colormap management. --- dlls/winex11.drv/window.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 22de5ca..b984bca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1879,7 +1879,6 @@ void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) * SetFocus (X11DRV.@) * * Set the X focus. - * Explicit colormap management seems to work only with OLVWM. */ void X11DRV_SetFocus( HWND hwnd ) { @@ -1887,18 +1886,7 @@ void X11DRV_SetFocus( HWND hwnd ) struct x11drv_win_data *data; XWindowChanges changes; - /* If setting the focus to 0, uninstall the colormap */ - if (!hwnd && root_window == DefaultRootWindow(display)) - { - wine_tsx11_lock(); - if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_PRIVATE) - XUninstallColormap( display, X11DRV_PALETTE_PaletteXColormap ); - wine_tsx11_unlock(); - return; - } - - hwnd = GetAncestor( hwnd, GA_ROOT ); - + if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (data->managed || !data->whole_window) return; @@ -1913,8 +1901,6 @@ void X11DRV_SetFocus( HWND hwnd ) XSetInputFocus( display, data->whole_window, RevertToParent, /* CurrentTime */ GetMessageTime() - EVENT_x11_time_to_win32_time(0)); - if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_PRIVATE) - XInstallColormap( display, X11DRV_PALETTE_PaletteXColormap ); } wine_tsx11_unlock(); }

1 0

Alexandre Julliard : winex11: Explicitly request creation of the per-thread data where necessary.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 06a1407c13aabd577ef2b1a8a4387aa92b5ddd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a1407c13aabd577ef2b1a8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 15:08:08 2008 +0200 winex11: Explicitly request creation of the per-thread data where necessary. --- dlls/winex11.drv/clipboard.c | 7 ++++--- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/window.c | 17 ++++++++++------- dlls/winex11.drv/wintab.c | 4 ++-- dlls/winex11.drv/x11ddraw.c | 2 ++ dlls/winex11.drv/x11drv.h | 6 ++---- dlls/winex11.drv/x11drv_main.c | 4 +++- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index af5ff9d..3675527 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -317,7 +317,8 @@ static UINT wSeqNo = 0; static Window thread_selection_wnd(void) { - Window w = x11drv_thread_data()->selection_wnd; + struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); + Window w = thread_data->selection_wnd; if (!w) { @@ -327,12 +328,12 @@ static Window thread_selection_wnd(void) ButtonPressMask | ButtonReleaseMask | EnterWindowMask); wine_tsx11_lock(); - w = XCreateWindow(thread_display(), root_window, 0, 0, 1, 1, 0, screen_depth, + w = XCreateWindow(thread_data->display, root_window, 0, 0, 1, 1, 0, screen_depth, InputOutput, CopyFromParent, CWEventMask, &attr); wine_tsx11_unlock(); if (w) - x11drv_thread_data()->selection_wnd = w; + thread_data->selection_wnd = w; else FIXME("Failed to create window. Fetching selection data will fail.\n"); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 354f74c..0d4aa5f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -918,7 +918,7 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) */ void X11DRV_SetCursor( CURSORICONINFO *lpCursor ) { - struct x11drv_thread_data *data = x11drv_thread_data(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); Cursor cursor; if (lpCursor) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 26f037a..22de5ca 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1487,7 +1487,6 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) void X11DRV_DestroyWindow( HWND hwnd ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - Display *display = thread_data->display; struct x11drv_win_data *data; if (!(data = X11DRV_get_win_data( hwnd ))) return; @@ -1506,13 +1505,13 @@ void X11DRV_DestroyWindow( HWND hwnd ) wine_tsx11_unlock(); } - destroy_whole_window( display, data, FALSE ); - destroy_icon_window( display, data ); + destroy_whole_window( thread_data->display, data, FALSE ); + destroy_icon_window( thread_data->display, data ); if (data->colormap) { wine_tsx11_lock(); - XFreeColormap( display, data->colormap ); + XFreeColormap( thread_data->display, data->colormap ); wine_tsx11_unlock(); } @@ -1520,7 +1519,7 @@ void X11DRV_DestroyWindow( HWND hwnd ) if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); - XDeleteContext( display, (XID)hwnd, win_data_context ); + XDeleteContext( thread_data->display, (XID)hwnd, win_data_context ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); } @@ -1638,9 +1637,12 @@ BOOL X11DRV_CreateWindow( HWND hwnd ) */ struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); char *data; - if (!hwnd || XFindContext( thread_display(), (XID)hwnd, win_data_context, &data )) data = NULL; + if (!thread_data) return NULL; + if (!hwnd) return NULL; + if (XFindContext( thread_data->display, (XID)hwnd, win_data_context, &data )) data = NULL; return (struct x11drv_win_data *)data; } @@ -1813,6 +1815,7 @@ void X11DRV_SetCapture( HWND hwnd, UINT flags ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (!thread_data) return; if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; if (hwnd) @@ -1924,7 +1927,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *rectWindow, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); + struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); Display *display = thread_data->display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index ed04ad5..e73f000 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -490,7 +490,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; - struct x11drv_thread_data *data = x11drv_thread_data(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; int loop; XDeviceInfo *devices; @@ -961,7 +961,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) */ int X11DRV_AttachEventQueueToTablet(HWND hOwner) { - struct x11drv_thread_data *data = x11drv_thread_data(); + struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; int loop; int cur_loop; diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index e0bda0a..e618618 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -77,6 +77,8 @@ static LRESULT WINAPI GrabWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM TRACE("hwnd=%p, grab=%ld\n", hWnd, wParam); + if (!data) return 0; + if (wParam) { /* find the X11 window that ddraw uses */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3bfe118..cfcfba4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -522,12 +522,10 @@ extern DWORD thread_data_tls_index; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); - if (!data) data = x11drv_init_thread_data(); - return data; + return TlsGetValue( thread_data_tls_index ); } -static inline Display *thread_display(void) { return x11drv_thread_data()->display; } +static inline Display *thread_display(void) { return x11drv_init_thread_data()->display; } static inline size_t get_property_size( int format, unsigned long count ) { diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 4ca1bb6..75b9bd9 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -616,7 +616,9 @@ static void set_queue_display_fd( Display *display ) */ struct x11drv_thread_data *x11drv_init_thread_data(void) { - struct x11drv_thread_data *data; + struct x11drv_thread_data *data = x11drv_thread_data(); + + if (data) return data; if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) {

1 0

Alexandre Julliard : winex11: Pass the display as parameter to a few more functions instead of using thread_display ().
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: e705764cca5f41c76a42f800ee3746abb31fd6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e705764cca5f41c76a42f800e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 16:20:02 2008 +0200 winex11: Pass the display as parameter to a few more functions instead of using thread_display(). --- dlls/winex11.drv/clipboard.c | 154 ++++++++++++++++++++---------------------- dlls/winex11.drv/event.c | 14 ++-- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/systray.c | 8 +- 4 files changed, 86 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e705764cca5f41c76a42f…

1 0

Chris Morgan : Assorted spelling fixes from Francois Gouget
by Chris Morgan 26 Jun '08

26 Jun '08

Module: appdb Branch: master Commit: 9f956d4ccc297f7e3f72f736d81424bd65540d9b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9f956d4ccc297f7e3f72f736… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Thu Jun 26 12:07:29 2008 -0400 Assorted spelling fixes from Francois Gouget --- CODING_STANDARD | 2 +- help/appdb_faq.help | 2 +- help/generic.help | 4 ++-- help/maintainer.help | 2 +- include/application.php | 2 +- include/distribution.php | 2 +- include/note.php | 2 +- include/objectManager.php | 2 +- include/testData.php | 8 ++++---- tables/testResults.sql | 2 +- unit_test/test_common.php | 2 +- unit_test/test_maintainer.php | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CODING_STANDARD b/CODING_STANDARD index f3fd3d4..463140e 100644 --- a/CODING_STANDARD +++ b/CODING_STANDARD @@ -74,7 +74,7 @@ function do_foo($sVar) 5) do not use vars that require register_globals to be on as: a) it is off by default in php 4.1+ b) it is more secure - c) it makes it easier to understand where your vars are comming from (forms, session, etc.) + c) it makes it easier to understand where your vars are coming from (forms, session, etc.) /** diff --git a/help/appdb_faq.help b/help/appdb_faq.help index 0eb70eb..7cdd832 100644 --- a/help/appdb_faq.help +++ b/help/appdb_faq.help @@ -73,7 +73,7 @@ reviewed by a maintainer or administrator. Q: How do I become an Application Database maintainer? <blockquote> A: Pretty much anyone supporting Wine is welcome (begged?) to be an application maintainer. -Simply click on the button you will find in the application overview or specific version page to send your request. An administrator will then review your proposal and add you the the maintainer's team for this application or version. Once we have a community of maintainers, we hope that community will further refine the policies and procedures. +Simply click on the button you will find in the application overview or specific version page to send your request. An administrator will then review your proposal and add you to the maintainer's team for this application or version. Once we have a community of maintainers, we hope that community will further refine the policies and procedures. </blockquote> diff --git a/help/generic.help b/help/generic.help index 4101de3..64afbb2 100644 --- a/help/generic.help +++ b/help/generic.help @@ -19,10 +19,10 @@ for a certain program hasn't been created.</center> <li>Run your program by changing into the directory where it is located, and then type 'wine yourprogram.exe'. Alternately your file manager should know to open .exe files with 'wine').</li> -<li>If there is an an error about missing files, or does not start at all, make sure you are in the directory where it was installed.</li> +<li>If there is an error about missing files, or it does not start at all, make sure you are in the directory where it was installed.</li> <li> Many newer games contain copy protection, which is sometimes not supported in Wine. Third party applications may be able to circumvent this, - when this is required an application cannot be rated higher than Gold</li> + when this is required an application cannot be rated higher than Gold.</li> <li> In case of failure, try different builtin, native DLL settings: Run Wine with 'WINEDEBUG=+loaddll wine yourprogram.exe' to find out which diff --git a/help/maintainer.help b/help/maintainer.help index cebcb71..15c4247 100644 --- a/help/maintainer.help +++ b/help/maintainer.help @@ -9,7 +9,7 @@ Information on what a maintainer is and why they are important to the appdb. Maintainers are privileged users who have the ability to administrate applications and versions. Maintainers typically use the applications and versions they maintain on a daily or weekely basis and test them with each new version of Wine that is -released. They also respond to forum posts for their applications/versions and review and process testing results and +released. They also respond to forum posts for their applications/versions and review and process test results and screenshots that users submit. Please see the <a href="./?sTopic=maintainer_guidelines" style="cursor: help">maintainer's guidelines</a> for more information on the kinds of things a maintainer has stewardship over. diff --git a/include/application.php b/include/application.php index 80bbf1b..6b2cd77 100644 --- a/include/application.php +++ b/include/application.php @@ -1320,7 +1320,7 @@ class Application { return FALSE; } - /* If no errors occured we return the number of moved children */ + /* If no errors occurred we return the number of moved children */ return $iCount; } diff --git a/include/distribution.php b/include/distribution.php index 1833177..28aeeb7 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -597,7 +597,7 @@ class distribution { $oTableRow->AddCell($oTableCell); - // enable the 'delete' action if this distribution has no testing results + // enable the 'delete' action if this distribution has no test results $bDeleteLink = sizeof($this->aTestingIds) ? FALSE : TRUE; $oOMTableRow = new OMTableRow($oTableRow); diff --git a/include/note.php b/include/note.php index 30cbed6..1558d66 100644 --- a/include/note.php +++ b/include/note.php @@ -305,7 +305,7 @@ class Note { return false; } - // NOTE: notes can not be queued at this point + // NOTE: notes cannot be queued at this point function mustBeQueued() { return false; diff --git a/include/objectManager.php b/include/objectManager.php index e8b2392..b1280ab 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -525,7 +525,7 @@ class ObjectManager $sSubmitter = " (submitted by ".$oUser->objectMakeLink().")"; } else { - $shWhyComment = "Although you submitted it it might be useful for other users to know why ". + $shWhyComment = "Although you submitted it, it might be useful for other users to know why ". "you are deleting it."; $sSubmitter = ""; diff --git a/include/testData.php b/include/testData.php index c029b1f..c749c53 100644 --- a/include/testData.php +++ b/include/testData.php @@ -439,15 +439,15 @@ class testData{ switch($sAction) { case "add": - $sSubject = "Submitted testing data accepted"; - $sMsg = "The testing data you submitted for '$sName' has been ". + $sSubject = "Submitted test data accepted"; + $sMsg = "The test data you submitted for '$sName' has been ". "accepted by ".$_SESSION['current']->sRealname.".\n"; $sMsg .= $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n"; $sMsg .= "Administrators response:\n"; break; case "reject": - $sSubject = "Submitted testing data rejected"; - $sMsg = "The testing data you submitted for '$sName' has ". + $sSubject = "Submitted test data rejected"; + $sMsg = "The test data you submitted for '$sName' has ". "been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= $this->objectMakeUrl()."\n"; $sMsg .= "Reason given:\n"; diff --git a/tables/testResults.sql b/tables/testResults.sql index 8c377ef..dd0d899 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -3,7 +3,7 @@ use apidb; drop table if exists testResults; /* - * Version Testing results + * Version Test results */ create table testResults ( testingId int not null auto_increment, diff --git a/unit_test/test_common.php b/unit_test/test_common.php index 6189f66..5734687 100644 --- a/unit_test/test_common.php +++ b/unit_test/test_common.php @@ -45,7 +45,7 @@ function delete_version_and_parent_app($iVersionId) echo __FUNCTION__."() oApp->purge() failed, returned false!\n"; } - // remove the admin privleges only if the user didn't + // remove the admin privileges only if the user didn't // have them to begin with if(!$bWasAdmin) $_SESSION['current']->delPriv("admin"); diff --git a/unit_test/test_maintainer.php b/unit_test/test_maintainer.php index a31fb26..87a043d 100644 --- a/unit_test/test_maintainer.php +++ b/unit_test/test_maintainer.php @@ -393,7 +393,7 @@ function test_maintainer_unQueue() return FALSE; } - // Now that the super maintainer entry was unqueued the the maintainer + // Now that the super maintainer entry was unqueued, the maintainer // entry should have been deleted $iExpected = 0; $iReceived = maintainer::getMaintainerCountForUser($oSecondUser, FALSE);

1 0

Chris Morgan : Fixed typo pointed out by Francois Gouget
by Chris Morgan 26 Jun '08

26 Jun '08

Module: appdb Branch: master Commit: 26854c6b3b7fb0b85c712b2ba4c1334d8cdc16ce URL: http://source.winehq.org/git/appdb.git/?a=commit;h=26854c6b3b7fb0b85c712b2b… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Thu Jun 26 12:05:00 2008 -0400 Fixed typo pointed out by Francois Gouget --- include/application_queue.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index d20dca8..14e1767 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -71,7 +71,7 @@ class application_queue function update() { - $bSucess = TRUE; + $bSuccess = TRUE; /* If the vendor was already un-queued then the edit vendor form would not have been displayed, and so the vendor name will not be set. Thus only

1 0

Nikolay Sivov : gdiplus: GdipClearPathMarkers implementation.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: eae78db8bb05bda2ac3cd346094746d24eb9d86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae78db8bb05bda2ac3cd3460… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 24 01:57:27 2008 +0400 gdiplus: GdipClearPathMarkers implementation. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 17 +++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 112e0b8..57e0de6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -45,7 +45,7 @@ @ stub GdipBitmapSetPixel @ stub GdipBitmapSetResolution @ stdcall GdipBitmapUnlockBits(ptr ptr) -@ stub GdipClearPathMarkers +@ stdcall GdipClearPathMarkers(ptr) @ stub GdipCloneBitmapArea @ stub GdipCloneBitmapAreaI @ stdcall GdipCloneBrush(ptr ptr) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 11374ad..c474e99 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -849,3 +849,20 @@ GpStatus WINGDIPAPI GdipSetPathMarker(GpPath* path) return Ok; } + +GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath* path) +{ + INT count; + INT i; + + if(!path) + return InvalidParameter; + + count = path->pathdata.Count; + + for(i = 0; i < count - 1; i++){ + path->pathdata.Types[i] &= ~PathPointTypePathMarker; + } + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 96ee322..c20efdc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -147,6 +147,7 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*); +GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath*); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint);

1 0

Alexandre Julliard : ole32: Make the apartment window a HWND_MESSAGE window .
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: a803fa3578194a3ebee9a673c7dadf5180b48e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a803fa3578194a3ebee9a673c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 13:22:16 2008 +0200 ole32: Make the apartment window a HWND_MESSAGE window. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 07e0f50..3df0421 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -724,7 +724,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) { HWND hwnd = CreateWindowW(wszAptWinClass, NULL, 0, 0, 0, 0, 0, - 0, 0, OLE32_hInstance, NULL); + HWND_MESSAGE, 0, OLE32_hInstance, NULL); if (!hwnd) { ERR("CreateWindow failed with error %d\n", GetLastError());

1 0

Anatoly Lyutin : user32/tests:c Add msg tests for SetActiveWindow().
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 2aba9f7fcb577e691335f09e6693fa97f6003938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aba9f7fcb577e691335f09e6… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Jun 25 16:40:41 2008 +0400 user32/tests:c Add msg tests for SetActiveWindow(). --- dlls/user32/tests/msg.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 153 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 390aca4..dfb6108 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9981,6 +9981,158 @@ static void test_nullCallback(void) DestroyWindow(hwnd); } +/* SetActiveWindow( 0 ) hwnd visible */ +static const struct message SetActiveWindowSeq0[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_NCACTIVATE, sent|wparam, 0 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { WM_SETFOCUS, sent|defwinproc }, + { 0 } +}; +/* SetActiveWindow( hwnd ) hwnd visible */ +static const struct message SetActiveWindowSeq1[] = +{ + { 0 } +}; +/* SetActiveWindow( popup ) hwnd visible, popup visible */ +static const struct message SetActiveWindowSeq2[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_NCACTIVATE, sent|wparam, 0 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { WM_NCPAINT, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { WM_SETFOCUS, sent|defwinproc }, + { 0 } +}; + +/* SetActiveWindow( hwnd ) hwnd not visible */ +static const struct message SetActiveWindowSeq3[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOACTIVATE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_ACTIVATEAPP, sent|wparam, 1 }, + { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { WM_SETFOCUS, sent|defwinproc }, + { 0 } +}; +/* SetActiveWindow( popup ) hwnd not visible, popup not visible */ +static const struct message SetActiveWindowSeq4[] = +{ + { HCBT_ACTIVATE, hook }, + { WM_NCACTIVATE, sent|wparam, 0 }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCACTIVATE, sent|wparam, 1 }, + { WM_ACTIVATE, sent|wparam, 1 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { WM_SETFOCUS, sent|defwinproc }, + { 0 } +}; + + +static void test_SetActiveWindow(void) +{ + HWND hwnd, popup, ret; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test SetActiveWindow", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + + popup = CreateWindowExA(0, "TestWindowClass", "Test SetActiveWindow", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_POPUP, + 100, 100, 200, 200, hwnd, 0, 0, NULL); + + ok(hwnd != 0, "Failed to create overlapped window\n"); + flush_sequence(); + + ok(popup != 0, "Failed to create popup window\n"); + flush_sequence(); + + trace("SetActiveWindow(0)\n"); + ret = SetActiveWindow(0); + ok( ret == popup, "Failed to SetActiveWindow(0)\n"); + ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", TRUE); + flush_sequence(); + + trace("SetActiveWindow(hwnd), hwnd visible\n"); + ret = SetActiveWindow(hwnd); + todo_wine + { + ok( ret == hwnd, "Failed to SetActiveWindow(hwnd), hwnd visible\n"); + } + ok_sequence(SetActiveWindowSeq1, "SetActiveWindow(hwnd), hwnd visible", TRUE); + flush_sequence(); + + trace("SetActiveWindow(popup), hwnd visible, popup visble\n"); + ret = SetActiveWindow(popup); + ok( ret == hwnd, "Failed to SetActiveWindow(popup), popup visble\n"); + ok_sequence(SetActiveWindowSeq2, "SetActiveWindow(popup), hwnd visible, popup visble", TRUE); + flush_sequence(); + + ShowWindow(hwnd, SW_HIDE); + ShowWindow(popup, SW_HIDE); + flush_sequence(); + + trace("SetActiveWindow(hwnd), hwnd not visible\n"); + ret = SetActiveWindow(hwnd); + ok( ret == NULL, "Failed to SetActiveWindow(hwnd), hwnd not visible\n"); + ok_sequence(SetActiveWindowSeq3, "SetActiveWindow(hwnd), hwnd not visible", TRUE); + flush_sequence(); + + trace("SetActiveWindow(popup), hwnd not visible, popup not visble\n"); + ret = SetActiveWindow(popup); + ok( ret == hwnd, "Failed to SetActiveWindow(popup)\n"); + ok_sequence(SetActiveWindowSeq4, "SetActiveWindow(popup), hwnd not visible, popup not visble", TRUE); + flush_sequence(); + + trace("done\n"); + + DestroyWindow(hwnd); +} + static const struct message SetForegroundWindowSeq[] = { { WM_NCACTIVATE, sent|wparam, 0 }, @@ -10830,6 +10982,7 @@ START_TEST(msg) test_SendMessageTimeout(); test_edit_messages(); test_quit_message(); + test_SetActiveWindow(); if (!pTrackMouseEvent) skip("TrackMouseEvent is not available\n");

1 0

Filipe Ferreira : winecfg: Added Windows registration information setting.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: a933d5401e42381cb8ada6f5e13129013e94aa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a933d5401e42381cb8ada6f5e… Author: Filipe Ferreira <filipe(a)tinypad.net> Date: Mon Jun 23 22:27:46 2008 -0400 winecfg: Added Windows registration information setting. --- programs/winecfg/Bg.rc | 5 ++++ programs/winecfg/Cs.rc | 5 ++++ programs/winecfg/Da.rc | 5 ++++ programs/winecfg/De.rc | 5 ++++ programs/winecfg/En.rc | 5 ++++ programs/winecfg/Es.rc | 5 ++++ programs/winecfg/Fi.rc | 5 ++++ programs/winecfg/Fr.rc | 5 ++++ programs/winecfg/Hu.rc | 5 ++++ programs/winecfg/It.rc | 5 ++++ programs/winecfg/Ja.rc | 5 ++++ programs/winecfg/Ko.rc | 5 ++++ programs/winecfg/Nl.rc | 5 ++++ programs/winecfg/No.rc | 5 ++++ programs/winecfg/Pl.rc | 5 ++++ programs/winecfg/Pt.rc | 10 +++++++ programs/winecfg/Ro.rc | 5 ++++ programs/winecfg/Ru.rc | 5 ++++ programs/winecfg/Si.rc | 5 ++++ programs/winecfg/Sv.rc | 5 ++++ programs/winecfg/Tr.rc | 5 ++++ programs/winecfg/Zh.rc | 5 ++++ programs/winecfg/main.c | 57 ++++++++++++++++++++++++++++++++++++------- programs/winecfg/resource.h | 4 +++ 24 files changed, 167 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a933d5401e42381cb8ada…

1 0

Alexandre Julliard : wine.inf: Make the initial owner information empty.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: b258f880add02043dad9550a7aabc1eada48e5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b258f880add02043dad9550a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 26 13:42:09 2008 +0200 wine.inf: Make the initial owner information empty. --- tools/wine.inf.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8dfc0d5..3e3a625 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -199,16 +199,16 @@ HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersion%,"ProgramFilesDir",,"%16422%" HKLM,%CurrentVersion%,"ProgramFilesPath",0x20000,"%%ProgramFiles%%" -HKLM,%CurrentVersion%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" -HKLM,%CurrentVersion%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" +HKLM,%CurrentVersion%,"RegisteredOrganization",2,"" +HKLM,%CurrentVersion%,"RegisteredOwner",2,"" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Uninstall,,,"" -HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" -HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" +HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" +HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Fonts,,,"" HKLM,%CurrentVersionNT%\Q246009,"Installed",,"1"

1 0