December 2012 - Wine-Commits

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

Dec. 11, 2012

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 Dec. 11, 2012

Dec. 11, 2012

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

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

Dec. 11, 2012

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

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

Dec. 11, 2012

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 Dec. 11, 2012

Dec. 11, 2012

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

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

Dec. 11, 2012

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

Andrew Talbot : comdlg32: Indentation fix.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 309654f058cba1d6980f0e0903c124f4d0fe103e URL: http://source.winehq.org/git/wine.git/?a=commit;h=309654f058cba1d6980f0e090… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 22:43:40 2012 +0000 comdlg32: Indentation fix. --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index b52b23e..7f918ff 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -201,11 +201,11 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) while (filter) { scptr = strchrW(filter, ';'); if (scptr) *scptr = 0; - while (*filter == ' ') filter++; + while (*filter == ' ') filter++; TRACE("Using file spec %s\n", debugstr_w(filter)); SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); if (scptr) *scptr = ';'; - filter = (scptr) ? (scptr + 1) : 0; + filter = (scptr) ? (scptr + 1) : 0; } }

1 0

Daniel Jelinski : comctl32/tests: Add listview header notification tests.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 70df1d58cbe0e4e914dd8861ca0a483a2c5cc574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70df1d58cbe0e4e914dd8861c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Dec 8 09:08:26 2012 +0100 comctl32/tests: Add listview header notification tests. --- dlls/comctl32/tests/listview.c | 160 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6c39c2d..6dfeb26 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -312,6 +312,21 @@ static const struct message listview_header_changed_seq[] = { { 0 } }; +static const struct message parent_header_click_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_COLUMNCLICK }, + { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCLICKA }, + { 0 } +}; + +static const struct message parent_header_divider_dclick_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW }, + { WM_NOTIFY, sent|id, 0, 0, NM_CUSTOMDRAW }, + { WM_NOTIFY, sent|id, 0, 0, HDN_ITEMCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, HDN_DIVIDERDBLCLICKA }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -4911,6 +4926,150 @@ static void test_header_notification(void) DestroyWindow(list); } +static void test_header_notification2(void) +{ + static char textA[] = "newtext"; + HWND list, header; + HDITEMW itemW; + NMHEADERW nmhdr; + LVCOLUMNA col; + DWORD ret; + WCHAR buffer[100]; + struct message parent_header_notify_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, 0 }, + { 0 } + }; + + list = create_listview_control(LVS_REPORT); + ok(list != NULL, "failed to create listview window\n"); + + memset(&col, 0, sizeof(col)); + col.mask = LVCF_WIDTH | LVCF_TEXT; + col.cx = 100; + col.pszText = textA; + ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + expect(0, ret); + + header = ListView_GetHeader(list); + ok(header != 0, "No header\n"); + memset(&itemW, 0, sizeof(itemW)); + itemW.mask = HDI_WIDTH | HDI_ORDER | HDI_TEXT; + itemW.pszText = buffer; + itemW.cchTextMax = sizeof(buffer); + ret = SendMessageW(header, HDM_GETITEMW, 0, (LPARAM)&itemW); + expect(1, ret); + + nmhdr.hdr.hwndFrom = header; + nmhdr.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID); + nmhdr.iItem = 0; + nmhdr.iButton = 0; + nmhdr.pitem = &itemW; + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMCHANGINGW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ITEMCHANGINGA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_ITEMCHANGINGA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMCHANGEDW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ITEMCHANGEDA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_ITEMCHANGEDA, "Expected ANSI notification code\n"); + /* HDN_ITEMCLICK sets focus to list, which generates messages we don't want to check */ + SetFocus(list); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMCLICKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_click_seq, + "header notify, parent", FALSE); + todo_wine + ok(nmhdr.hdr.code == HDN_ITEMCLICKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMDBLCLICKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_ITEMDBLCLICKW, "Expected Unicode notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_DIVIDERDBLCLICKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_divider_dclick_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_DIVIDERDBLCLICKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_BEGINTRACKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + ok(nmhdr.hdr.code == HDN_BEGINTRACKW, "Expected Unicode notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ENDTRACKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ENDTRACKA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_ENDTRACKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_TRACKW; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_TRACKA; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", TRUE); + todo_wine + ok(nmhdr.hdr.code == HDN_TRACKA, "Expected ANSI notification code\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_BEGINDRAG; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", TRUE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ENDDRAG; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_ENDDRAG; + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_FILTERCHANGE; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + parent_header_notify_seq[0].id = HDN_FILTERCHANGE; + parent_header_notify_seq[0].flags |= optional; /* NT4 does not send this message */ + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, + "header notify, parent", FALSE); + parent_header_notify_seq[0].flags &= ~optional; + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_BEGINFILTEREDIT; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ENDFILTEREDIT; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMSTATEICONCLICK; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + nmhdr.hdr.code = HDN_ITEMKEYDOWN; + ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + DestroyWindow(list); +} + static void test_createdragimage(void) { HIMAGELIST himl; @@ -5029,6 +5188,7 @@ START_TEST(listview) g_is_below_5 = is_below_comctl_5(); test_header_notification(); + test_header_notification2(); test_images(); test_checkboxes(); test_items();

1 0

Amine Khaldi : include: Define FIELD_OFFSET to the standard offsetof.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: e3dd01a264328b60bf2aa33fdab4be252315e0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dd01a264328b60bf2aa33fd… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:14:02 2012 +0100 include: Define FIELD_OFFSET to the standard offsetof. --- include/winnt.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 207adaa..5f753bc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -746,8 +746,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define UNICODE_STRING_MAX_CHARS 32767 -#define FIELD_OFFSET(type, field) \ - ((LONG)(INT_PTR)&(((type *)0)->field)) +#define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field)) #define CONTAINING_RECORD(address, type, field) \ ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))

1 0

Alexandre Julliard : gdi32: Add a level of pointers to the glyph cache to avoid the need for locking individual glyphs .
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: a3cf48afada1ab525ed5c60cea8dcbf64f94c0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3cf48afada1ab525ed5c60ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 21:42:18 2012 +0100 gdi32: Add a level of pointers to the glyph cache to avoid the need for locking individual glyphs. --- dlls/gdi32/dibdrv/graphics.c | 65 +++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index aadd9b5..bb4ec81 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -40,6 +40,9 @@ enum glyph_type GLYPH_NBTYPES }; +#define GLYPH_CACHE_PAGE_SIZE 0x100 +#define GLYPH_CACHE_PAGES (0x10000 / GLYPH_CACHE_PAGE_SIZE) + struct cached_font { struct list entry; @@ -48,8 +51,7 @@ struct cached_font LOGFONTW lf; XFORM xform; UINT aa_flags; - UINT nb_glyphs[GLYPH_NBTYPES]; - struct cached_glyph **glyphs[GLYPH_NBTYPES]; + struct cached_glyph **glyphs[GLYPH_NBTYPES][GLYPH_CACHE_PAGES]; }; static struct list font_cache = LIST_INIT( font_cache ); @@ -494,7 +496,7 @@ static int font_cache_cmp( const struct cached_font *p1, const struct cached_fon static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags ) { struct cached_font font, *ptr, *last_unused = NULL; - UINT i = 0, j; + UINT i = 0, j, k; GetObjectW( hfont, sizeof(font.lf), &font.lf ); GetTransform( hdc, 0x204, &font.xform ); @@ -530,8 +532,13 @@ static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags ptr = last_unused; for (i = 0; i < GLYPH_NBTYPES; i++) { - for (j = 0; j < ptr->nb_glyphs[i]; j++) HeapFree( GetProcessHeap(), 0, ptr->glyphs[i][j] ); - HeapFree( GetProcessHeap(), 0, ptr->glyphs[i] ); + for (j = 0; j < GLYPH_CACHE_PAGES; j++) + { + if (!ptr->glyphs[i][j]) continue; + for (k = 0; k < GLYPH_CACHE_PAGE_SIZE; k++) + HeapFree( GetProcessHeap(), 0, ptr->glyphs[i][j][k] ); + HeapFree( GetProcessHeap(), 0, ptr->glyphs[i][j] ); + } } list_remove( &ptr->entry ); } @@ -543,11 +550,7 @@ static struct cached_font *add_cached_font( HDC hdc, HFONT hfont, UINT aa_flags *ptr = font; ptr->ref = 1; - for (i = 0; i < GLYPH_NBTYPES; i++) - { - ptr->glyphs[i] = NULL; - ptr->nb_glyphs[i] = 0; - } + memset( ptr->glyphs, 0, sizeof(ptr->glyphs) ); done: list_add_head( &font_cache, &ptr->entry ); LeaveCriticalSection( &font_cache_cs ); @@ -560,33 +563,40 @@ void release_cached_font( struct cached_font *font ) if (font) InterlockedDecrement( &font->ref ); } -static void add_cached_glyph( struct cached_font *font, UINT index, UINT flags, struct cached_glyph *glyph ) +static struct cached_glyph *add_cached_glyph( struct cached_font *font, UINT index, UINT flags, + struct cached_glyph *glyph ) { + struct cached_glyph *ret; enum glyph_type type = (flags & ETO_GLYPH_INDEX) ? GLYPH_INDEX : GLYPH_WCHAR; + UINT page = index / GLYPH_CACHE_PAGE_SIZE; + UINT entry = index % GLYPH_CACHE_PAGE_SIZE; - if (index >= font->nb_glyphs[type]) + if (!font->glyphs[type][page]) { - UINT new_count = (index + 128) & ~127; - struct cached_glyph **new; + struct cached_glyph **ptr; - if (font->glyphs[type]) - new = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - font->glyphs[type], new_count * sizeof(*new) ); - else - new = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(*new) ); - if (!new) return; - font->glyphs[type] = new; - font->nb_glyphs[type] = new_count; + ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, GLYPH_CACHE_PAGE_SIZE * sizeof(*ptr) ); + if (!ptr) + { + HeapFree( GetProcessHeap(), 0, glyph ); + return NULL; + } + if (InterlockedCompareExchangePointer( (void **)&font->glyphs[type][page], ptr, NULL )) + HeapFree( GetProcessHeap(), 0, ptr ); } - font->glyphs[type][index] = glyph; + ret = InterlockedCompareExchangePointer( (void **)&font->glyphs[type][page][entry], glyph, NULL ); + if (!ret) ret = glyph; + else HeapFree( GetProcessHeap(), 0, glyph ); + return ret; } static struct cached_glyph *get_cached_glyph( struct cached_font *font, UINT index, UINT flags ) { enum glyph_type type = (flags & ETO_GLYPH_INDEX) ? GLYPH_INDEX : GLYPH_WCHAR; + UINT page = index / GLYPH_CACHE_PAGE_SIZE; - if (index < font->nb_glyphs[type]) return font->glyphs[type][index]; - return NULL; + if (!font->glyphs[type][page]) return NULL; + return font->glyphs[type][page][index % GLYPH_CACHE_PAGE_SIZE]; } /********************************************************************** @@ -733,8 +743,7 @@ static struct cached_glyph *cache_glyph_bitmap( HDC hdc, struct cached_font *fon done: glyph->metrics = metrics; - add_cached_glyph( font, index, flags, glyph ); - return glyph; + return add_cached_glyph( font, index, flags, glyph ); } static void render_string( HDC hdc, dib_info *dib, struct cached_font *font, INT x, INT y, @@ -758,7 +767,6 @@ static void render_string( HDC hdc, dib_info *dib, struct cached_font *font, INT if (glyph_dib.bit_count == 8) get_aa_ranges( dib->funcs->pixel_to_colorref( dib, text_color ), ranges ); - EnterCriticalSection( &font_cache_cs ); for (i = 0; i < count; i++) { if (!(glyph = get_cached_glyph( font, str[i], flags )) && @@ -789,7 +797,6 @@ static void render_string( HDC hdc, dib_info *dib, struct cached_font *font, INT y += glyph->metrics.gmCellIncY; } } - LeaveCriticalSection( &font_cache_cs ); } BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits *bits,

1 0