November 2007 - Wine-commits

Rob Shearman : comctl32: Fix the tooltips behaviour when TTF_ABSOLUTE isn' t specified.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: c6525745f241962d7776b665b768b08d3c9cca09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6525745f241962d7776b665b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 19 15:29:57 2007 +0000 comctl32: Fix the tooltips behaviour when TTF_ABSOLUTE isn't specified. This does not mean to use the current cursor position. Instead, it means that the left hand edge of balloon tips doesn't have to be exactly the co-ordinate passed in (i.e. the stem can be as vertical as possible) and it means non-balloon tips can use smart placement. --- dlls/comctl32/tooltips.c | 73 +++++++++++++++------------------------------- 1 files changed, 24 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 901abc0..8740b63 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -573,64 +573,39 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr, BOOL track_activate) if (track_activate) { - if (toolPtr->uFlags & TTF_ABSOLUTE) - { - rect.left = infoPtr->xTrackPos; - rect.top = infoPtr->yTrackPos; - ptfx = rect.left; + rect.left = infoPtr->xTrackPos; + rect.top = infoPtr->yTrackPos; + ptfx = rect.left; - if (toolPtr->uFlags & TTF_CENTERTIP) - { - rect.left -= (size.cx / 2); - if (!(style & TTS_BALLOON)) - rect.top -= (size.cy / 2); - } - infoPtr->bToolBelow = TRUE; + if (toolPtr->uFlags & TTF_CENTERTIP) + { + rect.left -= (size.cx / 2); + if (!(style & TTS_BALLOON)) + rect.top -= (size.cy / 2); } - else + infoPtr->bToolBelow = TRUE; + + if (!(toolPtr->uFlags & TTF_ABSOLUTE)) { - RECT rcTool; + if (style & TTS_BALLOON) + rect.left -= BALLOON_STEMINDENT; + else + { + RECT rcTool; - GetCursorPos ((LPPOINT)&rect); - if (style & TTS_BALLOON) - { - ptfx = rect.left; - if (rect.top - size.cy >= 0) - { - rect.top -= size.cy; - infoPtr->bToolBelow = FALSE; - } + if (toolPtr->uFlags & TTF_IDISHWND) + GetWindowRect ((HWND)toolPtr->uId, &rcTool); else { - infoPtr->bToolBelow = TRUE; - rect.top += 20; + rcTool = toolPtr->rect; + MapWindowPoints (toolPtr->hwnd, NULL, (LPPOINT)&rcTool, 2); } - rect.left = max(0, rect.left - BALLOON_STEMINDENT); - } - else - { - rect.top += 20; - infoPtr->bToolBelow = TRUE; - } - if (toolPtr->uFlags & TTF_CENTERTIP) - { - rect.left -= (size.cx / 2); - rect.top -= (size.cy / 2); - } - - if (toolPtr->uFlags & TTF_IDISHWND) - GetWindowRect ((HWND)toolPtr->uId, &rcTool); - else - { - rcTool = toolPtr->rect; - MapWindowPoints (toolPtr->hwnd, NULL, (LPPOINT)&rcTool, 2); + /* smart placement */ + if ((rect.left + size.cx > rcTool.left) && (rect.left < rcTool.right) && + (rect.top + size.cy > rcTool.top) && (rect.top < rcTool.bottom)) + rect.left = rcTool.right; } - - /* smart placement */ - if ((rect.left + size.cx > rcTool.left) && (rect.left < rcTool.right) && - (rect.top + size.cy > rcTool.top) && (rect.top < rcTool.bottom)) - rect.left = rcTool.right; } } else

1 0

Rob Shearman : comctl32: Forward the WM_GETTEXTLENGTH message from ComboEx controls to its edit control .
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 0d44f6f0700bef8a47769bd6d16ef55d6abf2671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d44f6f0700bef8a47769bd6d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 19 15:30:18 2007 +0000 comctl32: Forward the WM_GETTEXTLENGTH message from ComboEx controls to its edit control. --- dlls/comctl32/comboex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 006b8a6..55e5308 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -2236,6 +2236,7 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SETTEXT: case WM_GETTEXT: + case WM_GETTEXTLENGTH: return SendMessageW(infoPtr->hwndEdit, uMsg, wParam, lParam); case CB_GETLBTEXT:

1 0

Rob Shearman : explorer: Add a fixme to show when applications are trying to show a balloon tip in the taskbar notification area .
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: e301d172112e9ce854f2060e84bec6351577bb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e301d172112e9ce854f2060e8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 19 15:32:12 2007 +0000 explorer: Add a fixme to show when applications are trying to show a balloon tip in the taskbar notification area. --- programs/explorer/systray.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ca8a34b..a5535ff 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -212,6 +212,10 @@ static void modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) { set_tooltip(icon, nid->szTip, modify_tooltip); } + if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) + { + WINE_FIXME("balloon tip title %s, message %s\n", wine_dbgstr_w(nid->szInfoTitle), wine_dbgstr_w(nid->szInfo)); + } } static void add_icon(NOTIFYICONDATAW *nid)

1 0

Rob Shearman : urlmon: Fix a reference count leak in RegisterBindStatusCallback.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: 862aaaba5836737617d3cf3a561664f992ab0da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862aaaba5836737617d3cf3a5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 19 15:33:33 2007 +0000 urlmon: Fix a reference count leak in RegisterBindStatusCallback. --- dlls/urlmon/bindctx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 9d24707..13dd987 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -520,7 +520,9 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb IBindCtx_RevokeObjectParam(pbc, BSCBHolder); } - hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)create_bsc(pbsc)); + bsc = create_bsc(pbsc); + hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); + IBindStatusCallback_Release(bsc); if(FAILED(hres)) { IBindStatusCallback_Release(prev); return hres;

1 0

Jacek Caban : mshtml: Fixed handling channels without container and necko channel.
by Alexandre Julliard 20 Nov '07

20 Nov '07

Module: wine Branch: master Commit: c02b46d9876e23ec2d0e7090ba9c61d50b828e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02b46d9876e23ec2d0e7090b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 19 11:47:06 2007 +0100 mshtml: Fixed handling channels without container and necko channel. --- dlls/mshtml/nsio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 16ada42..22b30e5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -761,7 +761,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen nsIWineURI_GetNSContainer(This->uri, &container); if(!container) { TRACE("container = NULL\n"); - return nsIChannel_AsyncOpen(This->channel, aListener, aContext); + return This->channel + ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) + : NS_ERROR_UNEXPECTED; } nsIWineURI_GetIsDocumentURI(This->uri, &is_doc_uri);

1 0

Bang Jun-young : olecli32: Fix invalid syntax.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 9ae9109d39f7e92f01bbe37f4b6007f73de9ce8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae9109d39f7e92f01bbe37f4… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Mon Nov 19 14:54:16 2007 +0900 olecli32: Fix invalid syntax. --- dlls/olecli32/olecli_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index d751522..a36cb72 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -146,7 +146,7 @@ typedef LPCSTR LPCOLESTR16; struct _OLESTREAM; typedef struct _OLEOBJECTVTBL { - void CALLBACK *(*QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); + void * (CALLBACK *QueryProtocol)(_LPOLEOBJECT,LPCOLESTR16); OLESTATUS (CALLBACK *Release)(_LPOLEOBJECT); OLESTATUS (CALLBACK *Show)(_LPOLEOBJECT,BOOL16); OLESTATUS (CALLBACK *DoVerb)(_LPOLEOBJECT,UINT16,BOOL16,BOOL16);

1 0

Alexandre Julliard : libport: Work around Mac OS execve() breakage.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: be32b3413c2245dab21e03bb0cb5c107f68f2eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be32b3413c2245dab21e03bb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 14:57:27 2007 +0100 libport: Work around Mac OS execve() breakage. --- libs/port/spawn.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 832862c..490abb3 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -23,6 +23,7 @@ #include <errno.h> #include <signal.h> +#include <stdlib.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif @@ -41,7 +42,8 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) if (mode == _P_OVERLAY) { execvp(cmdname, (char **)argv); - return -1; /* if we get here it failed */ + /* if we get here it failed */ + if (errno != ENOTSUP) return -1; /* exec fails on MacOS if the process has multiple threads */ } dfl_act.sa_handler = SIG_DFL; @@ -58,6 +60,8 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) _exit(1); } + if (pid != -1 && mode == _P_OVERLAY) exit(0); + if (pid != -1 && mode == _P_WAIT) { while (pid != (wret = waitpid(pid, &status, 0)))

1 0

Dmitry Timoshkov : winex11.drv: Use display device guid managed by explorer .
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: efda9908777e039027141b6e9eb98064b6f8a5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=efda9908777e039027141b6e9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Nov 16 19:39:08 2007 +0800 winex11.drv: Use display device guid managed by explorer. --- dlls/winex11.drv/settings.c | 39 ++++++++++++++++++++++++++++++++++----- programs/explorer/Makefile.in | 2 +- programs/explorer/desktop.c | 20 ++++++++++++++++++++ 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 2de20ca..a3fd3d5 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -21,6 +21,7 @@ #include "config.h" #include <string.h> #include <stdio.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -166,17 +167,40 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); } -/* Our fake driver GUID path */ -static const char wine_X11_reg_key[] = - "System\\CurrentControlSet\\Control\\Video\\{64498428-1122-3344-5566-778899aabbcc}\\0000"; +static BOOL get_display_device_reg_key(char *key, unsigned len) +{ + static const char display_device_guid_prop[] = "__wine_display_device_guid"; + static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; + static const char display0[] = "}\\0000"; + ATOM guid_atom; + + assert(len >= sizeof(video_path) + sizeof(display0) + 40); + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); + if (!guid_atom) return FALSE; + + memcpy(key, video_path, sizeof(video_path)); + + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + return FALSE; + + strcat(key, display0); + + TRACE("display device key %s\n", wine_dbgstr_a(key)); + return TRUE; +} static BOOL read_registry_settings(DEVMODEW *dm) { + char wine_x11_reg_key[128]; HKEY hkey; DWORD type, size; BOOL ret = TRUE; - if (RegOpenKeyA(HKEY_CURRENT_CONFIG, wine_X11_reg_key, &hkey)) + if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + return FALSE; + + if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) return FALSE; #define query_value(name, data) \ @@ -203,10 +227,15 @@ static BOOL read_registry_settings(DEVMODEW *dm) static BOOL write_registry_settings(const DEVMODEW *dm) { + char wine_x11_reg_key[128]; HKEY hkey; BOOL ret = TRUE; - if (RegCreateKeyA(HKEY_CURRENT_CONFIG, wine_X11_reg_key, &hkey)) + if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + return FALSE; + + if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, + REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) return FALSE; #define set_value(name, data) \ diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 3ee51f8..9498a0f 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorer.exe APPMODE = -mwindows -IMPORTS = user32 gdi32 advapi32 kernel32 ntdll +IMPORTS = rpcrt4 user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = comctl32 EXTRADEFS = @HALINCL@ EXTRALIBS = @DISKARBITRATIONLIB@ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 7f2e23f..4b1d041 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -115,6 +115,25 @@ static BOOL get_default_desktop_size( unsigned int *width, unsigned int *height return ret; } +static void initialize_display_settings( HWND desktop ) +{ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + GUID guid; + LPWSTR guid_str; + ATOM guid_atom; + + UuidCreate( &guid ); + UuidToStringW( &guid, &guid_str ); + WINE_TRACE( "display guid %s\n", wine_dbgstr_w(guid_str) ); + + guid_atom = GlobalAddAtomW( guid_str ); + SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); + + RpcStringFreeW( &guid_str ); +} + /* main desktop management function */ void manage_desktop( char *arg ) { @@ -171,6 +190,7 @@ void manage_desktop( char *arg ) SetWindowTextW( hwnd, desktop_nameW ); SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); SetDeskWallPaper( (LPSTR)-1 ); + initialize_display_settings( hwnd ); initialize_diskarbitration(); initialize_hal(); initialize_systray();

1 0

Michael Stefaniuc : tools: Remove duplicate includes.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 7f5757f68307646b0726723d6b6b700817242acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5757f68307646b0726723d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 01:42:37 2007 +0100 tools: Remove duplicate includes. --- tools/widl/server.c | 1 - tools/widl/typegen.c | 1 - tools/widl/utils.c | 1 - tools/wrc/utils.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index a52c729..c915662 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -37,7 +37,6 @@ #include "header.h" #include "windef.h" -#include "widl.h" #include "typelib.h" #include "typelib_struct.h" #include "typegen.h" diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bb75a0a..1078ede 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -40,7 +40,6 @@ #include "windef.h" #include "wine/list.h" -#include "widl.h" #include "typegen.h" static const func_t *current_func; diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 7dafc10..e77361c 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -27,7 +27,6 @@ #include <stdlib.h> #include <stdarg.h> #include <string.h> -#include <assert.h> #include <ctype.h> #include "widl.h" diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index b0109a7..35811bb 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include <stdarg.h> #include <string.h> -#include <assert.h> #include <ctype.h> #include "wine/unicode.h"

1 0

Alexandre Julliard : ntdll: Initialize the PEB LoaderLock pointer.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 35c91324ea3e29f470a0f487cdce14327a975bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c91324ea3e29f470a0f487c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 13:56:26 2007 +0100 ntdll: Initialize the PEB LoaderLock pointer. --- dlls/ntdll/loader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8769b09..c6c6806 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2296,6 +2296,7 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, exit(1); } + peb->LoaderLock = &loader_section; peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer );

1 0