Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[akhaldi] 70847: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:02:49 2016 New Revision: 70847 URL: http://svn.reactos.org/svn/reactos?rev=70847&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/comctl32/button.c trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/misc.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.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] Tue Mar 1 19:02:49 2016 @@ -210,6 +210,7 @@ { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_APP, sent|wparam|lparam }, @@ -232,6 +233,7 @@ { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ @@ -244,6 +246,7 @@ { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, { WM_COMMAND, sent|wparam|parent|optional, MAKEWPARAM(ID_BUTTON, BN_CLICKED) }, /* radio button */ @@ -267,6 +270,7 @@ { { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam, 0 }, { WM_DRAWITEM, sent|wparam|parent, ID_BUTTON }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, @@ -292,6 +296,7 @@ { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { BM_GETSTATE, sent|defwinproc|optional }, /* when touchscreen is present */ { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, { 0 } Modified: trunk/rostests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… ============================================================================== --- trunk/rostests/winetests/comctl32/header.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/header.c [iso-8859-1] Tue Mar 1 19:02:49 2016 @@ -1732,11 +1732,7 @@ for(i = 1; i<=count; i++) array |= order[i-1]<<(4*(count-i)); - if (todo) { - todo_wine - ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array); - } - else + todo_wine_if(todo) ok_(__FILE__, line)(array == expected, "Expected %x, got %x\n", expected, array); } Modified: trunk/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel… ============================================================================== --- trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/imagelist.c [iso-8859-1] Tue Mar 1 19:02:49 2016 @@ -44,16 +44,6 @@ #include <wine/test.h> #include "v6util.h" -#undef VISIBLE - -#ifdef VISIBLE -#define WAIT Sleep (1000) -#define REDRAW(hwnd) RedrawWindow (hwnd, NULL, 0, RDW_UPDATENOW) -#else -#define WAIT -#define REDRAW(hwnd) -#endif - #define IMAGELIST_MAGIC (('L' << 8) | 'I') #include "pshpack2.h" @@ -82,6 +72,16 @@ static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); static HINSTANCE hinst; + +/* only used in interactive mode */ +static void force_redraw(HWND hwnd) +{ + if (!winetest_interactive) + return; + + RedrawWindow(hwnd, NULL, 0, RDW_UPDATENOW); + Sleep(1000); +} /* These macros build cursor/bitmap data in 4x4 pixel blocks */ #define B(x,y) ((x?0xf0:0)|(y?0xf:0)) @@ -165,11 +165,11 @@ CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, 0, hinst, 0); -#ifdef VISIBLE - ShowWindow (hWnd, SW_SHOW); -#endif - REDRAW(hWnd); - WAIT; + if (winetest_interactive) + { + ShowWindow (hWnd, SW_SHOW); + force_redraw (hWnd); + } return hWnd; } @@ -177,16 +177,15 @@ static HDC show_image(HWND hwnd, HIMAGELIST himl, int idx, int size, LPCSTR loc, BOOL clear) { - HDC hdc = NULL; -#ifdef VISIBLE - if (!himl) return NULL; - - SetWindowText(hwnd, loc); + HDC hdc; + + if (!winetest_interactive || !himl) return NULL; + + SetWindowTextA(hwnd, loc); hdc = GetDC(hwnd); ImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); - REDRAW(hwnd); - WAIT; + force_redraw(hwnd); if (clear) { @@ -194,12 +193,11 @@ ReleaseDC(hwnd, hdc); hdc = NULL; } -#endif /* VISIBLE */ + return hdc; } /* Useful for checking differences */ -#if 0 static void dump_bits(const BYTE *p, const BYTE *q, int size) { int i, j; @@ -220,18 +218,16 @@ } printf("\n"); } -#endif static void check_bits(HWND hwnd, HIMAGELIST himl, int idx, int size, const BYTE *checkbits, LPCSTR loc) { -#ifdef VISIBLE BYTE bits[100*100/8]; COLORREF c; HDC hdc; int x, y, i = -1; - if (!himl) return; + if (!winetest_interactive || !himl) return; memset(bits, 0, sizeof(bits)); hdc = show_image(hwnd, himl, idx, size, loc, FALSE); @@ -254,7 +250,6 @@ "%s: bits different\n", loc); if (memcmp(bits, checkbits, (size * size)/8)) dump_bits(bits, checkbits, size); -#endif /* VISIBLE */ } static void test_begindrag(void) @@ -507,8 +502,7 @@ ok(!pImageList_DrawIndirect(&imldp),"bad himl succeeded!\n"); imldp.himl = himl; - REDRAW(hwndfortest); - WAIT; + force_redraw(hwndfortest); imldp.fStyle = SRCCOPY; imldp.rgbBk = CLR_DEFAULT; @@ -1825,8 +1819,7 @@ imldp.hdcDst = hdc; imldp.himl = himl; - REDRAW(hwndfortest); - WAIT; + force_redraw(hwndfortest); imldp.fStyle = SRCCOPY; imldp.rgbBk = CLR_DEFAULT; @@ -1975,7 +1968,11 @@ static void test_create_destroy(void) { HIMAGELIST himl; + IImageList *imgl; + INT cx, cy; BOOL rc; + HRESULT hr; + INT ret; /* list with zero or negative image dimensions */ himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); @@ -1995,6 +1992,46 @@ rc = ImageList_Destroy((HIMAGELIST)0xdeadbeef); ok(rc == FALSE, "ImageList_Destroy(0xdeadbeef) should fail and not crash\n"); + + /* DDB image lists */ + himl = ImageList_Create(0, 14, ILC_COLORDDB, 4, 4); + ok(himl != NULL, "got %p\n", himl); + imgl = (IImageList*)himl; + IImageList_GetIconSize(imgl, &cx, &cy); + ok (cx == 0, "Wrong cx (%i)\n", cx); + ok (cy == 14, "Wrong cy (%i)\n", cy); + ImageList_Destroy(himl); + + himl = ImageList_Create(0, 0, ILC_COLORDDB, 4, 4); + ok(himl != NULL, "got %p\n", himl); + imgl = (IImageList*)himl; + IImageList_GetIconSize(imgl, &cx, &cy); + ok (cx == 0, "Wrong cx (%i)\n", cx); + ok (cy == 0, "Wrong cy (%i)\n", cy); + ImageList_Destroy(himl); + + himl = ImageList_Create(0, 0, ILC_COLORDDB, 0, 4); + ok(himl != NULL, "got %p\n", himl); + imgl = (IImageList*)himl; + IImageList_GetIconSize(imgl, &cx, &cy); + ok (cx == 0, "Wrong cx (%i)\n", cx); + ok (cy == 0, "Wrong cy (%i)\n", cy); + + hr = IImageList_SetImageCount(imgl, 3); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IImageList_GetImageCount(imgl, &ret); + ok(hr == S_OK && ret == 3, "invalid image count after increase\n"); + + /* Trying to actually add an image causes a crash on Windows */ + ImageList_Destroy(himl); + + /* Negative values fail */ + himl = ImageList_Create(-1, -1, ILC_COLORDDB, 4, 4); + ok(himl == NULL, "got %p\n", himl); + himl = ImageList_Create(-1, 1, ILC_COLORDDB, 4, 4); + ok(himl == NULL, "got %p\n", himl); + himl = ImageList_Create(1, -1, ILC_COLORDDB, 4, 4); + ok(himl == NULL, "got %p\n", himl); } static void test_IImageList_Clone(void) 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] Tue Mar 1 19:02:49 2016 @@ -201,7 +201,7 @@ { 0 } }; -static const struct message ownderdata_select_focus_parent_seq[] = { +static const struct message ownerdata_select_focus_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, { WM_NOTIFY, sent|id|optional, 0, 0, LVN_GETDISPINFOA }, /* version 4.7x */ @@ -793,16 +793,7 @@ ret = SendMessageA(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); - if (todo_item) - { - todo_wine - { - ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); - ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); - ok_(__FILE__, line)(lpht.iSubItem == 10, "Expected subitem not overwrited\n"); - } - } - else + todo_wine_if(todo_item) { ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); @@ -835,34 +826,16 @@ ret = SendMessageA(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); - if (todo_item) - { - todo_wine - { - ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); - ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); - } - } - else + todo_wine_if(todo_item) { ok_(__FILE__, line)(ret == item, "Expected %d retval, got %d\n", item, ret); ok_(__FILE__, line)(lpht.iItem == item, "Expected %d item, got %d\n", item, lpht.iItem); } - if (todo_subitem) - { - todo_wine - ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); - } - else + todo_wine_if(todo_subitem) ok_(__FILE__, line)(lpht.iSubItem == subitem, "Expected subitem %d, got %d\n", subitem, lpht.iSubItem); - if (todo_flags) - { - todo_wine - ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags); - } - else + todo_wine_if(todo_flags) ok_(__FILE__, line)(lpht.flags == flags, "Expected flags 0x%x, got 0x%x\n", flags, lpht.flags); } @@ -3149,7 +3122,7 @@ res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_focus_parent_seq, "ownerdata select notification", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -3160,7 +3133,7 @@ res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); expect(TRUE, res); - ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_focus_parent_seq, "ownerdata focus notification", TRUE); /* select all, check notifications */ @@ -3420,6 +3393,28 @@ SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTDESCENDING); style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); + DestroyWindow(hwnd); + + /* The focused item is updated after the invalidation */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 3, 0); + expect(TRUE, res); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + expect(TRUE, res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata setitemcount", FALSE); + + res = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + expect(-1, res); DestroyWindow(hwnd); } Modified: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… ============================================================================== --- trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] Tue Mar 1 19:02:49 2016 @@ -368,6 +368,36 @@ FreeLibrary(hinst); } +static void check_class( const char *name, int must_exist, UINT style, UINT ignore ) +{ + WNDCLASSA wc; + + if (GetClassInfoA( 0, name, &wc )) + { +todo_wine + ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", + name, ~wc.style & style, wc.style, style ); + ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", + name, wc.style & ~style, wc.style, style ); + ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); + } + else + ok( !must_exist, "System class %s does not exist\n", name ); +} + +/* test styles of system classes */ +static void test_builtin_classes(void) +{ + /* check style bits */ + check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); + check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); + check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); + check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); + check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); + check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); + check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW ); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -382,6 +412,7 @@ if (!load_v6_module(&ctx_cookie, &hCtx)) return; + test_builtin_classes(); test_TaskDialogIndirect(); test_LoadIconWithScaleDown(); 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] Tue Mar 1 19:02:49 2016 @@ -1185,14 +1185,9 @@ if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) break; - if (title_hits[title_index].todo) { - todo_wine + todo_wine_if(title_hits[title_index].todo) ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", title_hits[title_index].ht, res, x); - } else { - ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", - title_hits[title_index].ht, res, x); - } } old_res = res; } 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] Tue Mar 1 19:02:49 2016 @@ -935,7 +935,7 @@ ret = SendMessageA(hdlg, PSM_INSERTPAGE, 0, (LPARAM)INVALID_HANDLE_VALUE); } - ret = SendMessageA(hdlg, PSM_INSERTPAGE, (LPARAM)INVALID_HANDLE_VALUE, (LPARAM)hpsp[2]); + ret = SendMessageA(hdlg, PSM_INSERTPAGE, (WPARAM)INVALID_HANDLE_VALUE, (LPARAM)hpsp[2]); ok(ret == FALSE, "got %d\n", ret); /* check item count */ 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] Tue Mar 1 19:02:49 2016 @@ -449,6 +449,33 @@ GetClientRect(hwnd, &toolinfoW.rect); r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); ok(!r, "Adding the tool to the tooltip succeeded!\n"); + + /* lpszText with an invalid address */ + toolinfoW.cbSize = sizeof(TTTOOLINFOW); + toolinfoW.hwnd = notify; + toolinfoW.hinst = GetModuleHandleA(NULL); + toolinfoW.uFlags = 0; + toolinfoW.uId = 0; + toolinfoW.lpszText = (LPWSTR)0xdeadbeef; + toolinfoW.lParam = 0; + GetClientRect(hwnd, &toolinfoW.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW); + ok(!r, "Adding the tool to the tooltip succeeded!\n"); + + /* lpszText with an invalid address. Crashes using TTTOOLINFOA message */ + if(0) + { + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = notify; + toolinfoA.hinst = GetModuleHandleA(NULL); + toolinfoA.uFlags = 0; + toolinfoA.uId = 0; + toolinfoA.lpszText = (LPSTR)0xdeadbeef; + toolinfoA.lParam = 0; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + ok(!r, "Adding the tool to the tooltip succeeded!\n"); + } if (0) /* crashes on NT4 */ { Modified: trunk/rostests/winetests/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/trackb… ============================================================================== --- trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/trackbar.c [iso-8859-1] Tue Mar 1 19:02:49 2016 @@ -32,7 +32,18 @@ #define PARENT_SEQ_INDEX 0 #define TRACKBAR_SEQ_INDEX 1 +static const DWORD defaultstyle = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; static HWND hWndParent; + +static LRESULT WINAPI trackbar_no_wmpaint_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == WM_PAINT) + return 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} static struct msg_sequence *sequences[NUM_MSG_SEQUENCE]; @@ -467,13 +478,26 @@ return hWndTrack; } +static HWND create_trackbar2(DWORD style, HWND parent) +{ + RECT rect; + GetClientRect(parent, &rect); + return CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", style, + rect.right, rect.bottom, 100, 50, + parent, NULL, GetModuleHandleA(NULL), NULL); +} + /* test functions for setters, getters, and sequences */ -static void test_trackbar_buddy(HWND hWndTrackbar){ - HWND hWndLeftBuddy; +static void test_trackbar_buddy(void) +{ + HWND hWndLeftBuddy, hWndTrackbar; HWND hWndRightBuddy; HWND hWndCurrentBuddy; HWND rTest; + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); flush_sequences(sequences, NUM_MSG_SEQUENCE); @@ -518,10 +542,16 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, buddy_window_test_seq, "buddy test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_buddy_window_test_seq, "parent buddy test seq", TRUE); -} - -static void test_line_size(HWND hWndTrackbar){ + DestroyWindow(hWndTrackbar); +} + +static void test_line_size(void) +{ + HWND hWndTrackbar; int r; + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); flush_sequences(sequences, NUM_MSG_SEQUENCE); @@ -537,11 +567,18 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, line_size_test_seq, "linesize test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent line test sequence", FALSE); -} - - -static void test_page_size(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + + +static void test_page_size(void) +{ + HWND hWndTrackbar; int r; + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); flush_sequences(sequences, NUM_MSG_SEQUENCE); @@ -573,12 +610,22 @@ expect(20, r); r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); expect(-2, r); -} - -static void test_position(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + +static void test_position(void) +{ + HWND hWndTrackbar; + RECT rect, rect2; + WNDPROC oldproc; int r; - flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + /* test TBM_SETPOS */ SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, -1); r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); @@ -601,12 +648,55 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, position_test_seq, "position test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_position_test_seq, "parent position test sequence", TRUE); -} - -static void test_range(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar2(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + /* subclassing procedure blocks WM_PAINT */ + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + memset(&rect, 0, sizeof(rect)); + memset(&rect2, 0, sizeof(rect2)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + + /* without repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left == rect2.left, "got %d\n", rect.left); + + /* with repaint */ + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 30); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 30, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect2.left, rect.left); + + /* now move it with keys */ + SendMessageA(hWndTrackbar, WM_KEYDOWN, VK_END, 0); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 100, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect.left, rect2.left); + + DestroyWindow(hWndTrackbar); +} + +static void test_range(void) +{ + HWND hWndTrackbar; int r; - flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + /* test TBM_SETRANGE */ SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10)); r = SendMessageA(hWndTrackbar, TBM_GETRANGEMAX, 0,0); @@ -664,12 +754,23 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, range_test_seq, "range test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_range_test_seq, "parent range test sequence", TRUE); -} - -static void test_selection(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + +static void test_selection(void) +{ + HWND hWndTrackbar; int r; - flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 5); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + /* test TBM_SETSEL */ SendMessageA(hWndTrackbar, TBM_SETSEL, TRUE, MAKELONG(0,10)); r = SendMessageA(hWndTrackbar, TBM_GETSELEND, 0,0); @@ -725,12 +826,20 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, selection_test_seq, "selection test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test sequence", TRUE); -} - -static void test_thumb_length(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + +static void test_thumb_length(void) +{ + HWND hWndTrackbar; int r; - flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + /* testing TBM_SETTHUMBLENGTH */ SendMessageA(hWndTrackbar, TBM_SETTHUMBLENGTH, 15, 0); r = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); @@ -754,10 +863,20 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, thumb_length_test_seq, "thumb length test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb length test sequence", TRUE); -} - -static void test_tic_settings(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + +static void test_tic_settings(void) +{ + HWND hWndTrackbar; int r; + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 5); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10); /* testing TBM_SETTIC */ /* Set tics at 5 and 10 */ @@ -818,10 +937,15 @@ expect(3, r); } -static void test_tic_placement(HWND hWndTrackbar){ +static void test_tic_placement(void) +{ + HWND hWndTrackbar; int r; DWORD *rPTics; DWORD numtics; + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(1, 6)); SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); @@ -853,15 +977,21 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tic_placement_test_seq, "get tic placement test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent get tic placement test sequence", FALSE); -} - - -static void test_tool_tips(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + +static void test_tool_tips(void) +{ + HWND hWndTooltip, hWndTrackbar; + HWND rTest; int r; - HWND hWndTooltip; - HWND rTest; - - flush_sequences(sequences, NUM_MSG_SEQUENCE); + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + /* testing TBM_SETTIPSIDE */ r = SendMessageA(hWndTrackbar, TBM_SETTIPSIDE, TBTS_TOP, 0); expect(TBTS_TOP, r); @@ -897,13 +1027,21 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, tool_tips_test_seq, "tool tips test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent tool tips test sequence", FALSE); -} - - -static void test_unicode(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + + +static void test_unicode(void) +{ + HWND hWndTrackbar; int r; - flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + /* testing TBM_SETUNICODEFORMAT */ r = SendMessageA(hWndTrackbar, TBM_SETUNICODEFORMAT, TRUE, 0); ok(r == FALSE, "Expected FALSE, got %d\n",r); @@ -916,10 +1054,17 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, unicode_test_seq, "unicode test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent unicode test sequence", FALSE); -} - -static void test_ignore_selection(HWND hWndTrackbar){ + + DestroyWindow(hWndTrackbar); +} + +static void test_ignore_selection(void) +{ + HWND hWndTrackbar; int r; + + hWndTrackbar = create_trackbar(0, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); flush_sequences(sequences, NUM_MSG_SEQUENCE); /* test TBM_SETSEL ensure that it is ignored */ @@ -958,6 +1103,8 @@ ok_sequence(sequences, TRACKBAR_SEQ_INDEX, ignore_selection_test_seq, "ignore selection setting test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent ignore selection setting test sequence", FALSE); + + DestroyWindow(hWndTrackbar); } static void test_initial_state(void) @@ -1037,11 +1184,29 @@ DestroyWindow(hWnd); } +static void test_create(void) +{ + HWND hWndTrackbar; + + flush_sequences(sequences, NUM_MSG_SEQUENCE); + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + ok_sequence(sequences, TRACKBAR_SEQ_INDEX, empty_seq, "create Trackbar Window", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_trackbar_wnd_seq, "parent trackbar window", TRUE); + + DestroyWindow(hWndTrackbar); + + /* no style bits */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndTrackbar = create_trackbar(0, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_new_window_test_seq, "new trackbar window test sequence", TRUE); + DestroyWindow(hWndTrackbar); +} + START_TEST(trackbar) { - DWORD style = WS_VISIBLE | TBS_TOOLTIPS | TBS_ENABLESELRANGE | TBS_FIXEDLENGTH | TBS_AUTOTICKS; - HWND hWndTrackbar; - init_msg_sequences(sequences, NUM_MSG_SEQUENCE); InitCommonControls(); @@ -1054,55 +1219,20 @@ return; } - flush_sequences(sequences, NUM_MSG_SEQUENCE); - - /* create trackbar with set styles */ - hWndTrackbar = create_trackbar(style, hWndParent); - - ok(hWndTrackbar != NULL, "Expected non NULL value\n"); - - if (!hWndTrackbar){ - skip("trackbar control not present?\n"); - return; - } - - ok_sequence(sequences, TRACKBAR_SEQ_INDEX, empty_seq, "create Trackbar Window", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_trackbar_wnd_seq, "parent trackbar window", TRUE); - flush_sequences(sequences, NUM_MSG_SEQUENCE); - - /* TEST OF ALL SETTER and GETTER MESSAGES with required styles turned on*/ - test_trackbar_buddy(hWndTrackbar); - test_line_size(hWndTrackbar); - test_page_size(hWndTrackbar); - test_position(hWndTrackbar); - test_range(hWndTrackbar); - test_selection(hWndTrackbar); - test_thumb_length(hWndTrackbar); - test_tic_settings(hWndTrackbar); - test_tic_placement(hWndTrackbar); - test_tool_tips(hWndTrackbar); - test_unicode(hWndTrackbar); + test_create(); + test_trackbar_buddy(); + test_line_size(); + test_page_size(); + test_position(); + test_range(); + test_selection(); + test_thumb_length(); + test_tic_settings(); + test_tic_placement(); + test_tool_tips(); + test_unicode(); test_TBS_AUTOTICKS(); - - flush_sequences(sequences, NUM_MSG_SEQUENCE); - DestroyWindow(hWndTrackbar); - - /* test getters and setters without styles set */ - hWndTrackbar = create_trackbar(0, hWndParent); - - ok(hWndTrackbar != NULL, "Expected non NULL value\n"); - - if (!hWndTrackbar){ - skip("trackbar control not present?\n"); - return; - } - - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_new_window_test_seq, "new trackbar window test sequence", TRUE); - - test_ignore_selection(hWndTrackbar); - - DestroyWindow(hWndTrackbar); - + test_ignore_selection(); test_initial_state(); DestroyWindow(hWndParent); 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] Tue Mar 1 19:02:49 2016 @@ -1193,7 +1193,9 @@ case TVN_ENDLABELEDITA: return TRUE; case TVN_ITEMEXPANDINGA: - ok(pTreeView->itemNew.mask == + { + UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN; + ok(newmask == (TVIF_HANDLE | TVIF_SELECTEDIMAGE | TVIF_IMAGE | TVIF_PARAM | TVIF_STATE), "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemOld.mask == 0, @@ -1207,6 +1209,7 @@ ok(ret == TRUE, "got %lu\n", ret); } break; + } case TVN_ITEMEXPANDEDA: ok(pTreeView->itemNew.mask & TVIF_STATE, "got wrong mask %x\n", pTreeView->itemNew.mask); ok(pTreeView->itemNew.state & (TVIS_EXPANDED|TVIS_EXPANDEDONCE), @@ -1529,6 +1532,7 @@ static void test_expandnotify(void) { + HTREEITEM hitem; HWND hTree; BOOL ret; TVITEMA item; @@ -1678,6 +1682,22 @@ ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); expect(FALSE, ret); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_expand_empty_kb_seq, "expand node with no children", FALSE); + + /* stay on current selection and set non-zero children count */ + hitem = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); + ok(hitem != NULL, "got %p\n", hitem); + + item.hItem = hitem; + item.mask = TVIF_CHILDREN; + item.cChildren = 0x80000000; + + ret = SendMessageA(hTree, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, WM_KEYDOWN, VK_ADD, 0); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_collapse_2nd_kb_seq, "expand node with children", FALSE); DestroyWindow(hTree); } @@ -1858,7 +1878,12 @@ { const struct message *msg; HWND hTree; + HTREEITEM hItem1, hItem2; + TVINSERTSTRUCTA ins; INT ret; + + static CHAR item1[] = "Item 1"; + static CHAR item2[] = "Item 2"; hTree = create_treeview_control(0); fill_tree(hTree); @@ -1878,6 +1903,34 @@ } ret = SendMessageA(hTree, TVM_GETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + + DestroyWindow(hTree); + + /* Regression test for a crash when deleting the first visible item while bRedraw == false. */ + hTree = create_treeview_control(0); + + ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); + ok(ret == 0, "got %d\n", ret); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = item1; + hItem1 = TreeView_InsertItemA(hTree, &ins); + ok(hItem1 != NULL, "InsertItem failed\n"); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = hItem1; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = item2; + hItem2 = TreeView_InsertItemA(hTree, &ins); + ok(hItem2 != NULL, "InsertItem failed\n"); + + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); + ok(ret == TRUE, "got %d\n", ret); + + ret = SendMessageA(hTree, WM_SETREDRAW, TRUE, 0); ok(ret == 0, "got %d\n", ret); DestroyWindow(hTree);

8 years, 9 months

[akhaldi] 70846: [COMCTL32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 19:02:33 2016 New Revision: 70846 URL: http://svn.reactos.org/svn/reactos?rev=70846&view=rev Log: [COMCTL32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -1153,7 +1153,7 @@ * Gets the Reference data from a subclass. * * PARAMS - * hWnd [in] Handle to window which were subclassing + * hWnd [in] Handle to the window which we are subclassing * pfnSubclass [in] Pointer to the subclass procedure * uID [in] Unique identifier of the subclassing procedure * pdwRef [out] Pointer to the reference data @@ -1196,7 +1196,7 @@ * Removes a window subclass. * * PARAMS - * hWnd [in] Handle to the window were subclassing + * hWnd [in] Handle to the window which we are subclassing * pfnSubclass [in] Pointer to the subclass procedure * uID [in] Unique identifier of this subclass * Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -763,7 +763,8 @@ TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow); - if (cx <= 0 || cy <= 0) return NULL; + if (cx < 0 || cy < 0) return NULL; + if (!((flags&ILC_COLORDDB) == ILC_COLORDDB) && (cx == 0 || cy == 0)) return NULL; /* Create the IImageList interface for the image list */ if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) @@ -1232,8 +1233,11 @@ return ImageList_DrawIndirect (&imldp); } - +#ifdef __REACTOS__ static BOOL alpha_blend_image( HIMAGELIST himl, HDC srce_dc, HDC dest_dc, int dest_x, int dest_y, +#else +static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, +#endif int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, UINT style, COLORREF blend_col ) { @@ -1258,9 +1262,17 @@ info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; +#ifdef __REACTOS__ if (!(bmp = CreateDIBSection( srce_dc, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; +#else + if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; +#endif SelectObject( hdc, bmp ); +#ifdef __REACTOS__ BitBlt( hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY ); +#else + BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); +#endif if (blend_col != CLR_NONE) { @@ -1333,6 +1345,7 @@ return ret; } +#ifdef __REACTOS__ HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, int src_x, int src_y, int cx, int cy, COLORREF rgbFg) { @@ -1392,6 +1405,7 @@ /* return the handle to our desaturated dc, that will substitute its original counterpart in the next calls */ return hdc; } +#endif /* __REACTOS__ */ /************************************************************************* * ImageList_DrawIndirect [COMCTL32.@] @@ -1469,6 +1483,7 @@ oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); +#ifdef __REACTOS__ /* * If the ILS_SATURATE bit is enabled we should multiply the * RGB colors of the original image by the contents of rgbFg. @@ -1483,6 +1498,7 @@ pt.x = 0; pt.y = 0; } +#endif has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); if (!bMask && (has_alpha || (fState & ILS_ALPHA))) @@ -1504,7 +1520,11 @@ if (bIsTransparent) { +#ifdef __REACTOS__ bResult = alpha_blend_image( himl, hImageListDC, pimldp->hdcDst, pimldp->x, pimldp->y, +#else + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, +#endif pt.x, pt.y, cx, cy, func, fStyle, blend_col ); goto end; } @@ -1514,7 +1534,11 @@ hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); +#ifdef __REACTOS__ alpha_blend_image( himl, hImageListDC, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); +#else + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); +#endif DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; @@ -1608,6 +1632,9 @@ } } +#ifndef __REACTOS__ + if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); +#endif if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); @@ -1891,8 +1918,6 @@ ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy) { if (!is_valid(himl) || !cx || !cy) - return FALSE; - if ((himl->cx <= 0) || (himl->cy <= 0)) return FALSE; *cx = himl->cx; Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -8820,6 +8820,7 @@ if (infoPtr->dwStyle & LVS_OWNERDATA) { INT nOldCount = infoPtr->nItemCount; + infoPtr->nItemCount = nItems; if (nItems < nOldCount) { @@ -8832,7 +8833,6 @@ } } - infoPtr->nItemCount = nItems; LISTVIEW_UpdateScroll(infoPtr); /* the flags are valid only in ownerdata report and list modes */ @@ -10281,6 +10281,9 @@ } } + if (!infoPtr->bFocus) + SetFocus(infoPtr->hwndSelf); + if (infoPtr->dwLvExStyle & LVS_EX_ONECLICKACTIVATE) if(lvHitTestInfo.iItem != -1) notify_itemactivate(infoPtr,&lvHitTestInfo); } @@ -10366,9 +10369,6 @@ GetDoubleClickTime(), LISTVIEW_DelayedEditItem); } - - if (!infoPtr->bFocus) - SetFocus(infoPtr->hwndSelf); return 0; } Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -2955,7 +2955,11 @@ static LRESULT +#ifdef __REACTOS__ REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM flags, RECT *lpRect) +#else +REBAR_SizeToRect (REBAR_INFO *infoPtr, const RECT *lpRect) +#endif { if (!lpRect) return FALSE; @@ -3732,7 +3736,11 @@ return REBAR_ShowBand (infoPtr, wParam, lParam); case RB_SIZETORECT: +#ifdef __REACTOS__ return REBAR_SizeToRect (infoPtr, wParam, (LPRECT)lParam); +#else + return REBAR_SizeToRect (infoPtr, (LPCRECT)lParam); +#endif /* Messages passed to parent */ Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -6200,8 +6200,10 @@ infoPtr->clrBtnShadow = CLR_DEFAULT; infoPtr->szPadding.cx = DEFPAD_CX; infoPtr->szPadding.cy = DEFPAD_CY; +#ifdef __REACTOS__ infoPtr->szSpacing.cx = DEFSPACE_CX; infoPtr->szSpacing.cy = DEFSPACE_CY; +#endif infoPtr->iListGap = DEFLISTGAP; infoPtr->iTopMargin = default_top_margin(infoPtr); infoPtr->dwStyle = lpcs->style; @@ -6972,6 +6974,7 @@ return TOOLBAR_MouseLeave (infoPtr); case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TOOLBAR_CaptureChanged(infoPtr); case WM_NCACTIVATE: Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -91,6 +91,8 @@ #include "comctl32.h" +#include <wine/exception.h> + WINE_DEFAULT_DEBUG_CHANNEL(tooltips); static HICON hTooltipIcons[TTI_ERROR+1]; @@ -1063,10 +1065,19 @@ toolPtr->lpszText = LPSTR_TEXTCALLBACKW; } else if (isW) { - INT len = lstrlenW (ti->lpszText); - TRACE("add text %s!\n", debugstr_w(ti->lpszText)); - toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); - strcpyW (toolPtr->lpszText, ti->lpszText); + __TRY + { + INT len = lstrlenW (ti->lpszText); + TRACE("add text %s!\n", debugstr_w(ti->lpszText)); + toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR)); + strcpyW (toolPtr->lpszText, ti->lpszText); + } + __EXCEPT_PAGE_FAULT + { + WARN("Invalid lpszText.\n"); + return FALSE; + } + __ENDTRY } else { INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0); Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -1214,9 +1214,12 @@ if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - - if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + + if (fPosition && oldPos != lPosition) + { + TRACKBAR_UpdateThumb(infoPtr); + TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + } return 0; } @@ -1803,7 +1806,7 @@ } if (pos != infoPtr->lPos) { - infoPtr->flags |=TB_THUMBPOSCHANGED; + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_InvalidateThumbMove (infoPtr, pos, infoPtr->lPos); } @@ -1961,6 +1964,7 @@ case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TRACKBAR_CaptureChanged (infoPtr); case WM_CREATE: Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Tue Mar 1 19:02:33 2016 @@ -75,7 +75,7 @@ HTREEITEM focusedItem; /* item that was under the cursor when WM_LBUTTONDOWN was received */ HTREEITEM editItem; /* item being edited with builtin edit box */ - HTREEITEM firstVisible; /* handle to first visible item */ + HTREEITEM firstVisible; /* handle to item whose top edge is at y = 0 */ LONG maxVisibleOrder; HTREEITEM dropItem; /* handle to item selected by drag cursor */ HTREEITEM insertMarkItem; /* item after which insertion mark is placed */ @@ -141,7 +141,10 @@ LONG imageOffset; LONG textOffset; LONG textWidth; /* horizontal text extent for pszText */ - LONG visibleOrder; /* visible ordering, 0 is first visible item */ + LONG visibleOrder; /* Depth-first numbering of the items whose ancestors are all expanded, + corresponding to a top-to-bottom ordering in the tree view. + Each item takes up "item.iIntegral" spots in the visible order. + 0 is the root's first child. */ const TREEVIEW_INFO *infoPtr; /* tree data this item belongs to */ } TREEVIEW_ITEM; @@ -537,7 +540,7 @@ NMTREEVIEWW nmhdr; BOOL ret; - TRACE("code:%d action:%x olditem:%p newitem:%p\n", + TRACE("code:%d action:0x%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); memset(&nmhdr, 0, sizeof(NMTREEVIEWW)); @@ -589,7 +592,7 @@ NMTVCUSTOMDRAW nmcdhdr; NMCUSTOMDRAW *nmcd; - TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); + TRACE("drawstage:0x%x hdc:%p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; nmcd->dwDrawStage = dwDrawStage; @@ -636,7 +639,7 @@ nmcd->lItemlParam = item->lParam; nmcdhdr->iLevel = item->iLevel; - TRACE("drawstage:%x hdc:%p item:%lx, itemstate:%x, lItemlParam:%lx\n", + TRACE("drawstage:0x%x hdc:%p item:%lx, itemstate:0x%x, lItemlParam:0x%lx\n", nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); @@ -795,8 +798,9 @@ TREEVIEW_HasChildren(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) { TREEVIEW_UpdateDispInfo(infoPtr, item, TVIF_CHILDREN); - - return item->cChildren > 0; + /* Protect for a case when callback field is not changed by a host, + otherwise negative values trigger normal notifications. */ + return item->cChildren != 0 && item->cChildren != I_CHILDRENCALLBACK; } static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nCommand) @@ -1171,7 +1175,7 @@ if (tvItem->mask & TVIF_STATE) { - TRACE("prevstate,state,mask:%x,%x,%x\n", item->state, tvItem->state, + TRACE("prevstate 0x%x, state 0x%x, mask 0x%x\n", item->state, tvItem->state, tvItem->stateMask); item->state &= ~tvItem->stateMask; item->state |= (tvItem->state & tvItem->stateMask); @@ -1179,7 +1183,7 @@ if (tvItem->mask & TVIF_STATEEX) { - FIXME("New extended state: %x\n", tvItem->uStateEx); + FIXME("New extended state: 0x%x\n", tvItem->uStateEx); } item->callbackMask |= callbackSet; @@ -1337,7 +1341,7 @@ } - TRACE("new item %p; parent %p, mask %x\n", newItem, + TRACE("new item %p; parent %p, mask 0x%x\n", newItem, newItem->parent, tvItem->mask); newItem->iLevel = newItem->parent->iLevel + 1; @@ -1420,10 +1424,12 @@ static void TREEVIEW_UnlinkItem(const TREEVIEW_ITEM *item) { - TREEVIEW_ITEM *parentItem = item->parent; + TREEVIEW_ITEM *parentItem; assert(item != NULL); assert(item->parent != NULL); /* i.e. it must not be the root */ + + parentItem = item->parent; if (parentItem->firstChild == item) parentItem->firstChild = item->nextSibling; @@ -1518,6 +1524,7 @@ if (infoPtr->firstVisible == item) { + visible = TRUE; if (item->nextSibling) newFirstVisible = item->nextSibling; else if (item->prevSibling) @@ -1553,11 +1560,13 @@ TREEVIEW_VerifyTree(infoPtr); + if (visible) + TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); + if (!infoPtr->bRedraw) return TRUE; if (visible) { - TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); TREEVIEW_RecalculateVisibleOrder(infoPtr, prev); TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_Invalidate(infoPtr, NULL); @@ -1962,7 +1971,7 @@ { COLORREF prevColor = infoPtr->clrInsertMark; - TRACE("%x\n", color); + TRACE("0x%08x\n", color); infoPtr->clrInsertMark = color; return (LRESULT)prevColor; @@ -2134,7 +2143,7 @@ tvItem->uStateEx = 0; } - TRACE("item <%p>, txt %p, img %d, mask %x\n", + TRACE("item <%p>, txt %p, img %d, mask 0x%x\n", item, tvItem->pszText, tvItem->iImage, tvItem->mask); return TRUE; @@ -2150,7 +2159,7 @@ item = tvItem->hItem; - TRACE("item %d,mask %x\n", TREEVIEW_GetItemIndex(infoPtr, item), + TRACE("item %d, mask 0x%x\n", TREEVIEW_GetItemIndex(infoPtr, item), tvItem->mask); if (!TREEVIEW_ValidItem(infoPtr, item)) @@ -2245,7 +2254,7 @@ if (retval) { - TRACE("flags:%x, returns %p\n", which, retval); + TRACE("flags:0x%x, returns %p\n", which, retval); return (LRESULT)retval; } @@ -2275,11 +2284,11 @@ retval = TREEVIEW_GetPrevListItem(infoPtr, item); break; default: - TRACE("Unknown msg %x,item %p\n", which, item); + TRACE("Unknown msg 0x%x, item %p\n", which, item); break; } - TRACE("flags:%x, item %p;returns %p\n", which, item, retval); + TRACE("flags: 0x%x, item %p;returns %p\n", which, item, retval); return (LRESULT)retval; } @@ -2301,7 +2310,7 @@ unsigned int state; state = STATEIMAGEINDEX(item->state); - TRACE("state:%x\n", state); + TRACE("state: 0x%x\n", state); item->state &= ~TVIS_STATEIMAGEMASK; if (state < 3) @@ -2309,7 +2318,7 @@ item->state |= INDEXTOSTATEIMAGEMASK(state); - TRACE("state:%x\n", state); + TRACE("state: 0x%x\n", state); TREEVIEW_Invalidate(infoPtr, item); } } @@ -3683,7 +3692,7 @@ } lpht->hItem = item; - TRACE("(%d,%d):result %x\n", lpht->pt.x, lpht->pt.y, lpht->flags); + TRACE("(%d,%d):result 0x%x\n", lpht->pt.x, lpht->pt.y, lpht->flags); return (LRESULT)item; } @@ -3760,7 +3769,7 @@ static LRESULT TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - TRACE("code=%x, id=%x, handle=%lx\n", HIWORD(wParam), LOWORD(wParam), lParam); + TRACE("code=0x%x, id=0x%x, handle=0x%lx\n", HIWORD(wParam), LOWORD(wParam), lParam); switch (HIWORD(wParam)) { @@ -4383,7 +4392,7 @@ assert(newSelect == NULL || TREEVIEW_ValidItem(infoPtr, newSelect)); - TRACE("Entering item %p (%s), flag %x, cause %x, state %d\n", + TRACE("Entering item %p (%s), flag 0x%x, cause 0x%x, state %d\n", newSelect, TREEVIEW_ItemName(newSelect), action, cause, newSelect ? newSelect->state : 0); @@ -4994,7 +5003,7 @@ TREEVIEW_INFO *infoPtr; LOGFONTW lf; - TRACE("wnd %p, style %x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); + TRACE("wnd %p, style 0x%x\n", hwnd, GetWindowLongW(hwnd, GWL_STYLE)); infoPtr = Alloc(sizeof(TREEVIEW_INFO)); 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] Tue Mar 1 19:02:33 2016 @@ -54,7 +54,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4 reactos/dll/win32/clusapi # Synced to WineStaging-1.7.55 reactos/dll/win32/comcat # Synced to WineStaging-1.7.55 -reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.4 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.55 reactos/dll/win32/compstui # Synced to WineStaging-1.7.55 reactos/dll/win32/credui # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70845: [CMD_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:56:31 2016 New Revision: 70845 URL: http://svn.reactos.org/svn/reactos?rev=70845&view=rev Log: [CMD_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/cmd/batch.c trunk/rostests/winetests/cmd/test_builtins.cmd trunk/rostests/winetests/cmd/test_builtins.cmd.exp Modified: trunk/rostests/winetests/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/batch.c?rev… ============================================================================== --- trunk/rostests/winetests/cmd/batch.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/batch.c [iso-8859-1] Tue Mar 1 18:56:31 2016 @@ -274,11 +274,11 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_data, DWORD exp_size) { - const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; + const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err = NULL; DWORD line = 0; static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; static const char resync_cmd[] = {'-','-','-'}; - BOOL is_todo_wine, is_out_resync, is_exp_resync; + BOOL is_todo_wine, is_out_resync = FALSE, is_exp_resync = FALSE; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -288,32 +288,32 @@ is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); - if (is_todo_wine) { + if (is_todo_wine) exp_ptr += sizeof(todo_wine_cmd); - winetest_start_todo("wine"); - } - is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && - !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); - is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && - !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); - - err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); - if(err == out_nl) - ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", - line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if(err == exp_nl) - ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", - line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if (!err && is_todo_wine && is_out_resync && is_exp_resync) - /* Consider that the todo_wine was to deal with extra lines, - * not for the resync line itself - */ - err = NULL; - else - ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - - if(is_todo_wine) winetest_end_todo("wine"); + + todo_wine_if(is_todo_wine) + { + is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && + !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); + is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && + !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); + + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); + if(err == out_nl) + ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if(err == exp_nl) + ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if (!err && is_todo_wine && is_out_resync && is_exp_resync) + /* Consider that the todo_wine was to deal with extra lines, + * not for the resync line itself + */ + err = NULL; + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + } if (is_exp_resync && err && is_todo_wine) { @@ -321,7 +321,8 @@ /* If we rewind to the beginning of the line, don't increment line number */ line--; } - else if (!is_exp_resync || !err) + else if (!is_exp_resync || !err || + (is_exp_resync && is_out_resync && err)) { exp_ptr = exp_nl+1; if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') Modified: trunk/rostests/winetests/cmd/test_builtins.cmd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd [iso-8859-1] Tue Mar 1 18:56:31 2016 @@ -952,11 +952,11 @@ del temp.bat 2>nul call :WriteLine set WINE_found=N for /l %%i in (1,1,%WINE_expectedresults%) do ( - call :WriteLine if "%%%%WINE_expectedresults.%%i%%%%"=="%%%%1" set WINE_found=Y + call :WriteLine if "%%%%WINE_expectedresults.%%i%%%%"=="%%%%~1" set WINE_found=Y call :WriteLine if "%%%%WINE_found%%%%"=="Y" set WINE_expectedresults.%%i= call :WriteLine if "%%%%WINE_found%%%%"=="Y" goto :eof ) -call :WriteLine echo Got unexpected result: "%%%%1" +call :WriteLine echo Got unexpected result: "%%%%~1" goto :eof :WriteLine @@ -973,7 +973,7 @@ goto :eof :TestForR -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi echo --- for /R @@ -984,7 +984,7 @@ set WINE_expectedresults.3=%WINE_CURDIR%\baz\. set WINE_expectedresults.4=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (.) do call temp.bat %%i +for /R %%i in (.) do call temp.bat "%%i" call :ValidateExpected echo Plain directory enumeration from provided root @@ -995,7 +995,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\foo\. if "%CD%"=="" goto :SkipBrokenNT4 call :SetExpected -for /R "%WINE_CURDIR%" %%i in (.) do call temp.bat %%i +for /R "%WINE_CURDIR%" %%i in (.) do call temp.bat "%%i" call :ValidateExpected :SkipBrokenNT4 @@ -1004,7 +1004,7 @@ set WINE_expectedresults.1=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.2=%WINE_CURDIR%\bazbaz call :SetExpected -for /R %%i in (baz*) do call temp.bat %%i +for /R %%i in (baz*) do call temp.bat "%%i" call :ValidateExpected echo File enumeration from provided root @@ -1012,7 +1012,7 @@ set WINE_expectedresults.1=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.2=%WINE_CURDIR%\bazbaz call :SetExpected -for /R %%i in (baz*) do call temp.bat %%i +for /R %%i in (baz*) do call temp.bat "%%i" call :ValidateExpected echo Mixed enumeration @@ -1024,7 +1024,7 @@ set WINE_expectedresults.5=%WINE_CURDIR%\bazbaz set WINE_expectedresults.6=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (. baz*) do call temp.bat %%i +for /R %%i in (. baz*) do call temp.bat "%%i" call :ValidateExpected echo Mixed enumeration from provided root @@ -1036,7 +1036,7 @@ set WINE_expectedresults.5=%WINE_CURDIR%\bazbaz set WINE_expectedresults.6=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (. baz*) do call temp.bat %%i +for /R %%i in (. baz*) do call temp.bat "%%i" call :ValidateExpected echo With duplicates enumeration @@ -1054,7 +1054,7 @@ set WINE_expectedresults.11=%WINE_CURDIR%\foo\fred set WINE_expectedresults.12=%WINE_CURDIR%\fred call :SetExpected -for /R %%i in (baz* bazbaz fred ba*) do call temp.bat %%i +for /R %%i in (baz* bazbaz fred ba*) do call temp.bat "%%i" call :ValidateExpected echo Strip missing wildcards, keep unwildcarded names @@ -1066,7 +1066,7 @@ set WINE_expectedresults.5=%WINE_CURDIR%\foo\jim set WINE_expectedresults.6=%WINE_CURDIR%\jim call :SetExpected -for /R %%i in (baz* fred* jim) do call temp.bat %%i +for /R %%i in (baz* fred* jim) do call temp.bat "%%i" call :ValidateExpected echo for /R passed @@ -1493,6 +1493,28 @@ cd .. rd /s/q foobar +echo ------------ Testing del ------------ +echo abc > file +echo deleting 'file' +del file +if errorlevel 0 ( + echo errorlevel is 0, good +) else ( + echo unexpected errorlevel, got %errorlevel% +) +if not exist file ( + echo successfully deleted 'file' +) else ( + echo error deleting 'file' +) +echo attempting to delete 'file', even though it is not present +del file +if errorlevel 0 ( + echo errorlevel is 0, good +) else ( + echo unexpected errorlevel, got %errorlevel% +) + echo ------------ Testing del /a ------------ del /f/q *.test > nul echo r > r.test @@ -1928,6 +1950,10 @@ cd .. & rd /s/q foobar echo ------------ Testing assoc ------------ +rem Modifying associations requires some privileges... +net session >nul 2>&1 +if errorlevel 1 goto :SkipAssoc + rem FIXME Can't test error messages in the current test system, so we have to use some kludges rem FIXME Revise once || conditional execution is fixed mkdir foobar & cd foobar @@ -1956,8 +1982,25 @@ type baz echo --- cd .. & rd /s/q foobar - +goto ContinueFType +:SkipAssoc +echo --- setting association +echo --- +echo .foo=bar +echo .foo=bar +echo +++ +echo .foo=bar +echo --- resetting association +echo --- +echo +++ +echo --- + + +:ContinueFType echo ------------ Testing ftype ------------ +rem Modifying associations requires some privileges... +net session >nul 2>&1 +if errorlevel 1 goto :SkipFType rem FIXME Can't test error messages in the current test system, so we have to use some kludges rem FIXME Revise once || conditional execution is fixed mkdir foobar & cd foobar @@ -1998,7 +2041,19 @@ set WINE_FOO= endlocal cd .. & rd /s/q foobar - +goto ContinueCall +:SkipFType +echo --- setting association +echo --- +echo footype=foo_opencmd +echo .foo=footype +echo footype=foo_opencmd +echo +++ +echo footype=foo_opencmd +echo --- resetting association +echo original value + +:ContinueCall echo ------------ Testing CALL ------------ mkdir foobar & cd foobar echo --- external script @@ -2435,7 +2490,7 @@ rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) echo --- setlocal with corresponding endlocal -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi echo @echo off> test.cmd echo echo %%WINE_VAR%%>> test.cmd @@ -2465,7 +2520,7 @@ echo echo %%WINE_VAR%%>> test.cmd echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set WINE_VAR=globalval -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi call test.cmd echo %WINE_VAR% @@ -2477,7 +2532,7 @@ set WINE_var1=one set WINE_var2= set WINE_var3= -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi setlocal set WINE_var2=two @@ -2509,7 +2564,7 @@ mkdir foodir2 2>nul mkdir foodir3 2>nul mkdir foodir4 2>nul -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_curdir=%%~dpnxi echo @echo off> 2set1end.cmd @@ -2542,7 +2597,7 @@ setlocal set WINE_var=value2 cd foodir2 -call %WINE_CURDIR%\2set1end.cmd +call "%WINE_CURDIR%\2set1end.cmd" echo Finished: echo %WINE_VAR% for /d %%i in (.) do echo %%~dpnxi @@ -2557,7 +2612,7 @@ setlocal set WINE_var=value2 cd foodir2 -call %WINE_CURDIR%\1set2end.cmd +call "%WINE_CURDIR%\1set2end.cmd" echo Finished: echo %WINE_VAR% for /d %%i in (.) do echo %%~dpnxi Modified: trunk/rostests/winetests/cmd/test_builtins.cmd.exp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cmd/test_builti… ============================================================================== --- trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] (original) +++ trunk/rostests/winetests/cmd/test_builtins.cmd.exp [iso-8859-1] Tue Mar 1 18:56:31 2016 @@ -331,7 +331,7 @@ @todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' -'--a------'@or_broken@'%~ai' +'--a------'@or_broken@'--a--------'@or_broken@'%~ai' '5'@or_broken@'%~zi' ''@or_broken@'%~ti' ''@or_broken@'%~ti' @@ -1009,6 +1009,12 @@ h=%h i=a j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=a j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o@or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +------------ Testing del ------------ +deleting 'file' +errorlevel is 0, good +successfully deleted 'file' +attempting to delete 'file', even though it is not present +errorlevel is 0, good ------------ Testing del /a ------------ not-r.test not found after delete, good r.test found before delete, good @@ -1201,7 +1207,7 @@ --- a batch file can delete itself file correctly deleted --- a batch file can alter itself -@todo_wine@bar +bar ---------- Testing copy Passed: Found expected dummy.file Passed: Found expected dir1\file1

8 years, 9 months

[akhaldi] 70844: [INCLUDE/WINE] Update test.h. By Thomas Faber. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:56:14 2016 New Revision: 70844 URL: http://svn.reactos.org/svn/reactos?rev=70844&view=rev Log: [INCLUDE/WINE] Update test.h. By Thomas Faber. CORE-10912 Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Tue Mar 1 18:56:14 2016 @@ -60,9 +60,9 @@ extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); -extern void winetest_start_todo( const char* platform ); +extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); -extern void winetest_end_todo( const char* platform ); +extern void winetest_end_todo(void); extern int winetest_get_mainargs( char*** pargv ); extern LONG winetest_get_failures(void); extern void winetest_add_failures( LONG new_failures ); @@ -135,25 +135,18 @@ #define win_skip win_skip_(__FILE__, __LINE__) #define trace trace_(__FILE__, __LINE__) -#define todo(platform) for (winetest_start_todo(platform); \ - winetest_loop_todo(); \ - winetest_end_todo(platform)) - -#define todo_ros todo("reactos") +#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) + +#define todo_ros todo_if(!strcmp(winetest_platform, "reactos")) +#define todo_ros_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "reactos")) #ifdef USE_WINE_TODOS -#define todo_wine todo_ros +#define todo_wine todo_ros +#define todo_wine_if todo_ros_if #else -#define todo_wine todo("wine") -#endif - -#ifdef USE_WINE_TODOS -#define todo_wine_if(is_todo) \ - if ((is_todo) && (!strcmp(winetest_platform, "reactos"))) \ - todo(winetest_platform) -#else -#define todo_wine_if(is_todo) \ - if ((is_todo) && (!strcmp(winetest_platform, "wine"))) \ - todo(winetest_platform) +#define todo_wine todo_if(!strcmp(winetest_platform, "wine")) +#define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) #endif @@ -260,7 +253,7 @@ { const char* current_file; /* file of current check */ int current_line; /* line of current check */ - int todo_level; /* current todo nesting level */ + unsigned int todo_level; /* current todo nesting level */ int todo_do_loop; char *str_pos; /* position in debug buffer */ char strings[2000]; /* buffer for debug strings */ @@ -448,11 +441,10 @@ __winetest_va_end(valist); } -void winetest_start_todo( const char* platform ) +void winetest_start_todo( int is_todo ) { tls_data* data=get_tls_data(); - if (strcmp(winetest_platform,platform)==0) - data->todo_level++; + data->todo_level = (data->todo_level << 1) | (is_todo != 0); data->todo_do_loop=1; } @@ -464,13 +456,10 @@ return do_loop; } -void winetest_end_todo( const char* platform ) -{ - if (strcmp(winetest_platform,platform)==0) - { - tls_data* data=get_tls_data(); - data->todo_level--; - } +void winetest_end_todo(void) +{ + tls_data* data=get_tls_data(); + data->todo_level >>= 1; } int winetest_get_mainargs( char*** pargv )

8 years, 9 months

[akhaldi] 70843: [AVIFIL32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:32:02 2016 New Revision: 70843 URL: http://svn.reactos.org/svn/reactos?rev=70843&view=rev Log: [AVIFIL32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/avifil32/api.c Modified: trunk/rostests/winetests/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/api.c?… ============================================================================== --- trunk/rostests/winetests/avifil32/api.c [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/api.c [iso-8859-1] Tue Mar 1 18:32:02 2016 @@ -375,11 +375,6 @@ create_avi_file(&cah, filename); res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); - ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); - ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); - ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); - ok(res != AVIERR_FILEOPEN, "Unable to open file: error4=%u\n", AVIERR_FILEOPEN); - ok(res != REGDB_E_CLASSNOTREG, "Unable to open file: error5=%u\n", REGDB_E_CLASSNOTREG); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream0, 0, 0);

8 years, 9 months

[akhaldi] 70842: [AVIFIL32] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:31:48 2016 New Revision: 70842 URL: http://svn.reactos.org/svn/reactos?rev=70842&view=rev Log: [AVIFIL32] Sync with Wine Staging 1.9.4. CORE-10912 Added: trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl (with props) Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.idl trunk/reactos/dll/win32/avifil32/avifile_private.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -2,9 +2,10 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D__WINESRC__) +add_definitions(-D__WINESRC__ -DENTRY_PREFIX=avifil32_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB) +add_rpcproxy_files(avifil32.idl) list(APPEND SOURCE acmstream.c @@ -17,16 +18,18 @@ icmstream.c tmpfile.c wavfile.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c avifile_private.h) add_library(avifil32 SHARED ${SOURCE} guid.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/avifil32_p.c ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) -target_link_libraries(avifil32 wine) -add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll) +target_link_libraries(avifil32 wine ${PSEH_LIB}) +add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_pch(avifil32 avifile_private.h SOURCE) add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -2256,7 +2256,7 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - va_list vl; + __ms_va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2267,8 +2267,8 @@ if (nStreams <= 0) return AVIERR_BADPARAM; - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); if (!streams || !options) { ret = AVIERR_MEMORY; @@ -2278,13 +2278,13 @@ streams[0] = pavi; options[0] = lpOptions; - va_start(vl, lpOptions); + __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { - streams[i] = va_arg(vl, void *); - options[i] = va_arg(vl, void *); + streams[i] = va_arg(vl, PAVISTREAM); + options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - va_end(vl); + __ms_va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); @@ -2299,7 +2299,7 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - va_list vl; + __ms_va_list vl; int i; HRESULT ret; PAVISTREAM *streams; @@ -2310,8 +2310,8 @@ if (nStreams <= 0) return AVIERR_BADPARAM; - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); if (!streams || !options) { ret = AVIERR_MEMORY; @@ -2321,13 +2321,13 @@ streams[0] = pavi; options[0] = lpOptions; - va_start(vl, lpOptions); + __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { - streams[i] = va_arg(vl, void *); - options[i] = va_arg(vl, void *); + streams[i] = va_arg(vl, PAVISTREAM); + options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } - va_end(vl); + __ms_va_end(vl); for (i = 0; i < nStreams; i++) TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); Modified: trunk/reactos/dll/win32/avifil32/avifil32.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.idl [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -18,39 +18,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register + +#include "avifile_ifaces.idl" + +[ + helpstring("IAVIStream & IAVIFile Proxy"), + threading(both), + uuid(0002000d-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } [ helpstring("Microsoft AVI Files"), - threading(apartment), + threading(both), uuid(00020000-0000-0000-C000-000000000046) ] coclass AVIFile { interface IAVIFile; } [ helpstring("AVI Compressed Stream"), - threading(apartment), + threading(both), uuid(00020001-0000-0000-c000-000000000046) ] coclass ICMStream { interface IAVIStream; } [ helpstring("Microsoft Wave File"), - threading(apartment), + threading(both), uuid(00020003-0000-0000-c000-000000000046) ] coclass WAVFile { interface IAVIFile; } [ - helpstring("IAVIStream & IAVIFile Proxy"), - threading(apartment), - uuid(0002000d-0000-0000-c000-000000000046) -] -coclass AVIProxy { } - -[ helpstring("ACM Compressed Audio Stream"), - threading(apartment), + threading(both), uuid(0002000f-0000-0000-c000-000000000046) ] coclass ACMStream { interface IAVIStream; } Added: trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl (added) +++ trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -0,0 +1,105 @@ +/* + * Proxy support for avifil32 + * + * Copyright 2016 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * These interface descriptions are supposed to be used for automatic proxy + * generation by an IDL compiler. + * + * While it's possible to convert include/vfw.h to an .idl, that's proved to + * be a major waste of an effort because the resulting interface descriptions + * can't be used for automatic proxy generation since they are not compatible + * with IDL compiler restrictions for proxies, and fixing them up would make + * generated vfw.h source incompatible with PSDK's equivalent. + */ + +import "wtypes.idl"; +import "unknwn.idl"; + +typedef struct _AVISTREAMINFOW +{ + DWORD fccType; + DWORD fccHandler; + DWORD dwFlags; + DWORD dwCaps; + WORD wPriority; + WORD wLanguage; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwInitialFrames; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + RECT rcFrame; + DWORD dwEditCount; + DWORD dwFormatChangeCount; + WCHAR szName[64]; +} AVISTREAMINFOW; + +[ + object, + uuid(00020021-0000-0000-c000-000000000046) +] +interface IAVIStream : IUnknown +{ + HRESULT Create(LPARAM lParam1, LPARAM lParam2); + HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); + LONG FindSample(LONG lPos, LONG lFlags); + HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); + HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); + HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); + HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); + HRESULT Delete(LONG lStart, LONG lSamples); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); +}; + +typedef struct _AVIFILEINFOW +{ + DWORD dwMaxBytesPerSec; + DWORD dwFlags; + DWORD dwCaps; + DWORD dwStreams; + DWORD dwSuggestedBufferSize; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwScale; + DWORD dwRate; + DWORD dwLength; + DWORD dwEditCount; + WCHAR szFileType[64]; +} AVIFILEINFOW; + +[ + object, + uuid(00020020-0000-0000-c000-000000000046) +] +interface IAVIFile : IUnknown +{ + HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); + HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); + HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT EndRecord(void); + HRESULT DeleteStream(DWORD fccType, LONG lParam); +}; Propchange: trunk/reactos/dll/win32/avifil32/avifile_ifaces.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_private.h [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -70,5 +70,6 @@ extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; #endif /* __AVIFILE_PRIVATE_H */ Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -179,12 +179,18 @@ */ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { + HRESULT hr; + TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); if (pclsid == NULL || piid == NULL || ppv == NULL) return E_FAIL; - return AVIFILE_CreateClassFactory(pclsid,piid,ppv); + hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv); + if (SUCCEEDED(hr)) + return hr; + + return avifil32_DllGetClassObject(pclsid,piid,ppv); } /***************************************************************************** Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Tue Mar 1 18:31:48 2016 @@ -394,8 +394,6 @@ lpbi->biSize + lpbi->biClrUsed * sizeof(RGBQUAD)); if (lpbi->biBitCount <= 8) ICDecompressGetPalette(This->hic, This->lpInFormat, This->lpOutFormat); - - return AVIERR_OK; } else { if (bBestDisplay) { ICGetDisplayFormat(This->hic, This->lpInFormat, @@ -405,64 +403,64 @@ AVIFILE_CloseCompressor(This); return AVIERR_NOCOMPRESSOR; } - - /* check output format */ - if (This->lpOutFormat->biClrUsed == 0 && - This->lpOutFormat->biBitCount <= 8) - This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; - if (This->lpOutFormat->biSizeImage == 0 && - This->lpOutFormat->biCompression == BI_RGB) { - This->lpOutFormat->biSizeImage = - DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; - } - - if (lpBits == NULL) { - DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); - - size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; - This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); - if (This->lpOutFormat == NULL) { - AVIFILE_CloseCompressor(This); - return AVIERR_MEMORY; - } - This->lpOutBuffer = DIBPTR(This->lpOutFormat); - } else - This->lpOutBuffer = lpBits; - - /* for user size was irrelevant */ - if (dx == -1) - dx = This->lpOutFormat->biWidth; - if (dy == -1) - dy = This->lpOutFormat->biHeight; - - /* need to resize? */ - if (x != 0 || y != 0) { - if (dy == This->lpOutFormat->biHeight && - dx == This->lpOutFormat->biWidth) - This->bResize = FALSE; - else - This->bResize = TRUE; - } - - if (This->bResize) { - This->x = x; - This->y = y; - This->dx = dx; - This->dy = dy; - - if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, - 0,This->lpInFormat->biWidth, - This->lpInFormat->biHeight,This->lpOutFormat, - This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) - return AVIERR_OK; - } else if (ICDecompressBegin(This->hic, This->lpInFormat, - This->lpOutFormat) == ICERR_OK) + } + + /* check output format */ + if (This->lpOutFormat->biClrUsed == 0 && + This->lpOutFormat->biBitCount <= 8) + This->lpOutFormat->biClrUsed = 1u << This->lpOutFormat->biBitCount; + if (This->lpOutFormat->biSizeImage == 0 && + This->lpOutFormat->biCompression == BI_RGB) { + This->lpOutFormat->biSizeImage = + DIBWIDTHBYTES(*This->lpOutFormat) * This->lpOutFormat->biHeight; + } + + if (lpBits == NULL) { + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + + size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; + This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); + if (This->lpOutFormat == NULL) { + AVIFILE_CloseCompressor(This); + return AVIERR_MEMORY; + } + This->lpOutBuffer = DIBPTR(This->lpOutFormat); + } else + This->lpOutBuffer = lpBits; + + /* for user size was irrelevant */ + if (dx == -1) + dx = This->lpOutFormat->biWidth; + if (dy == -1) + dy = This->lpOutFormat->biHeight; + + /* need to resize? */ + if (x != 0 || y != 0) { + if (dy == This->lpOutFormat->biHeight && + dx == This->lpOutFormat->biWidth) + This->bResize = FALSE; + else + This->bResize = TRUE; + } + + if (This->bResize) { + This->x = x; + This->y = y; + This->dx = dx; + This->dy = dy; + + if (ICDecompressExBegin(This->hic,0,This->lpInFormat,This->lpInBuffer,0, + 0,This->lpInFormat->biWidth, + This->lpInFormat->biHeight,This->lpOutFormat, + This->lpOutBuffer, x, y, dx, dy) == ICERR_OK) return AVIERR_OK; - - AVIFILE_CloseCompressor(This); - - return AVIERR_COMPRESSOR; - } + } else if (ICDecompressBegin(This->hic, This->lpInFormat, + This->lpOutFormat) == ICERR_OK) + return AVIERR_OK; + + AVIFILE_CloseCompressor(This); + + return AVIERR_COMPRESSOR; } static const struct IGetFrameVtbl igetframeVtbl = { 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] Tue Mar 1 18:31:48 2016 @@ -48,7 +48,7 @@ reactos/dll/win32/atl # Synced to WineStaging-1.9.4 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.55 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.55 -reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.4 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.4 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-1.9.4

8 years, 9 months

[akhaldi] 70841: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:26:00 2016 New Revision: 70841 URL: http://svn.reactos.org/svn/reactos?rev=70841&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/quartz/filtergraph.c Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Tue Mar 1 18:26:00 2016 @@ -255,6 +255,7 @@ { HRESULT hr; LONGLONG pos = 0xdeadbeef; + GUID format = GUID_NULL; IMediaSeeking *seeking = NULL; IMediaFilter *filter = NULL; IMediaControl *control = NULL; @@ -281,6 +282,26 @@ IMediaFilter_Release(filter); return; } + + format = GUID_NULL; + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "GetTimeFormat failed: %08x\n", hr); + ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "GetTimeFormat: unexpected format %s\n", wine_dbgstr_guid(&format)); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + + pos = 0xdeadbeef; + hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME); + ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr); + ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr);

8 years, 9 months

[akhaldi] 70840: [QUARTZ] Sync with Wine Staging 1.9.4. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:25:44 2016 New Revision: 70840 URL: http://svn.reactos.org/svn/reactos?rev=70840&view=rev Log: [QUARTZ] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -181,7 +181,7 @@ This->uIndex = 0; hr = IGraphVersion_QueryVersion(This->pVersionSource, &currentVersion); - if (!hr) + if (hr == S_OK) This->Version = currentVersion; return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -637,8 +637,9 @@ hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { - CoTaskMemFree(This->pmt); - This->pmt = NULL; + memcpy(&This->pmt->majortype, &MEDIATYPE_Stream, sizeof(GUID)); + memcpy(&This->pmt->subtype, &MEDIASUBTYPE_NULL, sizeof(GUID)); + hr = S_OK; } } else Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -1596,7 +1596,7 @@ /* Try to find a match without reading the file first */ hr = GetClassMediaFile(NULL, pszFileName, NULL, NULL, &clsid); - if (!hr) + if (hr == S_OK) return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter); /* Now create a AyncReader instance, to check for signature bytes in the file */ @@ -1638,7 +1638,7 @@ hr = GetClassMediaFile(pReader, pszFileName, NULL, NULL, &clsid); IAsyncReader_Release(pReader); - if (!hr) + if (hr == S_OK) { /* Release the AsyncReader filter and create the matching one */ IBaseFilter_Release(*filter); @@ -2462,6 +2462,9 @@ if (!pSourceFormat) pSourceFormat = &This->timeformatseek; + if (!pTargetFormat) + pTargetFormat = &This->timeformatseek; + if (IsEqualGUID(pTargetFormat, pSourceFormat)) *pTarget = Source; else @@ -2607,6 +2610,11 @@ IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pdRate); + + if (!pdRate) + return E_POINTER; + + *pdRate = 1.0; return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -141,8 +141,12 @@ return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + if (!IsEqualIID(riid, &IID_IPin) && + !IsEqualIID(riid, &IID_IVideoWindow) && + !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) + { FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + } return E_NOINTERFACE; } Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -835,25 +835,3 @@ return SendFurther( iface, deliver_newsegment, &args, NULL ); } - -static const IPinVtbl PullPin_Vtbl = -{ - PullPin_QueryInterface, - BasePinImpl_AddRef, - PullPin_Release, - BaseInputPinImpl_Connect, - PullPin_ReceiveConnection, - PullPin_Disconnect, - BasePinImpl_ConnectedTo, - BasePinImpl_ConnectionMediaType, - BasePinImpl_QueryPinInfo, - BasePinImpl_QueryDirection, - BasePinImpl_QueryId, - PullPin_QueryAccept, - BasePinImpl_EnumMediaTypes, - BasePinImpl_QueryInternalConnections, - PullPin_EndOfStream, - PullPin_BeginFlush, - PullPin_EndFlush, - PullPin_NewSegment -}; Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Tue Mar 1 18:25:44 2016 @@ -19,6 +19,8 @@ */ #include "quartz_private.h" + +#include <uuids.h> /* * Near the bottom of this file are the exported DllRegisterServer and @@ -798,6 +800,11 @@ "0, 10, FFFFFF00000080808080, 494433000000000000", NULL } }, + { &MEDIATYPE_Stream, + &MEDIASUBTYPE_MPEG2_PROGRAM, + { "0, 5, FFFFFFFFC0, 000001BA40", + NULL } + }, { &MEDIATYPE_Stream, &MEDIASUBTYPE_QTMovie, { "4, 4, , 6d646174", 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] Tue Mar 1 18:25:44 2016 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.9.4 reactos/dll/win32/activeds # Synced to WineStaging-1.7.55

8 years, 9 months

[akhaldi] 70839: [INCLUDE/WINE] Update winternl.h. CORE-10912

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:21:47 2016 New Revision: 70839 URL: http://svn.reactos.org/svn/reactos?rev=70839&view=rev Log: [INCLUDE/WINE] Update winternl.h. CORE-10912 Modified: trunk/reactos/include/reactos/wine/winternl.h Modified: trunk/reactos/include/reactos/wine/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winte… ============================================================================== --- trunk/reactos/include/reactos/wine/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winternl.h [iso-8859-1] Tue Mar 1 18:21:47 2016 @@ -843,26 +843,35 @@ SystemVerifierInformation = 51, SystemAddVerifier = 52, SystemSessionProcessesInformation = 53, - Unknown54, - Unknown55, - Unknown56, - Unknown57, - Unknown58, - Unknown59, - Unknown60, - Unknown61, - Unknown62, - Unknown63, - Unknown64, - Unknown65, - Unknown66, - Unknown67, - Unknown68, - Unknown69, - Unknown70, - Unknown71, - Unknown72, + SystemLoadGdiDriverInSystemSpace = 54, + SystemNumaProcessorMap = 55, + SystemPrefetcherInformation = 56, + SystemExtendedProcessInformation = 57, + SystemRecommendedSharedDataAlignment = 58, + SystemComPlusPackage = 59, + SystemNumaAvailableMemory = 60, + SystemProcessorPowerInformation = 61, + SystemEmulationBasicInformation = 62, + SystemEmulationProcessorInformation = 63, + SystemExtendedHandleInformation = 64, + SystemLostDelayedWriteInformation = 65, + SystemBigPoolInformation = 66, + SystemSessionPoolTagInformation = 67, + SystemSessionMappedViewInformation = 68, + SystemHotpatchInformation = 69, + SystemObjectSecurityMode = 70, + SystemWatchdogTimerHandler = 71, + SystemWatchdogTimerInformation = 72, SystemLogicalProcessorInformation = 73, + SystemWow64SharedInformation = 74, + SystemRegisterFirmwareTableInformationHandler = 75, + SystemFirmwareTableInformation = 76, + SystemModuleInformationEx = 77, + SystemVerifierTriageInformation = 78, + SystemSuperfetchInformation = 79, + SystemMemoryListInformation = 80, + SystemFileCacheInformationEx = 81, + SystemLogicalProcessorInformationEx = 107, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS; @@ -1912,6 +1921,15 @@ ULONG_PTR SectionSize; UCHAR Data[ANYSIZE_ARRAY]; } LPC_MESSAGE, *PLPC_MESSAGE; + +typedef struct _RTL_USER_PROCESS_INFORMATION +{ + ULONG Length; + HANDLE Process; + HANDLE Thread; + CLIENT_ID ClientId; + SECTION_IMAGE_INFORMATION ImageInformation; +} RTL_USER_PROCESS_INFORMATION, *PRTL_USER_PROCESS_INFORMATION; typedef enum _SHUTDOWN_ACTION { ShutdownNoReboot, @@ -2204,11 +2222,11 @@ NTSYSAPI NTSTATUS WINAPI NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); -NTSYSAPI NTSTATUS WINAPI NtOpenEventPair(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenEventPair(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); NTSYSAPI NTSTATUS WINAPI NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); @@ -2222,7 +2240,7 @@ NTSYSAPI NTSTATUS WINAPI NtOpenProcessTokenEx(HANDLE,DWORD,DWORD,HANDLE *); NTSYSAPI NTSTATUS WINAPI NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINAPI NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); NTSYSAPI NTSTATUS WINAPI NtOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); NTSYSAPI NTSTATUS WINAPI NtOpenThreadTokenEx(HANDLE,DWORD,BOOLEAN,DWORD,HANDLE *); @@ -2264,6 +2282,7 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING,PWCHAR,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtQuerySystemTime(PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG); @@ -2414,6 +2433,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); +NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); NTSYSAPI PVOID WINAPI RtlDecodePointer(PVOID);

8 years, 9 months

[akhaldi] 70838: [DXSDK] Add missing ksuuids.h inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Mar 1 18:15:48 2016 New Revision: 70838 URL: http://svn.reactos.org/svn/reactos?rev=70838&view=rev Log: [DXSDK] Add missing ksuuids.h inclusion. Modified: trunk/reactos/include/dxsdk/uuids.h Modified: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] Tue Mar 1 18:15:48 2016 @@ -278,4 +278,6 @@ OUR_GUID_ENTRY(CLSID_VideoMixingRenderer, 0xb87beb7b, 0x8d29, 0x423f, 0xae, 0x4d, 0x65, 0x82, 0xc1, 0x01, 0x75, 0xac) OUR_GUID_ENTRY(CLSID_VideoMixingRenderer9, 0x51b4abf3, 0x748f, 0x4e3b, 0xa2, 0x76, 0xc8, 0x28, 0x33, 0x0e, 0x92, 0x6a) +#include <ksuuids.h> + #undef OUR_GUID_ENTRY

8 years, 9 months

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 March 2016