December 2012 - Wine-commits

Jacek Caban : atl100: Added AtlUpdateRegistryFromResourceD implementation ( based on AtlModuleUpdateRegistryFromResourceD).
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: a97a667670c6028d9466491b9fbef664d0ebcf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97a667670c6028d9466491b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 13:02:14 2012 +0100 atl100: Added AtlUpdateRegistryFromResourceD implementation (based on AtlModuleUpdateRegistryFromResourceD). --- dlls/atl100/atl100.spec | 2 +- dlls/atl100/registrar.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/atlbase.h | 1 + 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 47e3c56..13e043b 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -7,7 +7,7 @@ 17 stub AtlComModuleRegisterClassObjects 20 stub AtlComModuleRevokeClassObjects 22 stub AtlComModuleUnregisterServer -23 stub AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) diff --git a/dlls/atl100/registrar.c b/dlls/atl100/registrar.c index f9f5b3c..9cad32a 100644 --- a/dlls/atl100/registrar.c +++ b/dlls/atl100/registrar.c @@ -702,3 +702,48 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar **ret) *ret = &registrar->IRegistrar_iface; return S_OK; } + +/*********************************************************************** + * AtlUpdateRegistryFromResourceD [atl100.@] + */ +HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE inst, LPCOLESTR res, + BOOL bRegister, struct _ATL_REGMAP_ENTRY *pMapEntries, IRegistrar *pReg) +{ + const struct _ATL_REGMAP_ENTRY *iter; + WCHAR module_name[MAX_PATH]; + IRegistrar *registrar; + HRESULT hres; + + static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; + static const WCHAR registryW[] = {'R','E','G','I','S','T','R','Y',0}; + + if(!GetModuleFileNameW(inst, module_name, MAX_PATH)) { + FIXME("hinst %p: did not get module name\n", inst); + return E_FAIL; + } + + TRACE("%p (%s), %s, %d, %p, %p\n", inst, debugstr_w(module_name), + debugstr_w(res), bRegister, pMapEntries, pReg); + + if(pReg) { + registrar = pReg; + }else { + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + } + + IRegistrar_AddReplacement(registrar, moduleW, module_name); + + for (iter = pMapEntries; iter && iter->szKey; iter++) + IRegistrar_AddReplacement(registrar, iter->szKey, iter->szData); + + if(bRegister) + hres = IRegistrar_ResourceRegisterSz(registrar, module_name, res, registryW); + else + hres = IRegistrar_ResourceUnregisterSz(registrar, module_name, res, registryW); + + if(registrar != pReg) + IRegistrar_Release(registrar); + return hres; +} diff --git a/include/atlbase.h b/include/atlbase.h index 1e48f58..5dd0d5b 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -210,5 +210,6 @@ HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM); HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID * iid, DWORD dw); HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUnk); HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); +HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); #endif /* __WINE_ATLBASE_H__ */

1 0

Jacek Caban : atl: Reimplemented AtlModuleUpdateRegistryFromResourceD on top of AtlUpdateRegistryFromResourceD .
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 77c7fcdc946c1ac7b5b1a2002ad841246201dd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c7fcdc946c1ac7b5b1a2002… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 13:02:32 2012 +0100 atl: Reimplemented AtlModuleUpdateRegistryFromResourceD on top of AtlUpdateRegistryFromResourceD. --- dlls/atl/registrar.c | 53 ++----------------------------------------------- 1 files changed, 3 insertions(+), 50 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 41a5dc3..fc4e08b 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -108,63 +108,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) extern HINSTANCE hInst; -static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, - LPCOLESTR wszId, BOOL do_register, - const struct _ATL_REGMAP_ENTRY* pMapEntries) -{ - IRegistrar *registrar; - HRESULT hres; - const struct _ATL_REGMAP_ENTRY *pMapEntry; - - static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; - static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - - if(pRegistrar) { - registrar = pRegistrar; - }else { - hres = AtlCreateRegistrar(&registrar); - if(FAILED(hres)) - return hres; - } - - IRegistrar_AddReplacement(registrar, wszModule, wszDll); - - for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) - IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); - - if(do_register) - hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); - else - hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); - - if(registrar != pRegistrar) - IRegistrar_Release(registrar); - return hres; -} - /*********************************************************************** * AtlModuleUpdateRegistryFromResourceD [ATL.@] * */ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, - BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) + BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) { - HINSTANCE lhInst = pM->m_hInst; - /* everything inside this function below this point - * should go into atl71.AtlUpdateRegistryFromResourceD - */ - WCHAR module_name[MAX_PATH]; - - if(!GetModuleFileNameW(lhInst, module_name, MAX_PATH)) { - FIXME("hinst %p: did not get module name\n", - lhInst); - return E_FAIL; - } - - TRACE("%p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name), - debugstr_w(lpszRes), bRegister, pMapEntries, pReg); + TRACE("(%p %s %d %p %p)\n", pM, debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); + return AtlUpdateRegistryFromResourceD(pM->m_hInst, lpszRes, bRegister, pMapEntries, pReg); } /***********************************************************************

1 0

Jacek Caban : atl100: Added AtlLoadTypeLib implementation ( based on AtlModuleLoadTypeLib).
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: b09af0d0b2ab6cceac849533fad0069b3acd85e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09af0d0b2ab6cceac849533f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 13:02:46 2012 +0100 atl100: Added AtlLoadTypeLib implementation (based on AtlModuleLoadTypeLib). --- dlls/atl100/atl.c | 23 +++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index dd08867..7e273b7 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -265,6 +265,29 @@ void WINAPI AtlCallTermFunc(_ATL_MODULE *pM) } /*********************************************************************** + * AtlLoadTypeLib [atl100.@] + */ +HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, + BSTR *pbstrPath, ITypeLib **ppTypeLib) +{ + OLECHAR path[MAX_PATH+8]; /* leave some space for index */ + HRESULT hres; + + TRACE("(%p %s %p %p)\n", inst, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); + + GetModuleFileNameW(inst, path, MAX_PATH); + if(lpszIndex) + lstrcatW(path, lpszIndex); + + hres = LoadTypeLib(path, ppTypeLib); + if(FAILED(hres)) + return hres; + + *pbstrPath = SysAllocString(path); + return S_OK; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 13e043b..ec8a858 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -38,7 +38,7 @@ 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface -56 stub AtlLoadTypeLib +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx diff --git a/include/atlbase.h b/include/atlbase.h index 5dd0d5b..4aeabe9 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -211,5 +211,6 @@ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID * iid, DWORD dw); HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUnk); HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); +HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); #endif /* __WINE_ATLBASE_H__ */

1 0

Jacek Caban : atl: Reimplemented AtlModuleLoadTypeLib on top of AtlLoadTypeLib.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 9e2d5cae7367a716f4b1ce08dcfe63d24f6acdd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2d5cae7367a716f4b1ce08d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 11 13:03:04 2012 +0100 atl: Reimplemented AtlModuleLoadTypeLib on top of AtlLoadTypeLib. --- dlls/atl/atl_main.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 415fbc3..8f8cd76 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -111,25 +111,12 @@ static _ATL_OBJMAP_ENTRYW_V1 *get_objmap_entry( _ATL_MODULEW *mod, unsigned int HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib) { - HRESULT hRes; - OLECHAR path[MAX_PATH+8]; /* leave some space for index */ - TRACE("(%p, %s, %p, %p)\n", pM, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); if (!pM) return E_INVALIDARG; - GetModuleFileNameW(pM->m_hInstTypeLib, path, MAX_PATH); - if (lpszIndex) - lstrcatW(path, lpszIndex); - - hRes = LoadTypeLib(path, ppTypeLib); - if (FAILED(hRes)) - return hRes; - - *pbstrPath = SysAllocString(path); - - return S_OK; + return AtlLoadTypeLib(pM->m_hInstTypeLib, lpszIndex, pbstrPath, ppTypeLib); } HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM)

1 0

Michael Stefaniuc : localui: Avoid sizeof on structs with a varlength array .
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: f417dc1efbd227c6c88ab57143c2f8363d62c0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f417dc1efbd227c6c88ab5714… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 11 13:35:40 2012 +0100 localui: Avoid sizeof on structs with a varlength array. --- dlls/localui/localui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index b9e4c4e..382e2db 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -122,7 +122,7 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) shortname[len-1] = '\0'; /* get current settings */ - len = sizeof(cfg); + len = FIELD_OFFSET(COMMCONFIG, wcProviderData[1]); status = ERROR_SUCCESS; res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW, (PBYTE) shortname,

1 0

Michael Stefaniuc : netapi32: Avoid sizeof on structs with a varlength array.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 54b75f3de3b3ab7b1cd3807b18bb9bb5f2f8cc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b75f3de3b3ab7b1cd3807b1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 11 13:37:41 2012 +0100 netapi32: Avoid sizeof on structs with a varlength array. --- dlls/netapi32/nbt.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 3cd8a61..1bbcaf0 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -407,9 +407,8 @@ static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount, { if (queryData->cacheEntry == NULL) { - queryData->cacheEntry = HeapAlloc( - GetProcessHeap(), 0, sizeof(NBNameCacheEntry) + - (answerCount - 1) * sizeof(DWORD)); + queryData->cacheEntry = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(NBNameCacheEntry, addresses[answerCount])); if (queryData->cacheEntry) queryData->cacheEntry->numAddresses = 0; else @@ -541,8 +540,8 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ], if (addr != INADDR_NONE) { - *cacheEntry = HeapAlloc(GetProcessHeap(), - 0, sizeof(NBNameCacheEntry)); + *cacheEntry = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(NBNameCacheEntry, addresses[1])); if (*cacheEntry) { memcpy((*cacheEntry)->name, name, NCBNAMSZ); @@ -566,9 +565,8 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ], ; if (host->h_addr_list && host->h_addr_list[0]) { - *cacheEntry = HeapAlloc( - GetProcessHeap(), 0, sizeof(NBNameCacheEntry) + - (i - 1) * sizeof(DWORD)); + *cacheEntry = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(NBNameCacheEntry, addresses[i])); if (*cacheEntry) { memcpy((*cacheEntry)->name, name, NCBNAMSZ);

1 0

Alexandre Julliard : winex11: Send WM_ENTERSIZEMOVE when starting to poll for a window move/resize.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 91ebca2bf10e3ef5edcb65868a8f3ce96d514e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ebca2bf10e3ef5edcb65868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 13:57:35 2012 +0100 winex11: Send WM_ENTERSIZEMOVE when starting to poll for a window move/resize. --- dlls/winex11.drv/mouse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 47a453c..8870665 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1350,6 +1350,8 @@ void move_resize_window( HWND hwnd, int dir ) /* (some apps don't like it if we return before the size/move is done) */ if (!button) return; + SendMessageW( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); + for (;;) { MSG msg;

1 0

Alexandre Julliard : gdi32: Fix text justification to properly handle logical coordinates.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 351e58318ab453d88efb236bc350099d2c151634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351e58318ab453d88efb236bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 16:52:43 2012 +0100 gdi32: Fix text justification to properly handle logical coordinates. --- dlls/gdi32/font.c | 13 ++++++------- dlls/gdi32/tests/dc.c | 13 +++++++++++++ dlls/gdi32/tests/font.c | 40 ++++++++++++++++++++++++---------------- 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3d75682..34520f5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1189,7 +1189,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, /* Perform device size to world size transformations. */ if (ret) { - INT extra = dc->charExtra, + INT extra = abs(INTERNAL_XWSTODS(dc, dc->charExtra)), breakExtra = dc->breakExtra, breakRem = dc->breakRem, i; @@ -1198,7 +1198,6 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, { for (i = 0; i < count; ++i) { - dxs[i] = abs(INTERNAL_XDSTOWS(dc, dxs[i])); dxs[i] += (i+1) * extra; if (count > 1 && (breakExtra || breakRem) && str[i] == tm.tmBreakChar) { @@ -1209,15 +1208,12 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, dxs[i]++; } } + dxs[i] = abs(INTERNAL_XDSTOWS(dc, dxs[i])); if (dxs[i] <= maxExt) ++nFit; } - breakRem = dc->breakRem; } - size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); - size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); - - if (!dxs && count > 1 && (breakExtra || breakRem)) + else if (count > 1 && (breakExtra || breakRem)) { for (i = 0; i < count; i++) { @@ -1232,6 +1228,9 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, } } } + size->cx += count * extra; + size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); + size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); } if (lpnFit) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 8baacc2..802d82a 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -58,6 +58,7 @@ static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; + int extra; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -86,6 +87,18 @@ static void test_dc_values(void) color = GetTextColor( hdc ); ok( color == 0, "wrong color %08x\n", color ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 0, "initial extra %d\n", extra ); + SetTextCharacterExtra( hdc, 123 ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + SetMapMode( hdc, MM_LOMETRIC ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + SetMapMode( hdc, MM_TEXT ); + extra = GetTextCharacterExtra( hdc ); + ok( extra == 123, "initial extra %d\n", extra ); + DeleteDC( hdc ); } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 1064ce2..8508d70 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1753,18 +1753,17 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { INT y, breakCount, - justifiedWidth = 0, /* to test GetTextExtentExPointW() */ areaWidth = clientArea->right - clientArea->left, nErrors = 0, e; - BOOL lastExtent = FALSE; PSTR pFirstChar, pLastChar; SIZE size; TEXTMETRICA tm; struct err { - char extent[100]; + char *start; + int len; int GetTextExtentExPointWWidth; - } error[10]; + } error[20]; GetTextMetricsA(hdc, &tm); y = clientArea->top; @@ -1803,18 +1802,16 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { SetTextJustification(hdc, areaWidth - size.cx, breakCount); GetTextExtentPoint32(hdc, pFirstChar, pLastChar - pFirstChar, &size); - justifiedWidth = size.cx; + if (size.cx != areaWidth && nErrors < sizeof(error)/sizeof(error[0]) - 1) + { + error[nErrors].start = pFirstChar; + error[nErrors].len = pLastChar - pFirstChar; + error[nErrors].GetTextExtentExPointWWidth = size.cx; + nErrors++; + } } - else lastExtent = TRUE; - /* catch errors and report them */ - if (!lastExtent && (justifiedWidth != areaWidth)) - { - memset(error[nErrors].extent, 0, 100); - memcpy(error[nErrors].extent, pFirstChar, pLastChar - pFirstChar); - error[nErrors].GetTextExtentExPointWWidth = justifiedWidth; - nErrors++; - } + trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar); y += size.cy; str = pLastChar; @@ -1825,8 +1822,8 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ ok(error[e].GetTextExtentExPointWWidth == areaWidth, - "GetTextExtentPointW() for \"%s\" should have returned a width of %d, not %d.\n", - error[e].extent, areaWidth, error[e].GetTextExtentExPointWWidth); + "GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", + error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); } } @@ -1862,6 +1859,17 @@ static void test_SetTextJustification(void) testJustification(hdc, testText, &clientArea); + SetMapMode( hdc, MM_ANISOTROPIC ); + SetWindowExtEx( hdc, 2, 2, NULL ); + GetClientRect( hwnd, &clientArea ); + DPtoLP( hdc, (POINT *)&clientArea, 2 ); + testJustification(hdc, testText, &clientArea); + + SetViewportExtEx( hdc, 3, 3, NULL ); + GetClientRect( hwnd, &clientArea ); + DPtoLP( hdc, (POINT *)&clientArea, 2 ); + testJustification(hdc, testText, &clientArea); + DeleteObject(hfont); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

Nikolay Sivov : msxml3: GetMaxSize() is not a stub.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 9336a3903c231dd8261ed498e7c881e36aa6b327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9336a3903c231dd8261ed498e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 11 13:31:29 2012 +0300 msxml3: GetMaxSize() is not a stub. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/domdoc.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 52b41a7..49e6168 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -803,7 +803,7 @@ static HRESULT WINAPI PersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { domdoc *This = impl_from_IPersistStreamInit(iface); - TRACE("(%p)->(%p): stub!\n", This, pcbSize); + TRACE("(%p)->(%p)\n", This, pcbSize); return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df72987..eda98f1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1755,16 +1755,20 @@ static void test_persiststreaminit(void) { IXMLDOMDocument *doc; IPersistStreamInit *streaminit; + ULARGE_INTEGER size; HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&streaminit); - ok( hr == S_OK, "failed with 0x%08x\n", hr ); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IPersistStreamInit_InitNew(streaminit); - ok( hr == S_OK, "failed with 0x%08x\n", hr ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPersistStreamInit_GetSizeMax(streaminit, &size); + ok(hr == E_NOTIMPL, "got 0x%08x\n", hr); IXMLDOMDocument_Release(doc); }

1 0

Nikolay Sivov : comctl32: Fix font style when item is bold and hovered in track mode.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: fbd7f8813f0792616012875e714adb0b0381fcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd7f8813f0792616012875e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 11 19:51:56 2012 +0300 comctl32: Fix font style when item is bold and hovered in track mode. --- dlls/comctl32/treeview.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 57cb70c..22d7180 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -110,6 +110,7 @@ typedef struct tagTREEVIEW_INFO HFONT hDefaultFont; HFONT hBoldFont; HFONT hUnderlineFont; + HFONT hBoldUnderlineFont; HCURSOR hcurHand; HWND hwndToolTip; @@ -303,11 +304,22 @@ TREEVIEW_CreateUnderlineFont(HFONT hOrigFont) return CreateFontIndirectW(&font); } +static HFONT +TREEVIEW_CreateBoldUnderlineFont(HFONT hfont) +{ + LOGFONTW font; + + GetObjectW(hfont, sizeof(font), &font); + font.lfWeight = FW_BOLD; + font.lfUnderline = TRUE; + return CreateFontIndirectW(&font); +} + static inline HFONT TREEVIEW_FontForItem(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { if ((infoPtr->dwStyle & TVS_TRACKSELECT) && (item == infoPtr->hotItem)) - return infoPtr->hUnderlineFont; + return item->state & TVIS_BOLD ? infoPtr->hBoldUnderlineFont : infoPtr->hUnderlineFont; if (item->state & TVIS_BOLD) return infoPtr->hBoldFont; return infoPtr->hFont; @@ -1903,8 +1915,10 @@ TREEVIEW_SetFont(TREEVIEW_INFO *infoPtr, HFONT hFont, BOOL bRedraw) DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); + DeleteObject(infoPtr->hBoldUnderlineFont); infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont); infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont); + infoPtr->hBoldUnderlineFont = TREEVIEW_CreateBoldUnderlineFont(infoPtr->hFont); if (!infoPtr->bHeightSet) infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr); @@ -5059,6 +5073,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW(&lf); infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont); infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont); + infoPtr->hBoldUnderlineFont = TREEVIEW_CreateBoldUnderlineFont(infoPtr->hFont); infoPtr->hcurHand = LoadCursorW(NULL, (LPWSTR)IDC_HAND); infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr); @@ -5118,6 +5133,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hDefaultFont); DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); + DeleteObject(infoPtr->hBoldUnderlineFont); Free(infoPtr); return 0;

1 0