wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Detlef Riekenberg : urlmon/tests: Fix a typo in an ok message.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 0baa711b0bf0a571863f3958c20a6f489ce02e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0baa711b0bf0a571863f3958c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 15 21:07:54 2009 +0200 urlmon/tests: Fix a typo in an ok message. --- dlls/urlmon/tests/sec_mgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 08051f6..f90f5a5 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -251,7 +251,7 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ hres = IInternetZoneManager_GetZoneActionPolicy(zonemgr, 3, action, (BYTE*)&policy, sizeof(DWORD), URLZONEREG_DEFAULT); ok(hres == S_OK, "GetZoneActionPolicy failed: %08x\n", hres); - ok(policy == URLPOLICY_DISALLOW, "(%x) policy=%x, expected URLPOLIVY_DISALLOW\n", action, policy); + ok(policy == URLPOLICY_DISALLOW, "(%x) policy=%x, expected URLPOLICY_DISALLOW\n", action, policy); policy = 0xdeadbeef; hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy,

1 0

Rein Klazes : comdlg32: Delay setting the initial size of resizable file dialog until the CDN_INITDONE notification has been processed .
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: b498fe7544702e97e5ab2fb9dbe11e7c3c2813f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b498fe7544702e97e5ab2fb9d… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jun 16 08:17:09 2009 +0200 comdlg32: Delay setting the initial size of resizable file dialog until the CDN_INITDONE notification has been processed. --- dlls/comdlg32/filedlg.c | 6 +- dlls/comdlg32/tests/filedlg.c | 126 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index b820624..6e7f985 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1111,7 +1111,7 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { #if 0 - TRACE("0x%04x 0x%04x\n", hwnd, uMsg); + TRACE("%p 0x%04x\n", hwnd, uMsg); #endif switch(uMsg) @@ -1146,6 +1146,9 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l FILEDLG95_ResizeControls(hwnd, wParam, lParam); FILEDLG95_FillControls(hwnd, wParam, lParam); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { GetWindowRect( hwnd, &rc); @@ -1162,7 +1165,6 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) { - SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); } diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 9714dda..8b8d6e7 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -270,9 +270,135 @@ static void test_create_view_template(void) ok(!ret, "CommDlgExtendedError returned %#x\n", ret); } +/* test cases for resizing of the file dialog */ +struct { + DWORD flags; + int resize_init; /* change in CDN_INITDONE handler */ + int resize_folderchg; /* change in CDN_FOLDERCHANGE handler */ + int resize_timer1; /* change in first WM_TIMER handler */ + int resize_check; /* expected change (in second WM_TIMER handler) */ + BOOL todo; /* mark that test todo_wine */ +} resize_testcases[] = { + { 0 , 10, 10, 10, 30,FALSE}, /* 0 */ + { 0 ,-10,-10,-10,-30,FALSE}, + { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE}, + { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE}, + { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE}, + { OFN_ENABLESIZING , 0,-10, 0, 10, TRUE}, /* 5 */ + { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE}, + { OFN_ENABLESIZING ,-10, 0, 0, 10, TRUE}, + { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE}, + /* mark the end */ + { 0xffffffff } +}; + +static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static RECT initrc, rc; + static int index, count; + HWND parent = GetParent( dlg); + int resize; + switch( msg) + { + case WM_INITDIALOG: + { + DWORD style; + + index = ((OPENFILENAME*)lParam)->lCustData; + count = 0; + /* test style */ + style = GetWindowLong( parent, GWL_STYLE); + if( resize_testcases[index].flags & OFN_ENABLESIZING) + ok( style & WS_SIZEBOX, + "testid %d: dialog should have a WS_SIZEBOX style.\n", index); + else + ok( !(style & WS_SIZEBOX), + "testid %d: dialog should not have a WS_SIZEBOX style.\n", index); + break; + } + case WM_NOTIFY: + { + if(( (LPNMHDR)lParam)->code == CDN_INITDONE){ + GetWindowRect( parent, &initrc); + if( (resize = resize_testcases[index].resize_init)){ + MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, + initrc.bottom - initrc.top + resize, TRUE); + } + } else if(( (LPNMHDR)lParam)->code == CDN_FOLDERCHANGE){ + if( (resize = resize_testcases[index].resize_folderchg)){ + GetWindowRect( parent, &rc); + MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, + rc.bottom - rc.top + resize, TRUE); + } + SetTimer( dlg, 0, 100, 0); + } + break; + } + case WM_TIMER: + { + if( count == 0){ + if( (resize = resize_testcases[index].resize_timer1)){ + GetWindowRect( parent, &rc); + MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, + rc.bottom - rc.top + resize, TRUE); + } + } else if( count == 1){ + resize = resize_testcases[index].resize_check; + GetWindowRect( parent, &rc); + if( resize_testcases[index].todo){ + todo_wine { + ok( resize == rc.right - rc.left - initrc.right + initrc.left, + "testid %d size-x change %d expected %d\n", index, + rc.right - rc.left - initrc.right + initrc.left, resize); + ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, + "testid %d size-y change %d expected %d\n", index, + rc.bottom - rc.top - initrc.bottom + initrc.top, resize); + } + }else{ + ok( resize == rc.right - rc.left - initrc.right + initrc.left, + "testid %d size-x change %d expected %d\n", index, + rc.right - rc.left - initrc.right + initrc.left, resize); + ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, + "testid %d size-y change %d expected %d\n", index, + rc.bottom - rc.top - initrc.bottom + initrc.top, resize); + } + KillTimer( dlg, 0); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + } + count++; + } + break; + } + return 0; +} + +static void test_resize(void) +{ + OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + char filename[1024] = {0}; + DWORD ret; + int i; + + ofn.lpstrFile = filename; + ofn.nMaxFile = 1042; + ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; + ofn.hInstance = GetModuleHandle(NULL); + ofn.lpTemplateName = "template1"; + for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { + ofn.lCustData = i; + ofn.Flags = resize_testcases[i].flags | + OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE ; + ret = GetOpenFileName(&ofn); + ok(!ret, "GetOpenFileName returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + } +} + START_TEST(filedlg) { test_DialogCancel(); test_create_view_window2(); test_create_view_template(); + test_resize(); }

1 0

Alexandre Julliard : msvcrtd/tests: Fix calling convention for operator_new_dbg.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: cbaf176013826169cfa4884a8d66050703591b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaf176013826169cfa4884a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 13:29:38 2009 +0200 msvcrtd/tests: Fix calling convention for operator_new_dbg. --- dlls/msvcrtd/tests/debug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index a7f7db1..71f6e4c 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -30,7 +30,7 @@ /**********************************************************************/ -static void * (*pMSVCRTD_operator_new_dbg)(size_t, int, const char *, int) = NULL; +static void * (__cdecl *pMSVCRTD_operator_new_dbg)(size_t, int, const char *, int) = NULL; /* Some exports are only available in later versions */ #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y)

1 0

Alexandre Julliard : ntdll: Fix handling of self-relative security descriptors for 64-bit.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 2ee9118266c485571e4c43402aa39abe84b75ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee9118266c485571e4c43402… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 13:29:05 2009 +0200 ntdll: Fix handling of self-relative security descriptors for 64-bit. --- dlls/ntdll/sec.c | 242 ++++++++++++++++++++++++++---------------------------- 1 files changed, 115 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ee9118266c485571e4c4…

1 0

Alexandre Julliard : advapi32: Fix self-relative security descriptor creation for 64-bit.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 3a33ff7df9acf1b4d2a1fb80db9468807dbe9c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a33ff7df9acf1b4d2a1fb80d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 13:28:00 2009 +0200 advapi32: Fix self-relative security descriptor creation for 64-bit. --- dlls/advapi32/security.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0aa92ce..773a839 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -54,7 +54,7 @@ static BYTE ParseAceStringType(LPCWSTR* StringAcl); static DWORD ParseAceStringRights(LPCWSTR* StringAcl); static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR* SecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, LPDWORD cBytes); static DWORD ParseAclStringFlags(LPCWSTR* StringAcl); @@ -4060,7 +4060,7 @@ lerr: */ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR* SecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, LPDWORD cBytes) { BOOL bret = FALSE; @@ -4073,7 +4073,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( *cBytes = sizeof(SECURITY_DESCRIPTOR); if (SecurityDescriptor) - lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR); + lpNext = (LPBYTE)(SecurityDescriptor + 1); while (*StringSecurityDescriptor) { @@ -4111,7 +4111,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( if (SecurityDescriptor) { - SecurityDescriptor->Owner = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Owner = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -4129,7 +4129,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( if (SecurityDescriptor) { - SecurityDescriptor->Group = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Group = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -4149,7 +4149,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( if (SecurityDescriptor) { SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; - SecurityDescriptor->Dacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -4169,7 +4169,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( if (SecurityDescriptor) { SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; - SecurityDescriptor->Sacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -4265,7 +4265,7 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( psd->Control |= SE_SELF_RELATIVE; if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - psd, &cBytes)) + (SECURITY_DESCRIPTOR_RELATIVE *)psd, &cBytes)) { LocalFree(psd); goto lend;

1 0

Alexandre Julliard : advapi32/tests: Avoid accessing an uninitialized pointer.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: ac5002ed2b7a475980ac3ba60fa24320d42d2e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5002ed2b7a475980ac3ba60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 13:27:32 2009 +0200 advapi32/tests: Avoid accessing an uninitialized pointer. --- dlls/advapi32/tests/security.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b68629d..af52a3a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1237,10 +1237,11 @@ static void test_token_attr(void) Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); if (ret) - trace("\t%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); - else - trace("\t%s, attr: 0x%08x LookupAccountSid failed with error %d\n", SidString, Groups->Groups[i].Attributes, GetLastError()); - LocalFree(SidString); + { + trace("%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); + LocalFree(SidString); + } + else trace("attr: 0x%08x LookupAccountSid failed with error %d\n", Groups->Groups[i].Attributes, GetLastError()); } HeapFree(GetProcessHeap(), 0, Groups);

1 0

Nikolay Sivov : comctl32/listview: Convert forwarded header notifications to ANSI if NFR_ANSI is current format .
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 34b802caf088e526eadc23d785582e81ea5374cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b802caf088e526eadc23d78… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 16 01:46:11 2009 +0400 comctl32/listview: Convert forwarded header notifications to ANSI if NFR_ANSI is current format. --- dlls/comctl32/listview.c | 88 +++++++++++++++++++++++++++++++-------- dlls/comctl32/tests/listview.c | 30 +++++++++++++- 2 files changed, 99 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index de98e38..ebf49c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -701,10 +701,78 @@ static inline LPCSTR debugscrollcode(int nScrollCode) /******** Notification functions ************************************/ +static int get_ansi_notification(UINT unicodeNotificationCode) +{ + switch (unicodeNotificationCode) + { + case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; + case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; + case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; + case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; + case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; + case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; + /* header forwards */ + case HDN_TRACKW: return HDN_TRACKA; + case HDN_ENDTRACKW: return HDN_ENDTRACKA; + case HDN_BEGINDRAG: return HDN_BEGINDRAG; + case HDN_ENDDRAG: return HDN_ENDDRAG; + case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + } + ERR("unknown notification %x\n", unicodeNotificationCode); + assert(FALSE); + return 0; +} + +/* forwards header notifications to listview parent */ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) { - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)lpnmh->hdr.idFrom, (LPARAM)lpnmh); + NMHEADERA nmhA; + HDITEMA hditema; + HD_TEXTFILTERA textfilter; + LPSTR text = NULL, filter = NULL; + LRESULT ret; + + /* on unicode format exit earlier */ + if (infoPtr->notifyFormat == NFR_UNICODE) + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM)lpnmh->hdr.idFrom, (LPARAM)lpnmh); + + /* header always supplies unicode notifications, + all we have to do is to convert strings to ANSI */ + nmhA = *(NMHEADERA*)lpnmh; + if (lpnmh->pitem) + { + hditema = *(HDITEMA*)lpnmh->pitem; + nmhA.pitem = &hditema; + /* convert item text */ + if (lpnmh->pitem->mask & HDI_TEXT) + { + Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText); + text = hditema.pszText; + } + /* convert filter text */ + if ((lpnmh->pitem->mask & HDI_FILTER) && (lpnmh->pitem->type == HDFT_ISSTRING) && + lpnmh->pitem->pvFilter) + { + hditema.pvFilter = &textfilter; + textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter); + Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText); + filter = textfilter.pszText; + } + } + nmhA.hdr.code = get_ansi_notification(lpnmh->hdr.code); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM)nmhA.hdr.idFrom, (LPARAM)&nmhA); + + /* cleanup */ + Free(text); + Free(filter); + + return ret; } static LRESULT notify_hdr(const LISTVIEW_INFO *infoPtr, INT code, LPNMHDR pnmh) @@ -804,22 +872,6 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) return IsWindow(hwnd); } -static int get_ansi_notification(UINT unicodeNotificationCode) -{ - switch (unicodeNotificationCode) - { - case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; - case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; - case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; - case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; - case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; - case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; - } - ERR("unknown notification %x\n", unicodeNotificationCode); - assert(FALSE); - return 0; -} - /* Send notification. depends on dispinfoW having same structure as dispinfoA. diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d28fc1b..201826b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3177,7 +3177,7 @@ static void test_editbox(void) static void test_notifyformat(void) { - HWND hwnd; + HWND hwnd, header; DWORD r; hwnd = create_listview_control(0); @@ -3212,8 +3212,12 @@ static void test_notifyformat(void) notifyFormat = 0; hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); ok(r != 0, "Expected valid format\n"); @@ -3222,12 +3226,16 @@ static void test_notifyformat(void) expect(NFR_UNICODE, r); r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(1, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); notifyFormat = NFR_ANSI; r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_REQUERY); expect(NFR_ANSI, r); r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); @@ -3245,36 +3253,56 @@ static void test_notifyformat(void) notifyFormat = -1; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(1, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* recieving error code defaulting to ansi */ notifyFormat = 0; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* recieving ansi code from unicode window, use it */ notifyFormat = NFR_ANSI; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* unicode listview with ansi parent window */ notifyFormat = -1; hwnd = create_listview_controlW(0, hwndparent); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); /* unicode listview with ansi parent window, return error code */ notifyFormat = 0; hwnd = create_listview_controlW(0, hwndparent); ok(hwnd != NULL, "failed to create a listview window\n"); + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "expected header to be created\n"); r = SendMessageW(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); + r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); + expect(1, r); DestroyWindow(hwnd); DestroyWindow(hwndparentW);

1 0

Nikolay Sivov : comctl32/listview: Forward HDN_DIVIDERDBLCLICK to parent.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: b4b186d7b7cb5924e75cb6cc1278e862cd67fa63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b186d7b7cb5924e75cb6cc1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 15 23:14:39 2009 +0400 comctl32/listview: Forward HDN_DIVIDERDBLCLICK to parent. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 24c298e..de98e38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9342,6 +9342,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE case HDN_DIVIDERDBLCLICKW: case HDN_DIVIDERDBLCLICKA: LISTVIEW_SetColumnWidth(infoPtr, lpnmh->iItem, LVSCW_AUTOSIZE); + notify_forward_header(infoPtr, lpnmh); break; }

1 0

Nikolay Sivov : comctl32/listview: Block header items drag if LVS_EX_HEADERDRAGDROP isn't set.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 736d8ff0237bede9ab7632c66689be44b94dcea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736d8ff0237bede9ab7632c66… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 15 18:15:51 2009 +0400 comctl32/listview: Block header items drag if LVS_EX_HEADERDRAGDROP isn't set. --- dlls/comctl32/listview.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fd377ff..24c298e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9233,11 +9233,16 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE LISTVIEW_DrawTrackLine(infoPtr); infoPtr->xTrackLine = -1; break; - + + case HDN_BEGINDRAG: + notify_forward_header(infoPtr, lpnmh); + return (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0; + case HDN_ENDDRAG: FIXME("Changing column order not implemented\n"); + notify_forward_header(infoPtr, lpnmh); return TRUE; - + case HDN_ITEMCHANGINGW: case HDN_ITEMCHANGINGA: return notify_forward_header(infoPtr, lpnmh);

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 045c94baf1ca8bdea2f53279ff5a8cf6d92e8df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045c94baf1ca8bdea2f53279f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jun 15 22:08:41 2009 +0100 crypt32: Constify some variables. --- dlls/crypt32/msg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a16eef1..0b4027d 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1340,7 +1340,7 @@ static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, - const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + const void *pvMsgEncodeInfo, LPCSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) { const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *info = pvMsgEncodeInfo; @@ -1553,7 +1553,7 @@ static BOOL CDecodeMsg_CopyData(CRYPT_DATA_BLOB *blob, const BYTE *pbData, return ret; } -static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob) +static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_DATA_BLOB *data; @@ -1613,7 +1613,7 @@ static inline void CRYPT_FixUpAlgorithmID(CRYPT_ALGORITHM_IDENTIFIER *id) } static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, - CRYPT_DER_BLOB *blob) + const CRYPT_DER_BLOB *blob) { BOOL ret; CRYPT_DIGESTED_DATA *digestedData;

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 June 2009