Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68554: [COMCTL32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:30:52 2015 New Revision: 68554 URL: http://svn.reactos.org/svn/reactos?rev=68554&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/comctl32/button.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/treeview.c Modified: trunk/rostests/winetests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/button… ============================================================================== --- trunk/rostests/winetests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/button.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -321,6 +321,7 @@ { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_PAINT, sent|optional }, { 0 } }; @@ -368,6 +369,7 @@ { WM_PAINT, sent }, { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_PAINT, sent|optional }, { 0 } }; @@ -429,6 +431,7 @@ { { BM_SETCHECK, sent }, { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent|optional }, { 0 } }; Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… ============================================================================== --- trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/listview.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -179,6 +179,16 @@ static const struct message listview_getorderarray_seq[] = { { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, { HDM_GETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_GETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_GETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, + { 0 } +}; + +static const struct message listview_setorderarray_seq[] = { + { LVM_SETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, + { HDM_SETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_SETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_SETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, { 0 } }; @@ -1416,13 +1426,28 @@ static void test_columns(void) { - HWND hwnd; + HWND hwnd, header; LVCOLUMNA column; LVITEMA item; INT order[2]; CHAR buff[5]; DWORD rc; + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_LIST, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 2, (LPARAM)&order); + ok(rc == 0, "got %d\n", rc); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header == NULL, "got %p\n", header); + + DestroyWindow(hwnd); + hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); ok(hwnd != NULL, "failed to create listview window\n"); @@ -1460,7 +1485,23 @@ ok(order[0] == 0, "Expected order 0, got %d\n", order[0]); ok(order[1] == 1, "Expected order 1, got %d\n", order[1]); + rc = SendMessageA(hwnd, LVM_GETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); + + /* LVM_SETCOLUMNORDERARRAY */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + order[0] = 0; + order[1] = 1; + rc = SendMessageA(hwnd, LVM_SETCOLUMNORDERARRAY, 2, (LPARAM)&order); + expect(1, rc); + + rc = SendMessageA(hwnd, LVM_SETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_setorderarray_seq, "set order array", FALSE); /* after column added subitem is considered as present */ insert_item(hwnd, 0); @@ -3877,7 +3918,6 @@ LVCOLUMNA col; INT order[2]; POINT pt; - HDC hdc; /* rectangle isn't empty for empty text items */ hwnd = create_listview_control(LVS_LIST); @@ -3891,9 +3931,9 @@ expect(TRUE, r); expect(0, rect.left); expect(0, rect.top); - hdc = GetDC(hwnd); - todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, rect.right); - ReleaseDC(hwnd, hdc); + /* estimate it as width / height ratio */ +todo_wine + ok((rect.right / rect.bottom) >= 5, "got right %d, bottom %d\n", rect.right, rect.bottom); DestroyWindow(hwnd); hwnd = create_listview_control(LVS_REPORT); @@ -4557,6 +4597,12 @@ style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_LIST, "Expected style to be preserved\n"); + /* now change window style to see if view is remapped */ + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SHOWSELALWAYS); + ret = SendMessageA(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_SMALLICON, ret); + DestroyWindow(hwnd); } @@ -4789,6 +4835,36 @@ DestroyWindow(hwnd); } +static INT get_current_font_height(HWND listview) +{ + TEXTMETRICA tm; + HFONT hfont; + HWND hwnd; + HDC hdc; + + hwnd = (HWND)SendMessageA(listview, LVM_GETHEADER, 0, 0); + if (!hwnd) + hwnd = listview; + + hfont = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0); + if (!hfont) { + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + } + else { + HFONT oldfont; + + hdc = GetDC(0); + oldfont = SelectObject(hdc, hfont); + GetTextMetricsA(hdc, &tm); + SelectObject(hdc, oldfont); + ReleaseDC(0, hdc); + } + + return tm.tmHeight; +} + static void test_getcolumnwidth(void) { HWND hwnd; @@ -4796,7 +4872,7 @@ DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; - HDC hdc; + INT height; /* default column width */ hwnd = create_listview_control(LVS_ICON); @@ -4820,9 +4896,8 @@ memset(&itema, 0, sizeof(itema)); SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - hdc = GetDC(hwnd); - todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret); - ReleaseDC(hwnd, hdc); + height = get_current_font_height(hwnd); + ok((ret / height) >= 6, "got width %d, height %d\n", ret, height); DestroyWindow(hwnd); } @@ -5106,10 +5181,18 @@ static void test_hover(void) { - HWND hwnd; + HWND hwnd, fg; DWORD r; hwnd = create_listview_control(LVS_ICON); + SetForegroundWindow(hwndparent); + fg = GetForegroundWindow(); + if (fg != hwndparent) + { + skip("Window is not in the foreground. Skipping hover tests.\n"); + DestroyWindow(hwnd); + return; + } /* test WM_MOUSEHOVER forwarding */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -5638,6 +5721,30 @@ state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + DestroyWindow(hwnd); +} + +static void test_header_proc(void) +{ + HWND hwnd, header, hdr; + WNDPROC proc1, proc2; + + hwnd = create_listview_control(LVS_REPORT); + + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ok(header != NULL, "got %p\n", header); + + hdr = CreateWindowExA(0, WC_HEADERA, NULL, + WS_BORDER|WS_VISIBLE|HDS_BUTTONS|HDS_HORZ, + 0, 0, 0, 0, + NULL, NULL, NULL, NULL); + ok(hdr != NULL, "got %p\n", hdr); + + proc1 = (WNDPROC)GetWindowLongPtrW(header, GWLP_WNDPROC); + proc2 = (WNDPROC)GetWindowLongPtrW(hdr, GWLP_WNDPROC); + ok(proc1 == proc2, "got %p, expected %p\n", proc1, proc2); + + DestroyWindow(hdr); DestroyWindow(hwnd); } @@ -5709,6 +5816,7 @@ test_imagelists(); test_deleteitem(); test_insertitem(); + test_header_proc(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -5726,6 +5834,7 @@ test_deleteitem(); test_multiselect(); test_insertitem(); + test_header_proc(); unload_v6_module(ctx_cookie, hCtx); Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… ============================================================================== --- trunk/rostests/winetests/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/monthcal.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -615,7 +615,9 @@ static HWND create_monthcal_control(DWORD style) { WNDPROC oldproc; - HWND hwnd; + RECT rect; + HWND hwnd; + BOOL ret; hwnd = CreateWindowExA(0, MONTHCAL_CLASSA, "", WS_CHILD | WS_BORDER | WS_VISIBLE | style, 0, 0, 300, 400, parent_wnd, NULL, GetModuleHandleA(NULL), NULL); @@ -627,6 +629,13 @@ SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); SendMessageA(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + + /* make sure calendar grid is 2x1 */ + ret = SendMessageA(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&rect); + ok(ret, "got %d\n", ret); + + ret = SetWindowPos(hwnd, NULL, 0, 0, rect.right * 5 / 2, rect.bottom * 3 / 2, SWP_NOMOVE); + ok(ret, "got %d\n", ret); return hwnd; } Modified: trunk/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… ============================================================================== --- trunk/rostests/winetests/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/propsheet.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -877,6 +877,7 @@ r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); + DestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); } Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -54,6 +54,40 @@ { 0 } }; +static const struct message save_parent_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, -1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 0 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 2 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 3 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 4 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 5 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_SAVE, 6 }, + { 0 } +}; + +static const struct message restore_parent_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, -1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 0 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 2 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 3 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 4 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 5 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 6 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 7 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 8 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 9 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_RESTORE, 0xa }, + { WM_NOTIFY, sent|id, 0, 0, TBN_BEGINADJUST }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 0 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 1 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 2 }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, TBN_GETBUTTONINFOA, 3 }, + { WM_NOTIFY, sent|id, 0, 0, TBN_ENDADJUST }, + { 0 } +}; + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -92,6 +126,8 @@ p->fsStyle = fsStyle; p->iString = nString; } + +static void *alloced_str; static LRESULT parent_wnd_notify(LPARAM lParam) { @@ -133,6 +169,135 @@ compare(nmdisp->dwMask, g_dwExpectedDispInfoMask, "%x"); ok(nmdisp->pszText == NULL, "pszText is not NULL\n"); break; + case TBN_SAVE: + { + NMTBSAVE *save = (NMTBSAVE *)lParam; + if (save->iItem == -1) + { + save->cbData = save->cbData * 2 + 11 * sizeof(DWORD); + save->pData = HeapAlloc( GetProcessHeap(), 0, save->cbData ); + save->pData[0] = 0xcafe; + save->pCurrent = save->pData + 1; + } + else + { + save->pCurrent[0] = 0xcafe0000 + save->iItem; + save->pCurrent++; + } + + /* Add on 5 more pseudo buttons. */ + if (save->iItem == save->cButtons - 1) + { + save->pCurrent[0] = 0xffffffff; + save->pCurrent[1] = 0xcafe0007; + save->pCurrent[2] = 0xfffffffe; + save->pCurrent[3] = 0xcafe0008; + save->pCurrent[4] = 0x80000000; + save->pCurrent[5] = 0xcafe0009; + save->pCurrent[6] = 0x7fffffff; + save->pCurrent[7] = 0xcafe000a; + save->pCurrent[8] = 0x100; + save->pCurrent[9] = 0xcafe000b; + } + + /* Return value is ignored */ + return 1; + } + case TBN_RESTORE: + { + NMTBRESTORE *restore = (NMTBRESTORE *)lParam; + + if (restore->iItem == -1) + { + ok( restore->cButtons == 25, "got %d\n", restore->cButtons ); + ok( *restore->pCurrent == 0xcafe, "got %08x\n", *restore->pCurrent ); + /* Skip the last one */ + restore->cButtons = 11; + restore->pCurrent++; + /* BytesPerRecord is ignored */ + restore->cbBytesPerRecord = 10; + } + else + { + ok( *restore->pCurrent == 0xcafe0000 + restore->iItem, "got %08x\n", *restore->pCurrent ); + if (restore->iItem < 7 || restore->iItem == 10) + { + ok( restore->tbButton.iBitmap == -1, "got %08x\n", restore->tbButton.iBitmap ); + if (restore->iItem < 7) + ok( restore->tbButton.idCommand == restore->iItem * 2 + 1, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); + else + ok( restore->tbButton.idCommand == 0x7fffffff, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); + ok( restore->tbButton.fsState == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); + ok( restore->tbButton.fsStyle == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsStyle ); + } + else + { + ok( restore->tbButton.iBitmap == 8, "got %08x\n", restore->tbButton.iBitmap ); + ok( restore->tbButton.idCommand == 0, "%d: got %08x\n", restore->iItem, restore->tbButton.idCommand ); + if (restore->iItem == 7) + ok( restore->tbButton.fsState == 0, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); + else + ok( restore->tbButton.fsState == TBSTATE_HIDDEN, "%d: got %02x\n", restore->iItem, restore->tbButton.fsState ); + ok( restore->tbButton.fsStyle == BTNS_SEP, "%d: got %02x\n", restore->iItem, restore->tbButton.fsStyle ); + } + + ok( restore->tbButton.dwData == 0, "got %08lx\n", restore->tbButton.dwData ); + ok( restore->tbButton.iString == 0, "got %08lx\n", restore->tbButton.iString ); + + restore->tbButton.iBitmap = 0; + restore->tbButton.fsState = TBSTATE_ENABLED; + restore->tbButton.fsStyle = 0; + restore->tbButton.dwData = restore->iItem; + + if (restore->iItem == 0) + { + restore->tbButton.iString = (INT_PTR)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 8 ); + strcpy( (char *)restore->tbButton.iString, "foo" ); + } + else if (restore->iItem == 1) + restore->tbButton.iString = 2; + else + restore->tbButton.iString = -1; + + restore->pCurrent++; + /* Altering cButtons after the 1st call makes no difference. */ + restore->cButtons--; + } + + /* Returning non-zero from the 1st call aborts the restore, + otherwise the return value is ignored. */ + if (restore->iItem == -1) return 0; + return 1; + } + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *tb = (NMTOOLBARA *)lParam; + tb->tbButton.iBitmap = 0; + tb->tbButton.fsState = 0; + tb->tbButton.fsStyle = 0; + tb->tbButton.dwData = 0; + ok( tb->cchText == 128, "got %d\n", tb->cchText ); + switch (tb->iItem) + { + case 0: + tb->tbButton.idCommand = 7; + alloced_str = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 8 ); + strcpy( alloced_str, "foo" ); + tb->tbButton.iString = (INT_PTR)alloced_str; + return 1; + case 1: + tb->tbButton.idCommand = 9; + tb->tbButton.iString = 0; + /* tb->pszText is ignored */ + strcpy( tb->pszText, "foo" ); + return 1; + case 2: + tb->tbButton.idCommand = 11; + tb->tbButton.iString = 3; + return 1; + } + return 0; + } } return 0; } @@ -148,7 +313,31 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + msg.id = ((NMHDR*)lParam)->code; + switch (msg.id) + { + case TBN_SAVE: + { + NMTBSAVE *save = (NMTBSAVE *)lParam; + msg.stage = save->iItem; + } + break; + case TBN_RESTORE: + { + NMTBRESTORE *restore = (NMTBRESTORE *)lParam; + msg.stage = restore->iItem; + } + break; + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *tb = (NMTOOLBARA *)lParam; + msg.stage = tb->iItem; + } + break; + } + } /* log system messages, except for painting */ if (message < WM_USER && @@ -748,7 +937,7 @@ static tbsize_result_t *tbsize_results; -#define tbsize_results_num 24 +#define tbsize_results_num 28 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -991,6 +1180,18 @@ tbsize_results[23] = init_tbsize_result(2, 0, 0, 672, 42, 67, 41); tbsize_addbutton(&tbsize_results[23], 0, 2, 672, 25 + fontheight); tbsize_addbutton(&tbsize_results[23], 0, 25 + fontheight, 672, 48 + 2*fontheight); + + tbsize_results[24] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[24], 0, 2, 11 + string_width(STRING2), 24); + + tbsize_results[25] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[25], 0, 2, 40, 24); + + tbsize_results[26] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[26], 0, 2, 40, 24); + + tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); } static void free_tbsize_results(void) { @@ -1062,12 +1263,18 @@ {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2} }; +static TBBUTTON buttons4[] = { + {0, 40, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, 0, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, BTNS_SHOWTEXT, {0, }, 0, (UINT_PTR)STRING2} +}; static void test_sizes(void) { HWND hToolbar = NULL; HIMAGELIST himl, himl2; TBBUTTONINFOA tbinfo; + TBBUTTON button; int style; int i; int fontheight = system_font_height(); @@ -1083,9 +1290,13 @@ check_sizes(); SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0); check_sizes(); + SendMessageA(hToolbar, TB_GETBUTTON, 5, (LPARAM)&button); + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "got %08x\n", button.fsState); /* after setting the TBSTYLE_WRAPABLE the TBSTATE_WRAP is ignored */ SetWindowLongA(hToolbar, GWL_STYLE, style|TBSTYLE_WRAPABLE); check_sizes(); + SendMessageA(hToolbar, TB_GETBUTTON, 5, (LPARAM)&button); + ok(button.fsState == TBSTATE_ENABLED, "got %08x\n", button.fsState); /* adding new buttons with TBSTYLE_WRAPABLE doesn't add a new row */ SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); check_sizes(); @@ -1094,6 +1305,11 @@ for (i=0; i<15; i++) SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); check_sizes_todo(0x4); + SendMessageA(hToolbar, TB_GETBUTTON, 31, (LPARAM)&button); + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "got %08x\n", button.fsState); + SetWindowLongA(hToolbar, GWL_STYLE, style); + SendMessageA(hToolbar, TB_GETBUTTON, 31, (LPARAM)&button); + ok(button.fsState == TBSTATE_ENABLED, "got %08x\n", button.fsState); rebuild_toolbar_with_buttons(&hToolbar); SendMessageA(hToolbar, TB_ADDBUTTONSA, 2, (LPARAM)buttons1); @@ -1300,7 +1516,40 @@ { tbinfo.dwMask = TBIF_SIZE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 33, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFOA failed\n"); - } + tbsize_numtests++; + } + + /* Single BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[0]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE, BTNS_SHOWTEXT button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[2]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); free_tbsize_results(); DestroyWindow(hToolbar); @@ -1338,12 +1587,12 @@ RECT rect; /* return to style with a 2px top margin */ SetWindowLongA(hToolbar, GWL_STYLE, - GetWindowLongA(hToolbar, GWL_STYLE) & ~TBSTYLE_FLAT); + SendMessageA(hToolbar, TB_GETSTYLE, 0, 0) & ~TBSTYLE_FLAT); /* recalc */ SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons3[3]); /* top margin will be 0px if a recalc occurs */ SetWindowLongA(hToolbar, GWL_STYLE, - GetWindowLongA(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); + SendMessageA(hToolbar, TB_GETSTYLE, 0, 0) | TBSTYLE_FLAT); /* safety check */ SendMessageA(hToolbar, TB_GETITEMRECT, 1, (LPARAM)&rect); ok(rect.top == 2, "Test will make no sense because initial top is %d instead of 2\n", @@ -1358,6 +1607,7 @@ const int EX_STYLES_COUNT = 5; int i; BOOL recalc; + DWORD style; /* Like TB_ADDBUTTONSA tested in test_sized, inserting a button without text * results in a relayout, while adding one with text forces a recalc */ @@ -1417,6 +1667,47 @@ /* undocumented exstyle 0x2 seems to change the top margin, which * interferes with these tests */ + + /* Show that a change in TBSTYLE_WRAPABLE causes a recalc */ + prepare_recalc_test(&hToolbar); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | CCS_BOTTOM); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + /* Changing CCS_VERT does not recalc */ + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | CCS_VERT); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + /* Setting the window's style directly also causes recalc */ + SetWindowLongA(hToolbar, GWL_STYLE, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); DestroyWindow(hToolbar); } @@ -1917,9 +2208,159 @@ ok(style == TBSTYLE_EX_VERTICAL, "got style 0x%08x, expected 0x%08x\n", style, TBSTYLE_EX_VERTICAL); style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); todo_wine - ok(style == CCS_VERT, "got style 0x%08x, expected 0x%08x\n", style, CCS_VERT); + ok(style == CCS_VERT, "got style 0x%08x, expected CCS_VERT\n", style); DestroyWindow(hwnd); +} + +static void test_noresize(void) +{ + HWND wnd; + int i; + TBBUTTON button = {0, 10, TBSTATE_ENABLED, 0, {0, }, 0, -1}; + + wnd = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE | CCS_NORESIZE | TBSTYLE_WRAPABLE, 0, 0, 100, 20, + hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); + SendMessageA(wnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + for (i=0; i<30; i++) + { + button.idCommand = 10 + i; + SendMessageA(wnd, TB_ADDBUTTONSA, 1, (LPARAM)&button); + } + + SendMessageA(wnd, TB_SETSTATE, 10, TBSTATE_WRAP|TBSTATE_ENABLED); + + /* autosize clears the wrap on button 0 */ + SendMessageA(wnd, TB_AUTOSIZE, 0, 0); + for (i=0; i<30; i++) + { + SendMessageA(wnd, TB_GETBUTTON, i, (LPARAM)&button); + if (i % 4 == 3) + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "%d: got %08x\n", i, button.fsState); + else + ok(button.fsState == TBSTATE_ENABLED, "%d: got %08x\n", i, button.fsState); + } + + /* changing the parent doesn't do anything */ + MoveWindow(hMainWnd, 0,0, 400, 200, FALSE); + for (i=0; i<30; i++) + { + SendMessageA(wnd, TB_GETBUTTON, i, (LPARAM)&button); + if (i % 4 == 3) + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "%d: got %08x\n", i, button.fsState); + else + ok(button.fsState == TBSTATE_ENABLED, "%d: got %08x\n", i, button.fsState); + } + + /* again nothing here */ + SendMessageA(wnd, TB_AUTOSIZE, 0, 0); + for (i=0; i<30; i++) + { + SendMessageA(wnd, TB_GETBUTTON, i, (LPARAM)&button); + if (i % 4 == 3) + ok(button.fsState == (TBSTATE_WRAP|TBSTATE_ENABLED), "%d: got %08x\n", i, button.fsState); + else + ok(button.fsState == TBSTATE_ENABLED, "%d: got %08x\n", i, button.fsState); + } + + DestroyWindow(wnd); + +} + +static void test_save(void) +{ + HWND wnd = NULL; + TBSAVEPARAMSW params; + static const WCHAR subkey[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','T','e','s','t',0}; + static const WCHAR value[] = {'t','o','o','l','b','a','r','t','e','s','t',0}; + LONG res; + HKEY key; + BYTE data[100]; + DWORD size = sizeof(data), type, i, count; + TBBUTTON tb; + static const TBBUTTON more_btns[2] = + { + {0, 11, TBSTATE_HIDDEN, BTNS_BUTTON, {0}, 0, -1}, + {0, 13, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, -1} + }; + static const DWORD expect[] = {0xcafe, 1, 0xcafe0000, 3, 0xcafe0001, 5, 0xcafe0002, 7, 0xcafe0003, + 9, 0xcafe0004, 11, 0xcafe0005, 13, 0xcafe0006, 0xffffffff, 0xcafe0007, + 0xfffffffe, 0xcafe0008, 0x80000000, 0xcafe0009, 0x7fffffff, 0xcafe000a, + 0x100, 0xcafe000b}; + static const TBBUTTON expect_btns[] = + { + {0, 1, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + {0, 3, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 1, 2}, + {0, 5, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 2, 0}, + {0, 7, 0, BTNS_BUTTON, {0}, 0, (INT_PTR)"foo"}, + {0, 9, 0, BTNS_BUTTON, {0}, 0, 0}, + {0, 11, 0, BTNS_BUTTON, {0}, 0, 3}, + {0, 13, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 6, 0}, + {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 7, 0}, + {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 8, 0}, + {0, 0, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 9, 0}, + {0, 0x7fffffff, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0xa, 0}, + }; + + params.hkr = HKEY_CURRENT_USER; + params.pszSubKey = subkey; + params.pszValueName = value; + + rebuild_toolbar_with_buttons( &wnd ); + SendMessageW( wnd, TB_ADDBUTTONSW, sizeof(more_btns) / sizeof(more_btns[0]), (LPARAM)more_btns ); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageW( wnd, TB_SAVERESTOREW, TRUE, (LPARAM)&params ); + ok( res, "saving failed\n" ); + ok_sequence(sequences, PARENT_SEQ_INDEX, save_parent_seq, "save", FALSE); + DestroyWindow( wnd ); + + res = RegOpenKeyW( HKEY_CURRENT_USER, subkey, &key ); + ok( !res, "got %08x\n", res ); + res = RegQueryValueExW( key, value, NULL, &type, data, &size ); + ok( !res, "got %08x\n", res ); + ok( type == REG_BINARY, "got %08x\n", type ); + ok( size == sizeof(expect), "got %08x\n", size ); + ok( !memcmp( data, expect, size ), "mismatch\n" ); + + RegCloseKey( key ); + + wnd = NULL; + rebuild_toolbar( &wnd ); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageW( wnd, TB_SAVERESTOREW, FALSE, (LPARAM)&params ); + ok( res, "restoring failed\n" ); + ok_sequence(sequences, PARENT_SEQ_INDEX, restore_parent_seq, "restore", FALSE); + count = SendMessageW( wnd, TB_BUTTONCOUNT, 0, 0 ); + ok( count == sizeof(expect_btns) / sizeof(expect_btns[0]), "got %d\n", count ); + + for (i = 0; i < count; i++) + { + res = SendMessageW( wnd, TB_GETBUTTON, i, (LPARAM)&tb ); + ok( res, "got %d\n", res ); + + ok( tb.iBitmap == expect_btns[i].iBitmap, "%d: got %d\n", i, tb.iBitmap ); + ok( tb.idCommand == expect_btns[i].idCommand, "%d: got %d\n", i, tb.idCommand ); + ok( tb.fsState == expect_btns[i].fsState, "%d: got %02x\n", i, tb.fsState ); + ok( tb.fsStyle == expect_btns[i].fsStyle, "%d: got %02x\n", i, tb.fsStyle ); + ok( tb.dwData == expect_btns[i].dwData, "%d: got %lx\n", i, tb.dwData ); + if (IS_INTRESOURCE(expect_btns[i].iString)) + ok( tb.iString == expect_btns[i].iString, "%d: got %lx\n", i, tb.iString ); + else + ok( !strcmp( (char *)tb.iString, (char *)expect_btns[i].iString ), + "%d: got %s\n", i, (char *)tb.iString ); + + /* In fact the ptr value set in TBN_GETBUTTONINFOA is simply copied */ + if (tb.idCommand == 7) + ok( tb.iString == (INT_PTR)alloced_str, "string not set\n"); + } + + DestroyWindow( wnd ); + RegOpenKeyW( HKEY_CURRENT_USER, subkey, &key ); + RegDeleteValueW( key, value ); + RegCloseKey( key ); } START_TEST(toolbar) @@ -1964,6 +2405,8 @@ test_get_set_style(); test_create(); test_TB_GET_SET_EXTENDEDSTYLE(); + test_noresize(); + test_save(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… ============================================================================== --- trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -26,6 +26,8 @@ #include <winnls.h> #include <commctrl.h> +#include "resources.h" + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) static void test_create_tooltip(void) @@ -330,6 +332,30 @@ SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); ok(toolinfoA.lpszText == NULL, "expected NULL, got %p\n", toolinfoA.lpszText); + + /* NULL hinst, valid resource id for text */ + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = NULL; + toolinfoA.uFlags = 0; + toolinfoA.uId = 0x1233ABCD; + toolinfoA.lpszText = MAKEINTRESOURCEA(IDS_TBADD1); + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + ok(r, "failed to add a tool\n"); + + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1233ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, "abc") == 0, "lpszText should be an empty string\n"); + + toolinfoA.hinst = (HINSTANCE)0xdeadbee; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.hinst == NULL, "expected NULL, got %p\n", toolinfoA.hinst); + + SendMessageA(hwnd, TTM_DELTOOLA, 0, (LPARAM)&toolinfoA); } else { @@ -817,6 +843,154 @@ DestroyWindow(parent); } +static LRESULT CALLBACK info_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProcA(hWnd, msg, wParam, lParam); + } + return 0; +} + +static void test_setinfo(void) +{ + WNDCLASSA wc; + LRESULT lResult; + HWND parent, parent2, hwndTip, hwndTip2; + TTTOOLINFOA toolInfo = { 0 }; + TTTOOLINFOA toolInfo2 = { 0 }; + WNDPROC wndProc; + + /* Create a class to use the custom draw wndproc */ + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "SetInfoClass"; + wc.lpfnWndProc = info_wnd_proc; + RegisterClassA(&wc); + + /* Create a main window */ + parent = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent != NULL, "Creation of main window failed\n"); + + parent2 = CreateWindowExA(0, "SetInfoClass", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_VISIBLE, + 50, 50, + 300, 300, + NULL, NULL, NULL, 0); + ok(parent2 != NULL, "Creation of main window failed\n"); + + /* Make it show */ + ShowWindow(parent2, SW_SHOWNORMAL); + flush_events(100); + + /* Create Tooltip */ + hwndTip = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + + hwndTip2 = CreateWindowExA(WS_EX_TOPMOST, TOOLTIPS_CLASSA, + NULL, TTS_NOPREFIX | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + parent, NULL, GetModuleHandleA(NULL), 0); + ok(hwndTip2 != NULL, "Creation of tooltip window failed\n"); + + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + /* Create a tool */ + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = TTF_SUBCLASS; + toolInfo.uId = 0x1234ABCD; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + toolInfo.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo.hwnd = parent2; + toolInfo.hinst = GetModuleHandleA(NULL); + toolInfo.uFlags = 0; + toolInfo.uId = 0x1234ABCE; + toolInfo.lpszText = (LPSTR)"This is a test tooltip"; + toolInfo.lParam = 0xdeadbeef; + GetClientRect (parent, &toolInfo.rect); + lResult = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); + ok(lResult, "Adding the tool to the tooltip failed\n"); + + /* Try to Remove Subclass */ + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent; + toolInfo2.uId = 0x1234ABCD; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags &= ~TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent, GWLP_WNDPROC); + ok (wndProc != info_wnd_proc, "Window Proc is wrong\n"); + + /* Try to Add Subclass */ + + /* Make it topmost, as per the MSDN */ + SetWindowPos(hwndTip2, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + toolInfo2.cbSize = TTTOOLINFOA_V1_SIZE; + toolInfo2.hwnd = parent2; + toolInfo2.uId = 0x1234ABCE; + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(!(toolInfo2.uFlags & TTF_SUBCLASS), "uFlags has subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + toolInfo2.uFlags |= TTF_SUBCLASS; + SendMessageA(hwndTip, TTM_SETTOOLINFOA, 0, (LPARAM)&toolInfo2); + lResult = SendMessageA(hwndTip, TTM_GETTOOLINFOA, 0, (LPARAM)&toolInfo2); + ok(lResult, "GetToolInfo failed\n"); + ok(toolInfo2.uFlags & TTF_SUBCLASS, "uFlags does not have subclass\n"); + wndProc = (WNDPROC)GetWindowLongPtrA(parent2, GWLP_WNDPROC); + ok (wndProc == info_wnd_proc, "Window Proc is wrong\n"); + + /* Clean up */ + DestroyWindow(hwndTip); + DestroyWindow(hwndTip2); + DestroyWindow(parent); + DestroyWindow(parent2); +} + START_TEST(tooltips) { InitCommonControls(); @@ -828,4 +1002,5 @@ test_longtextA(); test_longtextW(); test_track(); -} + test_setinfo(); +} Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… ============================================================================== --- trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] Wed Jul 22 19:30:52 2015 @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -226,12 +227,91 @@ { 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 }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 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 } }; @@ -1637,21 +1717,95 @@ 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; + } + sequence_tests[] = + { + { &alpha, parent_singleexpand_seq0 }, + { &bravo, parent_singleexpand_seq1 }, + { &delta, parent_singleexpand_seq2 }, + { &foxtrot, parent_singleexpand_seq3 }, + { &alpha, parent_singleexpand_seq4 }, + { &golf, parent_singleexpand_seq5 }, + { &hotel, parent_singleexpand_seq6 }, + { &india, parent_singleexpand_seq7 }, + { &india, empty_seq } + }; 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); - - 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(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); + } + + 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, FALSE); + } + + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + { + ret = SendMessageA(hTree, TVM_GETITEMSTATE, (WPARAM)(*items[i].handle), 0xFFFF); + 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);

9 years, 1 month

[akhaldi] 68553: [COMCTL32] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 19:30:27 2015 New Revision: 68553 URL: http://svn.reactos.org/svn/reactos?rev=68553&view=rev Log: [COMCTL32] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/dsa.c trunk/reactos/dll/win32/comctl32/flatsb.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_scrollbar.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.c?r… Modified: trunk/reactos/dll/win32/comctl32/flatsb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/flatsb.… Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… Modified: trunk/reactos/dll/win32/comctl32/theme_scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_s… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 1 month

[cfinck] 68552: [WINSPOOL] Stub some functions properly to get unicows.dll to compile again.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 22 17:59:46 2015 New Revision: 68552 URL: http://svn.reactos.org/svn/reactos?rev=68552&view=rev Log: [WINSPOOL] Stub some functions properly to get unicows.dll to compile again. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdata.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdrivers.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printproviders.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/monitors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/ports.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/CMakeLists.txt [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -9,8 +9,11 @@ monitors.c ports.c precomp.h + printerdata.c + printerdrivers.c printers.c printprocessors.c + printproviders.c ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c) add_library(winspool SHARED Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/monitors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/monitors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/monitors.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -20,6 +20,20 @@ pMonitorInfo2->pDLLName = (PWSTR)((ULONG_PTR)pMonitorInfo2->pDLLName + (ULONG_PTR)pMonitorInfo2); pMonitorInfo2->pEnvironment = (PWSTR)((ULONG_PTR)pMonitorInfo2->pEnvironment + (ULONG_PTR)pMonitorInfo2); } +} + +BOOL WINAPI +AddMonitorW(PWSTR pName, DWORD Level, PBYTE pMonitors) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeleteMonitorW(PWSTR pName, PWSTR pEnvironment, PWSTR pMonitorName) +{ + UNIMPLEMENTED; + return FALSE; } BOOL WINAPI Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/ports.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/ports.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -20,6 +20,27 @@ pPortInfo2->pDescription = (PWSTR)((ULONG_PTR)pPortInfo2->pDescription + (ULONG_PTR)pPortInfo2); pPortInfo2->pMonitorName = (PWSTR)((ULONG_PTR)pPortInfo2->pMonitorName + (ULONG_PTR)pPortInfo2); } +} + +BOOL WINAPI +AddPortW(PWSTR pName, HWND hWnd, PWSTR pMonitorName) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +ConfigurePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeletePortW(PWSTR pName, HWND hWnd, PWSTR pPortName) +{ + UNIMPLEMENTED; + return FALSE; } BOOL WINAPI Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdata.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdata.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdata.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Printer Configuration Data + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +LONG WINAPI +AdvancedDocumentPropertiesW(HWND hWnd, HANDLE hPrinter, PWSTR pDeviceName, PDEVMODEW pDevModeOutput, PDEVMODEW pDevModeInput) +{ + UNIMPLEMENTED; + return FALSE; +} + +DWORD WINAPI +GetPrinterDataW(HANDLE hPrinter, PWSTR pValueName, PDWORD pType, PBYTE pData, DWORD nSize, PDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return FALSE; +} + +DWORD WINAPI +SetPrinterDataW(HANDLE hPrinter, PWSTR pValueName, DWORD Type, PBYTE pData, DWORD cbData) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdata.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdrivers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdrivers.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdrivers.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -0,0 +1,36 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Printer Drivers + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +AddPrinterDriverW(PWSTR pName, DWORD Level, PBYTE pDriverInfo) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeletePrinterDriverW(PWSTR pName, PWSTR pEnvironment, PWSTR pDriverName) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +EnumPrinterDriversW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pDriverInfo, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +GetPrinterDriverDirectoryW(PWSTR pName, PWSTR pEnvironment, DWORD Level, PBYTE pDriverDirectory, DWORD cbBuf, PDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printerdrivers.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -136,6 +136,13 @@ return dwErrorCode; } +HANDLE WINAPI +AddPrinterW(PWSTR pName, DWORD Level, PBYTE pPrinter) +{ + UNIMPLEMENTED; + return NULL; +} + BOOL WINAPI ClosePrinter(HANDLE hPrinter) { @@ -515,6 +522,20 @@ return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +ResetPrinterW(HANDLE hPrinter, PPRINTER_DEFAULTSW pDefault) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +SetPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pPrinter, DWORD Command) +{ + UNIMPLEMENTED; + return FALSE; +} + DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printprocessors.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -22,8 +22,23 @@ } BOOL WINAPI +AddPrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPathName, PWSTR pPrintProcessorName) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeletePrintProcessorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProcessorName) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI EnumPrintProcessorDatatypesA(PSTR pName, LPSTR pPrintProcessorName, DWORD Level, PBYTE pDatatypes, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { + UNIMPLEMENTED; return FALSE; } Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printproviders.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printproviders.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printproviders.c [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS Spooler API + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to Print Providers + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +AddPrintProvidorW(PWSTR pName, DWORD Level, PBYTE pProviderInfo) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL WINAPI +DeletePrintProvidorW(PWSTR pName, PWSTR pEnvironment, PWSTR pPrintProviderName) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printproviders.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Wed Jul 22 17:59:46 2015 @@ -12,31 +12,31 @@ 111 stdcall AddJobA(long long ptr long ptr) 112 stdcall AddJobW(long long ptr long ptr) 113 stub AddMonitorA -114 stub AddMonitorW +114 stdcall AddMonitorW(wstr long ptr) 115 stub AddPortA 116 stub AddPortExA 117 stub AddPortExW -118 stub AddPortW +118 stdcall AddPortW(wstr long wstr) 119 stub AddPrintProcessorA -120 stub AddPrintProcessorW +120 stdcall AddPrintProcessorW(wstr wstr wstr wstr) 121 stub AddPrintProvidorA -122 stub AddPrintProvidorW +122 stdcall AddPrintProvidorW(wstr long ptr) 123 stub AddPrinterA 124 stub AddPrinterConnectionA 125 stub AddPrinterConnectionW 126 stub AddPrinterDriverA 127 stub AddPrinterDriverExA 128 stub AddPrinterDriverExW -129 stub AddPrinterDriverW -130 stub AddPrinterW +129 stdcall AddPrinterDriverW(wstr long ptr) +130 stdcall AddPrinterW(wstr long ptr) 131 stub AdvancedDocumentPropertiesA -132 stub AdvancedDocumentPropertiesW +132 stdcall AdvancedDocumentPropertiesW(long long wstr ptr ptr) 133 stub AdvancedSetupDialog 134 stdcall ClosePrinter(long) 135 stub CloseSpoolFileHandle 136 stub CommitSpoolData 137 stub ConfigurePortA -138 stub ConfigurePortW +138 stdcall ConfigurePortW(wstr long wstr) 139 stub ConnectToPrinterDlg 140 stub ConvertAnsiDevModeToUnicodeDevmode 141 stub ConvertUnicodeDevModeToAnsiDevmode @@ -46,13 +46,13 @@ 145 stub DeleteFormA 146 stub DeleteFormW 147 stub DeleteMonitorA -148 stub DeleteMonitorW +148 stdcall DeleteMonitorW(wstr wstr wstr) 149 stub DeletePortA -150 stub DeletePortW +150 stdcall DeletePortW(wstr long wstr) 151 stub DeletePrintProcessorA -152 stub DeletePrintProcessorW +152 stdcall DeletePrintProcessorW(wstr wstr wstr) 153 stub DeletePrintProvidorA -154 stub DeletePrintProvidorW +154 stdcall DeletePrintProvidorW(wstr wstr wstr) 155 stub DeletePrinter 156 stub DeletePrinterConnectionA 157 stub DeletePrinterConnectionW @@ -63,7 +63,7 @@ 162 stub DeletePrinterDriverA 163 stub DeletePrinterDriverExA 164 stub DeletePrinterDriverExW -165 stub DeletePrinterDriverW +165 stdcall DeletePrinterDriverW(wstr wstr wstr) 166 stub DeletePrinterIC 167 stub DeletePrinterKeyA 168 stub DeletePrinterKeyW @@ -98,7 +98,7 @@ 197 stub EnumPrinterDataExW 198 stub EnumPrinterDataW 199 stub EnumPrinterDriversA -200 stub EnumPrinterDriversW +200 stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) 201 stdcall GetDefaultPrinterA(ptr ptr) 202 stub SetDefaultPrinterA 203 stdcall GetDefaultPrinterW(ptr ptr) @@ -150,10 +150,10 @@ 249 stub GetPrinterDataA 250 stub GetPrinterDataExA 251 stub GetPrinterDataExW -252 stub GetPrinterDataW +252 stdcall GetPrinterDataW(long wstr ptr ptr long ptr) 253 stdcall GetPrinterDriverA(long str long ptr long ptr) 254 stub GetPrinterDriverDirectoryA -255 stub GetPrinterDriverDirectoryW +255 stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) 256 stdcall GetPrinterDriverW(long wstr long ptr long ptr) 257 stdcall GetPrinterW(long long ptr long ptr) 258 stub GetSpoolFileHandle @@ -170,7 +170,7 @@ 269 stub QuerySpoolMode 270 stdcall ReadPrinter(long ptr long ptr) 271 stub ResetPrinterA -272 stub ResetPrinterW +272 stdcall ResetPrinterW(long ptr) 273 stdcall ScheduleJob(long long) 274 stub SeekPrinter 275 stub SetAllocFailCount @@ -184,8 +184,8 @@ 283 stub SetPrinterDataA 284 stub SetPrinterDataExA 285 stub SetPrinterDataExW -286 stub SetPrinterDataW -287 stub SetPrinterW +286 stdcall SetPrinterDataW(long wstr long ptr long) +287 stdcall SetPrinterW(long long ptr long) 288 stub SplDriverUnloadComplete 289 stub SpoolerDevQueryPrintW 290 stdcall SpoolerInit()

9 years, 1 month

[dquintana] 68551: [CONFIGURE.CMD] Add a case for VSSolution generation with VS14. It DOES NOT WORK with the cmake version we use currently, but it's better to have the error rather than generating...

by dquintana＠svn.reactos.org

Author: dquintana Date: Wed Jul 22 13:58:05 2015 New Revision: 68551 URL: http://svn.reactos.org/svn/reactos?rev=68551&view=rev Log: [CONFIGURE.CMD] Add a case for VSSolution generation with VS14. It DOES NOT WORK with the cmake version we use currently, but it's better to have the error rather than generating ninja files without warning. Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=68551&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Wed Jul 22 13:58:05 2015 @@ -129,6 +129,15 @@ ) else ( set CMAKE_GENERATOR="Visual Studio 12" ) + ) else if "!VS_VERSION!" == "14" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 14 Win64" + ) else if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 14 ARM" + set CMAKE_GENERATOR_HOST="Visual Studio 14" + ) else ( + set CMAKE_GENERATOR="Visual Studio 14" + ) ) ) else if /I "%1" == "RTC" ( echo Runtime checks enabled

9 years, 1 month

[cfinck] 68550: [LOCALSPL] This is where things get dirty. StartDocPort of the Print Monitor needs the Printer Name and Job ID of the job to print on this port. But StartDocPort is called by LocalS...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 22 12:44:22 2015 New Revision: 68550 URL: http://svn.reactos.org/svn/reactos?rev=68550&view=rev Log: [LOCALSPL] This is where things get dirty. StartDocPort of the Print Monitor needs the Printer Name and Job ID of the job to print on this port. But StartDocPort is called by LocalStartDocPrinter, whose parameters are fixed and don't include this information. Therefore, I have no way to pass these parameters to a port handle directly. Instead, I need to store a pointer to the job in the port structure itself and let the next port handle pick up this information in LocalStartDocPrinter. Surprisingly, Windows doesn't seem to do any better here. For testing, I stalled execution inside my own Print Processor and called StartDocPrinter from another thread. It then picked up and "stole" the stored job information. When the Print Processor resumed execution, the job information wasn't present anymore and its StartDocPrinter call crashed. So even Windows definitely stores this information only for a single StartDocPrinter call. Having solved this, I could finally implement OpenPrinter, StartDocPrinter, ReadPrinter, WritePrinter and ClosePrinter for Port handles as well as OpenPrinter and ClosePrinter for Xcv handles. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Wed Jul 22 12:44:22 2015 @@ -48,37 +48,48 @@ typedef LPMONITOREX(WINAPI *PInitializePrintMonitor)(PWSTR); typedef LPMONITOR2(WINAPI *PInitializePrintMonitor2)(PMONITORINIT, PHANDLE); +// Forward declarations +typedef struct _LOCAL_HANDLE LOCAL_HANDLE, *PLOCAL_HANDLE; +typedef struct _LOCAL_JOB LOCAL_JOB, *PLOCAL_JOB; +typedef struct _LOCAL_PORT LOCAL_PORT, *PLOCAL_PORT; +typedef struct _LOCAL_PORT_HANDLE LOCAL_PORT_HANDLE, *PLOCAL_PORT_HANDLE; +typedef struct _LOCAL_PRINT_MONITOR LOCAL_PRINT_MONITOR, *PLOCAL_PRINT_MONITOR; +typedef struct _LOCAL_PRINT_PROCESSOR LOCAL_PRINT_PROCESSOR, *PLOCAL_PRINT_PROCESSOR; +typedef struct _LOCAL_PRINTER LOCAL_PRINTER, *PLOCAL_PRINTER; +typedef struct _LOCAL_PRINTER_HANDLE LOCAL_PRINTER_HANDLE, *PLOCAL_PRINTER_HANDLE; +typedef struct _LOCAL_XCV_HANDLE LOCAL_XCV_HANDLE, *PLOCAL_XCV_HANDLE; +typedef struct _SHD_HEADER SHD_HEADER, *PSHD_HEADER; + // Structures /** * Describes a Print Monitor. */ -typedef struct _LOCAL_PRINT_MONITOR +struct _LOCAL_PRINT_MONITOR { LIST_ENTRY Entry; - PWSTR pwszName; /** Name of the Print Monitor as read from the registry. */ - PWSTR pwszFileName; /** DLL File Name of the Print Monitor. */ - BOOL bIsLevel2; /** Whether this Print Monitor supplies an InitializePrintMonitor2 API (preferred) instead of InitializePrintMonitor. */ - PVOID pMonitor; /** For bIsLevel2 == TRUE: LPMONITOR2 pointer returned by InitializePrintMonitor2. - For bIsLevel2 == FALSE: LPMONITOREX pointer returned by InitializePrintMonitor. */ - HANDLE hMonitor; /** Only used when bIsLevel2 == TRUE: Handle returned by InitializePrintMonitor2. */ -} -LOCAL_PRINT_MONITOR, *PLOCAL_PRINT_MONITOR; + PWSTR pwszName; /** Name of the Print Monitor as read from the registry. */ + PWSTR pwszFileName; /** DLL File Name of the Print Monitor. */ + BOOL bIsLevel2; /** Whether this Print Monitor supplies an InitializePrintMonitor2 API (preferred) instead of InitializePrintMonitor. */ + PVOID pMonitor; /** For bIsLevel2 == TRUE: LPMONITOR2 pointer returned by InitializePrintMonitor2. + For bIsLevel2 == FALSE: LPMONITOREX pointer returned by InitializePrintMonitor. */ + HANDLE hMonitor; /** Only used when bIsLevel2 == TRUE: Handle returned by InitializePrintMonitor2. */ +}; /** * Describes a Port handled by a Print Monitor. */ -typedef struct _LOCAL_PORT +struct _LOCAL_PORT { LIST_ENTRY Entry; - PWSTR pwszName; /** The name of the port (including the trailing colon). */ - PLOCAL_PRINT_MONITOR pPrintMonitor; /** The Print Monitor handling this port. */ -} -LOCAL_PORT, *PLOCAL_PORT; + PWSTR pwszName; /** The name of the port (including the trailing colon). */ + PLOCAL_PRINT_MONITOR pPrintMonitor; /** The Print Monitor handling this port. */ + PLOCAL_JOB pNextJobToProcess; /** The Print Job that will be processed by the next created Port handle. */ +}; /** * Describes a Print Processor. */ -typedef struct _LOCAL_PRINT_PROCESSOR +struct _LOCAL_PRINT_PROCESSOR { LIST_ENTRY Entry; PWSTR pwszName; @@ -90,14 +101,13 @@ PGetPrintProcessorCapabilities pfnGetPrintProcessorCapabilities; POpenPrintProcessor pfnOpenPrintProcessor; PPrintDocumentOnPrintProcessor pfnPrintDocumentOnPrintProcessor; -} -LOCAL_PRINT_PROCESSOR, *PLOCAL_PRINT_PROCESSOR; +}; /** * Describes a printer and manages its print jobs. * Created once for every printer at startup. */ -typedef struct _LOCAL_PRINTER +struct _LOCAL_PRINTER { // This sort key must be the first element for LookupElementSkiplist to work! PWSTR pwszPrinterName; @@ -111,14 +121,13 @@ PLOCAL_PRINT_PROCESSOR pPrintProcessor; PLOCAL_PORT pPort; SKIPLIST JobList; -} -LOCAL_PRINTER, *PLOCAL_PRINTER; +}; /** * Describes an entire print job associated to a specific printer through the Printer member. * Created with every valid call to LocalStartDocPrinter. */ -typedef struct _LOCAL_JOB +struct _LOCAL_JOB { // This sort key must be the first element for LookupElementSkiplist to work! DWORD dwJobID; /** Internal and external ID of this Job */ @@ -143,49 +152,60 @@ DWORD dwStatus; /** JOB_STATUS_* flags of the Job */ PWSTR pwszMachineName; /** Name of the machine that submitted the Job (prepended with two backslashes) */ PDEVMODEW pDevMode; /** Associated Device Mode to this Job */ -} -LOCAL_JOB, *PLOCAL_JOB; - -/** - * Describes a template for new print jobs for a specific printer. - * Created with every valid call to LocalOpenPrinter. - * - * This is needed, because you can supply defaults in a LocalOpenPrinter call, which affect all subsequent print jobs - * started with the same handle and a call to LocalStartDocPrinter. - */ -typedef struct _LOCAL_PRINTER_HANDLE +}; + +/** + * Specific handle returned by LocalOpenPrinter for every valid call that opens a Printer or Print Job. + */ +struct _LOCAL_PRINTER_HANDLE { BOOL bStartedDoc : 1; /** Whether StartDocPrinter has already been called. */ HANDLE hSPLFile; /** Handle to an opened SPL file for Printer Job handles. */ - PLOCAL_PRINTER pPrinter; - PLOCAL_JOB pJob; - PWSTR pwszDatatype; - PDEVMODEW pDevMode; -} -LOCAL_PRINTER_HANDLE, *PLOCAL_PRINTER_HANDLE; + PLOCAL_PRINTER pPrinter; /** Printer associated with this handle. */ + PLOCAL_JOB pJob; /** Print Job associated with this handle. This can be the specified Job if this is a Print Job handle or the started job through LocalStartDocPrinter. */ + PWSTR pwszDatatype; /** Datatype used for newly started jobs. */ + PDEVMODEW pDevMode; /** DevMode used for newly started jobs. */ +}; + +/** + * Specific handle returned by LocalOpenPrinter for every valid call that opens a Port. + */ +struct _LOCAL_PORT_HANDLE +{ + HANDLE hPort; /** Handle returned by pfnOpenPort. */ + PLOCAL_PORT pPort; /** Port associated with this handle. */ +}; + +/** + * Specific handle returned by LocalOpenPrinter for every valid call that opens an XcvMonitor or XcvPort. + */ +struct _LOCAL_XCV_HANDLE +{ + HANDLE hXcv; /** Handle returned by pfnXcvOpenPort. */ + PLOCAL_PRINT_MONITOR pPrintMonitor; /** Print Monitor associated with this handle. */ +}; /** * Describes a handle returned by LocalOpenPrinter. * Suitable for all things that can be opened through LocalOpenPrinter. */ -typedef struct _LOCAL_HANDLE +struct _LOCAL_HANDLE { enum { - HandleType_Port, - HandleType_Printer, - HandleType_Xcv + HandleType_Port, /** pSpecificHandle is a PLOCAL_PORT_HANDLE. */ + HandleType_Printer, /** pSpecificHandle is a PLOCAL_PRINTER_HANDLE. */ + HandleType_Xcv /** pSpecificHandle is a PLOCAL_XCV_HANDLE. */ } HandleType; PVOID pSpecificHandle; -} -LOCAL_HANDLE, *PLOCAL_HANDLE; +}; /** * Describes the header of a print job serialized into a shadow file (.SHD) * Documented in http://www.undocprint.org/formats/winspool/shd * Compatible with Windows Server 2003 */ -typedef struct _SHD_HEADER +struct _SHD_HEADER { DWORD dwSignature; DWORD cbHeader; @@ -215,8 +235,7 @@ DWORD dwUnknown5; DWORD offMachineName; DWORD dwSPLSize; -} -SHD_HEADER, *PSHD_HEADER; +}; // jobs.c extern SKIPLIST GlobalJobList; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Wed Jul 22 12:44:22 2015 @@ -505,9 +505,11 @@ PLOCAL_JOB pJob; PLOCAL_HANDLE pHandle = NULL; PLOCAL_PORT pPort; + PLOCAL_PORT_HANDLE pPortHandle = NULL; PLOCAL_PRINT_MONITOR pPrintMonitor; PLOCAL_PRINTER pPrinter; PLOCAL_PRINTER_HANDLE pPrinterHandle = NULL; + PLOCAL_XCV_HANDLE pXcvHandle = NULL; WCHAR wszComputerName[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR wszFullPath[MAX_PATH]; @@ -635,9 +637,21 @@ goto Cleanup; } + // Create a new LOCAL_PORT_HANDLE. + pPortHandle = DllAllocSplMem(sizeof(LOCAL_PORT_HANDLE)); + if (!pPortHandle) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + pPortHandle->hPort = hExternalHandle; + pPortHandle->pPort = pPort; + // Return the Port handle through our general handle. pHandle->HandleType = HandleType_Port; - pHandle->pSpecificHandle = hExternalHandle; + pHandle->pSpecificHandle = pPortHandle; } else if (!pwszFirstParameter && pwszSecondParameter && wcsncmp(pwszSecondParameter, L"Xcv", 3) == 0) { @@ -700,9 +714,21 @@ goto Cleanup; } + // Create a new LOCAL_XCV_HANDLE. + pXcvHandle = DllAllocSplMem(sizeof(LOCAL_XCV_HANDLE)); + if (!pXcvHandle) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + pXcvHandle->hXcv = hExternalHandle; + pXcvHandle->pPrintMonitor = pPrintMonitor; + // Return the Xcv handle through our general handle. pHandle->HandleType = HandleType_Xcv; - pHandle->pSpecificHandle = hExternalHandle; + pHandle->pSpecificHandle = pXcvHandle; } else { @@ -721,7 +747,7 @@ goto Cleanup; } - // Create a new printer handle. + // Create a new LOCAL_PRINTER_HANDLE. pPrinterHandle = DllAllocSplMem(sizeof(LOCAL_PRINTER_HANDLE)); if (!pPrinterHandle) { @@ -845,12 +871,44 @@ BOOL WINAPI LocalReadPrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pNoBytesRead) { + BOOL bReturnValue; DWORD dwErrorCode; PLOCAL_HANDLE pHandle = (PLOCAL_HANDLE)hPrinter; + PLOCAL_PORT_HANDLE pPortHandle; PLOCAL_PRINTER_HANDLE pPrinterHandle; // Sanity checks. - if (!pHandle || pHandle->HandleType != HandleType_Printer) + if (!pHandle) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + // Port handles are an entirely different thing. + if (pHandle->HandleType == HandleType_Port) + { + pPortHandle = (PLOCAL_PORT_HANDLE)pHandle->pSpecificHandle; + + // Call the monitor's ReadPort function. + if (pPortHandle->pPort->pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPortHandle->pPort->pPrintMonitor->pMonitor)->pfnReadPort(pPortHandle->hPort, pBuf, cbBuf, pNoBytesRead); + else + bReturnValue = ((LPMONITOREX)pPortHandle->pPort->pPrintMonitor->pMonitor)->Monitor.pfnReadPort(pPortHandle->hPort, pBuf, cbBuf, pNoBytesRead); + + if (!bReturnValue) + { + // The ReadPort function failed. Return its last error. + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // We were successful! + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + // The remaining function deals with Printer handles only. + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -884,22 +942,62 @@ DWORD WINAPI LocalStartDocPrinter(HANDLE hPrinter, DWORD Level, PBYTE pDocInfo) { + BOOL bReturnValue; DWORD dwErrorCode; DWORD dwReturnValue = 0; PDOC_INFO_1W pDocInfo1 = (PDOC_INFO_1W)pDocInfo; + PLOCAL_JOB pJob; PLOCAL_HANDLE pHandle = (PLOCAL_HANDLE)hPrinter; + PLOCAL_PORT_HANDLE pPortHandle; PLOCAL_PRINTER_HANDLE pPrinterHandle; // Sanity checks. + if (!pHandle) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + // Port handles are an entirely different thing. + if (pHandle->HandleType == HandleType_Port) + { + pPortHandle = (PLOCAL_PORT_HANDLE)pHandle->pSpecificHandle; + + // This call should come from a Print Processor and the job this port is going to print was assigned to us before opening the Print Processor. + // Claim it exclusively for this port handle. + pJob = pPortHandle->pPort->pNextJobToProcess; + pPortHandle->pPort->pNextJobToProcess = NULL; + ASSERT(pJob); + + // Call the monitor's StartDocPort function. + if (pPortHandle->pPort->pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPortHandle->pPort->pPrintMonitor->pMonitor)->pfnStartDocPort(pPortHandle->hPort, pJob->pPrinter->pwszPrinterName, pJob->dwJobID, Level, pDocInfo); + else + bReturnValue = ((LPMONITOREX)pPortHandle->pPort->pPrintMonitor->pMonitor)->Monitor.pfnStartDocPort(pPortHandle->hPort, pJob->pPrinter->pwszPrinterName, pJob->dwJobID, Level, pDocInfo); + + if (!bReturnValue) + { + // The StartDocPort function failed. Return its last error. + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // We were successful! + dwErrorCode = ERROR_SUCCESS; + dwReturnValue = pJob->dwJobID; + goto Cleanup; + } + + // The remaining function deals with Printer handles only. + if (pHandle->HandleType != HandleType_Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + if (!pDocInfo1) { dwErrorCode = ERROR_INVALID_PARAMETER; - goto Cleanup; - } - - if (!pHandle || pHandle->HandleType != HandleType_Printer) - { - dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; } @@ -989,14 +1087,46 @@ } BOOL WINAPI -LocalWritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) +LocalWritePrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pcWritten) { + BOOL bReturnValue; DWORD dwErrorCode; PLOCAL_HANDLE pHandle = (PLOCAL_HANDLE)hPrinter; + PLOCAL_PORT_HANDLE pPortHandle; PLOCAL_PRINTER_HANDLE pPrinterHandle; // Sanity checks. - if (!pHandle || pHandle->HandleType != HandleType_Printer) + if (!pHandle) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + // Port handles are an entirely different thing. + if (pHandle->HandleType == HandleType_Port) + { + pPortHandle = (PLOCAL_PORT_HANDLE)pHandle->pSpecificHandle; + + // Call the monitor's WritePort function. + if (pPortHandle->pPort->pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPortHandle->pPort->pPrintMonitor->pMonitor)->pfnWritePort(pPortHandle->hPort, pBuf, cbBuf, pcWritten); + else + bReturnValue = ((LPMONITOREX)pPortHandle->pPort->pPrintMonitor->pMonitor)->Monitor.pfnWritePort(pPortHandle->hPort, pBuf, cbBuf, pcWritten); + + if (!bReturnValue) + { + // The WritePort function failed. Return its last error. + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // We were successful! + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + // The remaining function deals with Printer handles only. + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -1054,12 +1184,44 @@ BOOL WINAPI LocalEndDocPrinter(HANDLE hPrinter) { + BOOL bReturnValue; DWORD dwErrorCode; PLOCAL_HANDLE pHandle = (PLOCAL_HANDLE)hPrinter; + PLOCAL_PORT_HANDLE pPortHandle; PLOCAL_PRINTER_HANDLE pPrinterHandle; // Sanity checks. - if (!pHandle || pHandle->HandleType != HandleType_Printer) + if (!pHandle) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + // Port handles are an entirely different thing. + if (pHandle->HandleType == HandleType_Port) + { + pPortHandle = (PLOCAL_PORT_HANDLE)pHandle->pSpecificHandle; + + // Call the monitor's EndDocPort function. + if (pPortHandle->pPort->pPrintMonitor->bIsLevel2) + bReturnValue = ((PMONITOR2)pPortHandle->pPort->pPrintMonitor->pMonitor)->pfnEndDocPort(pPortHandle->hPort); + else + bReturnValue = ((LPMONITOREX)pPortHandle->pPort->pPrintMonitor->pMonitor)->Monitor.pfnEndDocPort(pPortHandle->hPort); + + if (!bReturnValue) + { + // The EndDocPort function failed. Return its last error. + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // We were successful! + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + // The remaining function deals with Printer handles only. + if (pHandle->HandleType != HandleType_Printer) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -1090,7 +1252,9 @@ LocalClosePrinter(HANDLE hPrinter) { PLOCAL_HANDLE pHandle = (PLOCAL_HANDLE)hPrinter; + PLOCAL_PORT_HANDLE pPortHandle; PLOCAL_PRINTER_HANDLE pPrinterHandle; + PLOCAL_XCV_HANDLE pXcvHandle; if (!pHandle) { @@ -1100,7 +1264,13 @@ if (pHandle->HandleType == HandleType_Port) { - // TODO + pPortHandle = (PLOCAL_PORT_HANDLE)pHandle->pSpecificHandle; + + // Call the monitor's ClosePort function. + if (pPortHandle->pPort->pPrintMonitor->bIsLevel2) + ((PMONITOR2)pPortHandle->pPort->pPrintMonitor->pMonitor)->pfnClosePort(pPortHandle->hPort); + else + ((LPMONITOREX)pPortHandle->pPort->pPrintMonitor->pMonitor)->Monitor.pfnClosePort(pPortHandle->hPort); } else if (pHandle->HandleType == HandleType_Printer) { @@ -1113,16 +1283,20 @@ // Free memory for the fields. DllFreeSplMem(pPrinterHandle->pDevMode); DllFreeSplStr(pPrinterHandle->pwszDatatype); - - // Free memory for the printer handle itself. - DllFreeSplMem(pPrinterHandle); } else if (pHandle->HandleType == HandleType_Xcv) { - // TODO - } - - // Free memory for the handle itself. + pXcvHandle = (PLOCAL_XCV_HANDLE)pHandle->pSpecificHandle; + + // Call the monitor's XcvClosePort function. + if (pXcvHandle->pPrintMonitor->bIsLevel2) + ((PMONITOR2)pXcvHandle->pPrintMonitor->pMonitor)->pfnXcvClosePort(pXcvHandle->hXcv); + else + ((LPMONITOREX)pXcvHandle->pPrintMonitor->pMonitor)->Monitor.pfnXcvClosePort(pXcvHandle->hXcv); + } + + // Free memory for the handle and the specific handle. + DllFreeSplMem(pHandle->pSpecificHandle); DllFreeSplMem(pHandle); return TRUE; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c [iso-8859-1] Wed Jul 22 12:44:22 2015 @@ -47,6 +47,11 @@ OpenData.pOutputFile = NULL; OpenData.pParameters = pJob->pwszPrintProcessorParameters; OpenData.pPrinterName = pJob->pPrinter->pwszPrinterName; + + // Associate our job to the port. The next port handle created through LocalOpenPrinter will pick this up. + // LocalStartDocPrinter needs this information to call StartDocPort of the Print Monitor, but as the parameters + // for LocalOpenPrinter and LocalStartDocPrinter are fixed, we can only pass over the information this way. + pJob->pPrinter->pPort->pNextJobToProcess = pJob; // Open a handle to the Print Processor. hPrintProcessor = pPrintProcessor->pfnOpenPrintProcessor(pwszPrinterPort, &OpenData);

9 years, 1 month

[cfinck] 68549: [LOCALSPL] Stalling execution of the Print Processor under Windows reveals that the status flag JOB_STATUS_PRINTING is only set right before calling PrintDocumentOnPrintProcessor.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 22 09:21:20 2015 New Revision: 68549 URL: http://svn.reactos.org/svn/reactos?rev=68549&view=rev Log: [LOCALSPL] Stalling execution of the Print Processor under Windows reveals that the status flag JOB_STATUS_PRINTING is only set right before calling PrintDocumentOnPrintProcessor. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Wed Jul 22 09:21:20 2015 @@ -1155,9 +1155,8 @@ goto Cleanup; } - // Switch from spooling to printing. + // Spooling is finished at this point. pJob->dwStatus &= ~JOB_STATUS_SPOOLING; - pJob->dwStatus |= JOB_STATUS_PRINTING; // Write the job data into the shadow file. wcscpy(wcsrchr(wszFullPath, L'.'), L".SHD"); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printingthread.c [iso-8859-1] Wed Jul 22 09:21:20 2015 @@ -74,6 +74,9 @@ CopyMemory(&pwszPrinterAndJob[cchPrinterName], wszJobAppendix, cchJobAppendix * sizeof(WCHAR)); _ultow(OpenData.JobId, &pwszPrinterAndJob[cchPrinterName + cchJobAppendix], 10); + // Printing starts here. + pJob->dwStatus |= JOB_STATUS_PRINTING; + // Print the document. // Note that pJob is freed after this function, so we may not access it anymore. if (!pPrintProcessor->pfnPrintDocumentOnPrintProcessor(hPrintProcessor, pwszPrinterAndJob))

9 years, 1 month

[akhaldi] 68548: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 00:49:37 2015 New Revision: 68548 URL: http://svn.reactos.org/svn/reactos?rev=68548&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Wed Jul 22 00:49:37 2015 @@ -677,6 +677,72 @@ IStream_Release(stream); } +static void test_writeenddocument(void) +{ + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* WriteEndDocument resets it to initial state */ + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr == NULL, "got %p\n", ptr); + + /* we still need to flush manually, WriteEndDocument doesn't do that */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr != NULL, "got %p\n", ptr); + ok(!strncmp(ptr, "<a><b /></a>", 12), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -690,4 +756,5 @@ test_flush(); test_omitxmldeclaration(); test_bom(); -} + test_writeenddocument(); +}

9 years, 1 month

[akhaldi] 68547: [XMLLITE] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 00:49:19 2015 New Revision: 68547 URL: http://svn.reactos.org/svn/reactos?rev=68547&view=rev Log: [XMLLITE] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Wed Jul 22 00:49:19 2015 @@ -890,8 +890,20 @@ static int reader_cmp(xmlreader *reader, const WCHAR *str) { + int i=0; const WCHAR *ptr = reader_get_ptr(reader); - return strncmpW(str, ptr, strlenW(str)); + while (str[i]) + { + if (!ptr[i]) + { + reader_more(reader); + ptr = reader_get_ptr(reader); + } + if (str[i] != ptr[i]) + return ptr[i] - str[i]; + i++; + } + return 0; } /* moves cursor n WCHARs forward */ Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Wed Jul 22 00:49:19 2015 @@ -49,7 +49,8 @@ XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ XmlWriterState_ElemStarted, /* writing element */ - XmlWriterState_Content /* content is accepted at this point */ + XmlWriterState_Content, /* content is accepted at this point */ + XmlWriterState_DocClosed /* WriteEndDocument was called */ } XmlWriterState; typedef struct @@ -598,6 +599,8 @@ case XmlWriterState_ElemStarted: writer_close_starttag(This); break; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; default: ; } @@ -621,10 +624,34 @@ static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("%p\n", This); + + switch (This->state) + { + case XmlWriterState_Initial: + hr = E_UNEXPECTED; + break; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + hr = WR_E_INVALIDACTION; + break; + default: + ; + } + + if (FAILED(hr)) { + This->state = XmlWriterState_DocClosed; + return hr; + } + + /* empty element stack */ + while (IXmlWriter_WriteEndElement(iface) == S_OK) + ; + + This->state = XmlWriterState_DocClosed; + return S_OK; } static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) @@ -739,6 +766,7 @@ return WR_E_INVALIDACTION; break; case XmlWriterState_ElemStarted: + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; @@ -802,6 +830,7 @@ return S_OK; case XmlWriterState_DocStarted: case XmlWriterState_ElemStarted: + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; @@ -843,8 +872,15 @@ TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); - if (This->state == XmlWriterState_Initial) + switch (This->state) + { + case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } if (!local_name) return E_INVALIDARG; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jul 22 00:49:19 2015 @@ -223,7 +223,7 @@ reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.37 reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.37 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xmllite # Synced to WineStaging-1.7.37 +reactos/dll/win32/xmllite # Synced to WineStaging-1.7.47 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47

9 years, 1 month

[akhaldi] 68546: [WSHOM_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 00:47:52 2015 New Revision: 68546 URL: http://svn.reactos.org/svn/reactos?rev=68546&view=rev Log: [WSHOM_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/wshom/wshom.c trunk/rostests/winetests/wshom/wshom.idl Modified: trunk/rostests/winetests/wshom/wshom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.c?r… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] Wed Jul 22 00:47:52 2015 @@ -42,7 +42,10 @@ static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; static const WCHAR path2W[] = {'P','A','T','H',0}; + static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; + static const WCHAR emptyW[] = {'e','m','p','t','y',0}; IWshEnvironment *env; + IWshExec *shexec; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -212,6 +215,42 @@ SysFreeString(str); + /* current directory */ +if (0) /* crashes on native */ + hr = IWshShell3_get_CurrentDirectory(sh3, NULL); + + str = NULL; + hr = IWshShell3_get_CurrentDirectory(sh3, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(str && str[0] != 0, "got empty string\n"); + SysFreeString(str); + + hr = IWshShell3_put_CurrentDirectory(sh3, NULL); + ok(hr == E_INVALIDARG || + broken(hr == HRESULT_FROM_WIN32(ERROR_NOACCESS)), "got 0x%08x\n", hr); + + str = SysAllocString(emptyW); + hr = IWshShell3_put_CurrentDirectory(sh3, str); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(dummydirW); + hr = IWshShell3_put_CurrentDirectory(sh3, str); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + + /* Exec */ + hr = IWshShell3_Exec(sh3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWshShell3_Exec(sh3, NULL, &shexec); + ok(hr == DISP_E_EXCEPTION, "got 0x%08x\n", hr); + + str = SysAllocString(emptyW); + hr = IWshShell3_Exec(sh3, str, &shexec); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + SysFreeString(str); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3); @@ -241,7 +280,7 @@ { static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; - + static const WCHAR regsz2W[] = {'r','e','g','s','z','2',0}; static const WCHAR regszW[] = {'r','e','g','s','z',0}; static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; @@ -297,6 +336,9 @@ ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); + ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); ok(ret == 0, "got %d\n", ret); @@ -320,6 +362,18 @@ VariantClear(&value); SysFreeString(name); + /* REG_SZ with embedded NULL */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regsz2W); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + VariantClear(&value); + SysFreeString(name); + /* REG_DWORD */ lstrcpyW(pathW, keypathW); lstrcatW(pathW, regdwordW); @@ -371,6 +425,7 @@ hr = IWshShell3_RegRead(sh3, name, &value); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == (VT_ARRAY|VT_VARIANT), "got 0x%x\n", V_VT(&value)); + SysFreeString(name); dim = SafeArrayGetDim(V_ARRAY(&value)); ok(dim == 1, "got %u\n", dim); @@ -439,7 +494,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); @@ -452,7 +507,7 @@ VariantClear(&value); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); @@ -465,7 +520,7 @@ VariantClear(&value); type = REG_NONE; - ret = RegGetValueA(root, NULL, "regsz", RRF_RT_ANY, &type, NULL, NULL); + ret = RegQueryValueExA(root, "regsz", 0, &type, NULL, NULL); ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(type == REG_SZ, "got %d\n", type); Modified: trunk/rostests/winetests/wshom/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.idl… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] Wed Jul 22 00:47:52 2015 @@ -434,10 +434,10 @@ HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] long* pid); + HRESULT ProcessID([out, retval] DWORD *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] long* ExitCode); + HRESULT ExitCode([out, retval] DWORD *code); [id(0x0008)] HRESULT Terminate();

9 years, 1 month

[akhaldi] 68545: [WSHOM.OCX] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Jul 22 00:47:35 2015 New Revision: 68545 URL: http://svn.reactos.org/svn/reactos?rev=68545&view=rev Log: [WSHOM.OCX] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt trunk/reactos/dll/win32/wshom.ocx/shell.c trunk/reactos/dll/win32/wshom.ocx/wshom.idl trunk/reactos/dll/win32/wshom.ocx/wshom_main.c trunk/reactos/dll/win32/wshom.ocx/wshom_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/CMakeL… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/CMakeLists.txt [iso-8859-1] Wed Jul 22 00:47:35 2015 @@ -28,7 +28,7 @@ set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}") set_module_type(wshom win32ocx) target_link_libraries(wshom uuid wine) -add_importlibs(wshom oleaut32 ole32 shell32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(wshom oleaut32 ole32 shell32 advapi32 user32 msvcrt kernel32 ntdll) add_dependencies(wshom stdole2 wshom_idlheader) add_pch(wshom wshom_private.h SOURCE) add_cd_file(TARGET wshom DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wshom.ocx/shell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/shell.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/shell.c [iso-8859-1] Wed Jul 22 00:47:35 2015 @@ -67,6 +67,13 @@ LONG ref; } WshEnvironment; +typedef struct +{ + IWshExec IWshExec_iface; + LONG ref; + PROCESS_INFORMATION info; +} WshExec; + static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) { return CONTAINING_RECORD(iface, WshCollection, IWshCollection_iface); @@ -80,6 +87,260 @@ static inline WshEnvironment *impl_from_IWshEnvironment( IWshEnvironment *iface ) { return CONTAINING_RECORD(iface, WshEnvironment, IWshEnvironment_iface); +} + +static inline WshExec *impl_from_IWshExec( IWshExec *iface ) +{ + return CONTAINING_RECORD(iface, WshExec, IWshExec_iface); +} + +static HRESULT WINAPI WshExec_QueryInterface(IWshExec *iface, REFIID riid, void **obj) +{ + WshExec *This = impl_from_IWshExec(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IDispatch) || + IsEqualGUID(riid, &IID_IWshExec) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + }else { + FIXME("Unknown iface %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IWshExec_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI WshExec_AddRef(IWshExec *iface) +{ + WshExec *This = impl_from_IWshExec(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + return ref; +} + +static ULONG WINAPI WshExec_Release(IWshExec *iface) +{ + WshExec *This = impl_from_IWshExec(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) { + CloseHandle(This->info.hThread); + CloseHandle(This->info.hProcess); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI WshExec_GetTypeInfoCount(IWshExec *iface, UINT *pctinfo) +{ + WshExec *This = impl_from_IWshExec(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI WshExec_GetTypeInfo(IWshExec *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + WshExec *This = impl_from_IWshExec(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IWshExec_tid, ppTInfo); +} + +static HRESULT WINAPI WshExec_GetIDsOfNames(IWshExec *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WshExec *This = impl_from_IWshExec(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IWshExec_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshExec_Invoke(IWshExec *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WshExec *This = impl_from_IWshExec(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IWshExec_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IWshExec_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI WshExec_get_Status(IWshExec *iface, WshExecStatus *status) +{ + WshExec *This = impl_from_IWshExec(iface); + DWORD code; + + TRACE("(%p)->(%p)\n", This, status); + + if (!status) + return E_INVALIDARG; + + if (!GetExitCodeProcess(This->info.hProcess, &code)) + return HRESULT_FROM_WIN32(GetLastError()); + + switch (code) + { + case 0: + *status = WshFinished; + break; + case STILL_ACTIVE: + *status = WshRunning; + break; + default: + *status = WshFailed; + } + + return S_OK; +} + +static HRESULT WINAPI WshExec_get_StdIn(IWshExec *iface, ITextStream **stream) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_StdOut(IWshExec *iface, ITextStream **stream) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) +{ + WshExec *This = impl_from_IWshExec(iface); + + TRACE("(%p)->(%p)\n", This, pid); + + if (!pid) + return E_INVALIDARG; + + *pid = This->info.dwProcessId; + return S_OK; +} + +static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) +{ + WshExec *This = impl_from_IWshExec(iface); + + FIXME("(%p)->(%p): stub\n", This, code); + + return E_NOTIMPL; +} + +static BOOL CALLBACK enum_thread_wnd_proc(HWND hwnd, LPARAM lParam) +{ + INT *count = (INT*)lParam; + + (*count)++; + PostMessageW(hwnd, WM_CLOSE, 0, 0); + /* try to send it to all windows, even if failed for some */ + return TRUE; +} + +static HRESULT WINAPI WshExec_Terminate(IWshExec *iface) +{ + WshExec *This = impl_from_IWshExec(iface); + BOOL ret, kill = FALSE; + INT count = 0; + + TRACE("(%p)\n", This); + + ret = EnumThreadWindows(This->info.dwThreadId, enum_thread_wnd_proc, (LPARAM)&count); + if (ret && count) { + /* manual testing shows that it waits 2 seconds before forcing termination */ + if (WaitForSingleObject(This->info.hProcess, 2000) != WAIT_OBJECT_0) + kill = TRUE; + } + else + kill = TRUE; + + if (kill) + TerminateProcess(This->info.hProcess, 0); + + return S_OK; +} + +static const IWshExecVtbl WshExecVtbl = { + WshExec_QueryInterface, + WshExec_AddRef, + WshExec_Release, + WshExec_GetTypeInfoCount, + WshExec_GetTypeInfo, + WshExec_GetIDsOfNames, + WshExec_Invoke, + WshExec_get_Status, + WshExec_get_StdIn, + WshExec_get_StdOut, + WshExec_get_StdErr, + WshExec_get_ProcessID, + WshExec_get_ExitCode, + WshExec_Terminate +}; + +static HRESULT WshExec_create(BSTR command, IWshExec **ret) +{ + STARTUPINFOW si = {0}; + WshExec *This; + + *ret = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IWshExec_iface.lpVtbl = &WshExecVtbl; + This->ref = 1; + + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &This->info)) { + HeapFree(GetProcessHeap(), 0, This); + return HRESULT_FROM_WIN32(GetLastError()); + } + + *ret = &This->IWshExec_iface; + return S_OK; } static HRESULT WINAPI WshEnvironment_QueryInterface(IWshEnvironment *iface, REFIID riid, void **obj) @@ -1131,7 +1392,7 @@ case REG_SZ: case REG_EXPAND_SZ: V_VT(value) = VT_BSTR; - V_BSTR(value) = SysAllocStringLen((WCHAR*)data, datalen - sizeof(WCHAR)); + V_BSTR(value) = SysAllocString((WCHAR*)data); if (!V_BSTR(value)) hr = E_OUTOFMEMORY; break; @@ -1335,6 +1596,56 @@ { FIXME("(%s %p): stub\n", debugstr_w(Keys), Wait); return E_NOTIMPL; +} + +static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec **ret) +{ + TRACE("(%s %p)\n", debugstr_w(command), ret); + + if (!ret) + return E_POINTER; + + if (!command) + return DISP_E_EXCEPTION; + + return WshExec_create(command, ret); +} + +static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir) +{ + DWORD ret; + + TRACE("(%p)\n", dir); + + ret = GetCurrentDirectoryW(0, NULL); + if (!ret) + return HRESULT_FROM_WIN32(GetLastError()); + + *dir = SysAllocStringLen(NULL, ret-1); + if (!*dir) + return E_OUTOFMEMORY; + + ret = GetCurrentDirectoryW(ret, *dir); + if (!ret) { + SysFreeString(*dir); + *dir = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } + + return S_OK; +} + +static HRESULT WINAPI WshShell3_put_CurrentDirectory(IWshShell3 *iface, BSTR dir) +{ + TRACE("(%s)\n", debugstr_w(dir)); + + if (!dir) + return E_INVALIDARG; + + if (!SetCurrentDirectoryW(dir)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } static const IWshShell3Vtbl WshShell3Vtbl = { @@ -1356,7 +1667,10 @@ WshShell3_RegDelete, WshShell3_LogEvent, WshShell3_AppActivate, - WshShell3_SendKeys + WshShell3_SendKeys, + WshShell3_Exec, + WshShell3_get_CurrentDirectory, + WshShell3_put_CurrentDirectory }; static IWshShell3 WshShell3 = { &WshShell3Vtbl }; Modified: trunk/reactos/dll/win32/wshom.ocx/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom.… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom.idl [iso-8859-1] Wed Jul 22 00:47:35 2015 @@ -436,10 +436,10 @@ HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] long* pid); + HRESULT ProcessID([out, retval] DWORD *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] long* ExitCode); + HRESULT ExitCode([out, retval] DWORD *code); [id(0x0008)] HRESULT Terminate(); Modified: trunk/reactos/dll/win32/wshom.ocx/wshom_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom_… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_main.c [iso-8859-1] Wed Jul 22 00:47:35 2015 @@ -29,6 +29,7 @@ &IID_NULL, &IID_IWshCollection, &IID_IWshEnvironment, + &IID_IWshExec, &IID_IWshShell3, &IID_IWshShortcut }; Modified: trunk/reactos/dll/win32/wshom.ocx/wshom_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshom.ocx/wshom_… ============================================================================== --- trunk/reactos/dll/win32/wshom.ocx/wshom_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshom.ocx/wshom_private.h [iso-8859-1] Wed Jul 22 00:47:35 2015 @@ -35,6 +35,7 @@ NULL_tid, IWshCollection_tid, IWshEnvironment_tid, + IWshExec_tid, IWshShell3_tid, IWshShortcut_tid, LAST_tid Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jul 22 00:47:35 2015 @@ -216,7 +216,7 @@ reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.37 reactos/dll/win32/wmi # Synced to WineStaging-1.7.37 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.37 -reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.37 +reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 reactos/dll/win32/wuapi # Synced to WineStaging-1.7.37 reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.37

9 years, 1 month

← Newer
1
2
3
4
5
6
7
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015