April 2009 - Wine-commits - list.winehq.org

Aric Stewart : msctf: Define the TF_MOD_* Constants.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: a98ac9a6122f3eb95fc6fd50b6b6f14a5522e0c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98ac9a6122f3eb95fc6fd50b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:47 2009 -0500 msctf: Define the TF_MOD_* Constants. --- include/msctf.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 4c0d486..a78552d 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -38,6 +38,18 @@ typedef [uuid(7213778c-7bb0-4270-b050-6189ee594e97)] DWORD TfEditCookie; typedef [uuid(de403c21-89fd-4f85-8b87-64584d063fbc)] DWORD TfClientId; typedef [uuid(88a9c478-f3ec-4763-8345-cd9250443f8d)] DWORD TfGuidAtom; +cpp_quote("#define TF_MOD_ALT 0x0001") +cpp_quote("#define TF_MOD_CONTROL 0x0002") +cpp_quote("#define TF_MOD_SHIFT 0x0004") +cpp_quote("#define TF_MOD_RALT 0x0008") +cpp_quote("#define TF_MOD_RCONTROL 0x0010") +cpp_quote("#define TF_MOD_RSHIFT 0x0020") +cpp_quote("#define TF_MOD_LALT 0x0040") +cpp_quote("#define TF_MOD_LCONTROL 0x0080") +cpp_quote("#define TF_MOD_LSHIFT 0x0100") +cpp_quote("#define TF_MOD_ON_KEYUP 0x0200") +cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs;

1 0

Aric Stewart : msctf/tests: Framework for testing ITfKeystrokeMgr.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 2bb5ade29fe8b97eb4243c4dfee15765be749d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb5ade29fe8b97eb4243c4df… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:51 2009 -0500 msctf/tests: Framework for testing ITfKeystrokeMgr. --- dlls/msctf/tests/inputprocessor.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 5ac4160..c047e45 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -257,6 +257,16 @@ static void test_ThreadMgrUnadviseSinks(void) ITfSource_Release(source); } +static void test_KeystrokeMgr(void) +{ + ITfKeystrokeMgr *keymgr= NULL; + HRESULT hr; + + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfKeystrokeMgr, (LPVOID*)&keymgr); + ok(SUCCEEDED(hr),"Failed to get IID_ITfKeystrokeMgr for ThreadMgr\n"); + ITfKeystrokeMgr_Release(keymgr); +} + static void test_Activate(void) { HRESULT hr; @@ -439,6 +449,7 @@ START_TEST(inputprocessor) test_ThreadMgrAdviseSinks(); test_Activate(); test_startSession(); + test_KeystrokeMgr(); test_endSession(); test_EnumLanguageProfiles(); test_FindClosestCategory();

1 0

Aric Stewart : msctf/tests: Test ITfKeystrokeMgr:: UnpreserveKey and ITfKeystrokeMgr::PreserveKey.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 19d83ae3397b5e24a84c3de10d8d26a58b471458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d83ae3397b5e24a84c3de10… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:53 2009 -0500 msctf/tests: Test ITfKeystrokeMgr::UnpreserveKey and ITfKeystrokeMgr::PreserveKey. --- dlls/msctf/tests/inputprocessor.c | 22 ++++++++++++++++++++++ include/msctf.idl | 1 + 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index c047e45..e5b2cd8 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -28,6 +28,7 @@ #include "shlguid.h" #include "comcat.h" #include "msctf.h" +#include "olectl.h" static ITfInputProcessorProfiles* g_ipp; static LANGID gLangid; @@ -67,6 +68,7 @@ DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8 DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); +DEFINE_GUID(CLSID_PreservedKey, 0xA0ED8E55,0xCD3B,0x4274,0xB2,0x95,0xF6,0xC9,0xBA,0x2B,0x84,0x72); static HRESULT initialize(void) @@ -261,9 +263,29 @@ static void test_KeystrokeMgr(void) { ITfKeystrokeMgr *keymgr= NULL; HRESULT hr; + TF_PRESERVEDKEY tfpk; hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfKeystrokeMgr, (LPVOID*)&keymgr); ok(SUCCEEDED(hr),"Failed to get IID_ITfKeystrokeMgr for ThreadMgr\n"); + + tfpk.uVKey = 'A'; + tfpk.uModifiers = TF_MOD_SHIFT; + + hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); + todo_wine ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + + hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); + todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); + + hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); + todo_wine ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded \n"); + + hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); + todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnpreserveKey failed\n"); + + hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); + todo_wine ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); + ITfKeystrokeMgr_Release(keymgr); } diff --git a/include/msctf.idl b/include/msctf.idl index a78552d..9255fea 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -24,6 +24,7 @@ import "textstor.idl"; #endif cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") +cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;")

1 0

Aric Stewart : msctf/tests: Test ITfKeystrokeMgr::IsPreservedKey.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 35127bc01f5839e3a3a1fc645baba732121e9c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35127bc01f5839e3a3a1fc645… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:55 2009 -0500 msctf/tests: Test ITfKeystrokeMgr::IsPreservedKey. --- dlls/msctf/tests/inputprocessor.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index e5b2cd8..2b2adde 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -264,6 +264,7 @@ static void test_KeystrokeMgr(void) ITfKeystrokeMgr *keymgr= NULL; HRESULT hr; TF_PRESERVEDKEY tfpk; + BOOL preserved; hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfKeystrokeMgr, (LPVOID*)&keymgr); ok(SUCCEEDED(hr),"Failed to get IID_ITfKeystrokeMgr for ThreadMgr\n"); @@ -280,9 +281,18 @@ static void test_KeystrokeMgr(void) hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); todo_wine ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded \n"); + preserved = FALSE; + hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); + todo_wine ok(hr == S_OK, "ITfKeystrokeMgr_IsPreservedKey failed\n"); + if (hr == S_OK) todo_wine ok(preserved == TRUE,"misreporting preserved key\n"); + hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnpreserveKey failed\n"); + hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); + todo_wine ok(hr == S_FALSE, "ITfKeystrokeMgr_IsPreservedKey failed\n"); + if (hr == S_FALSE) todo_wine ok(preserved == FALSE,"misreporting preserved key\n"); + hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); todo_wine ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n");

1 0

Nicolas Le Cam : msi: Enfore use of GetFileAttributes return value.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 03afdb0217068d3fb8869ccfce5f60cbcd3f0a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03afdb0217068d3fb8869ccfc… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:08:31 2009 +0200 msi: Enfore use of GetFileAttributes return value. --- dlls/msi/appsearch.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 18a031c..ff54be0 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -178,7 +178,8 @@ static LPWSTR app_search_file(LPWSTR path, MSISIGNATURE *sig) } attr = GetFileAttributesW(path); - if (attr == INVALID_FILE_ATTRIBUTES || attr == FILE_ATTRIBUTE_DIRECTORY) + if (attr == INVALID_FILE_ATTRIBUTES || + (attr & FILE_ATTRIBUTE_DIRECTORY)) return NULL; size = GetFileVersionInfoSizeW(path, &handle); @@ -298,7 +299,8 @@ static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MS lstrcatW(path, MSI_RecordGetString(rec, 2)); attr = GetFileAttributesW(path); - if (attr != INVALID_FILE_ATTRIBUTES && attr != FILE_ATTRIBUTE_DIRECTORY) + if (attr != INVALID_FILE_ATTRIBUTES && + !(attr & FILE_ATTRIBUTE_DIRECTORY)) *appValue = strdupW(path); } @@ -901,7 +903,8 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, } attr = GetFileAttributesW(val); - if ((attr & FILE_ATTRIBUTE_DIRECTORY) && + if (attr != INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_DIRECTORY) && val && val[lstrlenW(val) - 1] != '\\') { val = msi_realloc(val, (lstrlenW(val) + 2) * sizeof(WCHAR)); @@ -933,7 +936,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU WCHAR expanded[MAX_PATH]; MSIRECORD *row; int depth; - DWORD sz; + DWORD sz, attr; UINT rc; TRACE("%s\n", debugstr_w(sig->Name)); @@ -970,7 +973,9 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU if (parent) { - if (!(GetFileAttributesW(parent) & FILE_ATTRIBUTE_DIRECTORY)) + attr = GetFileAttributesW(parent); + if (attr != INVALID_FILE_ATTRIBUTES && + !(attr & FILE_ATTRIBUTE_DIRECTORY)) { PathRemoveFileSpecW(parent); PathAddBackslashW(parent);

1 0

Nicolas Le Cam : msi/tests: Add empty dir test for the DrLocator part of the AppSearch action.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 34202629c92f3a723fd85d7b5f6591beecaa264c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34202629c92f3a723fd85d7b5… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:09:24 2009 +0200 msi/tests: Add empty dir test for the DrLocator part of the AppSearch action. --- dlls/msi/tests/package.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c5c3b67..8766260 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8555,6 +8555,42 @@ static void test_appsearch_inilocator(void) DeleteFileA(msifile); } +/* + * MSI AppSearch action on DrLocator table always returns absolute paths. + * If a relative path was set, it returns the first absolute path that + * matches or an empty string if it didn't find anything. + * This helper function replicates this behaviour. + */ +static void search_absolute_directory(LPSTR absolute, LPCSTR relative) +{ + int i, size; + DWORD attr, drives; + + size = lstrlenA(relative); + drives = GetLogicalDrives(); + lstrcpyA(absolute, "A:\\"); + for (i = 0; i < 26; absolute[0] = '\0', i++) + { + if (!(drives & (1 << i))) + continue; + + absolute[0] = 'A' + i; + if (GetDriveType(absolute) != DRIVE_FIXED) + continue; + + lstrcpynA(absolute + 3, relative, size + 1); + attr = GetFileAttributesA(absolute); + if (attr != INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_DIRECTORY)) + { + if (absolute[3 + size - 1] != '\\') + lstrcatA(absolute, "\\"); + break; + } + absolute[3] = '\0'; + } +} + static void test_appsearch_drlocator(void) { MSIHANDLE hpkg, hdb; @@ -8617,6 +8653,9 @@ static void test_appsearch_drlocator(void) r = add_appsearch_entry(hdb, "'SIGPROP10', 'NewSignature10'"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_appsearch_entry(hdb, "'SIGPROP11', 'NewSignature11'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_drlocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8670,6 +8709,11 @@ static void test_appsearch_drlocator(void) r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* no parent, relative empty path, depth 0, no signature */ + sprintf(path, "'NewSignature11', '', '', 0"); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_signature_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8770,6 +8814,13 @@ static void test_appsearch_drlocator(void) ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); } + size = MAX_PATH; + search_absolute_directory(path, ""); + r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + DeleteFileA("FileName1"); DeleteFileA("FileName3.dll"); DeleteFileA("FileName4.dll");

1 0

Nicolas Le Cam : msi: Fix ACTION_AppSearchDr on empty path.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: b91fc465ff493f31238696c7e829b688c8cdf92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91fc465ff493f31238696c7e… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:11:23 2009 +0200 msi: Fix ACTION_AppSearchDr on empty path. --- dlls/msi/appsearch.c | 7 +++++-- dlls/msi/tests/package.c | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index ff54be0..9cc1592 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -969,7 +969,10 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU else depth = MSI_RecordGetInteger(row,4); - ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH); + if (sz) + ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH); + else + strcpyW(expanded, path); if (parent) { @@ -984,7 +987,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU strcpyW(path, parent); strcatW(path, expanded); } - else + else if (sz) strcpyW(path, expanded); PathAddBackslashW(path); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 8766260..12127ee 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8818,7 +8818,6 @@ static void test_appsearch_drlocator(void) search_absolute_directory(path, ""); r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); DeleteFileA("FileName1");

1 0

Nicolas Le Cam : msi/tests: Fix package test when run on a different drive than C:\.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 8b348fca27c7e49062dd8a4af251f315e87123a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b348fca27c7e49062dd8a4af… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 21 02:38:23 2009 +0200 msi/tests: Fix package test when run on a different drive than C:\. --- dlls/msi/tests/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 12127ee..ccc9208 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8768,7 +8768,7 @@ static void test_appsearch_drlocator(void) ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + search_absolute_directory(path, CURR_DIR + 3); r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop);

1 0

Alexandre Julliard : include: Add defines for 32-bit dbghelp functions on 64-bit.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d3bfd6d5707fb5de780db4604e969943a9e2ab40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bfd6d5707fb5de780db4604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 14:24:45 2009 +0200 include: Add defines for 32-bit dbghelp functions on 64-bit. --- include/dbghelp.h | 139 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 98 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3bfd6d5707fb5de780db…

1 0

Nikolay Sivov : comctl32/tests: Existing items aren' t resorted after LVS_SORTASCENDING added.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: d30df7de0634bd064a7ea7a866e695681a83c4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30df7de0634bd064a7ea7a86… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 23 16:10:49 2009 +0400 comctl32/tests: Existing items aren't resorted after LVS_SORTASCENDING added. --- dlls/comctl32/tests/listview.c | 85 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6482c74..8fcf0f4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1578,6 +1578,9 @@ static void test_sorting(void) HWND hwnd; LVITEMA item = {0}; DWORD r; + LONG_PTR style; + static CHAR names[][4] = {"A", "B", "C", "D"}; + CHAR buff[10]; hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -1627,6 +1630,88 @@ static void test_sorting(void) expect(LVIS_SELECTED, r); DestroyWindow(hwnd); + + /* switch to LVS_SORTASCENDING when some items added */ + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 0; + item.pszText = names[1]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(0, r); + + item.mask = LVIF_TEXT; + item.iItem = 1; + item.iSubItem = 0; + item.pszText = names[2]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(1, r); + + item.mask = LVIF_TEXT; + item.iItem = 2; + item.iSubItem = 0; + item.pszText = names[0]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(2, r); + + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTASCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SORTASCENDING, "Expected LVS_SORTASCENDING to be set\n"); + + /* no sorting performed when switched to LVS_SORTASCENDING */ + item.mask = LVIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); + + item.iItem = 1; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); + + item.iItem = 2; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); + + /* adding new item doesn't resort list */ + item.mask = LVIF_TEXT; + item.iItem = 3; + item.iSubItem = 0; + item.pszText = names[3]; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + expect(3, r); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff); + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + todo_wine ok(lstrcmp(buff, names[1]) == 0, "Expected '%s', got '%s'\n", names[1], buff); + + item.iItem = 1; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + todo_wine ok(lstrcmp(buff, names[2]) == 0, "Expected '%s', got '%s'\n", names[2], buff); + + item.iItem = 2; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + todo_wine ok(lstrcmp(buff, names[0]) == 0, "Expected '%s', got '%s'\n", names[0], buff); + + item.iItem = 3; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + expect(TRUE, r); + ok(lstrcmp(buff, names[3]) == 0, "Expected '%s', got '%s'\n", names[3], buff); + + DestroyWindow(hwnd); } static void test_ownerdata(void)

1 0