wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Alexandre Julliard : winex11: Keep track of the window colormap and free it on destroy.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: e9307d09a65c36a76835bd41b3ef2823a9df2bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9307d09a65c36a76835bd41b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 21 20:23:32 2008 +0100 winex11: Keep track of the window colormap and free it on destroy. --- dlls/winex11.drv/window.c | 18 +++++++++++++----- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2fc8660..2d93104 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -360,12 +360,13 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) { XSetWindowAttributes attrib; + data->colormap = XCreateColormap(display, parent, vis->visual, + (vis->class == PseudoColor || + vis->class == GrayScale || + vis->class == DirectColor) ? + AllocAll : AllocNone); attrib.override_redirect = True; - attrib.colormap = XCreateColormap(display, parent, vis->visual, - (vis->class == PseudoColor || - vis->class == GrayScale || - vis->class == DirectColor) ? - AllocAll : AllocNone); + attrib.colormap = data->colormap; XInstallColormap(gdi_display, attrib.colormap); data->gl_drawable = XCreateWindow(display, parent, -w, 0, w, h, 0, @@ -1294,6 +1295,13 @@ void X11DRV_DestroyWindow( HWND hwnd ) destroy_whole_window( display, data ); destroy_icon_window( display, data ); + if (data->colormap) + { + wine_tsx11_lock(); + XFreeColormap( display, data->colormap ); + wine_tsx11_unlock(); + } + if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9f60624..ee2cac7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,7 @@ struct x11drv_win_data Window whole_window; /* X window for the complete window */ Window client_window; /* X window for the client area */ Window icon_window; /* X window for the icon */ + Colormap colormap; /* Colormap for this window */ XID fbconfig_id; /* fbconfig id for the GL drawable this hwnd uses */ Drawable gl_drawable; /* Optional GL drawable for rendering the client area */ Pixmap pixmap; /* Base pixmap for if gl_drawable is a GLXPixmap */

1 0

Aric Stewart : coreaudio: Set mDataByteSize of the buffer to the amount data provided. Greatly helps reduce audio corruption on buffer underflows.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: b5511ac6bfb1613aabc6e9b11a1272117783ce52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5511ac6bfb1613aabc6e9b11… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 21 11:15:53 2008 -0600 coreaudio: Set mDataByteSize of the buffer to the amount data provided. Greatly helps reduce audio corruption on buffer underflows. --- dlls/winecoreaudio.drv/audio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index ee089ab..ec5a096 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1579,6 +1579,7 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, needNotify = 1; } } + ioData->mBuffers[0].mDataByteSize = dataProvided; OSSpinLockUnlock(&wwo->lock);

1 0

Louis Lenders : shdocvw: Pretend success in WebBrowser_get_RegisterAsDropTarget.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 1df00aff39cf8855d64fc79dc6909f4f7ff109c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df00aff39cf8855d64fc79dc… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Feb 21 12:05:49 2008 +0000 shdocvw: Pretend success in WebBrowser_get_RegisterAsDropTarget. --- dlls/shdocvw/webbrowser.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 55f1620..41617a2 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -796,7 +796,8 @@ static HRESULT WINAPI WebBrowser_get_RegisterAsDropTarget(IWebBrowser2 *iface, { WebBrowser *This = WEBBROWSER_THIS(iface); FIXME("(%p)->(%p)\n", This, pbRegister); - return E_NOTIMPL; + *pbRegister=0; + return S_OK; } static HRESULT WINAPI WebBrowser_put_RegisterAsDropTarget(IWebBrowser2 *iface,

1 0

Rob Shearman : winspool: Fix the character count passed into RegEnumKeyExW in get_local_monitors.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 35be5e1d1b10287aa019762c6724f6c4f8026150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35be5e1d1b10287aa019762c6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:48 2008 +0000 winspool: Fix the character count passed into RegEnumKeyExW in get_local_monitors. RegEnumKeyExW takes a character count for the key name, not a byte count. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4ba9f28..17cd507 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -755,7 +755,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW ptr = (LPWSTR) &pMonitors[len]; numentries = 0; - len = sizeof(buffer); + len = sizeof(buffer)/sizeof(buffer[0]); buffer[0] = '\0'; /* Windows creates the "Monitors"-Key on reboot / start "spooler" */

1 0

Rob Shearman : Revert "winspool: Fix character count passed to RegQueryValueExW in get_local_monitors".
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: ee8dd6a19f1fbd06368cbee52a7b8cdb16551e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8dd6a19f1fbd06368cbee52… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:42 2008 +0000 Revert "winspool: Fix character count passed to RegQueryValueExW in get_local_monitors". This reverts commit 6886a49c5953c2cf5c141b1b09f288ce32ced3f3. RegQueryValueExW takes a byte count, not a character count (spotted by Detlef Riekenberg). --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a2f6779..4ba9f28 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -763,7 +763,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW /* Scan all Monitor-Registry-Keys */ while (RegEnumKeyExW(hroot, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { TRACE("Monitor_%d: %s\n", numentries, debugstr_w(buffer)); - dllsize = sizeof(dllname)/sizeof(dllname[0]); + dllsize = sizeof(dllname); dllname[0] = '\0'; /* The Monitor must have a Driver-DLL */

1 0

Rob Shearman : dplayx: Fix incorrect check in DirectPlayLobbyAImpl_EnumLocalApplications and IDirectPlayLobbyAImpl_EnumAddressTypes .
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 0435395ccc87b686852ae1d9a2f2a46d03952301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0435395ccc87b686852ae1d9a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:34 2008 +0000 dplayx: Fix incorrect check in DirectPlayLobbyAImpl_EnumLocalApplications and IDirectPlayLobbyAImpl_EnumAddressTypes. Dereferencing a function pointer and checking it against NULL doesn't make any sense, so remove the checks. --- dlls/dplayx/dplobby.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index f12025e..7a60602 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -736,7 +736,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumAddressTypes return DPERR_INVALIDPARAMS; } - if( !lpEnumAddressTypeCallback || !*lpEnumAddressTypeCallback ) + if( !lpEnumAddressTypeCallback ) { return DPERR_INVALIDPARAMS; } @@ -892,7 +892,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_EnumLocalApplications return DPERR_INVALIDPARAMS; } - if( !lpEnumLocalAppCallback || !*lpEnumLocalAppCallback ) + if( !lpEnumLocalAppCallback ) { return DPERR_INVALIDPARAMS; }

1 0

Rob Shearman : dplayx: Fix incorrect check in DirectPlay3AImpl_EnumConnections.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 488ac40fa8e8a22206d1fefd157fbd04fadae0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=488ac40fa8e8a22206d1fefd1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:29 2008 +0000 dplayx: Fix incorrect check in DirectPlay3AImpl_EnumConnections. Dereferencing a function pointer and checking it against NULL doesn't make any sense, so remove the check. --- dlls/dplayx/dplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e3c3562..04044a7 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3669,7 +3669,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections return DPERR_INVALIDFLAGS; } - if( !lpEnumCallback || !*lpEnumCallback ) + if( !lpEnumCallback ) { return DPERR_INVALIDPARAMS; }

1 0

Rob Shearman : dbghelp: Fix read beyond end of field in module_get_debug.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: f21b91c0a2d454d9e757ee14914ba944f224af36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21b91c0a2d454d9e757ee149… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:24 2008 +0000 dbghelp: Fix read beyond end of field in module_get_debug. --- dlls/dbghelp/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3f7fe7a..64e821f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -308,7 +308,7 @@ BOOL module_get_debug(struct module_pair* pair) idslW64.CheckSum = pair->effective->module.CheckSum; idslW64.TimeDateStamp = pair->effective->module.TimeDateStamp; memcpy(idslW64.FileName, pair->effective->module.ImageName, - sizeof(idslW64.FileName)); + sizeof(pair->effective->module.ImageName)); idslW64.Reparse = FALSE; idslW64.hFile = INVALID_HANDLE_VALUE;

1 0

Rob Shearman : dbghelp: VARIANT unions are accessed by name in msc. c so define NONAMELESSUNION.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 5e1976368a5fbcf86633b21820f7c76d95410383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1976368a5fbcf86633b2182… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:44:17 2008 +0000 dbghelp: VARIANT unions are accessed by name in msc.c so define NONAMELESSUNION. --- dlls/dbghelp/msc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index af09f1f..25589fc 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -32,6 +32,8 @@ * Add symbol size to internal symbol table. */ +#define NONAMELESSUNION + #include "config.h" #include "wine/port.h"

1 0

Rob Shearman : include: Include excpt.h from wine/exception.h.
by Alexandre Julliard 22 Feb '08

22 Feb '08

Module: wine Branch: master Commit: 4a4b1269fa4b55dd3b121dc9f84196aa67b5dde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4b1269fa4b55dd3b121dc9f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Feb 21 16:13:37 2008 +0000 include: Include excpt.h from wine/exception.h. Some files use wine/exception.h without also including excpt.h, but excpt.h is needed when using native exception handling. --- include/wine/exception.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 3a14a18..fc90364 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -23,6 +23,7 @@ #include <setjmp.h> #include <windef.h> +#include <excpt.h> /* The following definitions allow using exceptions in Wine and Winelib code *

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2008