October 2009 - Wine-commits

Eric Pouech : winmm: Move the 16bit management of midi in driver type to the new 16=> 32 thunking scheme.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 84efa19e90871327f237a92dc47a42efb6ae1eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84efa19e90871327f237a92dc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:09:58 2009 +0200 winmm: Move the 16bit management of midi in driver type to the new 16=>32 thunking scheme. --- dlls/winmm/message16.c | 49 +++++++++++++++++++++++++++++++++++++----- dlls/winmm/mmsystem.c | 55 ++++++++++++++++++++++------------------------- dlls/winmm/winemm.h | 2 - dlls/winmm/winmm.c | 18 +++++---------- 4 files changed, 75 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84efa19e90871327f237a…

1 0

Eric Pouech : winmm: Move the 16bit management of midi out driver type to the new 16=> 32 thunking scheme.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 80b079e011b23b9c07692490913c2191bc1ae9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b079e011b23b9c076924909… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 22 22:10:05 2009 +0200 winmm: Move the 16bit management of midi out driver type to the new 16=>32 thunking scheme. --- dlls/winmm/message16.c | 61 ++++++++++++++++++++++++++++++++++++----------- dlls/winmm/mmsystem.c | 56 +++++++++++++++++++++---------------------- dlls/winmm/winemm.h | 2 - dlls/winmm/winmm.c | 18 ++++--------- 4 files changed, 79 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80b079e011b23b9c07692…

1 0

Henri Verbeet : wined3d: Replace the "stateLookup" tables with a single " wrap_lookup" table.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 342a71b281c9ee732f65443de68db0bfcaab0fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=342a71b281c9ee732f65443de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 10:26:10 2009 +0200 wined3d: Replace the "stateLookup" tables with a single "wrap_lookup" table. --- dlls/wined3d/basetexture.c | 43 ++++++++++++++++++++------------------- dlls/wined3d/directx.c | 36 ++++++++------------------------- dlls/wined3d/wined3d_private.h | 9 +------- 3 files changed, 32 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index b38f668..be88506 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -319,29 +319,30 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac } /* GL locking is done by the caller */ -static inline void apply_wrap(const GLint textureDimensions, const DWORD state, const GLint type, - BOOL cond_np2) { - GLint wrapParm; +static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) +{ + GLint gl_wrap; - if (state < minLookup[WINELOOKUP_WARPPARAM] || state > maxLookup[WINELOOKUP_WARPPARAM]) { - FIXME("Unrecognized or unsupported WINED3DTADDRESS_U value %d\n", state); - } else { - if(textureDimensions==GL_TEXTURE_CUBE_MAP_ARB) { - /* Cubemaps are always set to clamp, regardless of the sampler state. */ - wrapParm = GL_CLAMP_TO_EDGE; - } else if(cond_np2) { - if(state == WINED3DTADDRESS_WRAP) { - wrapParm = GL_CLAMP_TO_EDGE; - } else { - wrapParm = stateLookup[WINELOOKUP_WARPPARAM][state - minLookup[WINELOOKUP_WARPPARAM]]; - } - } else { - wrapParm = stateLookup[WINELOOKUP_WARPPARAM][state - minLookup[WINELOOKUP_WARPPARAM]]; - } - TRACE("Setting WRAP_S to %d for %x\n", wrapParm, textureDimensions); - glTexParameteri(textureDimensions, type, wrapParm); - checkGLcall("glTexParameteri(..., type, wrapParm)"); + if (d3d_wrap < WINED3DTADDRESS_WRAP || d3d_wrap > WINED3DTADDRESS_MIRRORONCE) + { + FIXME("Unrecognized or unsupported WINED3DTEXTUREADDRESS %#x.\n", d3d_wrap); + return; } + + if (target == GL_TEXTURE_CUBE_MAP_ARB + || (cond_np2 && d3d_wrap == WINED3DTADDRESS_WRAP)) + { + /* Cubemaps are always set to clamp, regardless of the sampler state. */ + gl_wrap = GL_CLAMP_TO_EDGE; + } + else + { + gl_wrap = wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; + } + + TRACE("Setting param %#x to %#x for target %#x.\n", param, gl_wrap, target); + glTexParameteri(target, param, gl_wrap); + checkGLcall("glTexParameteri(target, param, gl_wrap)"); } /* GL locking is done by the caller (state handler) */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2259a86..6984a57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -160,18 +160,7 @@ static const struct fragment_pipeline *select_fragment_implementation(struct win static const shader_backend_t *select_shader_backend(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType); static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter, WINED3DDEVTYPE DeviceType); -/* lookup tables */ -const int minLookup[MAX_LOOKUPS] = -{ - WINED3DTADDRESS_WRAP, /* WINELOOKUP_WARPPARAM */ -}; - -const int maxLookup[MAX_LOOKUPS] = -{ - WINED3DTADDRESS_MIRRORONCE, /* WINELOOKUP_WARPPARAM */ -}; - -DWORD *stateLookup[MAX_LOOKUPS]; +GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; const struct min_lookup minMipLookup[] = { @@ -2031,21 +2020,14 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) else gl_info->vidmem = WINE_DEFAULT_VIDMEM; - /* Load all the lookup tables */ - for (i = 0; i < MAX_LOOKUPS; i++) { - stateLookup[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(*stateLookup[i]) * (1 + maxLookup[i] - minLookup[i]) ); - } - - stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_WRAP - minLookup[WINELOOKUP_WARPPARAM]] = GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_CLAMP - minLookup[WINELOOKUP_WARPPARAM]] = GL_CLAMP_TO_EDGE; - stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_BORDER - minLookup[WINELOOKUP_WARPPARAM]] = - gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_BORDER - minLookup[WINELOOKUP_WARPPARAM]] = - gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_MIRROR - minLookup[WINELOOKUP_WARPPARAM]] = - gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - stateLookup[WINELOOKUP_WARPPARAM][WINED3DTADDRESS_MIRRORONCE - minLookup[WINELOOKUP_WARPPARAM]] = - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; + wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = + gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; + wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; + wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = + gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; + wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = + gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; /* Make sure there's an active HDC else the WGL extensions will fail */ hdc = pwglGetCurrentDC(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bafdc02..cc097fb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -148,14 +148,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES -typedef enum _WINELOOKUP { - WINELOOKUP_WARPPARAM = 0, - MAX_LOOKUPS = 1 -} WINELOOKUP; - -extern const int minLookup[MAX_LOOKUPS] DECLSPEC_HIDDEN; -extern const int maxLookup[MAX_LOOKUPS] DECLSPEC_HIDDEN; -extern DWORD *stateLookup[MAX_LOOKUPS] DECLSPEC_HIDDEN; +extern GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1] DECLSPEC_HIDDEN; struct min_lookup {

1 0

Henri Verbeet : wined3d: Don't use the stack as cursor mask (Valgrind).
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 53104ac1e791a0082a8b251971acd1c925869b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53104ac1e791a0082a8b25197… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 10:26:11 2009 +0200 wined3d: Don't use the stack as cursor mask (Valgrind). --- dlls/wined3d/device.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec56980..83f537c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6376,12 +6376,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i cursorInfo.fIcon = FALSE; cursorInfo.xHotspot = XHotSpot; cursorInfo.yHotspot = YHotSpot; - cursorInfo.hbmMask = CreateBitmap(pSur->currentDesc.Width, - pSur->currentDesc.Height, 1, - 1, &maskBits); - cursorInfo.hbmColor = CreateBitmap(pSur->currentDesc.Width, - pSur->currentDesc.Height, 1, - 32, lockedRect.pBits); + cursorInfo.hbmMask = CreateBitmap(pSur->currentDesc.Width, pSur->currentDesc.Height, + 1, 1, maskBits); + cursorInfo.hbmColor = CreateBitmap(pSur->currentDesc.Width, pSur->currentDesc.Height, + 1, 32, lockedRect.pBits); IWineD3DSurface_UnlockRect(pCursorBitmap); /* Create our cursor and clean up. */ cursor = CreateIconIndirect(&cursorInfo);

1 0

Henri Verbeet : wined3d: Compare and copy the actual palette in palette9_changed() (Valgrind).
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: ade350b4d4d1048a0377d1c5aeb852ca176c678b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade350b4d4d1048a0377d1c5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 10:26:12 2009 +0200 wined3d: Compare and copy the actual palette in palette9_changed() (Valgrind). --- dlls/wined3d/surface.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7e69d7d..a3043cd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2516,14 +2516,16 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) { return FALSE; } - if(This->palette9) { - if(memcmp(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256) == 0) { + if (This->palette9) + { + if (!memcmp(This->palette9, device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256)) + { return FALSE; } } else { This->palette9 = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); } - memcpy(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256); + memcpy(This->palette9, device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256); return TRUE; }

1 0

Hans Leidekker : msi/tests: Avoid accessing uninitialized memory.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 483590a3c5a8060f0dd54ebaded06b7cff537e7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=483590a3c5a8060f0dd54ebad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 10:48:00 2009 +0200 msi/tests: Avoid accessing uninitialized memory. Found by valgrind. --- dlls/msi/tests/package.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index fcad0be..88ffa61 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11391,6 +11391,7 @@ static void test_emptypackage(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); } + buffer[0] = 0; size = MAX_PATH; r = MsiRecordGetString(hrec, 1, buffer, &size); todo_wine

1 0

Hans Leidekker : msi/tests: Free the string returned from ConvertSidToStringSid.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 394a437723273a43bd96acc8513de0245b99581c URL: http://source.winehq.org/git/wine.git/?a=commit;h=394a437723273a43bd96acc85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 10:48:24 2009 +0200 msi/tests: Free the string returned from ConvertSidToStringSid. Found by valgrind. --- dlls/msi/tests/package.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 88ffa61..903e2ac 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7691,6 +7691,7 @@ static void test_appsearch_complocator(void) DeleteFileA("FileName10.dll"); MsiCloseHandle(hpkg); DeleteFileA(msifile); + LocalFree(usersid); } static void test_appsearch_reglocator(void)

1 0

Hans Leidekker : wininet: Avoid accessing uninitialized memory.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 0f127fc7a1836c287e88995a086539a997108569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f127fc7a1836c287e88995a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 23 10:49:22 2009 +0200 wininet: Avoid accessing uninitialized memory. Found by valgrind. --- dlls/wininet/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8894add..b0dc695 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -716,9 +716,9 @@ HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect, ret = FtpFindFirstFileW(hConnect, lpwzSearchFile, lpFindFileDataW, dwFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzSearchFile); - if(lpFindFileData) { + if (ret && lpFindFileData) WININET_find_data_WtoA(lpFindFileDataW, lpFindFileData); - } + return ret; }

1 0

Ken Thomases : winecoreaudio: Allow getting/ setting volume on device as well as instances.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 3d93a1926658e05dd7f59280d4b8dfcac1ed0e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d93a1926658e05dd7f59280d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 22 19:36:24 2009 -0500 winecoreaudio: Allow getting/setting volume on device as well as instances. --- dlls/winecoreaudio.drv/audio.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 91f6599..f48a5aa 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -170,6 +170,7 @@ typedef struct { CoreAudio_Device *cadev; WAVEOUTCAPSW caps; char interface_name[32]; + DWORD device_volume; BOOL trace_on; BOOL warn_on; @@ -620,6 +621,8 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16; + WOutDev[i].device_volume = 0xffffffff; + WOutDev[i].lock = 0; /* initialize the mutex */ } @@ -904,6 +907,9 @@ static DWORD wodOpen(WORD wDevID, WINE_WAVEOUT_INSTANCE** pInstance, LPWAVEOPEND } auInited = TRUE; + AudioUnit_SetVolume(audioUnit, LOWORD(WOutDev[wDevID].device_volume) / 65535.0f, + HIWORD(WOutDev[wDevID].device_volume) / 65535.0f); + /* Our render callback CoreAudio_woAudioUnitIOProc may be called before * AudioOutputUnitStart returns. Core Audio will grab its own internal * lock before calling it and the callback grabs wwo->lock. This would @@ -1439,9 +1445,6 @@ static DWORD wodGetPosition(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo, LPMMTIME lp */ static DWORD wodGetVolume(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo, LPDWORD lpdwVol) { - float left; - float right; - if (wDevID >= MAX_WAVEOUTDRV) { WARN("bad device ID !\n"); @@ -1450,10 +1453,17 @@ static DWORD wodGetVolume(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo, LPDWORD lpdwV TRACE("(%u, %p, %p);\n", wDevID, wwo, lpdwVol); - AudioUnit_GetVolume(wwo->audioUnit, &left, &right); + if (wwo) + { + float left; + float right; + + AudioUnit_GetVolume(wwo->audioUnit, &left, &right); + *lpdwVol = (WORD)(left * 0xFFFFl) + ((WORD)(right * 0xFFFFl) << 16); + } + else + *lpdwVol = WOutDev[wDevID].device_volume; - *lpdwVol = (WORD)(left * 0xFFFFl) + ((WORD)(right * 0xFFFFl) << 16); - return MMSYSERR_NOERROR; } @@ -1476,7 +1486,17 @@ static DWORD wodSetVolume(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo, DWORD dwParam TRACE("(%u, %p, %08x);\n", wDevID, wwo, dwParam); - AudioUnit_SetVolume(wwo->audioUnit, left, right); + if (wwo) + AudioUnit_SetVolume(wwo->audioUnit, left, right); + else + { + OSSpinLockLock(&WOutDev[wDevID].lock); + LIST_FOR_EACH_ENTRY(wwo, &WOutDev[wDevID].instances, WINE_WAVEOUT_INSTANCE, entry) + AudioUnit_SetVolume(wwo->audioUnit, left, right); + OSSpinLockUnlock(&WOutDev[wDevID].lock); + + WOutDev[wDevID].device_volume = dwParam; + } return MMSYSERR_NOERROR; }

1 0

Paul Vriens : kernel32/tests: Fix an intermittent test failure on Vista+.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: cde867333911dac3c61f0a1923ff8fac87503d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde867333911dac3c61f0a192… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 23 10:22:19 2009 +0200 kernel32/tests: Fix an intermittent test failure on Vista+. --- dlls/kernel32/tests/debugger.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 57d68ec..ca26302 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -282,6 +282,7 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) * detaching, then the debuggee gets a special exit code. */ ok(exit_code == STATUS_DEBUGGER_INACTIVE || + broken(exit_code == STATUS_ACCESS_VIOLATION) || /* Intermittent Vista+ */ broken(exit_code == 0xffffffff) || /* Win9x */ broken(exit_code == WAIT_ABANDONED), /* NT4, W2K */ "wrong exit code : %08x\n", exit_code);

1 0