May 2008 - Wine-commits - list.winehq.org

Alexander Dorofeyev : wined3d: Set alpha to index even when there is no palette.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: b8a57423586123438c529a808a735b46b982ee43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a57423586123438c529a808… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Fri May 9 01:12:39 2008 +0300 wined3d: Set alpha to index even when there is no palette. Fixes a failure in p8_primary_test when running with opengl ddraw renderer. --- dlls/wined3d/surface.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3a7fc4b..40626d6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2088,17 +2088,21 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] /* In DirectDraw the palette is a property of the surface, there are no such things as device palettes. */ if(dxVersion <= 7) { ERR("This code should never get entered for DirectDraw!, expect problems\n"); - return; - } - - /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, - alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device - capability flag is present (wine does advertise this capability) */ - for (i = 0; i < 256; i++) { - table[i][0] = device->palettes[device->currentPalette][i].peRed; - table[i][1] = device->palettes[device->currentPalette][i].peGreen; - table[i][2] = device->palettes[device->currentPalette][i].peBlue; - table[i][3] = device->palettes[device->currentPalette][i].peFlags; + if(index_in_alpha) { + /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if + there's no palette at this time. */ + for (i = 0; i < 256; i++) table[i][3] = i; + } + } else { + /* Direct3D >= 8 palette usage style: P8 textures use device palettes, palette entry format is A8R8G8B8, + alpha is stored in peFlags and may be used by the app if D3DPTEXTURECAPS_ALPHAPALETTE device + capability flag is present (wine does advertise this capability) */ + for (i = 0; i < 256; i++) { + table[i][0] = device->palettes[device->currentPalette][i].peRed; + table[i][1] = device->palettes[device->currentPalette][i].peGreen; + table[i][2] = device->palettes[device->currentPalette][i].peBlue; + table[i][3] = device->palettes[device->currentPalette][i].peFlags; + } } } else { TRACE("Using surface palette %p\n", pal);

1 0

Alexander Dorofeyev : ddraw/tests: Add KEYSRCOVERRIDE test in p8_primary_test.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: ebf1f4e6bbd13e375f2823ef134aedc72272b5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf1f4e6bbd13e375f2823ef1… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Fri May 9 01:12:30 2008 +0300 ddraw/tests: Add KEYSRCOVERRIDE test in p8_primary_test. --- dlls/ddraw/tests/visual.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 8bbd14c..5b67d45 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2314,6 +2314,31 @@ static void p8_primary_test() "got R %02X G %02X B %02X, expected R 00 G 00 B FF\n", GetRValue(color), GetGValue(color), GetBValue(color)); + rect.left = 100; + rect.top = 200; + rect.right = 116; + rect.bottom = 216; + + memset(&ddbltfx, 0, sizeof(ddbltfx)); + ddbltfx.dwSize = sizeof(ddbltfx); + ddbltfx.ddckSrcColorkey.dwColorSpaceLowValue = ddbltfx.ddckSrcColorkey.dwColorSpaceHighValue = 2; + hr = IDirectDrawSurface_Blt(Surface1, &rect, offscreen, NULL, + DDBLT_WAIT | DDBLT_KEYSRC | DDBLT_KEYSRCOVERRIDE, &ddbltfx); + ok(hr==DDERR_INVALIDPARAMS, "IDirectDrawSurface_Blt returned: %x\n", hr); + hr = IDirectDrawSurface_Blt(Surface1, &rect, offscreen, NULL, + DDBLT_WAIT | DDBLT_KEYSRCOVERRIDE, &ddbltfx); + ok(hr==DD_OK, "IDirectDrawSurface_Blt returned: %x\n", hr); + + color = getPixelColor_GDI(Surface1, 105, 205); + ok(GetRValue(color) == 0x80 && GetGValue(color) == 0 && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R 80 G 00 B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + + color = getPixelColor_GDI(Surface1, 112, 212); + ok(GetRValue(color) == 0 && GetGValue(color) == 0xFF && GetBValue(color) == 0, + "got R %02X G %02X B %02X, expected R 00 G FF B 00\n", + GetRValue(color), GetGValue(color), GetBValue(color)); + /* Test blitting and locking patterns that are likely to trigger bugs in opengl renderer (p8 surface conversion and uploading/downloading to/from opengl texture). Similar patterns ( blitting front buffer areas to/from an offscreen surface mixed with locking) are used by C&C

1 0

Alexander Dorofeyev : wined3d: Use source colorkey when passed KEYSRC or KEYSRCOVERRIDE.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: 6d86e7f8618cb5fac9d7bccee388d62458425d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d86e7f8618cb5fac9d7bccee… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Fri May 9 01:12:24 2008 +0300 wined3d: Use source colorkey when passed KEYSRC or KEYSRCOVERRIDE. Fixes failure in p8_primary_test when using opengl ddraw renderer. --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2c84f0c..3a7fc4b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3242,7 +3242,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Blit from offscreen surface to render target */ float glTexCoord[4]; DWORD oldCKeyFlags = Src->CKeyFlags; - WINEDDCOLORKEY oldBltCKey = This->SrcBltCKey; + WINEDDCOLORKEY oldBltCKey = Src->SrcBltCKey; RECT SourceRectangle; BOOL paletteOverride = FALSE; @@ -3290,7 +3290,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } else if(Flags & WINEDDBLT_KEYSRCOVERRIDE) { /* Use color key from DDBltFx */ Src->CKeyFlags |= WINEDDSD_CKSRCBLT; - This->SrcBltCKey = DDBltFx->ddckSrcColorkey; + Src->SrcBltCKey = DDBltFx->ddckSrcColorkey; } else { /* Do not use color key */ Src->CKeyFlags &= ~WINEDDSD_CKSRCBLT; @@ -3353,7 +3353,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * Which means that the colorkey is one of the palette entries. In other cases pixels that * should be masked away have alpha set to 0. */ if(primary_render_target_is_p8(myDevice)) - glAlphaFunc(GL_NOTEQUAL, (float)This->SrcBltCKey.dwColorSpaceLowValue / 256.0); + glAlphaFunc(GL_NOTEQUAL, (float)Src->SrcBltCKey.dwColorSpaceLowValue / 256.0); else glAlphaFunc(GL_NOTEQUAL, 0.0); checkGLcall("glAlphaFunc\n"); @@ -3411,7 +3411,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } /* Restore the color key parameters */ Src->CKeyFlags = oldCKeyFlags; - This->SrcBltCKey = oldBltCKey; + Src->SrcBltCKey = oldBltCKey; /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ if(paletteOverride)

1 0

Alexandre Julliard : winefile: Fix the printf formats for file sizes.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: 39ebaba506f86bfee8b4ab716588ca429c906396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ebaba506f86bfee8b4ab716… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 9 11:18:27 2008 +0200 winefile: Fix the printf formats for file sizes. --- programs/winefile/winefile.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index d21f595..9b41aa1 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -196,15 +196,8 @@ static const TCHAR sQMarks[] = {'?','?','?','\0'}; static const TCHAR sWINEFILEFRAME[] = {'W','F','S','_','F','r','a','m','e','\0'}; static const TCHAR sWINEFILETREE[] = {'W','F','S','_','T','r','e','e','\0'}; -#ifdef _MSC_VER -/* #define LONGLONGARG _T("I64") */ static const TCHAR sLongHexFmt[] = {'%','I','6','4','X','\0'}; -static const TCHAR sLongNumFmt[] = {'%','I','6','4','d','\0'}; -#else -/* #define LONGLONGARG _T("L") */ -static const TCHAR sLongHexFmt[] = {'%','L','X','\0'}; -static const TCHAR sLongNumFmt[] = {'%','L','d','\0'}; -#endif +static const TCHAR sLongNumFmt[] = {'%','I','6','4','u','\0'}; /* load resource string */

1 0

Maarten Lankhorst : winealsa: Remove calls to deprecated functions.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: c8bdebde3dc94baf1439697306e6f797ca5c7ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bdebde3dc94baf143969730… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 8 14:51:07 2008 -0700 winealsa: Remove calls to deprecated functions. --- dlls/winealsa.drv/alsa.c | 1 - dlls/winealsa.drv/dscapture.c | 1 - dlls/winealsa.drv/dsoutput.c | 1 - dlls/winealsa.drv/wavein.c | 1 - dlls/winealsa.drv/waveout.c | 2 -- 5 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ce6b75d..a4b1008 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -735,7 +735,6 @@ if (err<0) { \ } while(0); X(period_time); - X(tick_time); #undef X if (!sw) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 98fe195..8be3e3a 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -448,7 +448,6 @@ static int CreateMMAP(IDsCaptureDriverBufferImpl* pdbi) snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, INT_MAX); snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0); snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); - snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE); err = snd_pcm_sw_params(pcm, sw_params); avail = snd_pcm_avail_update(pcm); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 130e181..18bdb46 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -210,7 +210,6 @@ static int DSDB_CreateMMAP(IDsDriverBufferImpl* pdbi) snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, INT_MAX); snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0); snd_pcm_sw_params_set_avail_min(pcm, sw_params, 0); - snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE); err = snd_pcm_sw_params(pcm, sw_params); avail = snd_pcm_avail_update(pcm); diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 9c89fde..af62bcf 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -483,7 +483,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_xfer_align(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set xfer align"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index f4452e5..6c8ffd4 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -759,9 +759,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) EXIT_ON_ERROR( snd_pcm_sw_params_set_start_threshold(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set start threshold"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_size(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence size"); EXIT_ON_ERROR( snd_pcm_sw_params_set_avail_min(pcm, sw_params, period_size), MMSYSERR_ERROR, "unable to set avail min"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_xfer_align(pcm, sw_params, 1), MMSYSERR_ERROR, "unable to set xfer align"); EXIT_ON_ERROR( snd_pcm_sw_params_set_silence_threshold(pcm, sw_params, 0), MMSYSERR_ERROR, "unable to set silence threshold"); - EXIT_ON_ERROR( snd_pcm_sw_params_set_xrun_mode(pcm, sw_params, SND_PCM_XRUN_NONE), MMSYSERR_ERROR, "unable to set xrun mode"); EXIT_ON_ERROR( snd_pcm_sw_params(pcm, sw_params), MMSYSERR_ERROR, "unable to set sw params for playback"); #undef EXIT_ON_ERROR

1 0

Aric Stewart : shdocvw: Do not do our iexplore. exe registration if native Internet Explorer is detected to be present.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: d4a3e9c01621d454f1373d12a450b9cc569c5603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4a3e9c01621d454f1373d12a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 8 11:26:47 2008 -0500 shdocvw: Do not do our iexplore.exe registration if native Internet Explorer is detected to be present. --- dlls/shdocvw/Makefile.in | 2 +- dlls/shdocvw/factory.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index e4f573a..e254078 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shell32 shlwapi user32 advapi32 kernel32 -DELAYIMPORTS = urlmon ole32 oleaut32 +DELAYIMPORTS = version urlmon ole32 oleaut32 C_SRCS = \ classinfo.c \ diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 3a4ba9f..69cbaa3 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -26,6 +26,8 @@ #include "advpub.h" #include "isguids.h" +#include "winver.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -287,8 +289,39 @@ HRESULT WINAPI DllUnregisterServer(void) return UnRegisterTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); } +static BOOL check_native_ie(void) +{ + static const WCHAR cszPath[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; + DWORD handle,size; + + size = GetFileVersionInfoSizeW(cszPath,&handle); + if (size) + { + LPVOID buf; + LPWSTR lpFileDescription; + UINT dwBytes; + static const WCHAR cszFD[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\','0','4','0','9','0','4','e','4','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR cszWine[] = {'W','i','n','e',0}; + + buf = HeapAlloc(GetProcessHeap(),0,size); + GetFileVersionInfoW(cszPath,0,size,buf); + + if (VerQueryValueW(buf, cszFD, (LPVOID*)&lpFileDescription, &dwBytes) && + strstrW(lpFileDescription,cszWine)) + return FALSE; + } + + return TRUE; +} + DWORD register_iexplore(BOOL doregister) { - HRESULT hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); + HRESULT hres; + if (check_native_ie()) + { + TRACE("Native IE detected, not doing registration\n"); + return S_OK; + } + hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); return !SUCCEEDED(hres); }

1 0

Lei Zhang : wininet: Handle NULL input for FindCloseUrlCache.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: 255eebe44d7cc157f7ff3c5c8d6ea8ba29d0e873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=255eebe44d7cc157f7ff3c5c8… Author: Lei Zhang <thestig(a)google.com> Date: Thu May 8 11:14:41 2008 -0700 wininet: Handle NULL input for FindCloseUrlCache. --- dlls/wininet/tests/urlcache.c | 11 +++++++++++ dlls/wininet/urlcache.c | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 6570d5a..08ffebb 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -166,7 +166,18 @@ static void test_urlcacheA(void) ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "local file should no longer exist\n"); } +static void test_FindCloseUrlCache(void) +{ + BOOL r; + DWORD err; + r = FindCloseUrlCache(NULL); + err = GetLastError(); + ok(0 == r, "expected 0, got %d\n", r); + ok(ERROR_INVALID_HANDLE == err, "expected %d, got %d\n", ERROR_INVALID_HANDLE, err); +} + START_TEST(urlcache) { test_urlcacheA(); + test_FindCloseUrlCache(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 6b00ebb..6e76893 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3127,7 +3127,7 @@ BOOL WINAPI FindCloseUrlCache(HANDLE hEnumHandle) TRACE("(%p)\n", hEnumHandle); - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) + if (!pEntryHandle || pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); return FALSE;

1 0

Vitaliy Margolen : dinput: Default value for unassigned POVs should be -1.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: 382ed33b7a770d532bcf4b7dc392ee929c987c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=382ed33b7a770d532bcf4b7dc… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu May 8 08:11:19 2008 -0600 dinput: Default value for unassigned POVs should be -1. --- dlls/dinput/device.c | 7 +++++-- dlls/dinput/tests/joystick.c | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1a5e25f..2c4cc6d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -452,9 +452,12 @@ HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) dt[index].size = sizeof(DWORD); dt[index].offset_in = -1; dt[index].offset_out = asked_format->rgodf[j].dwOfs; - dt[index].value = 0; + if (asked_format->rgodf[j].dwType & DIDFT_POV) + dt[index].value = -1; + else + dt[index].value = 0; index++; - + same = 0; } } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index d8c05f0..4727a5a 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -324,6 +324,13 @@ static BOOL CALLBACK EnumJoysticks( ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have returned S_FALSE, got: %s\n", DXGetErrorString8(hr)); + if (info.pov < 4) + { + hr = IDirectInputDevice_GetDeviceState(pJoystick, sizeof(DIJOYSTATE2), &js); + ok(hr == DI_OK, "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + ok(js.rgdwPOV[3] == -1, "Default for unassigned POV should be -1 not: %d\n", js.rgdwPOV[3]); + } + if (winetest_interactive) { trace("You have 30 seconds to test all axes, sliders, POVs and buttons\n"); count = 300;

1 0

Paul Vriens : crypt32/tests: Cleanup registry after tests.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: b92d1c7fbef30114b3aa7f3197a5df3556c98b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92d1c7fbef30114b3aa7f319… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu May 8 15:06:53 2008 +0200 crypt32/tests: Cleanup registry after tests. --- dlls/crypt32/tests/oid.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index e2e8bc4..0ec6c29 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -310,16 +310,32 @@ static void test_registerOIDFunction(void) ret = CryptUnregisterOIDFunction(X509_ASN_ENCODING, "bogus", "1.2.3.4.5.6.7.8.9.10"); ok(ret, "CryptUnregisterOIDFunction failed: %d\n", GetLastError()); - /* This has no effect */ + /* Unwanted Cryptography\OID\EncodingType 1\bogus\ will still be there */ + ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Cryptography\\OID\\EncodingType 1\\bogus"), + "Could not delete bogus key\n"); + /* Shouldn't have effect but registry keys are created */ ret = CryptRegisterOIDFunction(PKCS_7_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); ok(ret, "CryptRegisterOIDFunction failed: %d\n", GetLastError()); - /* Check with bogus encoding type: */ + ret = CryptUnregisterOIDFunction(PKCS_7_ASN_ENCODING, "CryptDllEncodeObject", + "1.2.3.4.5.6.7.8.9.10"); + ok(ret, "CryptUnregisterOIDFunction failed: %d\n", GetLastError()); + /* Check with bogus encoding type. Registry keys are still created */ ret = CryptRegisterOIDFunction(0, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); ok(ret, "CryptRegisterOIDFunction failed: %d\n", GetLastError()); + ret = CryptUnregisterOIDFunction(0, "CryptDllEncodeObject", + "1.2.3.4.5.6.7.8.9.10"); + ok(ret, "CryptUnregisterOIDFunction failed: %d\n", GetLastError()); + /* Unwanted Cryptography\OID\EncodingType 0\CryptDllEncodeObject\ + * will still be there + */ + ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Cryptography\\OID\\EncodingType 0\\CryptDllEncodeObject"), + "Could not delete CryptDllEncodeObject key\n"); /* This is written with value 3 verbatim. Thus, the encoding type isn't - * (for now) treated as a mask. + * (for now) treated as a mask. Registry keys are created. */ ret = CryptRegisterOIDFunction(3, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); @@ -327,6 +343,15 @@ static void test_registerOIDFunction(void) ret = CryptUnregisterOIDFunction(3, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10"); ok(ret, "CryptUnregisterOIDFunction failed: %d\n", GetLastError()); + /* Unwanted Cryptography\OID\EncodingType 3\CryptDllEncodeObject + * will still be there. + */ + ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Cryptography\\OID\\EncodingType 3\\CryptDllEncodeObject"), + "Could not delete CryptDllEncodeObject key\n"); + ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, + "SOFTWARE\\Microsoft\\Cryptography\\OID\\EncodingType 3"), + "Could not delete 'EncodingType 3' key\n"); } static void test_registerDefaultOIDFunction(void)

1 0

Kirill K. Smirnov : winhelp: Pointer coordinates are relative to richedit text window, not the main window.
by Alexandre Julliard 09 May '08

09 May '08

Module: wine Branch: master Commit: b3b6a227aac93d444c4f778f26e45fe41f796a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b6a227aac93d444c4f778f2… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu May 8 17:08:38 2008 +0400 winhelp: Pointer coordinates are relative to richedit text window, not the main window. --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index ee21053..3b8f173 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1001,7 +1001,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, } pt.x = (int)(short)LOWORD(msgf->lParam); pt.y = (int)(short)HIWORD(msgf->lParam); - ClientToScreen(hWnd, &pt); + ClientToScreen(msgf->nmhdr.hwndFrom, &pt); TrackPopupMenu(GetSubMenu(hMenu, 0), TPM_LEFTALIGN|TPM_TOPALIGN, pt.x, pt.y, 0, hWnd, NULL); DestroyMenu(hMenu);

1 0