wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Alexandre Julliard : comctl32: Process messages while waiting for the animation thread to finish.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 9510f97935f9c405d83fd47dee81c74383d90723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9510f97935f9c405d83fd47de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 20:16:35 2008 +0100 comctl32: Process messages while waiting for the animation thread to finish. --- dlls/comctl32/animate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index e0730f8..057cc3e 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -161,7 +161,7 @@ static BOOL ANIMATE_DoStop(ANIMATE_INFO *infoPtr) if (infoPtr->threadId != GetCurrentThreadId()) { LeaveCriticalSection(&infoPtr->cs); /* leave it a chance to run */ - WaitForSingleObject( handle, INFINITE ); + MsgWaitForMultipleObjects( 1, &handle, FALSE, INFINITE, QS_ALLINPUT ); TRACE("animation thread stopped\n"); EnterCriticalSection(&infoPtr->cs); }

1 0

Paul Vriens : opengl32/tests: Only use functions if they are implemented.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 82cbbbdb462236d24581ea133de77855eaf4eccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cbbbdb462236d24581ea133… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 11 17:22:32 2008 +0100 opengl32/tests: Only use functions if they are implemented. --- dlls/opengl32/tests/opengl.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c244bb8..456bf79 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -236,6 +236,12 @@ static void test_colorbits(HDC hdc) int res; int iPixelFormat = 0; + if (!pwglChoosePixelFormatARB) + { + skip("wglChoosePixelFormatARB is not available\n"); + return; + } + /* We need a pixel format with at least one bit of alpha */ res = pwglChoosePixelFormatARB(hdc, iAttribs, NULL, 1, &iPixelFormat, &nFormats); if(res == FALSE || nFormats == 0) @@ -264,6 +270,12 @@ static void test_gdi_dbuf(HDC hdc) int iPixelFormat; int res; + if (!pwglGetPixelFormatAttribivARB) + { + skip("wglGetPixelFormatAttribivARB is not available\n"); + return; + } + nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1;iPixelFormat <= nFormats;iPixelFormat++) { @@ -383,6 +395,13 @@ START_TEST(opengl) test_colorbits(hdc); test_gdi_dbuf(hdc); + if (!pwglGetExtensionsStringARB) + { + skip("wglGetExtensionsStringARB is not available\n"); + DestroyWindow(hwnd); + return; + } + wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n");

1 0

Paul Vriens : rpcrt4/tests: Don't crash on WinXP SP3.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: e2539cb9e572e430767f27c424c9001357170aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2539cb9e572e430767f27c42… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 11 16:45:36 2008 +0100 rpcrt4/tests: Don't crash on WinXP SP3. --- dlls/rpcrt4/tests/rpc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d2620c1..57973e5 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -388,7 +388,8 @@ static void test_towers(void) ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); ret = TowerExplode(tower, NULL, NULL, NULL, NULL, &address); ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); - ok(!strcmp(address, ""), "address was \"%s\" instead of \"\"\n", address); + /* Windows XP SP3 sets address to NULL */ + ok(!address || !strcmp(address, ""), "address was \"%s\" instead of \"\"\n or NULL (XP SP3)", address); I_RpcFree(address); I_RpcFree(tower);

1 0

Paul Vriens : wintrust/crypt: Fix some test failures for a NULL parameter.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: ea4489cfb06fff2985c07e3ed11a68f5ae90dff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4489cfb06fff2985c07e3ed… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 11 14:25:20 2008 +0100 wintrust/crypt: Fix some test failures for a NULL parameter. --- dlls/wintrust/crypt.c | 9 ++++++++- dlls/wintrust/tests/crypt.c | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index c919eef..8819ea8 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -51,7 +51,14 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, { FIXME("%p %s %x\n", catAdmin, debugstr_guid(sysSystem), dwFlags); - if (catAdmin) *catAdmin = (HCATADMIN)0xdeadbeef; + if (!catAdmin) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *catAdmin = (HCATADMIN)0xdeadbeef; + return TRUE; } diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 887d57a..31d8b8b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -67,12 +67,9 @@ static void test_context(void) /* All NULL */ SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(NULL, NULL, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } /* NULL GUID */ SetLastError(0xdeadbeef); @@ -113,12 +110,9 @@ static void test_context(void) /* NULL context handle and dummy GUID */ SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(NULL, &dummy, 0); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } /* Correct context handle and dummy GUID */ SetLastError(0xdeadbeef);

1 0

Paul Vriens : rpcrt4/tests: Vista uses the same status values as Windows 2003.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 517168b4c56ae0d0ebee492dc20bcae1fc83a171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517168b4c56ae0d0ebee492dc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 11 11:51:26 2008 +0100 rpcrt4/tests: Vista uses the same status values as Windows 2003. --- dlls/rpcrt4/tests/rpc.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index a95ff50..d2620c1 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -398,12 +398,15 @@ static void test_I_RpcMapWin32Status(void) { LONG win32status; RPC_STATUS rpc_status; - BOOL w2k3 = FALSE; + BOOL w2k3_up = FALSE; - /* Windows 2003 returns STATUS_UNSUCCESSFUL if given an unknown status */ + /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ win32status = I_RpcMapWin32Status(9999); if (win32status == STATUS_UNSUCCESSFUL) - w2k3 = TRUE; + { + trace("We are on Windows 2003 or Vista\n"); + w2k3_up = TRUE; + } for (rpc_status = 0; rpc_status < 10000; rpc_status++) { @@ -519,7 +522,7 @@ static void test_I_RpcMapWin32Status(void) case ERROR_PASSWORD_MUST_CHANGE: expected_win32status = STATUS_PASSWORD_MUST_CHANGE; break; case ERROR_ACCOUNT_LOCKED_OUT: expected_win32status = STATUS_ACCOUNT_LOCKED_OUT; break; default: - if (w2k3) + if (w2k3_up) expected_win32status = STATUS_UNSUCCESSFUL; else expected_win32status = rpc_status;

1 0

Paul Vriens : wintrust/tests: Change test_RegPolicyFlags to use the same logic as the rest of the tests.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 9be7a60d086b25b849435decc52d5715f7b4068a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be7a60d086b25b849435decc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 11 10:44:00 2008 +0100 wintrust/tests: Change test_RegPolicyFlags to use the same logic as the rest of the tests. --- dlls/wintrust/tests/register.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index bd277c5..bdfc9e1 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -30,14 +30,14 @@ static BOOL (WINAPI * pWintrustAddActionID)(GUID*, DWORD, CRYPT_REGISTER_ACTIONID*); static BOOL (WINAPI * pWintrustAddDefaultForUsage)(const CHAR*,CRYPT_PROVIDER_REGDEFUSAGE*); -static BOOL (WINAPI * pWintrustRemoveActionID)(GUID*); +static void (WINAPI * pWintrustGetRegPolicyFlags)(DWORD *); static BOOL (WINAPI * pWintrustLoadFunctionPointers)(GUID *, CRYPT_PROVIDER_FUNCTIONS *); - -static HMODULE hWintrust = 0; +static BOOL (WINAPI * pWintrustRemoveActionID)(GUID*); +static BOOL (WINAPI * pWintrustSetRegPolicyFlags)(DWORD); static void InitFunctionPtrs(void) { - hWintrust = GetModuleHandleA("wintrust.dll"); + HMODULE hWintrust = GetModuleHandleA("wintrust.dll"); #define WINTRUST_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hWintrust, #func); \ @@ -46,8 +46,10 @@ static void InitFunctionPtrs(void) WINTRUST_GET_PROC(WintrustAddActionID) WINTRUST_GET_PROC(WintrustAddDefaultForUsage) - WINTRUST_GET_PROC(WintrustRemoveActionID) + WINTRUST_GET_PROC(WintrustGetRegPolicyFlags) WINTRUST_GET_PROC(WintrustLoadFunctionPointers) + WINTRUST_GET_PROC(WintrustRemoveActionID) + WINTRUST_GET_PROC(WintrustSetRegPolicyFlags) #undef WINTRUST_GET_PROC } @@ -309,19 +311,18 @@ static void test_RegPolicyFlags(void) "Software\\Microsoft\\Windows\\CurrentVersion\\Wintrust\\" "Trust Providers\\Software Publishing"; static const CHAR State[] = "State"; - void (WINAPI *pGetFlags)(DWORD *); - BOOL (WINAPI *pSetFlags)(DWORD); HKEY key; LONG r; DWORD flags1, flags2, flags3, size; BOOL ret; - pGetFlags = (void*)GetProcAddress(hWintrust, "WintrustGetRegPolicyFlags"); - pSetFlags = (void*)GetProcAddress(hWintrust, "WintrustSetRegPolicyFlags"); - if (!pGetFlags || !pSetFlags) + if (!pWintrustGetRegPolicyFlags || !pWintrustSetRegPolicyFlags) + { skip("Policy flags functions not present\n"); + return; + } - pGetFlags(&flags2); + pWintrustGetRegPolicyFlags(&flags2); r = RegOpenKeyExA(HKEY_CURRENT_USER, Software_Publishing, 0, KEY_ALL_ACCESS, &key); @@ -334,13 +335,13 @@ static void test_RegPolicyFlags(void) ok(flags1 == flags2, "Got %08x flags instead of %08x\n", flags1, flags2); flags3 = flags2 | 1; - ret = pSetFlags(flags3); - ok(ret, "pSetFlags failed: %d\n", GetLastError()); + ret = pWintrustSetRegPolicyFlags(flags3); + ok(ret, "WintrustSetRegPolicyFlags failed: %d\n", GetLastError()); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); ok(flags1 == flags3, "Got %08x flags instead of %08x\n", flags1, flags3); - pSetFlags(flags2); + pWintrustSetRegPolicyFlags(flags2); RegCloseKey(key); }

1 0

Paul Vriens : wintrust/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: c16830db8cc45bae1bd9da4729a6a3d5f8f6babb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16830db8cc45bae1bd9da472… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 11 10:35:33 2008 +0100 wintrust/tests: Use GetModuleHandleA instead of LoadLibraryA. --- dlls/wintrust/tests/register.c | 45 ++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index f4aef92..bd277c5 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -35,30 +35,21 @@ static BOOL (WINAPI * pWintrustLoadFunctionPointers)(GUID *, CRYPT_PROVIDER_FUNC static HMODULE hWintrust = 0; -#define WINTRUST_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hWintrust, #func); \ - if(!p ## func) { \ - trace("GetProcAddress(%s) failed\n", #func); \ - FreeLibrary(hWintrust); \ - return FALSE; \ - } - -static BOOL InitFunctionPtrs(void) +static void InitFunctionPtrs(void) { - hWintrust = LoadLibraryA("wintrust.dll"); + hWintrust = GetModuleHandleA("wintrust.dll"); - if(!hWintrust) - { - trace("Could not load wintrust.dll\n"); - return FALSE; - } +#define WINTRUST_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hWintrust, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); WINTRUST_GET_PROC(WintrustAddActionID) WINTRUST_GET_PROC(WintrustAddDefaultForUsage) WINTRUST_GET_PROC(WintrustRemoveActionID) WINTRUST_GET_PROC(WintrustLoadFunctionPointers) - return TRUE; +#undef WINTRUST_GET_PROC } static void test_AddRem_ActionID(void) @@ -71,6 +62,12 @@ static void test_AddRem_ActionID(void) CRYPT_TRUST_REG_ENTRY DummyProvider = { sizeof(CRYPT_TRUST_REG_ENTRY), DummyDllW, DummyFunctionW }; BOOL ret; + if (!pWintrustAddActionID || !pWintrustRemoveActionID) + { + skip("WintrustAddActionID and/or WintrustRemoveActionID are not available\n"); + return; + } + /* All NULL */ SetLastError(0xdeadbeef); ret = pWintrustAddActionID(NULL, 0, NULL); @@ -174,6 +171,12 @@ static void test_AddDefaultForUsage(void) static const CHAR Usages[] = "SOFTWARE\\Microsoft\\Cryptography\\Providers\\Trust\\Usages\\1.2.3.4.5.6.7.8.9.10"; static CRYPT_PROVIDER_REGDEFUSAGE DefUsage; + if (!pWintrustAddDefaultForUsage) + { + skip("WintrustAddDefaultForUsage is not available\n"); + return; + } + /* All NULL */ SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(NULL, NULL); @@ -264,6 +267,11 @@ static void test_LoadFunctionPointers(void) CRYPT_PROVIDER_FUNCTIONS funcs; GUID action = WINTRUST_ACTION_GENERIC_VERIFY_V2; + if (!pWintrustLoadFunctionPointers) + { + skip("WintrustLoadFunctionPointers is not available\n"); + return; + } SetLastError(0xdeadbeef); ret = pWintrustLoadFunctionPointers(NULL, NULL); ok(!ret && GetLastError() == 0xdeadbeef, "Expected failure\n"); @@ -339,13 +347,10 @@ static void test_RegPolicyFlags(void) START_TEST(register) { - if(!InitFunctionPtrs()) - return; + InitFunctionPtrs(); test_AddRem_ActionID(); test_AddDefaultForUsage(); test_LoadFunctionPointers(); test_RegPolicyFlags(); - - FreeLibrary(hWintrust); }

1 0

Roderick Colenbrander : wined3d: Add read_from_framebuffer_texture which combines code from read_from_framebuffer (drawpixels) and LoadLocation.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: ba90a740beb9ce9a839cc843db8d87f5a37becdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba90a740beb9ce9a839cc843d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Feb 10 22:20:15 2008 +0100 wined3d: Add read_from_framebuffer_texture which combines code from read_from_framebuffer (drawpixels) and LoadLocation. This makes the code easier to read and the pieces borrowed from read_from_framebuffer are more correct than the code in LoadLocation. --- dlls/wined3d/surface.c | 114 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 82 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bd73089..5f8fd93 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -9,7 +9,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006-2007 Stefan D�singer for CodeWeavers * Copyright 2007 Henri Verbeet - * Copyright 2006-2007 Roderick Colenbrander + * Copyright 2006-2008 Roderick Colenbrander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); +static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { /* Make sure that a proper texture unit is selected, bind the texture @@ -603,6 +604,7 @@ const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface) { return (CONST void*)(This->resource.allocatedMemory); } +/* Read the framebuffer back into the surface */ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) { IWineD3DSwapChainImpl *swapchain; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; @@ -806,6 +808,79 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v LEAVE_GL(); } +/* Read the framebuffer contents into a texture */ +static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) +{ + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DSwapChainImpl *swapchain; + int bpp; + GLenum format, internal, type; + CONVERT_TYPES convert; + BOOL srcIsUpsideDown; + GLint prevRead; + + d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); + + IWineD3DSurface_GetContainer((IWineD3DSurface *) This, &IID_IWineD3DSwapChain, (void **)&swapchain); + /* Activate the surface. Set it up for blitting now, although not necessarily needed for LockRect. + * Certain graphics drivers seem to dislike some enabled states when reading from opengl, the blitting usage + * should help here. Furthermore unlockrect will need the context set up for blitting. The context manager will find + * context->last_was_blit set on the unlock. + */ + ActivateContext(device, (IWineD3DSurface *) This, CTXUSAGE_BLIT); + surface_bind_and_dirtify(This); + ENTER_GL(); + + glGetIntegerv(GL_READ_BUFFER, &prevRead); + + /* Select the correct read buffer, and give some debug output. + * There is no need to keep track of the current read buffer or reset it, every part of the code + * that reads sets the read buffer as desired. + */ + if(!swapchain) { + /* Locking the primary render target which is not on a swapchain(=offscreen render target). + * Read from the back buffer + */ + TRACE("Locking offscreen render target\n"); + glReadBuffer(device->offscreenBuffer); + srcIsUpsideDown = TRUE; + } else { + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); + TRACE("Locking %#x buffer\n", buffer); + glReadBuffer(buffer); + checkGLcall("glReadBuffer"); + + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + srcIsUpsideDown = FALSE; + } + + if(!(This->Flags & SFLAG_ALLOCATED)) { + surface_allocate_surface(This, internal, This->pow2Width, + This->pow2Height, format, type); + } + + clear_unused_channels(This); + + /* If !SrcIsUpsideDown we should flip the surface. + * This can be done using glCopyTexSubImage2D but this + * is VERY slow, so don't do that. We should prevent + * this code from getting called in such cases or perhaps + * we can use FBOs */ + + glCopyTexSubImage2D(This->glDescription.target, + This->glDescription.level, + 0, 0, 0, 0, + This->currentDesc.Width, + This->currentDesc.Height); + checkGLcall("glCopyTexSubImage2D"); + + glReadBuffer(prevRead); + vcheckGLcall("glReadBuffer"); + + LEAVE_GL(); + TRACE("Updated target %d\n", This->glDescription.target); +} + static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { /* Performance optimization: Count how often a surface is locked, if it is locked regularly do not throw away the system memory copy. * This avoids the need to download the surface from opengl all the time. The surface is still downloaded if the opengl texture is @@ -3865,41 +3940,15 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D HeapFree(GetProcessHeap(), 0, mem); } } else /* if(flag == SFLAG_INTEXTURE) */ { - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); - - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - surface_bind_and_dirtify(This); - if (This->Flags & SFLAG_INDRAWABLE) { - GLint prevRead; + read_from_framebuffer_texture(This); + } else { /* Upload from system memory */ + d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + surface_bind_and_dirtify(This); ENTER_GL(); - glGetIntegerv(GL_READ_BUFFER, &prevRead); - vcheckGLcall("glGetIntegerv"); - glReadBuffer(This->resource.wineD3DDevice->offscreenBuffer); - vcheckGLcall("glReadBuffer"); - - if(!(This->Flags & SFLAG_ALLOCATED)) { - surface_allocate_surface(This, internal, This->pow2Width, - This->pow2Height, format, type); - } - clear_unused_channels(This); - - glCopyTexSubImage2D(This->glDescription.target, - This->glDescription.level, - 0, 0, 0, 0, - This->currentDesc.Width, - This->currentDesc.Height); - checkGLcall("glCopyTexSubImage2D"); - - glReadBuffer(prevRead); - vcheckGLcall("glReadBuffer"); - - LEAVE_GL(); - - TRACE("Updated target %d\n", This->glDescription.target); - } else { /* The only place where LoadTexture() might get called when isInDraw=1 * is ActivateContext where lastActiveRenderTarget is preloaded. */ @@ -3967,6 +4016,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D /* Restore the default pitch */ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + LEAVE_GL(); /* Don't delete PBO memory */ if((mem != This->resource.allocatedMemory) && !(This->Flags & SFLAG_PBO))

1 0

Jacek Caban : mshtml: Mode range tests.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 61ca7a5731d878988fab8c31713fc0b45925735e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ca7a5731d878988fab8c317… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 10 19:47:47 2008 +0100 mshtml: Mode range tests. --- dlls/mshtml/tests/dom.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 35d82c6..e966f45 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -36,7 +36,7 @@ static const char doc_str1[] = "<html><body>test</body></html>"; static const char range_test_str[] = "<html><body>test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br /></body></html>"; static const char range_test2_str[] = - "<html><body>abc<hr />123</body></html>"; + "<html><body>abc<hr />123<br /><hr />def</body></html>"; static const char elem_test_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" "<body><a href=\"http://test\" name=\"x\">link</a><input />" @@ -948,13 +948,24 @@ static void test_txtrange2(IHTMLDocument2 *doc) range = test_create_body_range(doc); - test_range_text(range, "abc\r\n\r\n123"); + test_range_text(range, "abc\r\n\r\n123\r\n\r\n\r\ndef"); test_range_move(range, characterW, 5, 5); test_range_moveend(range, characterW, 1, 1); test_range_text(range, "2"); test_range_move(range, characterW, -3, -3); test_range_moveend(range, characterW, 3, 3); test_range_text(range, "c\r\n\r\n1"); + test_range_collapse(range, VARIANT_FALSE); + test_range_moveend(range, characterW, 4, 4); + test_range_text(range, "23"); + test_range_moveend(range, characterW, 1, 1); + test_range_text(range, "23\r\n\r\n\r\nd"); + test_range_moveend(range, characterW, -1, -1); + test_range_text(range, "23"); + test_range_moveend(range, characterW, -1, -1); + test_range_text(range, "23"); + test_range_moveend(range, characterW, -2, -2); + test_range_text(range, "2"); IHTMLTxtRange_Release(range); }

1 0

Jacek Caban : mshtml: Fixed bound_pos handling in move_prev_chars.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: d992735dcc4a9dd04c30be50185fbb388101582b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d992735dcc4a9dd04c30be501… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 10 19:47:21 2008 +0100 mshtml: Fixed bound_pos handling in move_prev_chars. --- dlls/mshtml/txtrange.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 7e505df..df8ee55 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -826,6 +826,7 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B { dompos_t iter, tmp; long ret = 0; + BOOL prev_eq = FALSE; WCHAR c; if(bounded) @@ -847,14 +848,16 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B ret++; - if(bound_pos && dompos_cmp(&iter, bound_pos)) { + if(prev_eq) { *bounded = TRUE; - cnt--; + ret++; } + + prev_eq = bound_pos && dompos_cmp(&iter, bound_pos); } *new_pos = iter; - return bounded && *bounded ? ret+1 : ret; + return ret; } static long find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2008