Author: akhaldi
Date: Fri Aug 19 09:24:50 2016
New Revision: 72339
URL: http://svn.reactos.org/svn/reactos?rev=72339&view=rev
Log:
[COMDLG32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
Modified:
trunk/rostests/winetests/comdlg32/filedlg.c
trunk/rostests/winetests/comdlg32/itemdlg.c
Modified: trunk/rostests/winetests/comdlg32/filedlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedlg.c?rev=72339&r1=72338&r2=72339&view=diff
==============================================================================
--- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Fri Aug 19
09:24:50 2016
@@ -430,63 +430,56 @@
case cmb1:
case edt1:
ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0),
- "control id %03x should have sized
horizontally and moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have sized
horizontally and moved vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* sized horizontal and vertical */
case lst2:
ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 10),
- "control id %03x should have sized
horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have sized
horizontally and vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* moved horizontal and vertical */
case IDCANCEL:
case pshHelp:
ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0),
- "control id %03x should have moved
horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have moved
horizontally and vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* moved vertically */
case chx1:
case stc2:
case stc3:
ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0),
- "control id %03x should have moved
vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have moved
vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* resized horizontal */
case cmb2: /* aka IDC_LOOKIN */
ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 0)||
TESTRECTS( ctrlrcs[i], rc, 0, 0, 0,
0), /* Vista and higher */
- "control id %03x should have resized
horizontally, before %d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have resized
horizontally, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* non moving non sizing controls */
case stc4:
ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0),
- "control id %03x was moved/resized, before
%d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x was moved/resized, before
%s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* todo_wine: non moving non sizing controls */
case lst1:
todo_wine
ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0),
- "control id %03x was moved/resized, before
%d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x was moved/resized, before
%s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
break;
/* don't test: id is not unique */
case IDOK:
@@ -495,10 +488,9 @@
case -1:
break;
default:
- trace("untested control id %03x before
%d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left,
ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ trace("untested control id %03x before %s
after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i]
),
+ wine_dbgstr_rect( &rc ));
#undef TESTRECTS
#undef MAXNRCTRLS
}
Modified: trunk/rostests/winetests/comdlg32/itemdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/itemdlg.c?rev=72339&r1=72338&r2=72339&view=diff
==============================================================================
--- trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/comdlg32/itemdlg.c [iso-8859-1] Fri Aug 19
09:24:50 2016
@@ -802,6 +802,21 @@
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IFileOpenDialog_SetFileName(pfod, null);
ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ filename = NULL;
+ hr = IFileOpenDialog_GetFileName(pfod, &filename);
+ ok(hr == S_OK, "Got 0x%08x\n", hr);
+ ok(!lstrcmpW(filename, null), "Strings do not match.\n");
+ CoTaskMemFree(filename);
+
+ hr = IFileOpenDialog_SetFileName(pfod, NULL);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ filename = (void*)0xdeadbeef;
+ hr = IFileOpenDialog_GetFileName(pfod, &filename);
+ ok(hr == E_FAIL, "Got 0x%08x\n", hr);
+ ok(filename == NULL, "got %p.\n", filename);
+
hr = IFileOpenDialog_SetFileName(pfod, txt);
ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IFileOpenDialog_GetFileName(pfod, &filename);
