December 2007 - Wine-commits

Francois Gouget : kernel32/tests: Get the test to run on Windows 95.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 8ee430d14623c20fefabb0db1d07ab717346e957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee430d14623c20fefabb0db1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:24:49 2007 +0100 kernel32/tests: Get the test to run on Windows 95. --- dlls/kernel32/tests/actctx.c | 5 ++++- dlls/kernel32/tests/file.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 40f8b6e..21faa68 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -29,6 +29,7 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); @@ -881,8 +882,9 @@ static void test_actctx(void) test_detailed_info(handle, &detailed_info1); test_info_in_assembly(handle, 1, &manifest1_info); - if (!IsDebuggerPresent()) /* CloseHandle will generate an exception if a debugger is present */ + if (pIsDebuggerPresent && !pIsDebuggerPresent()) { + /* CloseHandle will generate an exception if a debugger is present */ b = CloseHandle(handle); ok(!b, "CloseHandle succeeded\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() == %u\n", GetLastError()); @@ -1137,6 +1139,7 @@ static BOOL init_funcs(void) X(DeactivateActCtx); X(FindActCtxSectionStringW); X(GetCurrentActCtx); + X(IsDebuggerPresent); X(QueryActCtxW); X(ReleaseActCtx); #undef X diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8b8c5fa..1fac807 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -28,6 +28,9 @@ #include "winbase.h" #include "winerror.h" +static HINSTANCE hkernel32; +static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); + /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; static const WCHAR filenameW[] = { 't','e','s','t','f','i','l','e','.','x','x','x',0 }; @@ -1420,12 +1423,18 @@ static void test_FindFirstFileExA(void) WIN32_FIND_DATAA search_results; HANDLE handle; + if (!pFindFirstFileExA) + { + skip("FindFirstFileExA() is missing\n"); + return; + } + CreateDirectoryA("test-dir", NULL); _lclose(_lcreat("test-dir\\file1", 0)); _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); /* FindExLimitToDirectories is ignored */ - handle = FindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); + handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, FindExSearchLimitToDirectories, NULL, 0); ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); @@ -1895,6 +1904,9 @@ static void test_RemoveDirectory(void) START_TEST(file) { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); + test__hread( ); test__hwrite( ); test__lclose( );

1 0

Francois Gouget : hlink: Fix the HlinkUpdateStackItem() prototype.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 1f1fa1daec9d723e2e0c4e628359a7d8e279f5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1fa1daec9d723e2e0c4e628… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:24:57 2007 +0100 hlink: Fix the HlinkUpdateStackItem() prototype. --- dlls/hlink/hlink.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 280d21b..7dac4d9 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -6,7 +6,7 @@ 8 stdcall HlinkNavigateToStringReference(wstr wstr ptr long ptr long ptr ptr ptr) 9 stdcall HlinkOnNavigate(ptr ptr long ptr wstr wstr ptr) 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) -11 stdcall HlinkUpdateStackItem(ptr ptr long wstr wstr) +11 stdcall HlinkUpdateStackItem(ptr ptr long ptr wstr wstr) 12 stub HlinkOnRenameDocument 14 stub HlinkResolveMonikerForData 15 stub HlinkResolveStringForData

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 05170942dee7f89f17c40d9f86c1990237833b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05170942dee7f89f17c40d9f8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:25:04 2007 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 273970f..c9a3147 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -633,11 +633,11 @@ static void alpha_test(IDirect3DDevice7 *device) ddsd.dwHeight = 128; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE; U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U4(ddsd).ddpfPixelFormat.dwRGBBitCount = 32; - U4(ddsd).ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000; - U4(ddsd).ddpfPixelFormat.dwRBitMask = 0x00ff0000; - U4(ddsd).ddpfPixelFormat.dwGBitMask = 0x0000ff00; - U4(ddsd).ddpfPixelFormat.dwBBitMask = 0x000000ff; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(ddsd).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &offscreen, NULL); ok(hr == D3D_OK, "Creating the offscreen render target failed, hr = %08x\n", hr); if(!offscreen) {

1 0

Francois Gouget : comtcl32/tests: Dynamically load ImageList_SetImageCount( ) because it is missing on Windows 95.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 86b36241586ad22ffbed48dfb960bf47c434a3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b36241586ad22ffbed48dfb… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 10 01:25:15 2007 +0100 comtcl32/tests: Dynamically load ImageList_SetImageCount() because it is missing on Windows 95. --- dlls/comctl32/tests/imagelist.c | 44 +++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3d4c333..0d1770b 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -65,7 +65,8 @@ typedef struct _ILHEAD } ILHEAD; #include "poppack.h" -static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*) = NULL; +static BOOL (WINAPI *pImageList_DrawIndirect)(IMAGELISTDRAWPARAMS*); +static BOOL (WINAPI *pImageList_SetImageCount)(HIMAGELIST,UINT); static HDC desktopDC; static HINSTANCE hinst; @@ -359,12 +360,19 @@ static BOOL DoTest1(void) ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n"); /* check SetImageCount/GetImageCount */ - ok(ImageList_SetImageCount(himl, 3), "couldn't increase image count\n"); - ok(ImageList_GetImageCount(himl) == 3, "invalid image count after increase\n"); - ok(ImageList_SetImageCount(himl, 1), "couldn't decrease image count\n"); - ok(ImageList_GetImageCount(himl) == 1, "invalid image count after decrease to 1\n"); - ok(ImageList_SetImageCount(himl, 0), "couldn't decrease image count\n"); - ok(ImageList_GetImageCount(himl) == 0, "invalid image count after decrease to 0\n"); + if (pImageList_SetImageCount) + { + ok(pImageList_SetImageCount(himl, 3), "couldn't increase image count\n"); + ok(ImageList_GetImageCount(himl) == 3, "invalid image count after increase\n"); + ok(pImageList_SetImageCount(himl, 1), "couldn't decrease image count\n"); + ok(ImageList_GetImageCount(himl) == 1, "invalid image count after decrease to 1\n"); + ok(pImageList_SetImageCount(himl, 0), "couldn't decrease image count\n"); + ok(ImageList_GetImageCount(himl) == 0, "invalid image count after decrease to 0\n"); + } + else + { + skip("skipped ImageList_SetImageCount tests\n"); + } /* destroy it */ ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); @@ -425,13 +433,8 @@ static BOOL DoTest3(void) if (!pImageList_DrawIndirect) { - HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); - pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); - if (!pImageList_DrawIndirect) - { - trace("ImageList_DrawIndirect not available, skipping test\n"); - return TRUE; - } + trace("ImageList_DrawIndirect not available, skipping test\n"); + return TRUE; } hwndfortest = create_a_window(); @@ -454,9 +457,12 @@ static BOOL DoTest3(void) ok(0==ImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); ok(1==ImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); - ok(ImageList_SetImageCount(himl,3),"Setimage count failed\n"); - /*ok(2==ImageList_Add(himl, hbm3, NULL),"failed to add bitmap 3\n"); */ - ok(ImageList_Replace(himl, 2, hbm3, 0),"failed to replace bitmap 3\n"); + if (pImageList_SetImageCount) + { + ok(pImageList_SetImageCount(himl,3),"Setimage count failed\n"); + /*ok(2==ImageList_Add(himl, hbm3, NULL),"failed to add bitmap 3\n"); */ + ok(ImageList_Replace(himl, 2, hbm3, 0),"failed to replace bitmap 3\n"); + } memset(&imldp, 0, sizeof (imldp)); ok(!pImageList_DrawIndirect(&imldp), "zero data succeeded!\n"); @@ -969,6 +975,10 @@ static void test_imagelist_storage(void) START_TEST(imagelist) { + HMODULE hComCtl32 = GetModuleHandle("comctl32.dll"); + pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); + pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); + desktopDC=GetDC(NULL); hinst = GetModuleHandleA(NULL);

1 0

Rob Shearman : rpcrt4: NdrRangeUnmarshall is implemented so add it to the spec file.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 80b8743aa20d8c53fdc244d0b49077242bc9e06e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b8743aa20d8c53fdc244d0b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 9 18:22:36 2007 +0000 rpcrt4: NdrRangeUnmarshall is implemented so add it to the spec file. --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 631d135..9005a4f 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -294,7 +294,7 @@ @ stdcall NdrProxyGetBuffer(ptr ptr) @ stdcall NdrProxyInitialize(ptr ptr ptr ptr long) @ stdcall NdrProxySendReceive(ptr ptr) -@ stub NdrRangeUnmarshall +@ stdcall NdrRangeUnmarshall(ptr ptr ptr long) @ stub NdrRpcSmClientAllocate @ stub NdrRpcSmClientFree @ stub NdrRpcSmSetClientToOsf

1 0

Rob Shearman : rpcrt4: Pass the USER_MARSHAL_CB structure into user marshal routines.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 766d8a17af4b8195b378c7fed2260372220fd549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766d8a17af4b8195b378c7fed… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 9 18:22:57 2007 +0000 rpcrt4: Pass the USER_MARSHAL_CB structure into user marshal routines. --- dlls/rpcrt4/ndr_marshall.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4e1d80b..66833df 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3201,10 +3201,18 @@ void WINAPI NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, pMemory = ComplexFree(pStubMsg, pMemory, pFormat, NULL); } -static ULONG UserMarshalFlags(const MIDL_STUB_MESSAGE *pStubMsg) +static void UserMarshalCB(PMIDL_STUB_MESSAGE pStubMsg, + USER_MARSHAL_CB_TYPE cbtype, PFORMAT_STRING pFormat, + USER_MARSHAL_CB *umcb) { - return MAKELONG(pStubMsg->dwDestContext, - pStubMsg->RpcMsg->DataRepresentation); + umcb->Flags = MAKELONG(pStubMsg->dwDestContext, + pStubMsg->RpcMsg->DataRepresentation); + umcb->pStubMsg = pStubMsg; + umcb->pReserve = NULL; + umcb->Signature = USER_MARSHAL_CB_SIGNATURE; + umcb->CBType = cbtype; + umcb->pFormat = pFormat; + umcb->pTypeFormat = NULL /* FIXME */; } #define USER_MARSHAL_PTR_PREFIX \ @@ -3221,10 +3229,13 @@ unsigned char * WINAPI NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; unsigned char *saved_buffer = NULL; - ULONG uflag = UserMarshalFlags(pStubMsg); + USER_MARSHAL_CB umcb; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); + UserMarshalCB(pStubMsg, USER_MARSHAL_CB_MARSHALL, pFormat, &umcb); + if (flags & USER_MARSHAL_POINTER) { ALIGN_POINTER(pStubMsg->Buffer, 4); @@ -3243,7 +3254,7 @@ unsigned char * WINAPI NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->Buffer = pStubMsg->StubDesc->aUserMarshalQuadruple[index].pfnMarshall( - &uflag, pStubMsg->Buffer, pMemory); + &umcb.Flags, pStubMsg->Buffer, pMemory); if (saved_buffer) { @@ -3269,10 +3280,13 @@ unsigned char * WINAPI NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned index = *(const WORD*)&pFormat[2]; DWORD memsize = *(const WORD*)&pFormat[4]; unsigned char *saved_buffer = NULL; - ULONG uflag = UserMarshalFlags(pStubMsg); + USER_MARSHAL_CB umcb; + TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); TRACE("index=%d\n", index); + UserMarshalCB(pStubMsg, USER_MARSHAL_CB_UNMARSHALL, pFormat, &umcb); + if (flags & USER_MARSHAL_POINTER) { ALIGN_POINTER(pStubMsg->Buffer, 4); @@ -3294,7 +3308,7 @@ unsigned char * WINAPI NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->Buffer = pStubMsg->StubDesc->aUserMarshalQuadruple[index].pfnUnmarshall( - &uflag, pStubMsg->Buffer, *ppMemory); + &umcb.Flags, pStubMsg->Buffer, *ppMemory); if (saved_buffer) { @@ -3316,11 +3330,14 @@ void WINAPI NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned flags = pFormat[1]; unsigned index = *(const WORD*)&pFormat[2]; DWORD bufsize = *(const WORD*)&pFormat[6]; - ULONG uflag = UserMarshalFlags(pStubMsg); + USER_MARSHAL_CB umcb; unsigned long saved_buffer_length = 0; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); + UserMarshalCB(pStubMsg, USER_MARSHAL_CB_BUFFER_SIZE, pFormat, &umcb); + if (flags & USER_MARSHAL_POINTER) { ALIGN_LENGTH(pStubMsg->BufferLength, 4); @@ -3346,7 +3363,7 @@ void WINAPI NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, else pStubMsg->BufferLength = pStubMsg->StubDesc->aUserMarshalQuadruple[index].pfnBufferSize( - &uflag, pStubMsg->BufferLength, pMemory); + &umcb.Flags, pStubMsg->BufferLength, pMemory); if (saved_buffer_length) { @@ -3401,12 +3418,15 @@ void WINAPI NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, { /* unsigned flags = pFormat[1]; */ unsigned index = *(const WORD*)&pFormat[2]; - ULONG uflag = UserMarshalFlags(pStubMsg); + USER_MARSHAL_CB umcb; + TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("index=%d\n", index); + UserMarshalCB(pStubMsg, USER_MARSHAL_CB_FREE, pFormat, &umcb); + pStubMsg->StubDesc->aUserMarshalQuadruple[index].pfnFree( - &uflag, pMemory); + &umcb.Flags, pMemory); } /***********************************************************************

1 0

Hans Leidekker : usp10: Use GetCharABCWidthsI to implement ScriptGetGlyphABCWidth.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 143f2421b67767847bca3c1cd8f9cd2d7e640407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=143f2421b67767847bca3c1cd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 9 21:39:02 2007 +0100 usp10: Use GetCharABCWidthsI to implement ScriptGetGlyphABCWidth. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 576b056..a7bbf16 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1474,7 +1474,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB if ((hr = get_script_cache(hdc, psc))) return hr; /* FIXME: get this from the cache */ - if (!GetCharABCWidthsW(get_cache_hdc(psc), glyph, glyph, abc)) return E_HANDLE; + if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, 1, &glyph, abc)) return E_HANDLE; return S_OK; }

1 0

Hans Leidekker : usp10: Store original font in the script cache and reselect it on successive calls .
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 68efae1615aa2e40672bd0b1955c871a276cc64c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68efae1615aa2e40672bd0b19… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 9 21:39:19 2007 +0100 usp10: Store original font in the script cache and reselect it on successive calls. --- dlls/usp10/usp10.c | 59 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 48 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a7bbf16..fb0d4da 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -147,6 +147,7 @@ typedef struct { HDC hdc; LONG height; WCHAR default_char; + LOGFONTW lf; } ScriptCache; typedef struct { @@ -212,6 +213,8 @@ static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) TEXTMETRICW metric; if (!GetTextMetricsW(hdc, &metric)) return E_INVALIDARG; + if (!GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(LOGFONTW), &sc->lf)) return E_INVALIDARG; + sc->height = metric.tmHeight; sc->default_char = metric.tmDefaultChar; sc->hdc = hdc; @@ -239,6 +242,21 @@ static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return S_OK; } +static HFONT select_cached_font(SCRIPT_CACHE *psc) +{ + HFONT old_font; + ScriptCache *sc = *psc; + + old_font = SelectObject(sc->hdc, CreateFontIndirectW(&sc->lf)); + return old_font; +} + +static void unselect_cached_font(SCRIPT_CACHE *psc, HFONT old_font) +{ + ScriptCache *sc = *psc; + DeleteObject(SelectObject(sc->hdc, old_font)); +} + /*********************************************************************** * DllMain * @@ -1228,6 +1246,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, { int cnt; HRESULT hr; + HFONT hfont; *pcGlyphs = cChars; TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); @@ -1237,6 +1256,8 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; if ((hr = get_script_cache(hdc, psc))) return hr; + hfont = select_cached_font(psc); + TRACE("Before: "); for (cnt = 0; cnt < cChars; cnt++) TRACE("%4x",pwcChars[cnt]); @@ -1270,6 +1291,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, psva[cnt].fZeroWidth = 0; pwLogClust[cnt] = cnt; } + unselect_cached_font(psc, hfont); return S_OK; } @@ -1300,12 +1322,15 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int wcnt; HRESULT hr; LPABC lpABC; + HFONT hfont; TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); if ((hr = get_script_cache(hdc, psc))) return hr; + hfont = select_cached_font(psc); + /* Here we need to calculate the width of the run unit. At this point the input string * has been converted to glyphs and we still need to translate back to the original chars * to get the correct ABC widths. */ @@ -1315,8 +1340,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, memset(pABC, 0, sizeof(ABC)); /* FIXME: set pGoffset to more reasonable values */ - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) - { + if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC)) + { WARN("Could not get ABC values\n"); for (wcnt = 0; wcnt < cGlyphs; wcnt++) { piAdvance[wcnt] = 0; @@ -1346,8 +1371,9 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); - usp_free(lpABC); - return S_OK; + usp_free(lpABC); + unselect_cached_font(psc, hfont); + return S_OK; } /*********************************************************************** @@ -1372,12 +1398,15 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars { int cnt; HRESULT hr; + HFONT hfont; TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), cChars, dwFlags, pwOutGlyphs); if ((hr = get_script_cache(hdc, psc))) return hr; + hfont = select_cached_font(psc); + TRACE("Before: "); for (cnt = 0; cnt < cChars; cnt++) TRACE("%4x",pwcInChars[cnt]); @@ -1391,6 +1420,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars } TRACE("\n"); + unselect_cached_font(psc, hfont); return S_OK; } @@ -1403,7 +1433,8 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset) { - HRESULT hr; + HFONT hfont; + HRESULT hr = S_OK; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, @@ -1413,14 +1444,17 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; if ((hr = get_script_cache(hdc, psc))) return hr; + hfont = select_cached_font(psc); + fuOptions &= ETO_CLIPPED + ETO_OPAQUE; if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) - return S_FALSE; + hr = S_FALSE; - return S_OK; + unselect_cached_font(psc, hfont); + return hr; } /*********************************************************************** @@ -1467,15 +1501,18 @@ HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) */ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, ABC *abc) { - HRESULT hr; + HFONT hfont; + HRESULT hr = S_OK; TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc); if ((hr = get_script_cache(hdc, psc))) return hr; - /* FIXME: get this from the cache */ - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, 1, &glyph, abc)) return E_HANDLE; - return S_OK; + hfont = select_cached_font(psc); + if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, 1, &glyph, abc)) hr = E_HANDLE; + + unselect_cached_font(psc, hfont); + return hr; } /***********************************************************************

1 0

Michael Stefaniuc : hhctrl.ocx: Rename the wrappers around HeapAlloc() &Co to use the standard names.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 7e8d79fa3d183944dbf8e0c0d03db2ed824e7d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8d79fa3d183944dbf8e0c0d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 9 16:29:44 2007 +0100 hhctrl.ocx: Rename the wrappers around HeapAlloc() &Co to use the standard names. --- dlls/hhctrl.ocx/chm.c | 28 ++++++++++++++-------------- dlls/hhctrl.ocx/content.c | 22 +++++++++++----------- dlls/hhctrl.ocx/help.c | 34 +++++++++++++++++----------------- dlls/hhctrl.ocx/hhctrl.c | 10 +++++----- dlls/hhctrl.ocx/hhctrl.h | 14 +++++++------- dlls/hhctrl.ocx/webbrowser.c | 6 +++--- 6 files changed, 57 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8d79fa3d183944dbf8e…

1 0

Michael Stefaniuc : iccvid: Rename the wrappers around HeapAlloc() &Co to use the standard names.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: d9873e23146147dcf2b230884c188534d4015670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9873e23146147dcf2b230884… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 9 16:30:07 2007 +0100 iccvid: Rename the wrappers around HeapAlloc() &Co to use the standard names. --- dlls/iccvid/iccvid.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index a34e58c..3d1be34 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -82,12 +82,12 @@ typedef struct _ICCVID_Info cinepak_info *cvinfo; } ICCVID_Info; -static inline LPVOID ICCVID_Alloc( size_t size, size_t count ) +static inline LPVOID heap_alloc( size_t size ) { - return HeapAlloc( GetProcessHeap(), 0, size*count ); + return HeapAlloc( GetProcessHeap(), 0, size ); } -static inline BOOL ICCVID_Free( LPVOID ptr ) +static inline BOOL heap_free( LPVOID ptr ) { return HeapFree( GetProcessHeap(), 0, ptr ); } @@ -338,7 +338,7 @@ static cinepak_info *decode_cinepak_init(void) cinepak_info *cvinfo; int i; - cvinfo = ICCVID_Alloc( sizeof (cinepak_info), 1 ); + cvinfo = heap_alloc( sizeof (cinepak_info) ); if( !cvinfo ) return NULL; cvinfo->strip_num = 0; @@ -359,10 +359,10 @@ static void free_cvinfo( cinepak_info *cvinfo ) for( i=0; i<cvinfo->strip_num; i++ ) { - ICCVID_Free(cvinfo->v4_codebook[i]); - ICCVID_Free(cvinfo->v1_codebook[i]); + heap_free(cvinfo->v4_codebook[i]); + heap_free(cvinfo->v1_codebook[i]); } - ICCVID_Free( cvinfo ); + heap_free( cvinfo ); } typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit, @@ -457,13 +457,13 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, for(i = cvinfo->strip_num; i < strips; i++) { - if((cvinfo->v4_codebook[i] = ICCVID_Alloc(sizeof(cvid_codebook), 260)) == NULL) + if((cvinfo->v4_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) { ERR("CVID: codebook v4 alloc err\n"); return; } - if((cvinfo->v1_codebook[i] = ICCVID_Alloc(sizeof(cvid_codebook), 260)) == NULL) + if((cvinfo->v1_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) { ERR("CVID: codebook v1 alloc err\n"); return; @@ -918,7 +918,7 @@ static LRESULT ICCVID_Close( ICCVID_Info *info ) return 0; if( info->cvinfo ) free_cvinfo( info->cvinfo ); - ICCVID_Free( info ); + heap_free( info ); return 1; } @@ -978,7 +978,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; - info = ICCVID_Alloc( sizeof (ICCVID_Info), 1 ); + info = heap_alloc( sizeof (ICCVID_Info) ); if( info ) { info->dwMagic = ICCVID_MAGIC;

1 0