March 2006 - Wine-commits - list.winehq.org

Mike McCormack : server: Fix a race condition in the delivery of change notifications.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: f5c1381e065bfab1903eebd7596f670b82c28509 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5c1381e065bfab1903eebd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 28 17:58:07 2006 +0900 server: Fix a race condition in the delivery of change notifications. --- server/change.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/change.c b/server/change.c index 4349d7e..eec1241 100644 --- a/server/change.c +++ b/server/change.c @@ -591,11 +591,6 @@ static void inotify_do_change_notify( st if (!list_empty( &dir->change_q )) async_terminate_head( &dir->change_q, STATUS_ALERTED ); - else - { - dir->signaled++; - dir_signal_changed( dir ); - } } static unsigned int filter_from_event( struct inotify_event *ie ) @@ -1133,6 +1128,11 @@ DECL_HANDLER(read_directory_changes) if (event) reset_event( event ); + /* if there's already a change in the queue, send it */ + if (!list_empty( &dir->change_q ) && + !list_empty( &dir->change_records )) + async_terminate_head( &dir->change_q, STATUS_ALERTED ); + /* setup the real notification */ if (!inotify_adjust_changes( dir )) dnotify_adjust_changes( dir );

1 0

Mike McCormack : mpr: Improve the stub for WNetGetUniversalNameW.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: fbab61c4053314388f9d87fd5b0c6f56213106a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fbab61c4053314388f9d87f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Mar 28 14:42:33 2006 +0900 mpr: Improve the stub for WNetGetUniversalNameW. --- dlls/mpr/wnet.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index a0f0bd3..0f148e2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1711,11 +1711,36 @@ DWORD WINAPI WNetGetUniversalNameA ( LPC DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize ) { + LPUNIVERSAL_NAME_INFOW uniw; + DWORD err, len; + FIXME( "(%s, 0x%08lX, %p, %p): stub\n", debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + switch (dwInfoLevel) + { + case UNIVERSAL_NAME_INFO_LEVEL: + err = WN_MORE_DATA; + len = sizeof (*uniw) + lstrlenW(lpLocalPath); + if (*lpBufferSize <= len) + break; + uniw = lpBuffer; + uniw->lpUniversalName = (LPWSTR) &uniw[1]; + lstrcpyW(uniw->lpUniversalName, lpLocalPath); + *lpBufferSize = len; + err = WN_NO_ERROR; + break; + + case REMOTE_NAME_INFO_LEVEL: + err = WN_NO_NETWORK; + break; + + default: + err = WN_BAD_VALUE; + } + + SetLastError(err); + return err; }

1 0

Alexandre Julliard : winemp3: Renamed the dlls/msacm/ winemp3 directory to dlls/winemp3.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 25d134071f4e1c8ea78486b4e562a813c55519c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25d134071f4e1c8ea78486b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:19:50 2006 +0200 winemp3: Renamed the dlls/msacm/winemp3 directory to dlls/winemp3.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/msacm/winemp3/.gitignore | 1 dlls/msacm/winemp3/Makefile.in | 21 dlls/msacm/winemp3/common.c | 259 ---- dlls/msacm/winemp3/dct64_i386.c | 329 ------ dlls/msacm/winemp3/decode_i386.c | 166 --- dlls/msacm/winemp3/huffman.h | 346 ------ dlls/msacm/winemp3/interface.c | 244 ---- dlls/msacm/winemp3/l2tables.h | 175 --- dlls/msacm/winemp3/layer1.c | 159 --- dlls/msacm/winemp3/layer2.c | 300 ----- dlls/msacm/winemp3/layer3.c | 2023 ----------------------------------- dlls/msacm/winemp3/mpegl3.c | 628 ----------- dlls/msacm/winemp3/mpg123.h | 209 ---- dlls/msacm/winemp3/mpglib.h | 69 - dlls/msacm/winemp3/tabinit.c | 95 -- dlls/msacm/winemp3/winemp3.acm.spec | 1 dlls/winemp3.acm/.gitignore | 1 dlls/winemp3.acm/Makefile.in | 21 dlls/winemp3.acm/common.c | 259 ++++ dlls/winemp3.acm/dct64_i386.c | 329 ++++++ dlls/winemp3.acm/decode_i386.c | 166 +++ dlls/winemp3.acm/huffman.h | 346 ++++++ dlls/winemp3.acm/interface.c | 244 ++++ dlls/winemp3.acm/l2tables.h | 175 +++ dlls/winemp3.acm/layer1.c | 159 +++ dlls/winemp3.acm/layer2.c | 300 +++++ dlls/winemp3.acm/layer3.c | 2023 +++++++++++++++++++++++++++++++++++ dlls/winemp3.acm/mpegl3.c | 628 +++++++++++ dlls/winemp3.acm/mpg123.h | 209 ++++ dlls/winemp3.acm/mpglib.h | 69 + dlls/winemp3.acm/tabinit.c | 95 ++ dlls/winemp3.acm/winemp3.acm.spec | 1 35 files changed, 5030 insertions(+), 5034 deletions(-) delete mode 100644 dlls/msacm/winemp3/.gitignore delete mode 100644 dlls/msacm/winemp3/Makefile.in delete mode 100644 dlls/msacm/winemp3/common.c delete mode 100644 dlls/msacm/winemp3/dct64_i386.c delete mode 100644 dlls/msacm/winemp3/decode_i386.c delete mode 100644 dlls/msacm/winemp3/huffman.h delete mode 100644 dlls/msacm/winemp3/interface.c delete mode 100644 dlls/msacm/winemp3/l2tables.h delete mode 100644 dlls/msacm/winemp3/layer1.c delete mode 100644 dlls/msacm/winemp3/layer2.c delete mode 100644 dlls/msacm/winemp3/layer3.c delete mode 100644 dlls/msacm/winemp3/mpegl3.c delete mode 100644 dlls/msacm/winemp3/mpg123.h delete mode 100644 dlls/msacm/winemp3/mpglib.h delete mode 100644 dlls/msacm/winemp3/tabinit.c delete mode 100644 dlls/msacm/winemp3/winemp3.acm.spec create mode 100644 dlls/winemp3.acm/.gitignore create mode 100644 dlls/winemp3.acm/Makefile.in create mode 100644 dlls/winemp3.acm/common.c create mode 100644 dlls/winemp3.acm/dct64_i386.c create mode 100644 dlls/winemp3.acm/decode_i386.c create mode 100644 dlls/winemp3.acm/huffman.h create mode 100644 dlls/winemp3.acm/interface.c create mode 100644 dlls/winemp3.acm/l2tables.h create mode 100644 dlls/winemp3.acm/layer1.c create mode 100644 dlls/winemp3.acm/layer2.c create mode 100644 dlls/winemp3.acm/layer3.c create mode 100644 dlls/winemp3.acm/mpegl3.c create mode 100644 dlls/winemp3.acm/mpg123.h create mode 100644 dlls/winemp3.acm/mpglib.h create mode 100644 dlls/winemp3.acm/tabinit.c create mode 100644 dlls/winemp3.acm/winemp3.acm.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=25d134071f4e1c8ea78…

1 0

Alexandre Julliard : msg711: Renamed the dlls/msacm/ msg711 directory to dlls/msg711.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 66a5c739c8884f3161338dc4f5ff2da0dbc6a27a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66a5c739c8884f3161338dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:18:48 2006 +0200 msg711: Renamed the dlls/msacm/msg711 directory to dlls/msg711.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/msacm/msg711/.gitignore | 1 dlls/msacm/msg711/Makefile.in | 12 dlls/msacm/msg711/msg711.acm.spec | 1 dlls/msacm/msg711/msg711.c | 1164 ------------------------------------- dlls/msg711.acm/.gitignore | 1 dlls/msg711.acm/Makefile.in | 12 dlls/msg711.acm/msg711.acm.spec | 1 dlls/msg711.acm/msg711.c | 1164 +++++++++++++++++++++++++++++++++++++ 11 files changed, 1183 insertions(+), 1187 deletions(-) delete mode 100644 dlls/msacm/msg711/.gitignore delete mode 100644 dlls/msacm/msg711/Makefile.in delete mode 100644 dlls/msacm/msg711/msg711.acm.spec delete mode 100644 dlls/msacm/msg711/msg711.c create mode 100644 dlls/msg711.acm/.gitignore create mode 100644 dlls/msg711.acm/Makefile.in create mode 100644 dlls/msg711.acm/msg711.acm.spec create mode 100644 dlls/msg711.acm/msg711.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=66a5c739c8884f31613…

1 0

Alexandre Julliard : imaadp32: Renamed the dlls/msacm/ imaadp32 directory to dlls/imaadp32.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: ff0d10983c9ae7c6b225c7b81f2cb56e738cded7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff0d10983c9ae7c6b225c7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:17:19 2006 +0200 imaadp32: Renamed the dlls/msacm/imaadp32 directory to dlls/imaadp32.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/imaadp32.acm/.gitignore | 1 dlls/imaadp32.acm/Makefile.in | 12 dlls/imaadp32.acm/imaadp32.acm.spec | 1 dlls/imaadp32.acm/imaadp32.c | 937 +++++++++++++++++++++++++++++++++ dlls/msacm/imaadp32/.gitignore | 1 dlls/msacm/imaadp32/Makefile.in | 12 dlls/msacm/imaadp32/imaadp32.acm.spec | 1 dlls/msacm/imaadp32/imaadp32.c | 937 --------------------------------- 11 files changed, 956 insertions(+), 960 deletions(-) create mode 100644 dlls/imaadp32.acm/.gitignore create mode 100644 dlls/imaadp32.acm/Makefile.in create mode 100644 dlls/imaadp32.acm/imaadp32.acm.spec create mode 100644 dlls/imaadp32.acm/imaadp32.c delete mode 100644 dlls/msacm/imaadp32/.gitignore delete mode 100644 dlls/msacm/imaadp32/Makefile.in delete mode 100644 dlls/msacm/imaadp32/imaadp32.acm.spec delete mode 100644 dlls/msacm/imaadp32/imaadp32.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ff0d10983c9ae7c6b22…

1 0

Alexandre Julliard : msadp32: Renamed the dlls/msacm/ msadp32 directory to dlls/msadp32.acm.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 3fa4fc51aaec04b9eb3fe388748631a77e000896 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fa4fc51aaec04b9eb3fe38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 23:18:08 2006 +0200 msadp32: Renamed the dlls/msacm/msadp32 directory to dlls/msadp32.acm. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 8 dlls/msacm/msadp32/.gitignore | 1 dlls/msacm/msadp32/Makefile.in | 12 - dlls/msacm/msadp32/msadp32.acm.spec | 1 dlls/msacm/msadp32/msadp32.c | 780 ----------------------------------- dlls/msadp32.acm/.gitignore | 1 dlls/msadp32.acm/Makefile.in | 12 + dlls/msadp32.acm/msadp32.acm.spec | 1 dlls/msadp32.acm/msadp32.c | 780 +++++++++++++++++++++++++++++++++++ 11 files changed, 799 insertions(+), 803 deletions(-) delete mode 100644 dlls/msacm/msadp32/.gitignore delete mode 100644 dlls/msacm/msadp32/Makefile.in delete mode 100644 dlls/msacm/msadp32/msadp32.acm.spec delete mode 100644 dlls/msacm/msadp32/msadp32.c create mode 100644 dlls/msadp32.acm/.gitignore create mode 100644 dlls/msadp32.acm/Makefile.in create mode 100644 dlls/msadp32.acm/msadp32.acm.spec create mode 100644 dlls/msadp32.acm/msadp32.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3fa4fc51aaec04b9eb3…

1 0

Alexandre Julliard : x11drv: Moved desktop mode handling to the explorer process.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: db6608ac9f9bbc2ddd7f8bf201d1387d079dfd5f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db6608ac9f9bbc2ddd7f8bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 22:43:03 2006 +0200 x11drv: Moved desktop mode handling to the explorer process. Per-application desktop mode settings are no longer supported. Apps can be launched in a specific desktop window by using: explorer /desktop=name[,widthxheight] app.exe [args] If the named desktop already exists the app is launched inside it. The default desktop is cleverly named "default". --- dlls/x11drv/desktop.c | 123 ++--------------------------- dlls/x11drv/window.c | 60 +++++++++++--- dlls/x11drv/winex11.drv.spec | 3 + dlls/x11drv/x11drv.h | 2 dlls/x11drv/x11drv_main.c | 17 ---- programs/explorer/desktop.c | 144 +++++++++++++++++++++++++++++++--- programs/explorer/explorer.c | 10 -- programs/explorer/explorer_private.h | 2 8 files changed, 190 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=db6608ac9f9bbc2ddd7…

1 0

Alexandre Julliard : x11drv: Allow setting WM hints for the desktop window.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: ba1517fa80458d4cdf4a54e56d8178ac4d2918cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba1517fa80458d4cdf4a54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 22:16:04 2006 +0200 x11drv: Allow setting WM hints for the desktop window. --- dlls/x11drv/window.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index e8c376d..0c36b01 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -301,10 +301,15 @@ static void set_size_hints( Display *dis if ((size_hints = XAllocSizeHints())) { - size_hints->win_gravity = StaticGravity; - size_hints->x = data->whole_rect.left; - size_hints->y = data->whole_rect.top; - size_hints->flags = PWinGravity | PPosition; + size_hints->flags = 0; + + if (data->hwnd != GetDesktopWindow()) /* don't force position of desktop */ + { + size_hints->win_gravity = StaticGravity; + size_hints->x = data->whole_rect.left; + size_hints->y = data->whole_rect.top; + size_hints->flags |= PWinGravity | PPosition; + } if ( !(style & WS_THICKFRAME) ) { @@ -371,6 +376,13 @@ void X11DRV_set_wm_hints( Display *displ HWND owner = GetWindow( data->hwnd, GW_OWNER ); char *process_name = get_process_name(); + if (data->hwnd == GetDesktopWindow()) + { + /* force some styles for the desktop to get the correct decorations */ + style |= WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + owner = 0; + } + /* transient for hint */ if (owner) {

1 0

Alexandre Julliard : x11drv: Support SetWindowPos and ShowWindow on the desktop window.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 1625b385c8011ebda63c0790fd9edb14f403d619 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1625b385c8011ebda63c079… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 21:45:47 2006 +0200 x11drv: Support SetWindowPos and ShowWindow on the desktop window. --- dlls/x11drv/winpos.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index 96b1004..331d6d4 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -133,7 +133,8 @@ static BOOL SWP_DoWinPosChanging( WINDOW if (!(pWinpos->flags & SWP_NOSENDCHANGING)) SendMessageW( pWinpos->hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)pWinpos ); - if (!(wndPtr = WIN_GetPtr( pWinpos->hwnd )) || wndPtr == WND_OTHER_PROCESS) return FALSE; + if (!(wndPtr = WIN_GetPtr( pWinpos->hwnd )) || + wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; /* Calculate new position and size */ @@ -695,9 +696,6 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *win orig_flags = winpos->flags; winpos->flags &= ~SWP_WINE_NOHOSTMOVE; - /* Check window handle */ - if (winpos->hwnd == GetDesktopWindow()) return FALSE; - /* First make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ if (!(winpos->flags & SWP_NOMOVE)) { @@ -936,6 +934,7 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT BOOL X11DRV_ShowWindow( HWND hwnd, INT cmd ) { WND *wndPtr; + HWND parent; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; @@ -1004,7 +1003,8 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c if (!IsWindow( hwnd )) return wasVisible; } - if (!IsWindowVisible( GetAncestor( hwnd, GA_PARENT ))) + parent = GetAncestor( hwnd, GA_PARENT ); + if (parent && !IsWindowVisible( parent )) { /* if parent is not visible simply toggle WS_VISIBLE and return */ if (showFlag) WIN_SetStyle( hwnd, WS_VISIBLE, 0 );

1 0

Jacek Caban : mshtml: Added tooltip implementation.
by Alexandre Julliard 27 Mar '06

27 Mar '06

Module: wine Branch: refs/heads/master Commit: 5f009f2540759d767f4fa696d855edfd21bc3dcd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f009f2540759d767f4fa69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 27 21:02:28 2006 +0200 mshtml: Added tooltip implementation. --- dlls/mshtml/htmldoc.c | 4 + dlls/mshtml/mshtml_private.h | 23 ++++-- dlls/mshtml/nsembed.c | 172 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 51 ++++++++++++ dlls/mshtml/nsservice.c | 114 ++++++++++++++++++++++++++++ dlls/mshtml/view.c | 83 ++++++++++++++++++++ 6 files changed, 435 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5f009f2540759d767f4…

1 0