September 2009 - Wine-Commits

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_SetTexture() a bit.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 26db0be136a2e1a84da6213c20ffb7c9189615bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=26db0be136a2e1a84da6213c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:05:02 2009 +0200 wined3d: Cleanup IWineD3DDeviceImpl_SetTexture() a bit. --- dlls/wined3d/device.c | 133 +++++++++++++++++++++++++----------------------- 1 files changed, 69 insertions(+), 64 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11d55a2..56c046e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4429,108 +4429,113 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *if /***** * Get / Set Texture *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD Stage, IWineD3DBaseTexture* pTexture) { +static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, + DWORD stage, IWineD3DBaseTexture *texture) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DBaseTexture *oldTexture; + IWineD3DBaseTexture *prev; - TRACE("(%p) : Stage %#x, Texture %p\n", This, Stage, pTexture); + TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); - if (Stage >= WINED3DVERTEXTEXTURESAMPLER0 && Stage <= WINED3DVERTEXTEXTURESAMPLER3) { - Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); - } + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); - if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) { - ERR("Current stage overflows textures array (stage %d)\n", Stage); - return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + /* Windows accepts overflowing this array... we do not. */ + if (stage >= sizeof(This->stateBlock->textures) / sizeof(*This->stateBlock->textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + return WINED3D_OK; } - oldTexture = This->updateStateBlock->textures[Stage]; - /* SetTexture isn't allowed on textures in WINED3DPOOL_SCRATCH */ - if (pTexture && ((IWineD3DTextureImpl*)pTexture)->resource.pool == WINED3DPOOL_SCRATCH) + if (texture && ((IWineD3DTextureImpl *)texture)->resource.pool == WINED3DPOOL_SCRATCH) { - WARN("(%p) Attempt to set scratch texture rejected\n", pTexture); + WARN("Rejecting attempt to set scratch texture.\n"); return WINED3DERR_INVALIDCALL; } - TRACE("GL_LIMITS %d\n",GL_LIMITS(sampler_stages)); - TRACE("(%p) : oldtexture(%p)\n", This,oldTexture); - - This->updateStateBlock->changed.textures |= 1 << Stage; - TRACE("(%p) : setting new texture to %p\n", This, pTexture); - This->updateStateBlock->textures[Stage] = pTexture; + This->updateStateBlock->changed.textures |= 1 << stage; - /* Handle recording of state blocks */ - if (This->isRecordingState) { - TRACE("Recording... not performing anything\n"); - - if (pTexture) IWineD3DBaseTexture_AddRef(pTexture); - if (oldTexture) IWineD3DBaseTexture_Release(oldTexture); + prev = This->updateStateBlock->textures[stage]; + TRACE("Previous texture %p.\n", prev); + if (texture == prev) + { + TRACE("App is setting the same texture again, nothing to do.\n"); return WINED3D_OK; } - if(oldTexture == pTexture) { - TRACE("App is setting the same texture again, nothing to do\n"); + TRACE("Setting new texture to %p.\n", texture); + This->updateStateBlock->textures[stage] = texture; + + if (This->isRecordingState) + { + TRACE("Recording... not performing anything\n"); + + if (texture) IWineD3DBaseTexture_AddRef(texture); + if (prev) IWineD3DBaseTexture_Release(prev); + return WINED3D_OK; } - /** NOTE: MSDN says that setTexture increases the reference count, - * and that the application must set the texture back to null (or have a leaky application), - * This means we should pass the refcount up to the parent - *******************************/ - if (NULL != This->updateStateBlock->textures[Stage]) { - IWineD3DBaseTextureImpl *new = (IWineD3DBaseTextureImpl *) This->updateStateBlock->textures[Stage]; - ULONG bindCount = InterlockedIncrement(&new->baseTexture.bindCount); - UINT dimensions = IWineD3DBaseTexture_GetTextureDimensions(pTexture); + if (texture) + { + IWineD3DBaseTextureImpl *t = (IWineD3DBaseTextureImpl *)texture; + LONG bind_count = InterlockedIncrement(&t->baseTexture.bindCount); + UINT dimensions = IWineD3DBaseTexture_GetTextureDimensions(texture); - IWineD3DBaseTexture_AddRef(This->updateStateBlock->textures[Stage]); + IWineD3DBaseTexture_AddRef(texture); - if (!oldTexture || dimensions != IWineD3DBaseTexture_GetTextureDimensions(oldTexture)) + if (!prev || dimensions != IWineD3DBaseTexture_GetTextureDimensions(prev)) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); } - if(oldTexture == NULL && Stage < MAX_TEXTURES) { - /* The source arguments for color and alpha ops have different meanings when a NULL texture is bound, - * so the COLOROP and ALPHAOP have to be dirtified. - */ - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_COLOROP)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_ALPHAOP)); - } - if(bindCount == 1) { - new->baseTexture.sampler = Stage; + if (!prev && stage < MAX_TEXTURES) + { + /* The source arguments for color and alpha ops have different + * meanings when a NULL texture is bound, so the COLOROP and + * ALPHAOP have to be dirtified. */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_COLOROP)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_ALPHAOP)); } - /* More than one assignment? Doesn't matter, we only need one gl texture unit to use for uploading */ + if (bind_count == 1) t->baseTexture.sampler = stage; } - if (NULL != oldTexture) { - IWineD3DBaseTextureImpl *old = (IWineD3DBaseTextureImpl *) oldTexture; - LONG bindCount = InterlockedDecrement(&old->baseTexture.bindCount); + if (prev) + { + IWineD3DBaseTextureImpl *t = (IWineD3DBaseTextureImpl *)prev; + LONG bind_count = InterlockedDecrement(&t->baseTexture.bindCount); + + IWineD3DBaseTexture_Release(prev); - IWineD3DBaseTexture_Release(oldTexture); - if(pTexture == NULL && Stage < MAX_TEXTURES) { - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_COLOROP)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, WINED3DTSS_ALPHAOP)); + if (!texture && stage < MAX_TEXTURES) + { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_COLOROP)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_ALPHAOP)); } - if(bindCount && old->baseTexture.sampler == Stage) { - int i; - /* Have to do a search for the other sampler(s) where the texture is bound to - * Shouldn't happen as long as apps bind a texture only to one stage - */ - TRACE("Searcing for other sampler / stage id where the texture is bound to\n"); - for(i = 0; i < MAX_COMBINED_SAMPLERS; i++) { - if(This->updateStateBlock->textures[i] == oldTexture) { - old->baseTexture.sampler = i; + if (bind_count && t->baseTexture.sampler == stage) + { + unsigned int i; + + /* Search for other stages the texture is bound to. Shouldn't + * happen if applications bind textures to a single stage only. */ + TRACE("Searching for other stages the texture is bound to.\n"); + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (This->updateStateBlock->textures[i] == prev) + { + TRACE("Texture is also bound to stage %u.\n", i); + t->baseTexture.sampler = i; break; } } } } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(Stage)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(stage)); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Properly keep texture references in the stateblock .
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 709aedf5f9bdfd0cdeab3d2189f6382680356922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709aedf5f9bdfd0cdeab3d218… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:04:59 2009 +0200 wined3d: Properly keep texture references in the stateblock. --- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/stateblock.c | 29 ++++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70656b7..42d78ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4460,6 +4460,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); + + if (pTexture) IWineD3DBaseTexture_AddRef(pTexture); + if (oldTexture) IWineD3DBaseTexture_Release(oldTexture); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index feb9808..0e097aa 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -5,6 +5,7 @@ * Copyright 2004 Jason Edmeades * Copyright 2005 Oliver Stieber * Copyright 2007 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -278,17 +279,9 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; - /* type 0 represents the primary stateblock, so free all the resources */ - if (This->blockType == WINED3DSBT_INIT) { - /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */ - for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { - if (This->textures[counter]) { - /* release our 'internal' hold on the texture */ - if(0 != IWineD3DBaseTexture_Release(This->textures[counter])) { - TRACE("Texture still referenced by stateblock, applications has leaked Stage = %u Texture = %p\n", counter, This->textures[counter]); - } - } - } + for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) + { + if (This->textures[counter]) IWineD3DBaseTexture_Release(This->textures[counter]); } for (counter = 0; counter < MAX_STREAMS; counter++) { @@ -605,13 +598,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Samplers */ - /* TODO: move over to using memcpy */ map = This->changed.textures; for (i = 0; map; map >>= 1, ++i) { if (!(map & 1)) continue; TRACE("Updating texture %u to %p (was %p)\n", i, targetStateBlock->textures[i], This->textures[i]); + if (targetStateBlock->textures[i]) IWineD3DBaseTexture_AddRef(targetStateBlock->textures[i]); + if (This->textures[i]) IWineD3DBaseTexture_Release(This->textures[i]); This->textures[i] = targetStateBlock->textures[i]; } @@ -650,11 +644,20 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->pixelShaderConstantI, targetStateBlock->pixelShaderConstantI, sizeof(This->pixelShaderConstantF)); memcpy(This->pixelShaderConstantF, targetStateBlock->pixelShaderConstantF, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); memcpy(This->renderState, targetStateBlock->renderState, sizeof(This->renderState)); - memcpy(This->textures, targetStateBlock->textures, sizeof(This->textures)); memcpy(This->textureState, targetStateBlock->textureState, sizeof(This->textureState)); memcpy(This->samplerState, targetStateBlock->samplerState, sizeof(This->samplerState)); This->scissorRect = targetStateBlock->scissorRect; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (targetStateBlock->textures[i] != This->textures[i]) + { + if (targetStateBlock->textures[i]) IWineD3DBaseTexture_AddRef(targetStateBlock->textures[i]); + if (This->textures[i]) IWineD3DBaseTexture_Release(This->textures[i]); + This->textures[i] = targetStateBlock->textures[i]; + } + } + if(targetStateBlock->pIndexData != This->pIndexData || targetStateBlock->IndexFmt != This->IndexFmt) { if (targetStateBlock->pIndexData) IWineD3DBuffer_AddRef(targetStateBlock->pIndexData);

1 0

Andrey Turkin : user32: Accept SPI_GET/ SETDROPSHADOW parameters in SystemParametersInfo.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 1a80add0e3ec96aaaa9f0643a1857c7a412c3ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a80add0e3ec96aaaa9f0643a… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Sep 27 19:50:29 2009 +0400 user32: Accept SPI_GET/SETDROPSHADOW parameters in SystemParametersInfo. --- dlls/user32/sysparams.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 94757a3..59276df 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2327,8 +2327,14 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_user_pref_param( 2, 0x02, PtrToUlong(pvParam), fWinIni ); break; - WINE_SPI_FIXME(SPI_GETDROPSHADOW); /* 0x1024 _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_SETDROPSHADOW); /* 0x1025 _WIN32_WINNT >= 0x510 */ + case SPI_GETDROPSHADOW: + ret = get_user_pref_param( 2, 0x04, pvParam ); + break; + + case SPI_SETDROPSHADOW: + ret = set_user_pref_param( 2, 0x04, PtrToUlong(pvParam), fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETBLOCKSENDINPUTRESETS); WINE_SPI_FIXME(SPI_SETBLOCKSENDINPUTRESETS); case SPI_GETUIEFFECTS:

1 0

Stefan Leichter : kernel32: Check parameter of CheckRemoteDebuggerPresent with tests.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 2c576e88b481f579b6fd87ff80da526570318529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c576e88b481f579b6fd87ff8… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Sep 27 10:10:41 2009 +0200 kernel32: Check parameter of CheckRemoteDebuggerPresent with tests. --- dlls/kernel32/debugger.c | 5 +++++ dlls/kernel32/tests/debugger.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index b83647c..bb0b5fa 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -402,6 +402,11 @@ BOOL WINAPI IsDebuggerPresent(void) */ BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE process, PBOOL DebuggerPresent) { + if(!process || !DebuggerPresent) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } FIXME("(%p)->(%p): Stub!\n", process, DebuggerPresent); *DebuggerPresent = FALSE; return TRUE; diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2f32478..57d68ec 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -32,6 +32,7 @@ static int myARGC; static char** myARGV; +static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); @@ -431,11 +432,42 @@ static void test_ExitCode(void) } } +static void test_RemoteDebugger(void) +{ + BOOL bret, present; + if(!pCheckRemoteDebuggerPresent) + { + win_skip("CheckRemoteDebuggerPresent is not available\n"); + return; + } + present = TRUE; + SetLastError(0xdeadbeef); + bret = pCheckRemoteDebuggerPresent(GetCurrentProcess(),&present); + ok(bret , "expected CheckRemoteDebuggerPresent to succeed\n"); + ok(0xdeadbeef == GetLastError(), + "expected error to be unchanged, got %d/%x\n",GetLastError(), GetLastError()); + + present = TRUE; + SetLastError(0xdeadbeef); + bret = pCheckRemoteDebuggerPresent(NULL,&present); + ok(!bret , "expected CheckRemoteDebuggerPresent to fail\n"); + ok(present, "expected parameter to be unchanged\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); + + SetLastError(0xdeadbeef); + bret = pCheckRemoteDebuggerPresent(GetCurrentProcess(),NULL); + ok(!bret , "expected CheckRemoteDebuggerPresent to fail\n"); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); +} + START_TEST(debugger) { HMODULE hdll; hdll=GetModuleHandle("kernel32.dll"); + pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); @@ -451,5 +483,6 @@ START_TEST(debugger) else { test_ExitCode(); + test_RemoteDebugger(); } }

1 0

Vincent Povirk : user32: Invert y in DrawTextEx in GM_COMPATIBLE mode if y increases up.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: d1099eb4d819494e2fcfe0a3d7a1a6cd6a4d766f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1099eb4d819494e2fcfe0a3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 25 16:55:45 2009 -0500 user32: Invert y in DrawTextEx in GM_COMPATIBLE mode if y increases up. --- dlls/user32/tests/text.c | 2 +- dlls/user32/text.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 080e5dd..88ea6b5 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -80,7 +80,7 @@ static void test_DrawTextCalcRect(void) ok( textheight, "DrawTextA error %u\n", GetLastError()); trace("MM_HIENGLISH rect.bottom %d\n", rect.bottom); - todo_wine ok(rect.bottom < 0, "In MM_HIENGLISH, DrawText with " + ok(rect.bottom < 0, "In MM_HIENGLISH, DrawText with " "DT_CALCRECT should return a negative rectangle bottom. " "(bot=%d)\n", rect.bottom); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index b8aad0b..e34877f 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -855,6 +855,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; + int invert_y=0; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -898,6 +899,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, } } + if (GetGraphicsMode(hdc) == GM_COMPATIBLE) + { + SIZE window_ext, viewport_ext; + GetWindowExtEx(hdc, &window_ext); + GetViewportExtEx(hdc, &viewport_ext); + if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) + invert_y = 1; + } + if (dtp) { lmargin = dtp->iLeftMargin; @@ -932,7 +942,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, do { len = sizeof(line)/sizeof(line[0]); - last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); if (flags & DT_CENTER) x = (rect->left + rect->right - @@ -1001,7 +1014,10 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, else if (size.cx > max_width) max_width = size.cx; - y += lh; + if (invert_y) + y -= lh; + else + y += lh; if (dtp) dtp->uiLengthDrawn += len; }

1 0

Detlef Riekenberg : urlmon/tests: Fix sec_mgr tests on win98 (IE 4).
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 575ee0bb4efbca3db06753278957e3caea6e0c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=575ee0bb4efbca3db06753278… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 25 17:55:48 2009 +0200 urlmon/tests: Fix sec_mgr tests on win98 (IE 4). --- dlls/urlmon/tests/sec_mgr.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 9d9e19c..2df702c 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -213,13 +213,15 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag policy = 0xdeadbeef; hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, sizeof(WCHAR), NULL, 0, 0, 0); - ok(hres == E_FAIL, "ProcessUrlAction(%x) failed: %08x, expected E_FAIL\n", action, hres); + ok(hres == E_FAIL || broken(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), + "(0x%x) got 0x%x (expected E_FAIL)\n", action, hres); ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); policy = 0xdeadbeef; hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, (BYTE*)&policy, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL || broken(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), + "(0x%x) got 0x%x (expected E_FAIL)\n", action, hres); ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); return; } @@ -425,7 +427,8 @@ static void test_GetZoneActionPolicy(void) hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, 0x1fff, buf, sizeof(DWORD), URLZONEREG_DEFAULT); - ok(hres == E_FAIL, "GetZoneActionPolicy failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL || broken(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND)), + "(0x%x) got 0x%x (expected E_FAIL)\n", action, hres); hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 13, action, buf, sizeof(DWORD), URLZONEREG_DEFAULT);

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: f7d8954befde93bb19b642858d5b9175f1cdab32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d8954befde93bb19b642858… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 25 21:25:36 2009 +0200 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 39c6f68..c523b6d 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -46,4 +46,5 @@ STRINGTABLE DISCARDABLE IDS_JSCRIPT_EXPECTED "Objet JScript attendu" IDS_REGEXP_SYNTAX_ERROR "Erreur de syntaxe dans l'expression rationnelle" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" + IDS_ARRAY_EXPECTED "Objet tableau attendu" }

1 0

Alexandre Julliard : gdi32: Get rid of the 16-bit DC hook support.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 3411821ff6a9e94b7fed330976736c0271f3954d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3411821ff6a9e94b7fed33097… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:32:47 2009 +0200 gdi32: Get rid of the 16-bit DC hook support. It can only work with native user32 anyway. --- dlls/gdi32/dc.c | 72 ++++------------------------------------------ dlls/gdi32/gdi16.c | 20 +++++++++++++ dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 27 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index db8a91b..f7b295a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -87,7 +87,6 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->saved_dc = 0; dc->dwHookData = 0; dc->hookProc = NULL; - dc->hookThunk = NULL; dc->wndOrgX = 0; dc->wndOrgY = 0; dc->wndExtX = 1; @@ -224,8 +223,8 @@ void release_dc_ptr( DC *dc ) */ void update_dc( DC *dc ) { - if (InterlockedExchange( &dc->dirty, 0 ) && dc->hookThunk) - dc->hookThunk( dc->hSelf, DCHC_INVALIDVISRGN, dc->dwHookData, 0 ); + if (InterlockedExchange( &dc->dirty, 0 ) && dc->hookProc) + dc->hookProc( dc->hSelf, DCHC_INVALIDVISRGN, dc->dwHookData, 0 ); } @@ -403,8 +402,7 @@ INT save_dc_state( HDC hdc ) PATH_InitGdiPath( &newdc->path ); newdc->pAbortProc = NULL; - newdc->hookThunk = NULL; - newdc->hookProc = 0; + newdc->hookProc = NULL; newdc->saved_visrgn = NULL; if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) @@ -820,7 +818,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) } /* Call hook procedure to check whether is it OK to delete this DC */ - if (dc->hookThunk && !dc->hookThunk( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) + if (dc->hookProc && !dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); return FALSE; @@ -1389,7 +1387,7 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) if (!(dc->flags & DC_SAVED)) { dc->dwHookData = dwHookData; - dc->hookThunk = hookProc; + dc->hookProc = hookProc; } release_dc_ptr( dc ); return TRUE; @@ -1407,65 +1405,7 @@ DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) DWORD_PTR ret; if (!dc) return 0; - if (proc) *proc = dc->hookThunk; - ret = dc->dwHookData; - release_dc_ptr( dc ); - return ret; -} - - -/* relay function to call the 16-bit DC hook proc */ -static BOOL WINAPI call_dc_hook16( HDC hdc, WORD code, DWORD_PTR data, LPARAM lParam ) -{ - WORD args[6]; - DWORD ret = 0; - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - if (dc->hookProc) - { - args[5] = HDC_16(hdc); - args[4] = code; - args[3] = HIWORD(data); - args[2] = LOWORD(data); - args[1] = HIWORD(lParam); - args[0] = LOWORD(lParam); - WOWCallback16Ex( (DWORD)dc->hookProc, WCB16_PASCAL, sizeof(args), args, &ret ); - } - release_dc_ptr( dc ); - return LOWORD(ret); -} - -/*********************************************************************** - * SetDCHook (GDI.190) - */ -BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData ) -{ - DC *dc = get_dc_ptr( HDC_32(hdc16) ); - - if (!dc) return FALSE; - if (!(dc->flags & DC_SAVED)) - { - dc->dwHookData = dwHookData; - dc->hookThunk = call_dc_hook16; - dc->hookProc = hookProc; - } - release_dc_ptr( dc ); - return TRUE; -} - - -/*********************************************************************** - * GetDCHook (GDI.191) - */ -DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) -{ - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - DWORD ret; - - if (!dc) return 0; - *phookProc = dc->hookProc; + if (proc) *proc = dc->hookProc; ret = dc->dwHookData; release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index f442d51..5fd779e 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1769,6 +1769,26 @@ void WINAPI PlayMetaFileRecord16( HDC16 hdc, HANDLETABLE16 *ht, METARECORD *mr, /*********************************************************************** + * SetDCHook (GDI.190) + */ +BOOL16 WINAPI SetDCHook16( HDC16 hdc16, FARPROC16 hookProc, DWORD dwHookData ) +{ + FIXME( "%04x %p %x: not supported\n", hdc16, hookProc, dwHookData ); + return FALSE; +} + + +/*********************************************************************** + * GetDCHook (GDI.191) + */ +DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) +{ + FIXME( "%04x: not supported\n", hdc16 ); + return 0; +} + + +/*********************************************************************** * SetHookFlags (GDI.192) */ WORD WINAPI SetHookFlags16( HDC16 hdc, WORD flags ) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 03c63d4..a637a98 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -252,8 +252,7 @@ typedef struct tagDC INT saveLevel; HDC saved_dc; DWORD_PTR dwHookData; - FARPROC16 hookProc; /* the original SEGPTR ... */ - DCHOOKPROC hookThunk; /* ... and the thunk to call it */ + DCHOOKPROC hookProc; /* DC hook */ INT wndOrgX; /* Window origin */ INT wndOrgY;

1 0

Markus Stockhausen : ole32/storage32: Fix for reference counters in nested storage.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: abdebcdbbe61cfaf7c9198f279637ec69daa63d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdebcdbbe61cfaf7c9198f27… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Fri Sep 25 16:27:49 2009 +0200 ole32/storage32: Fix for reference counters in nested storage. --- dlls/ole32/storage32.c | 4 +--- dlls/ole32/tests/storage32.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 6e3e1e1..9082334 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3713,7 +3713,6 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; - StorageBaseImpl_Release((IStorage*)This->base.ancestorStorage); HeapFree(GetProcessHeap(), 0, This); } @@ -4312,10 +4311,9 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.openFlags = (openFlags & ~STGM_CREATE); /* - * Keep the ancestor storage pointer and nail a reference to it. + * Keep the ancestor storage pointer but do not nail a reference to it. */ newStorage->base.ancestorStorage = ancestorStorage; - StorageBaseImpl_AddRef((IStorage*)(newStorage->base.ancestorStorage)); /* * Keep the index of the root property set for this storage, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index fec854e..620e6cb 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1470,6 +1470,45 @@ static void test_fmtusertypestg(void) } } +static void test_references(void) +{ + IStorage *stg,*stg2; + HRESULT hr; + unsigned c1,c2; + static const WCHAR StorName[] = { 'D','a','t','a','S','p','a','c','e','I','n','f','o',0 }; + + DeleteFileA(filenameA); + + hr = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(hr==S_OK, "StgCreateDocfile failed\n"); + + if (SUCCEEDED(hr)) + { + IStorage_Release(stg); + + hr = StgOpenStorage( filename, NULL, STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &stg); + ok(hr==S_OK, "StgOpenStorage failed (result=%x)\n",hr); + + if (SUCCEEDED(hr)) + { + hr = IStorage_CreateStorage(stg,StorName,STGM_READWRITE | STGM_SHARE_EXCLUSIVE,0,0,&stg2); + ok(hr == S_OK, "IStorage_CreateStorage failed (result=%x)\n",hr); + + if (SUCCEEDED(hr)) + { + c1 = IStorage_AddRef(stg); + ok(c1 == 2, "creating internal storage added references to ancestor\n"); + c1 = IStorage_AddRef(stg); + IStorage_Release(stg2); + c2 = IStorage_AddRef(stg) - 1; + ok(c1 == c2, "releasing internal storage removed references to ancestor\n"); + } + c1 = IStorage_Release(stg); + while ( c1 ) c1 = IStorage_Release(stg); + } + } +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -1497,4 +1536,5 @@ START_TEST(storage32) test_readonly(); test_simple(); test_fmtusertypestg(); + test_references(); }

1 0

Alexandre Julliard : gdi32: Move remaining 16-bit metafile functions to metafile16.c
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 7582b13d8d413e195e8a4401d41d566fc32431d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7582b13d8d413e195e8a4401d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 26 13:31:45 2009 +0200 gdi32: Move remaining 16-bit metafile functions to metafile16.c --- dlls/gdi32/gdi16.c | 9 ------- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/metafile16.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/mfdrv/init.c | 48 ---------------------------------------- 4 files changed, 55 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 2f49948..f442d51 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -1601,15 +1601,6 @@ void WINAPI Resurrection16(HDC16 hdc, } -/********************************************************************** - * CreateMetaFile (GDI.125) - */ -HDC16 WINAPI CreateMetaFile16( LPCSTR filename ) -{ - return HDC_16( CreateMetaFileA( filename ) ); -} - - /*********************************************************************** * MulDiv (GDI.128) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d7f1d91..03c63d4 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -460,7 +460,6 @@ extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; -extern HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) DECLSPEC_HIDDEN; extern METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mr, LPCVOID filename, BOOL unicode ) DECLSPEC_HIDDEN; extern METAHEADER *MF_ReadMetaFile(HANDLE hfile) DECLSPEC_HIDDEN; extern METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi32/metafile16.c index a8e8ca6..812fb9c 100644 --- a/dlls/gdi32/metafile16.c +++ b/dlls/gdi32/metafile16.c @@ -58,6 +58,61 @@ static BOOL16 MF_ReleaseMetaHeader16( HMETAFILE16 hmf ) } /****************************************************************** + * MF_Create_HMETATFILE16 + * + * Creates a HMETAFILE16 object from a METAHEADER + * + * HMETAFILE16s are Global memory handles. + */ +static HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) +{ + HMETAFILE16 hmf; + DWORD size = mh->mtSize * sizeof(WORD); + + hmf = GlobalAlloc16(GMEM_MOVEABLE, size); + if(hmf) + { + METAHEADER *mh_dest = GlobalLock16(hmf); + memcpy(mh_dest, mh, size); + GlobalUnlock16(hmf); + } + HeapFree(GetProcessHeap(), 0, mh); + return hmf; +} + +/********************************************************************** + * CreateMetaFile (GDI.125) + */ +HDC16 WINAPI CreateMetaFile16( LPCSTR filename ) +{ + return HDC_16( CreateMetaFileA( filename ) ); +} + +/****************************************************************** + * CloseMetaFile (GDI.126) + */ +HMETAFILE16 WINAPI CloseMetaFile16(HDC16 hdc) +{ + HMETAFILE16 hmf16 = 0; + HMETAFILE hmf = CloseMetaFile( HDC_32(hdc) ); + + if (hmf) + { + UINT size = GetMetaFileBitsEx( hmf, 0, NULL ); + + hmf16 = GlobalAlloc16( GMEM_MOVEABLE, size ); + if (hmf16) + { + void *buffer = GlobalLock16( hmf16 ); + GetMetaFileBitsEx( hmf, size, buffer ); + GlobalUnlock16( hmf16 ); + } + DeleteMetaFile( hmf ); + } + return hmf16; +} + +/****************************************************************** * DeleteMetaFile (GDI.127) */ BOOL16 WINAPI DeleteMetaFile16( HMETAFILE16 hmf ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a5b18d3..b6cf549 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -23,8 +23,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" -#include "wownt32.h" #include "gdi_private.h" #include "mfdrv/metafiledrv.h" #include "wine/debug.h" @@ -354,52 +352,6 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) } /****************************************************************** - * MF_Create_HMETATFILE16 - * - * Creates a HMETAFILE16 object from a METAHEADER - * - * HMETAFILE16s are Global memory handles. - */ -HMETAFILE16 MF_Create_HMETAFILE16(METAHEADER *mh) -{ - HMETAFILE16 hmf; - DWORD size = mh->mtSize * sizeof(WORD); - - hmf = GlobalAlloc16(GMEM_MOVEABLE, size); - if(hmf) - { - METAHEADER *mh_dest = GlobalLock16(hmf); - memcpy(mh_dest, mh, size); - GlobalUnlock16(hmf); - } - HeapFree(GetProcessHeap(), 0, mh); - return hmf; -} - -/****************************************************************** - * CloseMetaFile (GDI.126) - * - * PARAMS - * hdc [I] Metafile DC to close - */ -HMETAFILE16 WINAPI CloseMetaFile16(HDC16 hdc) -{ - HMETAFILE16 hmf; - METAFILEDRV_PDEVICE *physDev; - DC *dc = MFDRV_CloseMetaFile(HDC_32(hdc)); - if (!dc) return 0; - physDev = (METAFILEDRV_PDEVICE *)dc->physDev; - - /* Now allocate a global handle for the metafile */ - - hmf = MF_Create_HMETAFILE16( physDev->mh ); - - physDev->mh = NULL; /* So it won't be deleted */ - MFDRV_DeleteDC( dc ); - return hmf; -} - -/****************************************************************** * CloseMetaFile (GDI32.@) * * Stop recording graphics operations in metafile associated with

1 0