wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Alex Henrie : comctl32: Close previously selected treeview item at common ancestor.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: a0ebe244c4aac37db23e89c5ff61ca126ee0988a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ebe244c4aac37db23e89c5f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:36:25 2015 -0600 comctl32: Close previously selected treeview item at common ancestor. Also, send WM_NOTIFY mesages when collapsing the previous selection and expanding the new one. --- dlls/comctl32/tests/treeview.c | 14 +++++--------- dlls/comctl32/treeview.c | 38 +++++++++++--------------------------- 2 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 72d4c2a..d03b126 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1767,9 +1767,9 @@ static void test_TVS_SINGLEEXPAND(void) { { &alpha, parent_singleexpand_seq0, FALSE }, { &bravo, parent_singleexpand_seq1, FALSE }, - { &delta, parent_singleexpand_seq2, TRUE }, - { &foxtrot, parent_singleexpand_seq3, TRUE }, - { &alpha, parent_singleexpand_seq4, TRUE }, + { &delta, parent_singleexpand_seq2, FALSE }, + { &foxtrot, parent_singleexpand_seq3, FALSE }, + { &alpha, parent_singleexpand_seq4, FALSE }, { &golf, parent_singleexpand_seq5, TRUE }, { &hotel, parent_singleexpand_seq6, FALSE }, { &india, parent_singleexpand_seq7, FALSE }, @@ -1801,12 +1801,8 @@ static void test_TVS_SINGLEEXPAND(void) for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) { ret = SendMessageA(hTree, TVM_GETITEMSTATE, (WPARAM)(*items[i].handle), 0xFFFF); - if (i == 0) - todo_wine ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", - i, items[i].final_state, ret); - else - ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", - i, items[i].final_state, ret); + ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", + i, items[i].final_state, ret); } /* a workaround for NT4 that sends expand notifications when nothing is about to expand */ diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f13090f..dcb1bf7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -29,7 +29,7 @@ * * TODO: * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, - * TVN_SETDISPINFO, TVN_SINGLEEXPAND + * TVN_SETDISPINFO * * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, * @@ -3508,47 +3508,31 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, HTREEITEM selection, HTREEITEM item) { - TREEVIEW_ITEM *SelItem; + TREEVIEW_ITEM *prev, *curr; if ((infoPtr->dwStyle & TVS_SINGLEEXPAND) == 0 || infoPtr->hwndEdit || !item) return; TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, item, 0); /* - * Close the previous selection all the way to the root - * as long as the new selection is not a child + * Close the previous item and its ancestors as long as they are not + * ancestors of the current item */ - if(selection && (selection != item)) + for (prev = selection; prev && TREEVIEW_ValidItem(infoPtr, prev); prev = prev->parent) { - BOOL closeit = TRUE; - SelItem = item; - - /* determine if the hitItem is a child of the currently selected item */ - while(closeit && SelItem && TREEVIEW_ValidItem(infoPtr, SelItem) && - (SelItem->parent != infoPtr->root)) - { - closeit = (SelItem != selection); - SelItem = SelItem->parent; - } - - if(closeit) + for (curr = item; curr && TREEVIEW_ValidItem(infoPtr, curr); curr = curr->parent) { - if(TREEVIEW_ValidItem(infoPtr, selection)) - SelItem = selection; - - while(SelItem && (SelItem != item) && TREEVIEW_ValidItem(infoPtr, SelItem) && - SelItem->parent != infoPtr->root) - { - TREEVIEW_Collapse(infoPtr, SelItem, FALSE, FALSE); - SelItem = SelItem->parent; - } + if (curr == prev) + goto finish; } + TREEVIEW_Collapse(infoPtr, prev, FALSE, TRUE); } +finish: /* * Expand the current item */ - TREEVIEW_Expand(infoPtr, item, FALSE, FALSE); + TREEVIEW_Expand(infoPtr, item, FALSE, TRUE); } static BOOL

1 0

Alex Henrie : comctl32/tests: Extend TVS_SINGLEEXPAND tests.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 9f93080754feae79a292508f48f96a17cfdf80cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f93080754feae79a292508f4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:36:24 2015 -0600 comctl32/tests: Extend TVS_SINGLEEXPAND tests. --- dlls/comctl32/tests/treeview.c | 173 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 166 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eb7d7e5..72d4c2a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -226,7 +227,8 @@ static const struct message parent_expand_empty_kb_seq[] = { { 0 } }; -static const struct message parent_singleexpand_seq[] = { +static const struct message parent_singleexpand_seq0[] = { + /* alpha expands */ { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, @@ -235,6 +237,84 @@ static const struct message parent_singleexpand_seq[] = { { 0 } }; +static const struct message parent_singleexpand_seq1[] = { + /* bravo expands */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq2[] = { + /* delta expands, bravo collapses */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq3[] = { + /* foxtrot expands, alpha and delta collapse */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq4[] = { + /* alpha expands, foxtrot collapses */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq5[] = { + /* foxtrot expands while golf is selected, then golf expands and alpha collapses */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq6[] = { + /* hotel does not expand and india does not collapse because they have no children */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { 0 } +}; + +static const struct message parent_singleexpand_seq7[] = { + /* india does not expand and hotel does not collapse because they have no children */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { 0 } +}; + static const struct message parent_get_dispinfo_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TVN_GETDISPINFOA }, { 0 } @@ -1637,21 +1717,100 @@ static void test_expandedimage(void) static void test_TVS_SINGLEEXPAND(void) { HWND hTree; + HTREEITEM alpha, bravo, charlie, delta, echo, foxtrot, golf, hotel, india, juliet; + TVINSERTSTRUCTA ins; + char foo[] = "foo"; + char context[32]; + int i; BOOL ret; + /* build a fairly complex tree + * - TVI_ROOT + * - alpha + * - bravo + * - charlie + * - delta + * - echo + * - foxtrot + * - golf + * - hotel + * - india + * - juliet + */ + struct + { + HTREEITEM *handle; + HTREEITEM *parent; + UINT final_state; + } + items[] = + { + { &alpha, NULL, TVIS_EXPANDEDONCE }, + { &bravo, &alpha, TVIS_EXPANDEDONCE }, + { &charlie, &bravo, 0 }, + { &delta, &alpha, TVIS_EXPANDEDONCE }, + { &echo, &delta, 0 }, + { &foxtrot, NULL, TVIS_EXPANDEDONCE|TVIS_EXPANDED }, + { &golf, &foxtrot, TVIS_EXPANDEDONCE|TVIS_EXPANDED }, + { &hotel, &golf, 0 }, + { &india, &golf, TVIS_SELECTED }, + { &juliet, &foxtrot, 0 } + }; + + struct + { + HTREEITEM *select; + const struct message *sequence; + BOOL todo; + } + sequence_tests[] = + { + { &alpha, parent_singleexpand_seq0, FALSE }, + { &bravo, parent_singleexpand_seq1, FALSE }, + { &delta, parent_singleexpand_seq2, TRUE }, + { &foxtrot, parent_singleexpand_seq3, TRUE }, + { &alpha, parent_singleexpand_seq4, TRUE }, + { &golf, parent_singleexpand_seq5, TRUE }, + { &hotel, parent_singleexpand_seq6, FALSE }, + { &india, parent_singleexpand_seq7, FALSE }, + { &india, empty_seq, TRUE } + }; + hTree = create_treeview_control(0); SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_SINGLEEXPAND); /* to avoid painting related notifications */ ShowWindow(hTree, SW_HIDE); - fill_tree(hTree); + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + { + ins.hParent = items[i].parent ? *items[i].parent : TVI_ROOT; + ins.hInsertAfter = TVI_FIRST; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = foo; + *items[i].handle = TreeView_InsertItemA(hTree, &ins); + } - flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); - ok(ret, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_singleexpand_seq, "singleexpand notifications", FALSE); + for (i = 0; i < sizeof(sequence_tests)/sizeof(sequence_tests[0]); i++) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)(*sequence_tests[i].select)); + ok(ret, "got %d\n", ret); + sprintf(context, "singleexpand notifications %d", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, sequence_tests[i].sequence, context, sequence_tests[i].todo); + } + + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + { + ret = SendMessageA(hTree, TVM_GETITEMSTATE, (WPARAM)(*items[i].handle), 0xFFFF); + if (i == 0) + todo_wine ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", + i, items[i].final_state, ret); + else + ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", + i, items[i].final_state, ret); + } /* a workaround for NT4 that sends expand notifications when nothing is about to expand */ - ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hRoot); + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); ok(ret, "got %d\n", ret); fill_tree(hTree); ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0);

1 0

Alex Henrie : winmm: Improve grammar by changing "or" to "and" in an error message.
by Alexandre Julliard 18 May '15

18 May '15

1 0

Nikolay Sivov : oledlg: Make object name menu item localized.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 66bcad51c0c1f27739ab190bf27e002d20286043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bcad51c0c1f27739ab190bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 18 10:19:11 2015 +0300 oledlg: Make object name menu item localized. --- dlls/oledlg/oledlg.rc | 1 + dlls/oledlg/oledlg_main.c | 4 ++- dlls/oledlg/resource.h | 3 ++ po/ar.po | 68 ++++++++++++++++++++++----------------------- po/bg.po | 68 ++++++++++++++++++++++----------------------- po/ca.po | 68 ++++++++++++++++++++++----------------------- po/cs.po | 68 ++++++++++++++++++++++----------------------- po/da.po | 68 ++++++++++++++++++++++----------------------- po/de.po | 68 ++++++++++++++++++++++----------------------- po/el.po | 68 ++++++++++++++++++++++----------------------- po/en.po | 68 ++++++++++++++++++++++----------------------- po/en_US.po | 68 ++++++++++++++++++++++----------------------- po/eo.po | 68 ++++++++++++++++++++++----------------------- po/es.po | 68 ++++++++++++++++++++++----------------------- po/fa.po | 68 ++++++++++++++++++++++----------------------- po/fi.po | 68 ++++++++++++++++++++++----------------------- po/fr.po | 68 ++++++++++++++++++++++----------------------- po/he.po | 68 ++++++++++++++++++++++----------------------- po/hi.po | 68 ++++++++++++++++++++++----------------------- po/hr.po | 68 ++++++++++++++++++++++----------------------- po/hu.po | 68 ++++++++++++++++++++++----------------------- po/it.po | 68 ++++++++++++++++++++++----------------------- po/ja.po | 68 ++++++++++++++++++++++----------------------- po/ko.po | 68 ++++++++++++++++++++++----------------------- po/lt.po | 68 ++++++++++++++++++++++----------------------- po/ml.po | 68 ++++++++++++++++++++++----------------------- po/nb_NO.po | 68 ++++++++++++++++++++++----------------------- po/nl.po | 68 ++++++++++++++++++++++----------------------- po/or.po | 68 ++++++++++++++++++++++----------------------- po/pa.po | 68 ++++++++++++++++++++++----------------------- po/pl.po | 68 ++++++++++++++++++++++----------------------- po/pt_BR.po | 68 ++++++++++++++++++++++----------------------- po/pt_PT.po | 68 ++++++++++++++++++++++----------------------- po/rm.po | 68 ++++++++++++++++++++++----------------------- po/ro.po | 68 ++++++++++++++++++++++----------------------- po/ru.po | 68 ++++++++++++++++++++++----------------------- po/sk.po | 68 ++++++++++++++++++++++----------------------- po/sl.po | 68 ++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 70 +++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 70 +++++++++++++++++++++++------------------------ po/sv.po | 68 ++++++++++++++++++++++----------------------- po/te.po | 68 ++++++++++++++++++++++----------------------- po/th.po | 68 ++++++++++++++++++++++----------------------- po/tr.po | 68 ++++++++++++++++++++++----------------------- po/uk.po | 68 ++++++++++++++++++++++----------------------- po/wa.po | 68 ++++++++++++++++++++++----------------------- po/wine.pot | 68 ++++++++++++++++++++++----------------------- po/zh_CN.po | 68 ++++++++++++++++++++++----------------------- po/zh_TW.po | 68 ++++++++++++++++++++++----------------------- 49 files changed, 1573 insertions(+), 1567 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66bcad51c0c1f27739ab1…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: eebd24dd8fa7ad6c24f0d14b0bf192b549ffc96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebd24dd8fa7ad6c24f0d14b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 18 10:49:32 2015 +0200 po: Update French translation. --- po/fr.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index c12e024..cafeab1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8617,10 +8617,8 @@ msgid "Duplex:" msgstr "Recto verso :" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Configurer" +msgstr "Configurer" #: wininet.rc:42 wininet.rc:62 msgid "Realm"

1 0

Alexandre Julliard : server: Add an intermediate file object for file handles opened on devices.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 6260aa6cd2af689ba8f550862ffc2cf56ac3d7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6260aa6cd2af689ba8f550862… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 16:42:03 2015 +0900 server: Add an intermediate file object for file handles opened on devices. --- server/device.c | 252 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 165 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6260aa6cd2af689ba8f55…

1 0

Alexandre Julliard : server: Ignore FILE_DIRECTORY_FILE on special files.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 47eec1364a2628efc48cac0c083667645ac8a7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47eec1364a2628efc48cac0c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 17:49:56 2015 +0900 server: Ignore FILE_DIRECTORY_FILE on special files. --- server/fd.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/fd.c b/server/fd.c index 1253b3d..f0a52ad 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1865,11 +1865,6 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, } else /* special file */ { - if (options & FILE_DIRECTORY_FILE) - { - set_error( STATUS_NOT_A_DIRECTORY ); - goto error; - } if (unlink_name[0]) /* we can't unlink special files */ { set_error( STATUS_INVALID_PARAMETER );

1 0

Alexandre Julliard : ntdll/tests: Use the correct flags for NtOpenFile.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 871ab5123325e9427c4bd0eff77159390b9dbabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=871ab5123325e9427c4bd0eff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 17:41:29 2015 +0900 ntdll/tests: Use the correct flags for NtOpenFile. --- dlls/ntdll/tests/directory.c | 2 +- dlls/ntdll/tests/om.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index f190ff4..ec8cd5a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -180,7 +180,7 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char data_size = mask ? offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ) : sizeof(data); /* Read the directory and note which files are found */ - status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_OPEN, + status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE); ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdirA, status, GetLastError()); if (status != STATUS_SUCCESS) { diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 8939758..71380a7 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -150,7 +150,7 @@ static void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer3); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE || status == STATUS_OBJECT_NAME_INVALID || /* vista */ @@ -159,7 +159,7 @@ static void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); ok(status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); @@ -657,7 +657,9 @@ static void test_symboliclink(void) pRtlFreeUnicodeString(&target); pRtlCreateUnicodeStringFromAsciiz(&str, "test-link\\NUL"); - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + todo_wine ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE); todo_wine ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); pRtlFreeUnicodeString(&str);

1 0

Sebastian Lackner : ntdll/tests: Add tests for accessing \\Device\\Null.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: b3913c4f77f224accbe549066f456ac2bb661d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3913c4f77f224accbe549066… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 15 19:57:42 2015 +0200 ntdll/tests: Add tests for accessing \\Device\\Null. --- dlls/ntdll/tests/om.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 96e1e6e..8939758 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1032,6 +1032,105 @@ static void test_keyed_events(void) NtClose( event ); } +static void test_null_device(void) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + NTSTATUS status; + DWORD num_bytes; + OVERLAPPED ov; + char buf[64]; + HANDLE null; + BOOL ret; + + memset(buf, 0xAA, sizeof(buf)); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr); + todo_wine + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status); + + status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + todo_wine + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + if (status != STATUS_SUCCESS) + { + skip("opening \\Device\\Null failed, skipping read/write tests\n"); + goto out; + } + + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(ret, "WriteFile failed with error %u\n", GetLastError()); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError()); + } + ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", + (DWORD)sizeof(buf), num_bytes); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(!ret, "ReadFile unexpectedly succeeded\n"); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); + } + ok(GetLastError() == ERROR_HANDLE_EOF, + "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); + + pNtClose(null); + +out: + null = CreateFileA("\\\\.\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError()); + + pRtlFreeUnicodeString(&str); + CloseHandle(ov.hEvent); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1081,4 +1180,5 @@ START_TEST(om) test_type_mismatch(); test_event(); test_keyed_events(); + test_null_device(); }

1 0

Nikolay Sivov : riched20: Added tom typelib.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: c8362ec3b8d873ecc8df4e6ea39b350c8051900d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8362ec3b8d873ecc8df4e6ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:30:56 2015 +0300 riched20: Added tom typelib. I had to duplicate idl unfortunately, because typelib in riched20 is not compatible with interfaces from tom.idl - method names are different, while vtables are identical. --- configure | 2 +- configure.ac | 2 +- dlls/riched20/Makefile.in | 3 + dlls/riched20/riched_tom.idl | 710 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 40 +++ 5 files changed, 755 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8362ec3b8d873ecc8df4…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
43
Older →

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 May 2015