October 2007 - Wine-Commits

Jacek Caban : mshtml: Move init_nsevents call from start_binding to read_stream_data to avoid race .
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 9a9de4d65b9dda6c0a788e7255da5e368e56a0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9de4d65b9dda6c0a788e725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 01:21:41 2007 +0200 mshtml: Move init_nsevents call from start_binding to read_stream_data to avoid race. --- dlls/mshtml/navigate.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 014fcdb..659ba22 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -220,6 +220,10 @@ static HRESULT read_stream_data(BSCallback *This, IStream *stream) (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext); if(NS_FAILED(nsres)) FIXME("OnStartRequest failed: %08x\n", nsres); + + /* events are reset when a new document URI is loaded, so re-initialise them here */ + if(This->doc && This->doc->nscontainer) + init_nsevents(This->doc->nscontainer); } This->readed += This->nsstream->buf_size; @@ -819,10 +823,6 @@ HRESULT start_binding(BSCallback *bscallback) IMoniker_Release(bscallback->mon); bscallback->mon = NULL; - /* events are reset when a new document URI is loaded, so re-initialise them here */ - if(bscallback->doc && bscallback->doc->nscontainer) - init_nsevents(bscallback->doc->nscontainer); - return S_OK; }

1 0

Maarten Lankhorst : wineoss: Remove useless fixme shown on initialisation.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 4ed3f220827c23991b2009d0a89b0a9aff2d9948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed3f220827c23991b2009d0a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 9 08:57:39 2007 +0200 wineoss: Remove useless fixme shown on initialisation. --- dlls/wineoss.drv/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 21a0a22..6453da4 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1151,7 +1151,8 @@ LRESULT OSS_WaveInit(void) char* str; int i; - FIXME("() stub\n"); + /* FIXME: Remove unneeded members of WOutDev and WInDev */ + TRACE("()\n"); str=getenv("AUDIODEV"); if (str!=NULL)

1 0

Juan Lang : crypt32: Add an extra pointer alignment to avoid possible memory corruption.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 57b13b37d5bcec103fd39152db5adafca97cae0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b13b37d5bcec103fd39152d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 8 15:38:35 2007 -0700 crypt32: Add an extra pointer alignment to avoid possible memory corruption. --- dlls/crypt32/msg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 15fbbc9..2d19736 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1800,6 +1800,9 @@ static DWORD CRYPT_SizeOfAttributes(const CRYPT_ATTRIBUTES *attr) for (j = 0; j < attr->rgAttr[i].cValue; j++) size += attr->rgAttr[i].rgValue[j].cbData; } + /* align pointer again to be conservative */ + if (size % sizeof(DWORD_PTR)) + size += size % sizeof(DWORD_PTR); return size; }

1 0

Maarten Lankhorst : dsound: Release buffer before reopening when buffer is too small.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 6ad603d2198fad0ad76be9a3ce339ce243d17928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad603d2198fad0ad76be9a3c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 9 08:52:11 2007 +0200 dsound: Release buffer before reopening when buffer is too small. --- dlls/dsound/primary.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 615b6f2..8e15cc5 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -176,6 +176,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { WARN("Too little sound buffer to be effective (%d/%d) falling back to waveout\n", device->buflen, ds_snd_queue_min * device->fraglen); device->buflen = buflen; + IDsDriverBuffer_Release(device->hwbuf); + device->hwbuf = NULL; err = DSOUND_ReopenDevice(device, TRUE); if (FAILED(err)) {

1 0

Maarten Lankhorst : winmm: Set default sound driver to alsa, oss, coreaudio.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: d322d63b10b4a71f4d71f43e83d0c1b4d20c7414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d322d63b10b4a71f4d71f43e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Oct 8 20:11:13 2007 +0200 winmm: Set default sound driver to alsa,oss,coreaudio. --- dlls/winmm/winemm.h | 2 +- programs/winecfg/audio.c | 40 ++++++---------------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 72de79a..805ad83 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -25,7 +25,7 @@ #include "winbase.h" #include "mmddk.h" -#define WINE_DEFAULT_WINMM_DRIVER "oss" +#define WINE_DEFAULT_WINMM_DRIVER "alsa,oss,coreaudio" #define WINE_DEFAULT_WINMM_MAPPER "msacm32.drv" #define WINE_DEFAULT_WINMM_MIDI "midimap.dll" diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 89fee96..39b3b07 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -82,12 +82,12 @@ static const char* DSound_Bits[] = { static const AUDIO_DRIVER sAudioDrivers[] = { {IDS_DRIVER_ALSA, "alsa"}, - {IDS_DRIVER_ESOUND, "esd"}, {IDS_DRIVER_OSS, "oss"}, + {IDS_DRIVER_COREAUDIO, "coreaudio"}, {IDS_DRIVER_JACK, "jack"}, {IDS_DRIVER_NAS, "nas"}, + {IDS_DRIVER_ESOUND, "esd"}, {IDS_DRIVER_AUDIOIO, "audioio"}, - {IDS_DRIVER_COREAUDIO, "coreaudio"}, {0, ""} }; @@ -623,41 +623,13 @@ static void initAudioDlg (HWND hDlg) buf = get_reg_key(config_key, "Drivers", "Audio", NULL); /* check for first time install and set a default driver - * select in this order: oss, alsa, first available driver, none + * select first available driver, and if that fails: none */ if (buf == NULL) { - const AUDIO_DRIVER *pAudioDrv = NULL; - - /* select oss if available */ - for (pAudioDrv = loadedAudioDrv; pAudioDrv->nameID; pAudioDrv++) - { - if (strcmp(pAudioDrv->szDriver, "oss") == 0) - { - selectDriver(hDlg, "oss"); - break; - } - } - - if (strlen(curAudioDriver) == 0) - { - /* select alsa if available */ - for (pAudioDrv = loadedAudioDrv; pAudioDrv->nameID; pAudioDrv++) - { - if (strcmp(pAudioDrv->szDriver, "alsa") == 0) - { - selectDriver(hDlg, "alsa"); - break; - } - } - } - - if (strlen(curAudioDriver) == 0) - { - /* select first available driver */ - if (*loadedAudioDrv->szDriver) - selectDriver(hDlg, loadedAudioDrv->szDriver); - } + /* select first available driver */ + if (*loadedAudioDrv->szDriver) + selectDriver(hDlg, loadedAudioDrv->szDriver); } else /* make a local copy of the current registry setting */ strcpy(curAudioDriver, buf);

1 0

Reece H. Dunn : comctl32: Fixed drawing the trackbar background when themes are installed.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 4b4cfff4bad305cbd3b882547f5a95c185733510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4cfff4bad305cbd3b882547… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sun Oct 7 16:52:55 2007 +0100 comctl32: Fixed drawing the trackbar background when themes are installed. --- dlls/comctl32/trackbar.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 1ae1f73..f95ec5e 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -824,6 +824,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) HBITMAP hOldBmp = 0, hOffScreenBmp = 0; NMCUSTOMDRAW nmcd; int gcdrf, icdrf; + HTHEME theme; if (infoPtr->flags & TB_THUMBCHANGED) { TRACKBAR_UpdateThumb (infoPtr); @@ -868,8 +869,12 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) /* Erase backbround */ if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { - if (GetWindowTheme (infoPtr->hwndSelf)) + if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { + DrawThemeBackground (theme, hdc, + (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_VERT) ? + TKP_TRACKVERT : TKP_TRACK, TKS_NORMAL, &rcClient, 0); DrawThemeParentBackground (infoPtr->hwndSelf, hdc, &rcClient); + } else FillRect (hdc, &rcClient, GetSysColorBrush(COLOR_BTNFACE)); if (gcdrf != CDRF_DODEFAULT)

1 0

Stefan Leichter : winecfg: Replace call to remove_path with RegDeleteTreeW.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 8422a64a3a7552c03efb4d142d50f8f7d28a9249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8422a64a3a7552c03efb4d142… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Oct 7 22:59:06 2007 +0200 winecfg: Replace call to remove_path with RegDeleteTreeW. --- programs/winecfg/winecfg.c | 48 +------------------------------------------- 1 files changed, 1 insertions(+), 47 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 342d1e8..c492a11 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -211,52 +211,6 @@ static HRESULT remove_value(HKEY root, const WCHAR *subkey, const WCHAR *name) return S_OK; } -/* removes the requested subkey from the registry, assuming it exists */ -static LONG remove_path(HKEY root, WCHAR *section) { - HKEY branch_key; - DWORD max_sub_key_len; - DWORD subkeys; - DWORD curr_len; - LONG ret = ERROR_SUCCESS; - long int i; - WCHAR *buffer; - - WINE_TRACE("section=%s\n", wine_dbgstr_w(section)); - - if ((ret = RegOpenKeyW(root, section, &branch_key)) != ERROR_SUCCESS) - return ret; - - /* get size information and resize the buffers if necessary */ - if ((ret = RegQueryInfoKeyW(branch_key, NULL, NULL, NULL, - &subkeys, &max_sub_key_len, - NULL, NULL, NULL, NULL, NULL, NULL - )) != ERROR_SUCCESS) - return ret; - - curr_len = lstrlenW(section); - buffer = HeapAlloc(GetProcessHeap(), 0, (max_sub_key_len + curr_len + 1)*sizeof(WCHAR)); - lstrcpyW(buffer, section); - - buffer[curr_len] = '\\'; - for (i = subkeys - 1; i >= 0; i--) - { - DWORD buf_len = max_sub_key_len - curr_len - 1; - - ret = RegEnumKeyExW(branch_key, i, buffer + curr_len + 1, - &buf_len, NULL, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA && - ret != ERROR_NO_MORE_ITEMS) - break; - else - remove_path(root, buffer); - } - HeapFree(GetProcessHeap(), 0, buffer); - RegCloseKey(branch_key); - - return RegDeleteKeyW(root, section); -} - - /* ========================================================================= */ /* This code exists for the following reasons: @@ -682,7 +636,7 @@ static void process_setting(struct setting *s) { /* NULL name means remove that path/section entirely */ if (s->path && s->name) remove_value(s->root, s->path, s->name); - else if (s->path && !s->name) remove_path(s->root, s->path); + else if (s->path && !s->name) RegDeleteTreeW(s->root, s->path); } }

1 0

Jacek Caban : urlmon: Fixed test on IE7.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 5c57c838b283ff0759dd5912defe529ea56eed81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c57c838b283ff0759dd5912d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 17:50:02 2007 +0200 urlmon: Fixed test on IE7. --- dlls/urlmon/sec_mgr.c | 4 +++- dlls/urlmon/tests/misc.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 609ca4f..52e29b6 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -251,8 +251,10 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac return hres; } - if(!pwszUrl) + if(!pwszUrl) { + *pdwZone = -1; return E_INVALIDARG; + } if(dwFlags) FIXME("not supported flags: %08x\n", dwFlags); diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index c93d6c2..b6f6421 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -691,7 +691,7 @@ static void test_SecurityManager(void) zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, NULL, &zone, 0); ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08x, expected E_INVALIDARG\n", hres); - ok(zone == 100, "zone=%d\n", zone); + ok(zone == 100 || zone == -1, "zone=%d\n", zone); size = sizeof(buf); hres = IInternetSecurityManager_GetSecurityId(secmgr, NULL, buf, &size, 0);

1 0

Jacek Caban : shdocvw: Fixed tests on IE7.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: d8ba5bf20bbf04604977b54b5c56e5fd8ae22cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ba5bf20bbf04604977b54b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 7 17:39:08 2007 +0200 shdocvw: Fixed tests on IE7. --- dlls/shdocvw/tests/webbrowser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 2b38154..796c47c 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1075,7 +1075,7 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_get_ToolBar(wb, &i); ok(hres == S_OK, "get_ToolBar failed: %08x\n", hres); - ok(i == VARIANT_TRUE, "i=%x\n", i); + ok(i, "i=%x\n", i); hres = IWebBrowser2_put_ToolBar(wb, VARIANT_FALSE); ok(hres == S_OK, "put_ToolBar failed: %08x\n", hres); @@ -1089,7 +1089,7 @@ static void test_ie_funcs(IUnknown *unk) hres = IWebBrowser2_get_ToolBar(wb, &i); ok(hres == S_OK, "get_ToolBar failed: %08x\n", hres); - ok(i == VARIANT_TRUE, "i=%x\n", i); + ok(i, "i=%x\n", i); hres = IWebBrowser2_put_ToolBar(wb, VARIANT_TRUE); ok(hres == S_OK, "put_ToolBar failed: %08x\n", hres);

1 0

Rob Shearman : ole32: RegisterDragDrop should return E_OUTOFMEMORY in the case that COM isn' t intialised, instead of CO_E_NOTINITIALIZED.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: 5e2d890e5d6371263cf9a131c6fea915af562b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2d890e5d6371263cf9a131c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Oct 7 16:52:28 2007 +0200 ole32: RegisterDragDrop should return E_OUTOFMEMORY in the case that COM isn't intialised, instead of CO_E_NOTINITIALIZED. --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/dragdrop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e58385b..e8793fc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -284,7 +284,7 @@ HRESULT WINAPI RegisterDragDrop( if (!COM_CurrentApt()) { ERR("COM not initialized\n"); - return CO_E_NOTINITIALIZED; + return E_OUTOFMEMORY; } if (!pDropTarget) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 48b308c..1561066 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -113,7 +113,7 @@ START_TEST(dragdrop) HRESULT hr; hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); - ok(hr == CO_E_NOTINITIALIZED, "RegisterDragDrop without OLE initialized should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); OleInitialize(NULL);

1 0