October 2009 - Wine-commits

Ge van Geldorp : winex11.drv: Fix build on systems without libXrender.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: e77bef234a330066bbf700df5cca49c6b3d47e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77bef234a330066bbf700df5… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Sat Oct 17 23:03:02 2009 +0200 winex11.drv: Fix build on systems without libXrender. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 391c15a..90503bf 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2206,7 +2206,7 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } -void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev) +void X11DRV_XRender_SetDeviceClipping(X11DRV_PDEVICE *physDev, const RGNDATA *data) { assert(0); return;

1 0

Marcus Meissner : cabinet: Fixed free_decompression_temps/_mem , handle NULL (Coverity).
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 87118d00fee433eff377f81b5feb3dd9c7f85903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87118d00fee433eff377f81b5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 18 21:31:59 2009 +0200 cabinet: Fixed free_decompression_temps/_mem , handle NULL (Coverity). --- dlls/cabinet/fdi.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 8132818..61dafdb 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2279,9 +2279,10 @@ static void free_decompression_temps(HFDI hfdi, const struct fdi_folder *fol, } } -static void free_decompression_mem(HFDI hfdi, struct fdi_folder *fol, +static void free_decompression_mem(HFDI hfdi, fdi_decomp_state *decomp_state, struct fdi_file *file) { + struct fdi_folder *fol; while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2896,17 +2897,17 @@ BOOL __cdecl FDICopy( } free_decompression_temps(hfdi, fol, decomp_state); - free_decompression_mem(hfdi, fol, decomp_state, file); + free_decompression_mem(hfdi, decomp_state, file); return TRUE; bail_and_fail: /* here we free ram before error returns */ - free_decompression_temps(hfdi, fol, decomp_state); + if (fol) free_decompression_temps(hfdi, fol, decomp_state); if (filehf) PFDI_CLOSE(hfdi, filehf); - free_decompression_mem(hfdi, fol, decomp_state, file); + free_decompression_mem(hfdi, decomp_state, file); return FALSE; }

1 0

Jacek Caban : shlwapi: Properly handle ParseURL errors in UrlGetPart[AW].
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: a34ed0f6eeee7477ec0e3db40f634d05065a196e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34ed0f6eeee7477ec0e3db40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 18 21:48:57 2009 +0200 shlwapi: Properly handle ParseURL errors in UrlGetPart[AW]. --- dlls/shlwapi/url.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f031297..66c88a6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2141,6 +2141,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, BOOL WINAPI PathIsURLA(LPCSTR lpstrPath) { PARSEDURLA base; + HRESULT hres; TRACE("%s\n", debugstr_a(lpstrPath)); @@ -2148,8 +2149,8 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath) /* get protocol */ base.cbSize = sizeof(base); - ParseURLA(lpstrPath, &base); - return (base.nScheme != URL_SCHEME_INVALID); + hres = ParseURLA(lpstrPath, &base); + return hres == S_OK && (base.nScheme != URL_SCHEME_INVALID); } /************************************************************************* @@ -2160,6 +2161,7 @@ BOOL WINAPI PathIsURLA(LPCSTR lpstrPath) BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath) { PARSEDURLW base; + HRESULT hres; TRACE("%s\n", debugstr_w(lpstrPath)); @@ -2167,8 +2169,8 @@ BOOL WINAPI PathIsURLW(LPCWSTR lpstrPath) /* get protocol */ base.cbSize = sizeof(base); - ParseURLW(lpstrPath, &base); - return (base.nScheme != URL_SCHEME_INVALID); + hres = ParseURLW(lpstrPath, &base); + return hres == S_OK && (base.nScheme != URL_SCHEME_INVALID); } /*************************************************************************

1 0

Jacek Caban : shlwapi: Make more strict restriction for URL scheme and fix error handling in ParseURLA .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: e57b8526b293560b5731f51f2b06c93b247077c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57b8526b293560b5731f51f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 18 21:49:18 2009 +0200 shlwapi: Make more strict restriction for URL scheme and fix error handling in ParseURLA. --- dlls/shlwapi/url.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 66c88a6..1b8803c 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -145,40 +145,29 @@ static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len) HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) { WCHAR scheme[INTERNET_MAX_SCHEME_LENGTH]; - DWORD cnt, len; + const char *ptr = x; + int len; - y->nScheme = URL_SCHEME_INVALID; - if (y->cbSize != sizeof(*y)) return E_INVALIDARG; - /* FIXME: leading white space generates error of 0x80041001 which - * is undefined - */ - if (*x <= ' ') return 0x80041001; - cnt = 0; - y->cchProtocol = 0; - y->pszProtocol = x; - while (*x) { - if (*x == ':') { - y->cchProtocol = cnt; - cnt = -1; - y->pszSuffix = x+1; - break; - } - x++; - cnt++; - } + TRACE("%s %p\n", debugstr_a(x), y); - /* check for no scheme in string start */ - /* (apparently schemes *must* be larger than a single character) */ - if ((*x == '\0') || (y->cchProtocol <= 1)) { + if(y->cbSize != sizeof(*y)) + return E_INVALIDARG; + + while(*ptr && (isalnum(*ptr) || *ptr == '-')) + ptr++; + + if (*ptr != ':' || ptr <= x+1) { y->pszProtocol = NULL; return 0x80041001; } - /* found scheme, set length of remainder */ - y->cchSuffix = lstrlenA(y->pszSuffix); + y->pszProtocol = x; + y->cchProtocol = ptr-x; + y->pszSuffix = ptr+1; + y->cchSuffix = strlen(y->pszSuffix); - len = MultiByteToWideChar(CP_ACP, 0, y->pszProtocol, y->cchProtocol, - scheme, sizeof(scheme)/sizeof(WCHAR)); + len = MultiByteToWideChar(CP_ACP, 0, x, ptr-x, + scheme, sizeof(scheme)/sizeof(WCHAR)); y->nScheme = get_scheme_code(scheme, len); return S_OK;

1 0

Eric Pouech : winmm: Protect MCI_SYSINFO against null buffers.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 4587a322df75853d82048eba61ac523b5a2482d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4587a322df75853d82048eba6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 17 10:08:51 2009 +0200 winmm: Protect MCI_SYSINFO against null buffers. --- dlls/winmm/mci.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 32204a0..b133ffc 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1834,7 +1834,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm LPWINE_MCIDRIVER wmd; HKEY hKey; - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL || lpParms->lpstrReturn == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType);

1 0

Eric Pouech : mmsystem: Move the 16-bit MCI functions to a new mci16.c file .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 4633822cdf093d270ef768b792dd8fe58f6f3004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4633822cdf093d270ef768b79… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 17 12:04:57 2009 +0200 mmsystem: Move the 16-bit MCI functions to a new mci16.c file. --- dlls/winmm/Makefile.in | 1 + dlls/winmm/mci16.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/mmsystem.c | 156 -------------------------------------- 3 files changed, 197 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4633822cdf093d270ef76…

1 0

Eric Pouech : mmsystem: Cleanly separate MCI in MMSystem from WinMM code.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 09a9c87d6b36bd0a6d5b3087ae260d7924aac1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a9c87d6b36bd0a6d5b3087a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 17 12:05:04 2009 +0200 mmsystem: Cleanly separate MCI in MMSystem from WinMM code. --- dlls/winmm/mci.c | 126 +++------------------------ dlls/winmm/mci16.c | 223 ++++++++++++++++++++++++++++++++++++++---------- dlls/winmm/message16.c | 58 ++++++------- dlls/winmm/winemm.h | 8 +-- dlls/winmm/winemm16.h | 10 ++ dlls/winmm/winmm.c | 2 +- 6 files changed, 229 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09a9c87d6b36bd0a6d5b3…

1 0

Eric Pouech : winmm: Get rid of WINE_TIMER_IS32 internal flag.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: b6c7eda2d3d61ab81e9d9ad8c543f603f5f32593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7eda2d3d61ab81e9d9ad8c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Oct 17 12:10:05 2009 +0200 winmm: Get rid of WINE_TIMER_IS32 internal flag. --- dlls/winmm/mmsystem.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++--- dlls/winmm/time.c | 22 ++---------- dlls/winmm/winemm.h | 4 -- 3 files changed, 85 insertions(+), 27 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 3b36f8b..0b4a694 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -38,6 +38,7 @@ #include "wownt32.h" #include "winnls.h" +#include "wine/list.h" #include "wine/winuser16.h" #include "winemm.h" #include "winemm16.h" @@ -51,6 +52,15 @@ static LPWINE_DRIVER DRIVER_OpenDriver16(LPCWSTR, LPCWSTR, LPARAM); static LRESULT DRIVER_CloseDriver16(HDRVR16, LPARAM, LPARAM); static LRESULT DRIVER_SendMessage16(HDRVR16, UINT, LPARAM, LPARAM); +static CRITICAL_SECTION mmdrv_cs; +static CRITICAL_SECTION_DEBUG mmdrv_critsect_debug = +{ + 0, 0, &mmdrv_cs, + { &mmdrv_critsect_debug.ProcessLocksList, &mmdrv_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": mmsystem_mmdrv_cs") } +}; +static CRITICAL_SECTION mmdrv_cs = { &mmdrv_critsect_debug, -1, 0, 0, 0, 0 }; + /* ################################################### * # LIBRARY # * ################################################### @@ -2371,17 +2381,66 @@ MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16 lpTime, UINT16 wSize) return 0; } +struct timer_entry { + struct list entry; + UINT id; + LPTIMECALLBACK16 func16; + DWORD user; +}; + +static struct list timer_list = LIST_INIT(timer_list); + +static void CALLBACK timeCB3216(UINT id, UINT uMsg, DWORD_PTR user, DWORD_PTR dw1, DWORD_PTR dw2) +{ + struct timer_entry* te = (void*)user; + WORD args[8]; + DWORD ret; + + args[7] = LOWORD(id); + args[6] = LOWORD(uMsg); + args[5] = HIWORD(te->user); + args[4] = LOWORD(te->user); + args[3] = HIWORD(dw1); + args[2] = LOWORD(dw2); + args[1] = HIWORD(dw2); + args[0] = LOWORD(dw2); + WOWCallback16Ex((DWORD)te->func16, WCB16_PASCAL, sizeof(args), args, &ret); +} + /************************************************************************** * timeSetEvent [MMSYSTEM.602] */ MMRESULT16 WINAPI timeSetEvent16(UINT16 wDelay, UINT16 wResol, LPTIMECALLBACK16 lpFunc, DWORD dwUser, UINT16 wFlags) { - if (wFlags & WINE_TIMER_IS32) - WARN("Unknown windows flag... wine internally used.. ooch\n"); + MMRESULT16 id; + struct timer_entry* te; - return TIME_SetEventInternal(wDelay, wResol, (LPTIMECALLBACK)lpFunc, - dwUser, wFlags & ~WINE_TIMER_IS32); + switch (wFlags & (TIME_CALLBACK_EVENT_SET|TIME_CALLBACK_EVENT_PULSE)) + { + case TIME_CALLBACK_EVENT_SET: + case TIME_CALLBACK_EVENT_PULSE: + id = timeSetEvent(wDelay, wResol, (LPTIMECALLBACK)lpFunc, dwUser, wFlags); + break; + case TIME_CALLBACK_FUNCTION: + te = HeapAlloc(GetProcessHeap(), 0, sizeof(*te)); + if (!te) return 0; + te->func16 = lpFunc; + te->user = dwUser; + id = te->id = timeSetEvent(wDelay, wResol, timeCB3216, (DWORD_PTR)te, wFlags); + if (id) + { + EnterCriticalSection(&mmdrv_cs); + list_add_tail(&timer_list, &te->entry); + LeaveCriticalSection(&mmdrv_cs); + } + else HeapFree(GetProcessHeap(), 0, te); + break; + default: + id = 0; + break; + } + return id; } /************************************************************************** @@ -2389,7 +2448,24 @@ MMRESULT16 WINAPI timeSetEvent16(UINT16 wDelay, UINT16 wResol, LPTIMECALLBACK16 */ MMRESULT16 WINAPI timeKillEvent16(UINT16 wID) { - return timeKillEvent(wID); + MMRESULT16 ret = timeKillEvent(wID); + struct timer_entry* te; + + if (ret == TIMERR_NOERROR) + { + EnterCriticalSection(&mmdrv_cs); + LIST_FOR_EACH_ENTRY(te, &timer_list, struct timer_entry, entry) + { + if (wID == te->id) + { + list_remove(&te->entry); + HeapFree(GetProcessHeap(), 0, te); + break; + } + } + LeaveCriticalSection(&mmdrv_cs); + } + return ret; } /************************************************************************** diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 8c64ac8..fcf31f0 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -179,8 +179,7 @@ static int TIME_MMSysTimeCallback(void) if (flags & TIME_KILL_SYNCHRONOUS) EnterCriticalSection(&TIME_cbcrst); LeaveCriticalSection(&WINMM_cs); - if (flags & WINE_TIMER_IS32) func(id, 0, user, 0, 0); - else if (pFnCallMMDrvFunc16) pFnCallMMDrvFunc16((DWORD_PTR)func, id, 0, user, 0, 0); + func(id, 0, user, 0, 0); EnterCriticalSection(&WINMM_cs); if (flags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst); @@ -301,10 +300,10 @@ MMRESULT WINAPI timeGetSystemTime(LPMMTIME lpTime, UINT wSize) } /************************************************************************** - * TIME_SetEventInternal [internal] + * timeSetEvent [WINMM.@] */ -WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, - LPTIMECALLBACK lpFunc, DWORD_PTR dwUser, UINT wFlags) +MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, + DWORD_PTR dwUser, UINT wFlags) { WORD wNewID = 0; LPWINE_TIMERENTRY lpNewTimer; @@ -351,19 +350,6 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, } /************************************************************************** - * timeSetEvent [WINMM.@] - */ -MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, - DWORD_PTR dwUser, UINT wFlags) -{ - if (wFlags & WINE_TIMER_IS32) - WARN("Unknown windows flag... wine internally used.. ooch\n"); - - return TIME_SetEventInternal(wDelay, wResol, lpFunc, - dwUser, wFlags|WINE_TIMER_IS32); -} - -/************************************************************************** * timeKillEvent [WINMM.@] */ MMRESULT WINAPI timeKillEvent(UINT wID) diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 22bf222..97403e5 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -151,8 +151,6 @@ typedef struct tagWINE_MCIDRIVER { struct tagWINE_MCIDRIVER*lpNext; } WINE_MCIDRIVER, *LPWINE_MCIDRIVER; -#define WINE_TIMER_IS32 0x80 - struct IOProcList { struct IOProcList*pNext; /* Next item in linked list */ @@ -220,8 +218,6 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, LPCWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags, BOOL bFrom32); -WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, - DWORD_PTR dwUser, UINT wFlags); void TIME_MMTimeStop(void); /* Global variables */

1 0

Marcus Meissner : dsound: Check for NULL listener (Coverity).
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 61393fa021f271a7751aee41260f63a501443854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61393fa021f271a7751aee412… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 17 17:21:00 2009 +0200 dsound: Check for NULL listener (Coverity). --- dlls/dsound/tests/ds3d8.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 9dfdd31..8ad428d 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -767,9 +767,11 @@ static HRESULT test_secondary8(LPGUID lpGuid, int play, } EXIT1: if (has_listener) { - ref=IDirectSound3DListener_Release(listener); - ok(ref==0,"IDirectSound3dListener_Release() listener has %d " - "references, should have 0\n",ref); + if (listener) { + ref=IDirectSound3DListener_Release(listener); + ok(ref==0,"IDirectSound3dListener_Release() listener has %d " + "references, should have 0\n",ref); + } } else { ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, "

1 0

Marcus Meissner : winmm: Return error on NULL ioProc (Coverity).
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 6999921a6d1c18948bef6c162bc08327232148de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6999921a6d1c18948bef6c162… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 17 17:29:48 2009 +0200 winmm: Return error on NULL ioProc (Coverity). --- dlls/winmm/mmio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 5205e8a..14fb4e3 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -345,8 +345,8 @@ static LRESULT send_message(struct IOProcList* ioProc, LPMMIOINFO mmioinfo, LPARAM lp1 = lParam1, lp2 = lParam2; if (!ioProc) { - ERR("brrr\n"); - result = MMSYSERR_INVALPARAM; + ERR("ioProc NULL\n"); + return MMSYSERR_INVALPARAM; } if (ioProc->is_unicode != is_unicode) {

1 0