Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64323: [COMCTL32_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 00:19:59 2014 New Revision: 64323 URL: http://svn.reactos.org/svn/reactos?rev=64323&view=rev Log: [COMCTL32_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/comctl32/button.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/msg.h trunk/rostests/winetests/comctl32/syslink.c trunk/rostests/winetests/comctl32/tab.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.c trunk/rostests/winetests/comctl32/treeview.c trunk/rostests/winetests/comctl32/updown.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] Sat Sep 27 00:19:59 2014 @@ -748,10 +748,10 @@ ok(lstrcmpW(nameW, WC_BUTTONW), "got %s\n", wine_dbgstr_w(nameW)); ret = GetClassInfoExW(NULL, nameW, &ex2W); -todo_wine { +todo_wine ok(ret, "got %d\n", ret); +if (ret) /* TODO: remove once Wine is fixed */ ok(ex2W.lpfnWndProc == exW.lpfnWndProc, "got %p, %p\n", exW.lpfnWndProc, ex2W.lpfnWndProc); -} /* Check reported class name */ hwnd = create_button(BS_CHECKBOX, NULL); 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] Sat Sep 27 00:19:59 2014 @@ -1481,6 +1481,7 @@ static void test_iimagelist(void) { IImageList *imgl, *imgl2; + IImageList2 *imagelist; HIMAGELIST himl; HRESULT hr; ULONG ret; @@ -1545,6 +1546,16 @@ IImageList_Release(imgl); ImageList_Destroy(himl); + + /* IImageList2 */ + hr = pImageList_CoCreateInstance(&CLSID_ImageList, NULL, &IID_IImageList2, (void**)&imagelist); + if (hr != S_OK) + { + win_skip("IImageList2 is not supported.\n"); + return; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + IImageList2_Release(imagelist); } static void test_hotspot_v6(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] Sat Sep 27 00:19:59 2014 @@ -3,7 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov - * Copyright 2009-2013 Nikolay Sivov + * Copyright 2009-2014 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,12 +31,15 @@ #include "v6util.h" #include "msg.h" -#define PARENT_SEQ_INDEX 0 -#define PARENT_FULL_SEQ_INDEX 1 -#define LISTVIEW_SEQ_INDEX 2 -#define EDITBOX_SEQ_INDEX 3 -#define COMBINED_SEQ_INDEX 4 -#define NUM_MSG_SEQUENCES 5 +enum seq_index { + PARENT_SEQ_INDEX, + PARENT_FULL_SEQ_INDEX, + PARENT_CD_SEQ_INDEX, + LISTVIEW_SEQ_INDEX, + EDITBOX_SEQ_INDEX, + COMBINED_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -389,6 +392,26 @@ { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_report_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT|CDDS_SUBITEM }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, + { 0 } +}; + +static const struct message parent_list_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, { 0 } }; @@ -1761,24 +1784,36 @@ DestroyWindow(hwnd); } -static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { COLORREF clr, c0ffee = RGB(0xc0, 0xff, 0xee); - if(msg == WM_NOTIFY) { - NMHDR *nmhdr = (PVOID)lp; + if(message == WM_NOTIFY) { + NMHDR *nmhdr = (NMHDR*)lParam; if(nmhdr->code == NM_CUSTOMDRAW) { NMLVCUSTOMDRAW *nmlvcd = (NMLVCUSTOMDRAW*)nmhdr; + struct message msg; + + msg.message = message; + msg.flags = sent|wparam|lparam|custdraw; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = nmhdr->code; + msg.stage = nmlvcd->nmcd.dwDrawStage; + add_message(sequences, PARENT_CD_SEQ_INDEX, &msg); switch(nmlvcd->nmcd.dwDrawStage) { case CDDS_PREPAINT: SetBkColor(nmlvcd->nmcd.hdc, c0ffee); - return CDRF_NOTIFYITEMDRAW; + return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: nmlvcd->clrTextBk = CLR_DEFAULT; - return CDRF_NOTIFYSUBITEMDRAW; + nmlvcd->clrText = RGB(0, 255, 0); + return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); if (nmlvcd->iSubItem) todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); else @@ -1787,13 +1822,15 @@ case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; } return CDRF_DODEFAULT; } } - return DefWindowProcA(hwnd, msg, wp, lp); + return DefWindowProcA(hwnd, message, wParam, lParam); } static void test_customdraw(void) @@ -1813,8 +1850,26 @@ InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); + /* message tests */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE); + + DestroyWindow(hwnd); + + hwnd = create_listview_control(LVS_LIST); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_list_cd_seq, "parent customdraw, LVS_LIST", FALSE); + SetWindowLongPtrA(hwndparent, GWLP_WNDPROC, (LONG_PTR)oldwndproc); - DestroyWindow(hwnd); } Modified: trunk/rostests/winetests/comctl32/msg.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.h?… ============================================================================== --- trunk/rostests/winetests/comctl32/msg.h [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/msg.h [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -38,7 +38,8 @@ optional = 0x80, hook = 0x100, winevent_hook =0x200, - id = 0x400 + id = 0x400, + custdraw = 0x800 } msg_flags_t; struct message @@ -49,6 +50,7 @@ LPARAM lParam; /* expected value of lParam */ UINT id; /* extra message data: id of the window, notify code etc. */ + DWORD stage; /* custom draw stage */ }; struct msg_sequence @@ -80,12 +82,7 @@ assert(msg_seq->sequence); - msg_seq->sequence[msg_seq->count].message = msg->message; - msg_seq->sequence[msg_seq->count].flags = msg->flags; - msg_seq->sequence[msg_seq->count].wParam = msg->wParam; - msg_seq->sequence[msg_seq->count].lParam = msg->lParam; - msg_seq->sequence[msg_seq->count].id = msg->id; - + msg_seq->sequence[msg_seq->count] = *msg; msg_seq->count++; } @@ -105,6 +102,68 @@ flush_sequence(seq, i); } +static void dump_sequence( struct msg_sequence **seq, int sequence_index, + const struct message *expected, const char *context, + const char *file, int line ) +{ + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *actual, *sequence; + unsigned int count = 0; + + sequence = msg_seq->sequence; + actual = sequence; + + trace_(file, line)("Failed sequence %s:\n", context ); + while (expected->message && actual->message) + { + trace_(file, line)( " %u: expected: %04x - actual: %04x wp %08lx lp %08lx\n", + count, expected->message, actual->message, actual->wParam, actual->lParam ); + + if (expected->message == actual->message) + { + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } + } + else + { + expected++; + actual++; + } + count++; + } + + /* optional trailing messages */ + while (expected->message && expected->flags & optional) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + expected++; + count++; + } + + if (expected->message) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + return; + } + + while (actual->message) + { + trace_(file, line)( " %u: expected: nothing - actual: %04x wp %08lx lp %08lx\n", + count, actual->message, actual->wParam, actual->lParam ); + actual++; + count++; + } +} + static void ok_sequence_(struct msg_sequence **seq, int sequence_index, const struct message *expected, const char *context, BOOL todo, const char *file, int line) @@ -112,7 +171,7 @@ struct msg_sequence *msg_seq = seq[sequence_index]; static const struct message end_of_sequence = {0, 0, 0, 0}; const struct message *actual, *sequence; - int failcount = 0; + int failcount = 0, dump = 0; add_message(seq, sequence_index, &end_of_sequence); @@ -121,8 +180,6 @@ while (expected->message && actual->message) { - trace_( file, line)("expected %04x - actual %04x\n", expected->message, actual->message); - if (expected->message == actual->message) { if (expected->flags & wparam) @@ -132,6 +189,7 @@ todo_wine { failcount++; + dump++; ok_(file, line) (FALSE, "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", context, expected->message, expected->wParam, actual->wParam); @@ -142,6 +200,7 @@ ok_(file, line) (expected->wParam == actual->wParam, "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", context, expected->message, expected->wParam, actual->wParam); + if (expected->wParam != actual->wParam) dump++; } } @@ -152,6 +211,7 @@ todo_wine { failcount++; + dump++; ok_(file, line) (FALSE, "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", context, expected->message, expected->lParam, actual->lParam); @@ -162,21 +222,45 @@ ok_(file, line) (expected->lParam == actual->lParam, "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", context, expected->message, expected->lParam, actual->lParam); - } - } - - if (expected->flags & id) - { - if (expected->id != actual->id && expected->flags & optional) - { - expected++; - continue; - } - if (expected->id != actual->id && todo) + if (expected->lParam != actual->lParam) dump++; + } + } + + if (expected->flags & custdraw) + { + if (expected->stage != actual->stage && todo) { todo_wine { failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + } + } + else + { + ok_(file, line) (expected->stage == actual->stage, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + if (expected->stage != actual->stage) dump++; + } + } + + if (expected->flags & id) + { + if (expected->id != actual->id && expected->flags & optional) + { + expected++; + continue; + } + if (expected->id != actual->id && todo) + { + todo_wine + { + failcount++; + dump++; ok_(file, line) (FALSE, "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", context, expected->message, expected->id, actual->id); @@ -187,6 +271,7 @@ ok_(file, line) (expected->id == actual->id, "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", context, expected->message, expected->id, actual->id); + if (expected->id != actual->id) dump++; } } @@ -195,6 +280,7 @@ todo_wine { failcount++; + dump++; ok_(file, line) (FALSE, "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); @@ -205,23 +291,34 @@ ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc), "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + if ((expected->flags & defwinproc) != (actual->flags & defwinproc)) dump++; } ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint), "%s: the msg 0x%04x should %shave been sent by BeginPaint\n", context, expected->message, (expected->flags & beginpaint) ? "" : "NOT "); + if ((expected->flags & beginpaint) != (actual->flags & beginpaint)) dump++; + ok_(file, line) ((expected->flags & (sent|posted)) == (actual->flags & (sent|posted)), "%s: the msg 0x%04x should have been %s\n", context, expected->message, (expected->flags & posted) ? "posted" : "sent"); + if ((expected->flags & (sent|posted)) != (actual->flags & (sent|posted))) dump++; + ok_(file, line) ((expected->flags & parent) == (actual->flags & parent), "%s: the msg 0x%04x was expected in %s\n", context, expected->message, (expected->flags & parent) ? "parent" : "child"); + if ((expected->flags & parent) != (actual->flags & parent)) dump++; + ok_(file, line) ((expected->flags & hook) == (actual->flags & hook), "%s: the msg 0x%04x should have been sent by a hook\n", context, expected->message); + if ((expected->flags & hook) != (actual->flags & hook)) dump++; + ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), "%s: the msg 0x%04x should have been sent by a winevent hook\n", context, expected->message); + if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) dump++; + expected++; actual++; } @@ -230,19 +327,19 @@ else if (todo) { failcount++; + dump++; todo_wine { ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, expected->message, actual->message); } - - flush_sequence(seq, sequence_index); - return; + goto done; } else { ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, expected->message, actual->message); + dump++; expected++; actual++; } @@ -259,6 +356,7 @@ if (expected->message || actual->message) { failcount++; + dump++; ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", context, expected->message, actual->message); } @@ -266,18 +364,22 @@ } else if (expected->message || actual->message) { + dump++; ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", context, expected->message, actual->message); } if(todo && !failcount) /* succeeded yet marked todo */ { + dump++; todo_wine { ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); } } +done: + if (dump) dump_sequence( seq, sequence_index, expected, context, file, line ); flush_sequence(seq, sequence_index); } Modified: trunk/rostests/winetests/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/syslin… ============================================================================== --- trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/syslink.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -94,8 +94,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -151,8 +149,6 @@ LRESULT ret; struct message msg; - trace("syslink: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; Modified: trunk/rostests/winetests/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/tab.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -344,8 +344,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -409,8 +407,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("tab: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -160,7 +160,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hWnd, message, wParam, lParam); add_message(sequences, PARENT_SEQ_INDEX, &msg); } 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] Sat Sep 27 00:19:59 2014 @@ -470,6 +470,7 @@ tiW.hwnd = NULL; tiW.uId = 0x1234ABCD; tiW.lParam = 0xaaaaaaaa; + tiW.lpszText = NULL; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); ok(0x1abe11ed == tiW.lParam || 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] Sat Sep 27 00:19:59 2014 @@ -387,8 +387,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -435,8 +433,6 @@ static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; - - trace("trackbar: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam; 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] Sat Sep 27 00:19:59 2014 @@ -40,10 +40,12 @@ static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; - -#define NUM_MSG_SEQUENCES 2 +static HFONT g_customdraw_font; + +#define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 #define PARENT_SEQ_INDEX 1 +#define PARENT_CD_SEQ_INDEX 2 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -204,7 +206,7 @@ }; static const struct message parent_expand_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, { WM_CHANGEUISTATE, sent|optional }, @@ -219,7 +221,7 @@ }; static const struct message parent_expand_empty_kb_seq[] = { - { WM_NOTIFY, sent|id|optional, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -239,6 +241,21 @@ }; static const struct message empty_seq[] = { + { 0 } +}; + +static const struct message parent_cd_seq[] = { + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, + { 0 } +}; + +static const struct message parent_vk_return_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TVN_KEYDOWN }, + { WM_NOTIFY, sent|id, 0, 0, NM_RETURN }, + { WM_CHANGEUISTATE, sent|optional }, { 0 } }; @@ -1017,7 +1034,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hWnd, message, wParam, lParam); add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -1149,6 +1165,38 @@ break; } + case NM_CUSTOMDRAW: + { + NMTVCUSTOMDRAW *nmcd = (NMTVCUSTOMDRAW*)lParam; + COLORREF c0ffee = RGB(0xc0,0xff,0xee), cafe = RGB(0xca,0xfe,0x00); + + msg.flags |= custdraw; + msg.stage = nmcd->nmcd.dwDrawStage; + add_message(sequences, PARENT_CD_SEQ_INDEX, &msg); + + switch (msg.stage) + { + case CDDS_PREPAINT: + return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYITEMERASE|CDRF_NOTIFYPOSTPAINT; + case CDDS_ITEMPREPAINT: + nmcd->clrTextBk = c0ffee; + nmcd->clrText = cafe; + if (g_customdraw_font) + SelectObject(nmcd->nmcd.hdc, g_customdraw_font); + return CDRF_NOTIFYPOSTPAINT|CDRF_NEWFONT; + case CDDS_ITEMPOSTPAINT: + /* at the point of post paint notification colors are already restored */ + ok(GetTextColor(nmcd->nmcd.hdc) != cafe, "got 0%x\n", GetTextColor(nmcd->nmcd.hdc)); + ok(GetBkColor(nmcd->nmcd.hdc) != c0ffee, "got 0%x\n", GetBkColor(nmcd->nmcd.hdc)); + if (g_customdraw_font) + ok(GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT) != g_customdraw_font, "got %p\n", + GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT)); + break; + default: + ; + } + break; + } } } break; @@ -2051,6 +2099,60 @@ ok(code == (DLGC_WANTCHARS | DLGC_WANTARROWS), "0x%08x\n", code); DestroyWindow(hTree); +} + +static void test_customdraw(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + LOGFONTA lf; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + /* create additional font, custom draw handler will select it */ + SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); + lf.lfHeight *= 2; + g_customdraw_font = CreateFontIndirectA(&lf); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + InvalidateRect(hwnd, NULL, TRUE); + UpdateWindow(hwnd); + ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_cd_seq, "custom draw notifications", FALSE); + DeleteObject(g_customdraw_font); + g_customdraw_font = NULL; + + DestroyWindow(hwnd); +} + +static void test_WM_KEYDOWN(void) +{ + static const char *rootA = "root"; + TVINSERTSTRUCTA ins; + HTREEITEM hRoot; + HWND hwnd; + + hwnd = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = (char*)rootA; + hRoot = TreeView_InsertItemA(hwnd, &ins); + ok(hRoot != NULL, "got %p\n", hRoot); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_KEYDOWN, VK_RETURN, 0); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_vk_return_seq, "WM_KEYDOWN/VK_RETURN parent notification", TRUE); + + DestroyWindow(hwnd); } START_TEST(treeview) @@ -2126,6 +2228,8 @@ test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); test_WM_GETDLGCODE(); + test_customdraw(); + test_WM_KEYDOWN(); if (!load_v6_module(&ctx_cookie, &hCtx)) { Modified: trunk/rostests/winetests/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/updown… ============================================================================== --- trunk/rostests/winetests/comctl32/updown.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/updown.c [iso-8859-1] Sat Sep 27 00:19:59 2014 @@ -182,8 +182,6 @@ message != WM_GETICON && message != WM_DEVICECHANGE) { - trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -237,8 +235,6 @@ LRESULT ret; struct message msg; - trace("edit: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -278,8 +274,6 @@ static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; - - trace("updown: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam;

1 0

[akhaldi] 64322: [COMCTL32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 00:19:40 2014 New Revision: 64322 URL: http://svn.reactos.org/svn/reactos?rev=64322&view=rev Log: [COMCTL32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE 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] Sat Sep 27 00:19:40 2014 @@ -48,8 +48,7 @@ struct _IMAGELIST { - const struct IImageListVtbl *lpVtbl; /* 00: IImageList vtable */ - + IImageList2 IImageList2_iface; /* 00: IImageList vtable */ INT cCurImage; /* 04: ImageCount */ INT cMaxImage; /* 08: maximages */ INT cGrow; /* 0C: cGrow */ @@ -116,9 +115,14 @@ static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, 0, FALSE, 0 }; +static inline HIMAGELIST impl_from_IImageList2(IImageList2 *iface) +{ + return CONTAINING_RECORD(iface, struct _IMAGELIST, IImageList2_iface); +} + static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); -static inline BOOL is_valid(HIMAGELIST himl); +static BOOL is_valid(HIMAGELIST himl); /* * An imagelist with N images is tiled like this: @@ -2053,13 +2057,13 @@ * RETURNS * Success: The newly created image list. It contains a single image * consisting of the second image merged with the first. - * Failure: NULL, if either himl1 or himl2 are invalid. + * Failure: NULL, if either himl1 or himl2 is invalid. * * NOTES * - The returned image list should be deleted by the caller using * ImageList_Destroy() when it is no longer required. - * - If either i1 or i2 are not valid image indices they will be treated - * as a blank image. + * - If either i1 or i2 is not a valid image index, they will be treated + * as blank images. */ HIMAGELIST WINAPI ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, @@ -2363,6 +2367,12 @@ for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; + if (himl->has_alpha) + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + } + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage); @@ -3183,38 +3193,43 @@ * IImageList implementation */ -static HRESULT WINAPI ImageListImpl_QueryInterface(IImageList *iface, +static HRESULT WINAPI ImageListImpl_QueryInterface(IImageList2 *iface, REFIID iid, void **ppv) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; - if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IImageList, iid)) - *ppv = This; + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IImageList, iid) || + IsEqualIID(&IID_IImageList2, iid)) + { + *ppv = &imgl->IImageList2_iface; + } else { *ppv = NULL; return E_NOINTERFACE; } - IUnknown_AddRef((IUnknown*)*ppv); + IImageList2_AddRef(iface); return S_OK; } -static ULONG WINAPI ImageListImpl_AddRef(IImageList *iface) -{ - HIMAGELIST This = (HIMAGELIST) iface; - ULONG ref = InterlockedIncrement(&This->ref); +static ULONG WINAPI ImageListImpl_AddRef(IImageList2 *iface) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + ULONG ref = InterlockedIncrement(&imgl->ref); TRACE("(%p) refcount=%u\n", iface, ref); return ref; } -static ULONG WINAPI ImageListImpl_Release(IImageList *iface) -{ - HIMAGELIST This = (HIMAGELIST) iface; +static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) +{ + HIMAGELIST This = impl_from_IImageList2(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -3233,7 +3248,7 @@ if (This->hbrBlend25) DeleteObject (This->hbrBlend25); if (This->hbrBlend50) DeleteObject (This->hbrBlend50); - This->lpVtbl = NULL; + This->IImageList2_iface.lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This->has_alpha); HeapFree(GetProcessHeap(), 0, This); } @@ -3241,16 +3256,16 @@ return ref; } -static HRESULT WINAPI ImageListImpl_Add(IImageList *iface, HBITMAP hbmImage, +static HRESULT WINAPI ImageListImpl_Add(IImageList2 *iface, HBITMAP hbmImage, HBITMAP hbmMask, int *pi) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); int ret; if (!pi) return E_FAIL; - ret = ImageList_Add(This, hbmImage, hbmMask); + ret = ImageList_Add(imgl, hbmImage, hbmMask); if (ret == -1) return E_FAIL; @@ -3259,16 +3274,16 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_ReplaceIcon(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_ReplaceIcon(IImageList2 *iface, int i, HICON hicon, int *pi) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); int ret; if (!pi) return E_FAIL; - ret = ImageList_ReplaceIcon(This, i, hicon); + ret = ImageList_ReplaceIcon(imgl, i, hicon); if (ret == -1) return E_FAIL; @@ -3277,30 +3292,30 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_SetOverlayImage(IImageList *iface, +static HRESULT WINAPI ImageListImpl_SetOverlayImage(IImageList2 *iface, int iImage, int iOverlay) { - return ImageList_SetOverlayImage((HIMAGELIST) iface, iImage, iOverlay) - ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_Replace(IImageList *iface, int i, + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_SetOverlayImage(imgl, iImage, iOverlay) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_Replace(IImageList2 *iface, int i, HBITMAP hbmImage, HBITMAP hbmMask) { - return ImageList_Replace((HIMAGELIST) iface, i, hbmImage, hbmMask) ? S_OK : - E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_AddMasked(IImageList *iface, HBITMAP hbmImage, + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_Replace(imgl, i, hbmImage, hbmMask) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_AddMasked(IImageList2 *iface, HBITMAP hbmImage, COLORREF crMask, int *pi) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); int ret; if (!pi) return E_FAIL; - ret = ImageList_AddMasked(This, hbmImage, crMask); + ret = ImageList_AddMasked(imgl, hbmImage, crMask); if (ret == -1) return E_FAIL; @@ -3309,17 +3324,17 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_Draw(IImageList *iface, +static HRESULT WINAPI ImageListImpl_Draw(IImageList2 *iface, IMAGELISTDRAWPARAMS *pimldp) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); HIMAGELIST old_himl; int ret; /* As far as I can tell, Windows simply ignores the contents of pimldp->himl so we shall simulate the same */ old_himl = pimldp->himl; - pimldp->himl = This; + pimldp->himl = imgl; ret = ImageList_DrawIndirect(pimldp); @@ -3327,20 +3342,22 @@ return ret ? S_OK : E_INVALIDARG; } -static HRESULT WINAPI ImageListImpl_Remove(IImageList *iface, int i) -{ - return (ImageList_Remove((HIMAGELIST) iface, i) == 0) ? E_INVALIDARG : S_OK; -} - -static HRESULT WINAPI ImageListImpl_GetIcon(IImageList *iface, int i, UINT flags, +static HRESULT WINAPI ImageListImpl_Remove(IImageList2 *iface, int i) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + return (ImageList_Remove(imgl, i) == 0) ? E_INVALIDARG : S_OK; +} + +static HRESULT WINAPI ImageListImpl_GetIcon(IImageList2 *iface, int i, UINT flags, HICON *picon) { + HIMAGELIST imgl = impl_from_IImageList2(iface); HICON hIcon; if (!picon) return E_FAIL; - hIcon = ImageList_GetIcon((HIMAGELIST) iface, i, flags); + hIcon = ImageList_GetIcon(imgl, i, flags); if (hIcon == NULL) return E_FAIL; @@ -3349,28 +3366,29 @@ return S_OK; } -static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_GetImageInfo(IImageList2 *iface, int i, IMAGEINFO *pImageInfo) { - return ImageList_GetImageInfo((HIMAGELIST) iface, i, pImageInfo) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, - IUnknown *punkSrc, int iSrc, UINT uFlags) -{ - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_GetImageInfo(imgl, i, pImageInfo) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_Copy(IImageList2 *iface, int dst_index, + IUnknown *unk_src, int src_index, UINT flags) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); IImageList *src = NULL; HRESULT ret; - if (!punkSrc) + if (!unk_src) return E_FAIL; /* TODO: Add test for IID_ImageList2 too */ - if (FAILED(IUnknown_QueryInterface(punkSrc, &IID_IImageList, + if (FAILED(IUnknown_QueryInterface(unk_src, &IID_IImageList, (void **) &src))) return E_FAIL; - if (ImageList_Copy(This, iDst, (HIMAGELIST) src, iSrc, uFlags)) + if (ImageList_Copy(imgl, dst_index, (HIMAGELIST) src, src_index, flags)) ret = S_OK; else ret = E_FAIL; @@ -3379,12 +3397,12 @@ return ret; } -static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, +static HRESULT WINAPI ImageListImpl_Merge(IImageList2 *iface, int i1, IUnknown *punk2, int i2, int dx, int dy, REFIID riid, void **ppv) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); IImageList *iml2 = NULL; - HIMAGELIST hNew; + HIMAGELIST merged; HRESULT ret = E_FAIL; TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv); @@ -3394,126 +3412,126 @@ (void **) &iml2))) return E_FAIL; - hNew = ImageList_Merge(This, i1, (HIMAGELIST) iml2, i2, dx, dy); + merged = ImageList_Merge(imgl, i1, (HIMAGELIST) iml2, i2, dx, dy); /* Get the interface for the new image list */ - if (hNew) - { - IImageList *imerge = (IImageList*)hNew; - - ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); - IImageList_Release(imerge); + if (merged) + { + ret = HIMAGELIST_QueryInterface(merged, riid, ppv); + ImageList_Destroy(merged); } IImageList_Release(iml2); return ret; } -static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, void **ppv) -{ - HIMAGELIST This = (HIMAGELIST) iface; +static HRESULT WINAPI ImageListImpl_Clone(IImageList2 *iface, REFIID riid, void **ppv) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); HIMAGELIST clone; HRESULT ret = E_FAIL; TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - clone = ImageList_Duplicate(This); + clone = ImageList_Duplicate(imgl); /* Get the interface for the new image list */ if (clone) { - IImageList *iclone = (IImageList*)clone; - ret = HIMAGELIST_QueryInterface(clone, riid, ppv); - IImageList_Release(iclone); + ImageList_Destroy(clone); } return ret; } -static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_GetImageRect(IImageList2 *iface, int i, RECT *prc) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST imgl = impl_from_IImageList2(iface); IMAGEINFO info; if (!prc) return E_FAIL; - if (!ImageList_GetImageInfo(This, i, &info)) + if (!ImageList_GetImageInfo(imgl, i, &info)) return E_FAIL; return CopyRect(prc, &info.rcImage) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx, +static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList2 *iface, int *cx, int *cy) { - HIMAGELIST This = (HIMAGELIST) iface; - - return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_INVALIDARG; -} - -static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_GetIconSize(imgl, cx, cy) ? S_OK : E_INVALIDARG; +} + +static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList2 *iface, int cx, int cy) { - return ImageList_SetIconSize((HIMAGELIST) iface, cx, cy) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) -{ - *pi = ImageList_GetImageCount((HIMAGELIST) iface); + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_SetIconSize(imgl, cx, cy) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList2 *iface, int *pi) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + *pi = ImageList_GetImageCount(imgl); return S_OK; } -static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList *iface, - UINT uNewCount) -{ - return ImageList_SetImageCount((HIMAGELIST) iface, uNewCount) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList *iface, COLORREF clrBk, +static HRESULT WINAPI ImageListImpl_SetImageCount(IImageList2 *iface, UINT count) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_SetImageCount(imgl, count) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_SetBkColor(IImageList2 *iface, COLORREF clrBk, COLORREF *pclr) { - *pclr = ImageList_SetBkColor((HIMAGELIST) iface, clrBk); + HIMAGELIST imgl = impl_from_IImageList2(iface); + *pclr = ImageList_SetBkColor(imgl, clrBk); return S_OK; } -static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList *iface, COLORREF *pclr) -{ - *pclr = ImageList_GetBkColor((HIMAGELIST) iface); +static HRESULT WINAPI ImageListImpl_GetBkColor(IImageList2 *iface, COLORREF *pclr) +{ + HIMAGELIST imgl = impl_from_IImageList2(iface); + *pclr = ImageList_GetBkColor(imgl); return S_OK; } -static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList *iface, int iTrack, +static HRESULT WINAPI ImageListImpl_BeginDrag(IImageList2 *iface, int iTrack, int dxHotspot, int dyHotspot) { - return ImageList_BeginDrag((HIMAGELIST) iface, iTrack, dxHotspot, dyHotspot) ? S_OK : E_FAIL; -} - -static HRESULT WINAPI ImageListImpl_EndDrag(IImageList *iface) + HIMAGELIST imgl = impl_from_IImageList2(iface); + return ImageList_BeginDrag(imgl, iTrack, dxHotspot, dyHotspot) ? S_OK : E_FAIL; +} + +static HRESULT WINAPI ImageListImpl_EndDrag(IImageList2 *iface) { ImageList_EndDrag(); return S_OK; } -static HRESULT WINAPI ImageListImpl_DragEnter(IImageList *iface, HWND hwndLock, +static HRESULT WINAPI ImageListImpl_DragEnter(IImageList2 *iface, HWND hwndLock, int x, int y) { return ImageList_DragEnter(hwndLock, x, y) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_DragLeave(IImageList *iface, HWND hwndLock) +static HRESULT WINAPI ImageListImpl_DragLeave(IImageList2 *iface, HWND hwndLock) { return ImageList_DragLeave(hwndLock) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_DragMove(IImageList *iface, int x, int y) +static HRESULT WINAPI ImageListImpl_DragMove(IImageList2 *iface, int x, int y) { return ImageList_DragMove(x, y) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList *iface, +static HRESULT WINAPI ImageListImpl_SetDragCursorImage(IImageList2 *iface, IUnknown *punk, int iDrag, int dxHotspot, int dyHotspot) { IImageList *iml2 = NULL; @@ -3535,12 +3553,12 @@ return ret ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_DragShowNolock(IImageList *iface, BOOL fShow) +static HRESULT WINAPI ImageListImpl_DragShowNolock(IImageList2 *iface, BOOL fShow) { return ImageList_DragShowNolock(fShow) ? S_OK : E_FAIL; } -static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList *iface, POINT *ppt, +static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList2 *iface, POINT *ppt, POINT *pptHotspot, REFIID riid, PVOID *ppv) { HRESULT ret = E_FAIL; @@ -3563,17 +3581,17 @@ return ret; } -static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList *iface, int i, +static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList2 *iface, int i, DWORD *dwFlags) { FIXME("STUB: %p %d %p\n", iface, i, dwFlags); return E_NOTIMPL; } -static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList *iface, int iOverlay, +static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList2 *iface, int iOverlay, int *piIndex) { - HIMAGELIST This = (HIMAGELIST) iface; + HIMAGELIST This = impl_from_IImageList2(iface); int i; if ((iOverlay < 0) || (iOverlay > This->cCurImage)) @@ -3591,8 +3609,80 @@ return E_FAIL; } - -static const IImageListVtbl ImageListImpl_Vtbl = { +static HRESULT WINAPI ImageListImpl_Resize(IImageList2 *iface, INT cx, INT cy) +{ + FIXME("(%p)->(%d %d): stub\n", iface, cx, cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_GetOriginalSize(IImageList2 *iface, INT image, DWORD flags, INT *cx, INT *cy) +{ + FIXME("(%p)->(%d %x %p %p): stub\n", iface, image, flags, cx, cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_SetOriginalSize(IImageList2 *iface, INT image, INT cx, INT cy) +{ + FIXME("(%p)->(%d %d %d): stub\n", iface, image, cx, cy); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_SetCallback(IImageList2 *iface, IUnknown *callback) +{ + FIXME("(%p)->(%p): stub\n", iface, callback); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_GetCallback(IImageList2 *iface, REFIID riid, void **ppv) +{ + FIXME("(%p)->(%s %p): stub\n", iface, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_ForceImagePresent(IImageList2 *iface, INT image, DWORD flags) +{ + FIXME("(%p)->(%d %x): stub\n", iface, image, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_DiscardImages(IImageList2 *iface, INT first_image, INT last_image, DWORD flags) +{ + FIXME("(%p)->(%d %d %x): stub\n", iface, first_image, last_image, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_PreloadImages(IImageList2 *iface, IMAGELISTDRAWPARAMS *params) +{ + FIXME("(%p)->(%p): stub\n", iface, params); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_GetStatistics(IImageList2 *iface, IMAGELISTSTATS *stats) +{ + FIXME("(%p)->(%p): stub\n", iface, stats); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT cy, UINT flags, INT initial, INT grow) +{ + FIXME("(%p)->(%d %d %d %d %d): stub\n", iface, cx, cy, flags, initial, grow); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags) +{ + FIXME("(%p)->(%d %p %p %p %x): stub\n", iface, i, image, mask, unk, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ImageListImpl_ReplaceFromImageList(IImageList2 *iface, INT i, IImageList *imagelist, INT src, + IUnknown *unk, DWORD flags) +{ + FIXME("(%p)->(%d %p %d %p %x): stub\n", iface, i, imagelist, src, unk, flags); + return E_NOTIMPL; +} + +static const IImageList2Vtbl ImageListImpl_Vtbl = { ImageListImpl_QueryInterface, ImageListImpl_AddRef, ImageListImpl_Release, @@ -3624,7 +3714,19 @@ ImageListImpl_DragShowNolock, ImageListImpl_GetDragImage, ImageListImpl_GetItemFlags, - ImageListImpl_GetOverlayImage + ImageListImpl_GetOverlayImage, + ImageListImpl_Resize, + ImageListImpl_GetOriginalSize, + ImageListImpl_SetOriginalSize, + ImageListImpl_SetCallback, + ImageListImpl_GetCallback, + ImageListImpl_ForceImagePresent, + ImageListImpl_DiscardImages, + ImageListImpl_PreloadImages, + ImageListImpl_GetStatistics, + ImageListImpl_Initialize, + ImageListImpl_Replace2, + ImageListImpl_ReplaceFromImageList }; static BOOL is_valid(HIMAGELIST himl) @@ -3632,7 +3734,7 @@ BOOL valid; __TRY { - valid = himl && himl->lpVtbl == &ImageListImpl_Vtbl; + valid = himl && himl->IImageList2_iface.lpVtbl == &ImageListImpl_Vtbl; } __EXCEPT_PAGE_FAULT { @@ -3661,7 +3763,7 @@ HIMAGELIST_QueryInterface (HIMAGELIST himl, REFIID riid, void **ppv) { TRACE("(%p,%s,%p)\n", himl, debugstr_guid(riid), ppv); - return IImageList_QueryInterface((IImageList *) himl, riid, ppv); + return IImageList2_QueryInterface((IImageList2 *) himl, riid, ppv); } static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv) @@ -3678,11 +3780,11 @@ This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &ImageListImpl_Vtbl; + This->IImageList2_iface.lpVtbl = &ImageListImpl_Vtbl; This->ref = 1; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IImageList2_QueryInterface(&This->IImageList2_iface, iid, ppv); + IImageList2_Release(&This->IImageList2_iface); return ret; } 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] Sat Sep 27 00:19:40 2014 @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2013 Nikolay Sivov + * Copyright 2009-2014 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * Copyright 2012-2013 Daniel Jelinski * @@ -313,7 +313,6 @@ WCHAR szSearchParam[ MAX_PATH ]; /* painting */ - DWORD cditemmode; /* Keep the custom draw flags for an item/row */ BOOL bIsDrawing; /* Drawing in progress */ INT nMeasureItemHeight; /* WM_MEASUREITEM result */ BOOL bRedraw; /* WM_SETREDRAW switch */ @@ -767,6 +766,7 @@ if (lpnmh->pitem->mask & HDI_TEXT) { text = (LPCWSTR)lpnmh->pitem->pszText; + lpnmh->pitem->pszText = NULL; Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ @@ -774,6 +774,7 @@ lpnmh->pitem->pvFilter) { filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL; Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } } @@ -1034,10 +1035,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) { - if (lpnmlvcd->clrTextBk == CLR_DEFAULT) - lpnmlvcd->clrTextBk = comctl32_color.clrWindow; - if (lpnmlvcd->clrText == CLR_DEFAULT) - lpnmlvcd->clrText = comctl32_color.clrWindowText; + COLORREF backcolor, textcolor; /* apparently, for selected items, we have to override the returned values */ if (!SubItem) @@ -1057,15 +1055,23 @@ } } + backcolor = lpnmlvcd->clrTextBk; + textcolor = lpnmlvcd->clrText; + + if (backcolor == CLR_DEFAULT) + backcolor = comctl32_color.clrWindow; + if (textcolor == CLR_DEFAULT) + textcolor = comctl32_color.clrWindowText; + /* Set the text attributes */ - if (lpnmlvcd->clrTextBk != CLR_NONE) + if (backcolor != CLR_NONE) { SetBkMode(hdc, OPAQUE); - SetBkColor(hdc,lpnmlvcd->clrTextBk); + SetBkColor(hdc, backcolor); } else SetBkMode(hdc, TRANSPARENT); - SetTextColor(hdc, lpnmlvcd->clrText); + SetTextColor(hdc, textcolor); } static inline DWORD notify_postpaint (const LISTVIEW_INFO *infoPtr, NMLVCUSTOMDRAW *lpnmlvcd) @@ -4536,86 +4542,27 @@ return FillRect(hdc, lprcBox, infoPtr->hBkBrush); } -/*** - * DESCRIPTION: - * Draws an item. - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] hdc : device context handle - * [I] nItem : item index - * [I] nSubItem : subitem index - * [I] pos : item position in client coordinates - * [I] cdmode : custom draw mode - * - * RETURN: - * Success: TRUE - * Failure: FALSE - */ -static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nSubItem, POINT pos, DWORD cdmode) -{ - UINT uFormat; - WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; - static WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; - DWORD cdsubitemmode = CDRF_DODEFAULT; - LPRECT lprcFocus; - RECT rcSelect, rcBox, rcIcon, rcLabel, rcStateIcon; - NMLVCUSTOMDRAW nmlvcd; +/* Draw main item or subitem */ +static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const NMLVCUSTOMDRAW *nmlvcd, const POINT *pos) +{ + RECT rcSelect, rcLabel, rcBox, rcStateIcon, rcIcon; HIMAGELIST himl; - LVITEMW lvItem; - - TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); - - /* get information needed for drawing the item */ - lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; - if (nSubItem == 0) lvItem.mask |= LVIF_STATE; - if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; - lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; - lvItem.iItem = nItem; - lvItem.iSubItem = nSubItem; - lvItem.state = 0; - lvItem.lParam = 0; - lvItem.cchTextMax = DISP_TEXT_SIZE; - lvItem.pszText = szDispText; - if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; - if (nSubItem > 0 && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); - if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = szCallback; - TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); + UINT format; + RECT *focus; /* now check if we need to update the focus rectangle */ - lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; - - if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED; - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcSelect, &rcIcon, &rcStateIcon, &rcLabel); - OffsetRect(&rcBox, pos.x, pos.y); - OffsetRect(&rcSelect, pos.x, pos.y); - OffsetRect(&rcIcon, pos.x, pos.y); - OffsetRect(&rcStateIcon, pos.x, pos.y); - OffsetRect(&rcLabel, pos.x, pos.y); + focus = infoPtr->bFocus && (item->state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; + if (!focus) item->state &= ~LVIS_FOCUSED; + + LISTVIEW_GetItemMetrics(infoPtr, item, &rcBox, &rcSelect, &rcIcon, &rcStateIcon, &rcLabel); + OffsetRect(&rcBox, pos->x, pos->y); + OffsetRect(&rcSelect, pos->x, pos->y); + OffsetRect(&rcIcon, pos->x, pos->y); + OffsetRect(&rcStateIcon, pos->x, pos->y); + OffsetRect(&rcLabel, pos->x, pos->y); TRACE(" rcBox=%s, rcSelect=%s, rcIcon=%s. rcLabel=%s\n", wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcSelect), wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel)); - - /* fill in the custom draw structure */ - customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - - if (nSubItem > 0) cdmode = infoPtr->cditemmode; - if (cdmode & CDRF_SKIPDEFAULT) goto postpaint; - if (cdmode & CDRF_NOTIFYITEMDRAW) - cdsubitemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); - if (nSubItem == 0) infoPtr->cditemmode = cdsubitemmode; - if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; - /* we have to send a CDDS_SUBITEM customdraw explicitly for subitem 0 */ - if (nSubItem == 0 && (cdsubitemmode & CDRF_NOTIFYITEMDRAW) != 0) - { - cdsubitemmode = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; - } - if (nSubItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) - prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); /* FIXME: temporary hack */ rcSelect.left = rcLabel.left; @@ -4625,16 +4572,15 @@ /* in detail mode, we want to paint background for label rect when * item is not selected or listview has full row select; otherwise paint * background for text only */ - if (infoPtr->uView == LV_VIEW_ICON || - (infoPtr->uView == LV_VIEW_DETAILS && - (!(lvItem.state & LVIS_SELECTED) || - (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) != 0))) + if ( infoPtr->uView == LV_VIEW_ICON || + (infoPtr->uView == LV_VIEW_DETAILS && (!(item->state & LVIS_SELECTED) || + (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)))) rcSelect = rcLabel; - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); - - if(nSubItem == 0 && infoPtr->nFocusedItem == nItem) + if (nmlvcd->clrTextBk != CLR_NONE) + ExtTextOutW(nmlvcd->nmcd.hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + + if (item->state & LVIS_FOCUSED) { if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) { @@ -4646,7 +4592,7 @@ if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) { - INT Originx = pos.x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; + INT Originx = pos->x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); @@ -4663,73 +4609,201 @@ } /* state icons */ - if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && (nSubItem == 0)) - { - UINT uStateImage = STATEIMAGEINDEX(lvItem.state); - if (uStateImage) + if (infoPtr->himlState && STATEIMAGEINDEX(item->state) && (item->iSubItem == 0)) + { + UINT stateimage = STATEIMAGEINDEX(item->state); + if (stateimage) { - TRACE("uStateImage=%d\n", uStateImage); - ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, - rcStateIcon.left, rcStateIcon.top, ILD_NORMAL); + TRACE("stateimage=%d\n", stateimage); + ImageList_Draw(infoPtr->himlState, stateimage-1, nmlvcd->nmcd.hdc, rcStateIcon.left, rcStateIcon.top, ILD_NORMAL); } } /* item icons */ himl = (infoPtr->uView == LV_VIEW_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); - if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) + if (himl && item->iImage >= 0 && !IsRectEmpty(&rcIcon)) { UINT style; - TRACE("iImage=%d\n", lvItem.iImage); - - if (lvItem.state & (LVIS_SELECTED | LVIS_CUT) && infoPtr->bFocus) + TRACE("iImage=%d\n", item->iImage); + + if (item->state & (LVIS_SELECTED | LVIS_CUT) && infoPtr->bFocus) style = ILD_SELECTED; else style = ILD_NORMAL; - ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + ImageList_DrawEx(himl, item->iImage, nmlvcd->nmcd.hdc, rcIcon.left, rcIcon.top, rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, - lvItem.state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, - style | (lvItem.state & LVIS_OVERLAYMASK)); + item->state & LVIS_CUT ? RGB(255, 255, 255) : CLR_DEFAULT, + style | (item->state & LVIS_OVERLAYMASK)); } /* Don't bother painting item being edited */ - if (infoPtr->hwndEdit && nItem == infoPtr->nEditLabelItem && nSubItem == 0) goto postpaint; - + if (infoPtr->hwndEdit && item->iItem == infoPtr->nEditLabelItem && item->iSubItem == 0) return; + /* figure out the text drawing flags */ - uFormat = (infoPtr->uView == LV_VIEW_ICON ? (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS); + format = (infoPtr->uView == LV_VIEW_ICON ? (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS); if (infoPtr->uView == LV_VIEW_ICON) - uFormat = (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS); - else if (nSubItem) - { - switch (LISTVIEW_GetColumnInfo(infoPtr, nSubItem)->fmt & LVCFMT_JUSTIFYMASK) + format = (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS); + else if (item->iSubItem) + { + switch (LISTVIEW_GetColumnInfo(infoPtr, item->iSubItem)->fmt & LVCFMT_JUSTIFYMASK) { - case LVCFMT_RIGHT: uFormat |= DT_RIGHT; break; - case LVCFMT_CENTER: uFormat |= DT_CENTER; break; - default: uFormat |= DT_LEFT; + case LVCFMT_RIGHT: format |= DT_RIGHT; break; + case LVCFMT_CENTER: format |= DT_CENTER; break; + default: format |= DT_LEFT; } } - if (!(uFormat & (DT_RIGHT | DT_CENTER))) - { - if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) rcLabel.left += IMAGE_PADDING; + if (!(format & (DT_RIGHT | DT_CENTER))) + { + if (himl && item->iImage >= 0 && !IsRectEmpty(&rcIcon)) rcLabel.left += IMAGE_PADDING; else rcLabel.left += LABEL_HOR_PADDING; } - else if (uFormat & DT_RIGHT) rcLabel.right -= LABEL_HOR_PADDING; + else if (format & DT_RIGHT) rcLabel.right -= LABEL_HOR_PADDING; /* for GRIDLINES reduce the bottom so the text formats correctly */ if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) rcLabel.bottom--; #ifdef __REACTOS__ - if ((!(lvItem.state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) - DrawShadowText(hdc, lvItem.pszText, -1, &rcLabel, uFormat, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); + if ((!(item->state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) + DrawShadowText(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); else #endif - DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); + DrawTextW(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format); +} + +/*** + * DESCRIPTION: + * Draws an item. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] hdc : device context handle + * [I] nItem : item index + * [I] nSubItem : subitem index + * [I] pos : item position in client coordinates + * [I] cdmode : custom draw mode + * + * RETURN: + * Success: TRUE + * Failure: FALSE + */ +static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERATOR *subitems, POINT pos, DWORD cdmode) +{ + WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; + static WCHAR callbackW[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; + DWORD cdsubitemmode = CDRF_DODEFAULT; + RECT *focus, rcBox; + NMLVCUSTOMDRAW nmlvcd; + LVITEMW lvItem; + + TRACE("(hdc=%p, nItem=%d, subitems=%p, pos=%s)\n", hdc, nItem, subitems, wine_dbgstr_point(&pos)); + + /* get information needed for drawing the item */ + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_STATE; + if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; + lvItem.iItem = nItem; + lvItem.iSubItem = 0; + lvItem.state = 0; + lvItem.lParam = 0; + lvItem.cchTextMax = DISP_TEXT_SIZE; + lvItem.pszText = szDispText; + if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; + if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = callbackW; + TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); + + /* now check if we need to update the focus rectangle */ + focus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; + if (!focus) lvItem.state &= ~LVIS_FOCUSED; + + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, NULL, NULL, NULL); + OffsetRect(&rcBox, pos.x, pos.y); + + /* Full custom draw stage sequence looks like this: + + LV_VIEW_DETAILS: + + - CDDS_ITEMPREPAINT + - CDDS_ITEMPREPAINT|CDDS_SUBITEM | => sent n times, where n is number of subitems, + CDDS_ITEMPOSTPAINT|CDDS_SUBITEM | including item iself + - CDDS_ITEMPOSTPAINT + + other styles: + + - CDDS_ITEMPREPAINT + - CDDS_ITEMPOSTPAINT + */ + + /* fill in the custom draw structure */ + customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); + if (cdmode & CDRF_NOTIFYITEMDRAW) + cdsubitemmode = notify_customdraw(infoPtr, CDDS_ITEMPREPAINT, &nmlvcd); + if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; + + if (subitems) + { + while (iterator_next(subitems)) + { + DWORD subitemstage = CDRF_DODEFAULT; + + /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */ + if (subitems->nItem) + { + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_INDENT; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK | LVIS_CUT | LVIS_OVERLAYMASK; + lvItem.iItem = nItem; + lvItem.iSubItem = subitems->nItem; + lvItem.state = 0; + lvItem.lParam = 0; + lvItem.cchTextMax = DISP_TEXT_SIZE; + lvItem.pszText = szDispText; + if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return FALSE; + if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) + lvItem.state = LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); + if (lvItem.pszText == LPSTR_TEXTCALLBACKW) lvItem.pszText = callbackW; + TRACE(" lvItem=%s\n", debuglvitem_t(&lvItem, TRUE)); + + /* update custom draw data */ + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &nmlvcd.nmcd.rc, NULL, NULL, NULL, NULL); + OffsetRect(&nmlvcd.nmcd.rc, pos.x, pos.y); + nmlvcd.iSubItem = subitems->nItem; + } + + if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) + subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); + else + { + nmlvcd.clrTextBk = infoPtr->clrTextBk; + nmlvcd.clrText = infoPtr->clrText; + } + + if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); + + if (!(subitemstage & CDRF_SKIPDEFAULT)) + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); + + if (subitemstage & CDRF_NOTIFYPOSTPAINT) + subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd); + } + } + else + { + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos); + } postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) - notify_postpaint(infoPtr, &nmlvcd); + { + nmlvcd.iSubItem = 0; + notify_customdraw(infoPtr, CDDS_ITEMPOSTPAINT, &nmlvcd); + } + return TRUE; } @@ -4856,9 +4930,14 @@ /* iterate through the invalidated rows */ while(iterator_next(i)) { + RANGES subitems; + ITERATOR k; + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.y += Origin.y; + + subitems = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); /* iterate through the invalidated columns */ while(iterator_next(&j)) @@ -4874,8 +4953,12 @@ if (!RectVisible(hdc, &rcItem)) continue; } - LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, j.nItem, Position, cdmode); + ranges_additem(subitems, j.nItem); } + + iterator_rangesitems(&k, subitems); + LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, &k, Position, cdmode); + iterator_destroy(&k); } iterator_destroy(&j); } @@ -5009,7 +5092,7 @@ Position.x += Origin.x; Position.y += Origin.y; - LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, 0, Position, cdmode); + LISTVIEW_DrawItem(infoPtr, hdc, i->nItem, NULL, Position, cdmode); } } @@ -5085,8 +5168,6 @@ hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); } - infoPtr->cditemmode = CDRF_DODEFAULT; - GetClientRect(infoPtr->hwndSelf, &rcClient); customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); @@ -5352,7 +5433,7 @@ FillRect(hdc, &rcItem, infoPtr->hBkBrush); pos.x = pos.y = 0; - if (LISTVIEW_DrawItem(infoPtr, hdc, iItem, 0, pos, infoPtr->cditemmode)) + if (LISTVIEW_DrawItem(infoPtr, hdc, iItem, NULL, pos, CDRF_DODEFAULT)) { dragList = ImageList_Create(size.cx, size.cy, ILC_COLOR, 10, 10); SelectObject(hdc, hOldbmp); Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -744,7 +744,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) { POINT clpt, pt; - RECT wnrect, *btnrect = NULL; + RECT wnrect; BOOL topLeft = FALSE; INT btnstate = 0; INT hit; @@ -757,8 +757,9 @@ ClientToScreen(infoPtr->hwndSelf, &pt); GetWindowRect(infoPtr->hwndSelf, &wnrect); if (PtInRect(&wnrect, pt)) { - RECT TLbtnrect, BRbtnrect; - PAGER_GetButtonRects(infoPtr, &TLbtnrect, &BRbtnrect, FALSE); + RECT topleft, bottomright, *rect = NULL; + + PAGER_GetButtonRects(infoPtr, &topleft, &bottomright, FALSE); clpt = pt; MapWindowPoints(0, infoPtr->hwndSelf, &clpt, 1); @@ -766,23 +767,23 @@ if ((hit == PGB_TOPORLEFT) && (infoPtr->TLbtnState == PGF_NORMAL)) { topLeft = TRUE; - btnrect = &TLbtnrect; + rect = &topleft; infoPtr->TLbtnState = PGF_HOT; btnstate = infoPtr->TLbtnState; } else if ((hit == PGB_BOTTOMORRIGHT) && (infoPtr->BRbtnState == PGF_NORMAL)) { topLeft = FALSE; - btnrect = &BRbtnrect; + rect = &bottomright; infoPtr->BRbtnState = PGF_HOT; btnstate = infoPtr->BRbtnState; } /* If in one of the buttons the capture and draw buttons */ - if (btnrect) + if (rect) { TRACE("[%p] draw btn (%s), Capture %s, style %08x\n", - infoPtr->hwndSelf, wine_dbgstr_rect(btnrect), + infoPtr->hwndSelf, wine_dbgstr_rect(rect), (infoPtr->bCapture) ? "TRUE" : "FALSE", infoPtr->dwStyle); if (!infoPtr->bCapture) @@ -795,7 +796,7 @@ SetTimer(infoPtr->hwndSelf, TIMERID1, 0x3e, 0); hdc = GetWindowDC(infoPtr->hwndSelf); /* OffsetRect(wnrect, 0 | 1, 0 | 1) */ - PAGER_DrawButton(hdc, infoPtr->clrBk, *btnrect, + PAGER_DrawButton(hdc, infoPtr->clrBk, *rect, infoPtr->dwStyle & PGS_HORZ, topLeft, btnstate); ReleaseDC(infoPtr->hwndSelf, hdc); return 0; @@ -976,16 +977,17 @@ { POINT pt, ptorig; HWND parent; + LRESULT ret; pt.x = 0; pt.y = 0; parent = GetParent(infoPtr->hwndSelf); MapWindowPoints(infoPtr->hwndSelf, parent, &pt, 1); OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig); - SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); + ret = SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0); - return 0; + return ret; } Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] Sat Sep 27 00:19:40 2014 @@ -57,6 +57,7 @@ #define LED_GAP 2 #define MARQUEE_LEDS 5 #define ID_MARQUEE_TIMER 1 +#define DEFAULT_MARQUEE_PERIOD 30 /* Helper to obtain size of a progress bar chunk ("led"). */ static inline int get_led_size ( const PROGRESS_INFO *infoPtr, LONG style, @@ -436,40 +437,32 @@ /*********************************************************************** - * PROGRESS_Timer - * Handle the marquee timer messages - */ -static LRESULT PROGRESS_Timer (PROGRESS_INFO *infoPtr, INT idTimer) -{ - if(idTimer == ID_MARQUEE_TIMER) - { - LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); - RECT rect; - int ledWidth, leds; - HTHEME theme = GetWindowTheme (infoPtr->Self); - BOOL barSmooth = (style & PBS_SMOOTH) && !theme; - - get_client_rect (infoPtr->Self, &rect); - - if(!barSmooth) - ledWidth = get_led_size( infoPtr, style, &rect ) + - get_led_gap( infoPtr ); - else - ledWidth = 1; - - leds = (get_bar_size( style, &rect ) + ledWidth - 1) / - ledWidth; - - /* increment the marquee progress */ - if(++infoPtr->MarqueePos >= leds) - { - infoPtr->MarqueePos = 0; - } - - InvalidateRect(infoPtr->Self, &rect, FALSE); - UpdateWindow(infoPtr->Self); - } - return 0; + * Advance marquee progress by one step. + */ +static void PROGRESS_UpdateMarquee (PROGRESS_INFO *infoPtr) +{ + LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); + RECT rect; + int ledWidth, leds; + HTHEME theme = GetWindowTheme (infoPtr->Self); + BOOL smooth = (style & PBS_SMOOTH) && !theme; + + get_client_rect (infoPtr->Self, &rect); + + if (smooth) + ledWidth = 1; + else + ledWidth = get_led_size( infoPtr, style, &rect ) + get_led_gap( infoPtr ); + + leds = (get_bar_size( style, &rect ) + ledWidth - 1) / + ledWidth; + + /* increment the marquee progress */ + if (++infoPtr->MarqueePos >= leds) + infoPtr->MarqueePos = 0; + + InvalidateRect(infoPtr->Self, &rect, TRUE); + UpdateWindow(infoPtr->Self); } @@ -510,6 +503,30 @@ PROGRESS_CoercePos(infoPtr); InvalidateRect(infoPtr->Self, NULL, TRUE); return res; +} + +static UINT PROGRESS_SetPos (PROGRESS_INFO *infoPtr, INT pos) +{ + DWORD style = GetWindowLongW(infoPtr->Self, GWL_STYLE); + + if (style & PBS_MARQUEE) + { + PROGRESS_UpdateMarquee(infoPtr); + return 1; + } + else + { + UINT oldVal; + oldVal = infoPtr->CurVal; + if (oldVal != pos) { + infoPtr->CurVal = pos; + PROGRESS_CoercePos(infoPtr); + TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); + PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow( infoPtr->Self ); + } + return oldVal; + } } /*********************************************************************** @@ -586,7 +603,9 @@ return PROGRESS_Paint (infoPtr, (HDC)wParam); case WM_TIMER: - return PROGRESS_Timer (infoPtr, (INT)wParam); + if (wParam == ID_MARQUEE_TIMER) + PROGRESS_UpdateMarquee (infoPtr); + return 0; case WM_THEMECHANGED: { @@ -622,18 +641,7 @@ } case PBM_SETPOS: - { - UINT oldVal; - oldVal = infoPtr->CurVal; - if(oldVal != wParam) { - infoPtr->CurVal = (INT)wParam; - PROGRESS_CoercePos(infoPtr); - TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); - PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); - UpdateWindow( infoPtr->Self ); - } - return oldVal; - } + return PROGRESS_SetPos(infoPtr, wParam); case PBM_SETRANGE: return PROGRESS_SetRange (infoPtr, (int)LOWORD(lParam), (int)HIWORD(lParam)); @@ -713,8 +721,9 @@ case PBM_SETMARQUEE: if(wParam != 0) { + UINT period = lParam ? (UINT)lParam : DEFAULT_MARQUEE_PERIOD; infoPtr->Marquee = TRUE; - SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, (UINT)lParam, NULL); + SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, period, NULL); } else { 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] Sat Sep 27 00:19:40 2014 @@ -734,10 +734,10 @@ /* draws a blank frame for a toolbar button */ static void -TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) +TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd, const RECT *rect, DWORD dwItemCDFlag) { HDC hdc = tbcd->nmcd.hdc; - RECT rc = tbcd->nmcd.rc; + RECT rc = *rect; /* if the state is disabled or indeterminate then the button * cannot have an interactive look like pressed or hot */ BOOL non_interactive_state = (tbcd->nmcd.uItemState & CDIS_DISABLED) || @@ -940,7 +940,7 @@ tbcd.rcText.bottom = rcText.bottom - rc.top; tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr); tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush; /* FIXME: what are these used for? */ @@ -958,7 +958,7 @@ ntfret = TOOLBAR_SendNotify(&tbcd.nmcd.hdr, infoPtr, NM_CUSTOMDRAW); /* reset these fields so the user can't alter the behaviour like native */ tbcd.nmcd.hdc = hdc; - tbcd.nmcd.rc = rc; + tbcd.nmcd.rc = btnPtr->rect; dwItemCustDraw = ntfret & 0xffff; dwItemCDFlag = ntfret & 0xffff0000; @@ -1007,10 +1007,10 @@ || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) stateId = TS_HOT; - DrawThemeBackground (theme, hdc, partId, stateId, &tbcd.nmcd.rc, NULL); + DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } else - TOOLBAR_DrawFrame(infoPtr, &tbcd, dwItemCDFlag); + TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow) { 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] Sat Sep 27 00:19:40 2014 @@ -477,24 +477,22 @@ } static inline BOOL -TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPNMHDR pnmh) -{ - TRACE("wParam=%ld, lParam=%p\n", wParam, pnmh); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, (LPARAM)pnmh); +TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, UINT code, NMHDR *hdr) +{ + TRACE("code=%d, hdr=%p\n", code, hdr); + + hdr->hwndFrom = infoPtr->hwnd; + hdr->idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + hdr->code = get_notifycode(infoPtr, code); + + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); } static BOOL TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code) { - NMHDR nmhdr; - HWND hwnd = infoPtr->hwnd; - - TRACE("%d\n", code); - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.code = get_notifycode(infoPtr, code); - - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, &nmhdr); + NMHDR hdr; + return TREEVIEW_SendRealNotify(infoPtr, code, &hdr); } static VOID @@ -534,18 +532,13 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action, UINT mask, HTREEITEM oldItem, HTREEITEM newItem) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; BOOL ret; TRACE("code:%d action:%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); - ZeroMemory(&nmhdr, sizeof(NMTREEVIEWW)); - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); + memset(&nmhdr, 0, sizeof(NMTREEVIEWW)); nmhdr.action = action; if (oldItem) @@ -557,7 +550,7 @@ nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -570,14 +563,10 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, HTREEITEM dragItem, POINT pt) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; TRACE("code:%d dragitem:%p\n", code, dragItem); - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); nmhdr.action = 0; nmhdr.itemNew.mask = TVIF_STATE | TVIF_PARAM | TVIF_HANDLE; nmhdr.itemNew.hItem = dragItem; @@ -587,7 +576,7 @@ nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + return TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); } @@ -595,16 +584,12 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, RECT rc) { - HWND hwnd = infoPtr->hwnd; NMTVCUSTOMDRAW nmcdhdr; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = rc; @@ -615,10 +600,8 @@ nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr.nmcd.hdr); -} - - + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr.nmcd.hdr); +} /* FIXME: need to find out when the flags in uItemState need to be set */ @@ -627,8 +610,7 @@ TREEVIEW_ITEM *item, UINT uItemDrawState, NMTVCUSTOMDRAW *nmcdhdr) { - HWND hwnd = infoPtr->hwnd; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; DWORD dwDrawStage; DWORD_PTR dwItemSpec; UINT uItemState; @@ -644,9 +626,6 @@ uItemState |= CDIS_HOT; nmcd = &nmcdhdr->nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = item->rect; @@ -659,24 +638,19 @@ nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr->nmcd.hdr); + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr->nmcd.hdr); } static BOOL TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editItem) { - HWND hwnd = infoPtr->hwnd; NMTVDISPINFOW tvdi; BOOL ret; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_BEGINLABELEDITW); - TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, &tvdi.item, editItem); - ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) Free(tvdi.item.pszText); @@ -689,16 +663,11 @@ UINT mask) { NMTVDISPINFOEXW callback; - HWND hwnd = infoPtr->hwnd; TRACE("mask=0x%x, callbackmask=0x%x\n", mask, item->callbackMask); mask &= item->callbackMask; if (mask == 0) return; - - callback.hdr.hwndFrom = hwnd; - callback.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - callback.hdr.code = get_notifycode(infoPtr, TVN_GETDISPINFOW); /* 'state' always contains valid value, as well as 'lParam'. * All other parameters are uninitialized. @@ -714,7 +683,7 @@ if (mask & TVIF_TEXT) item->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, &callback.hdr); + TREEVIEW_SendRealNotify(infoPtr, TVN_GETDISPINFOW, &callback.hdr); TRACE("resulting code 0x%08x\n", callback.hdr.code); /* It may have changed due to a call to SetItem. */ @@ -2692,17 +2661,17 @@ DeleteObject(hNewPen); } - if (cditem & CDRF_NOTIFYPOSTPAINT) - { - cditem = TREEVIEW_SendCustomDrawItemNotify - (infoPtr, hdc, item, CDDS_ITEMPOSTPAINT, &nmcdhdr); - TRACE("postpaint:cditem-app returns 0x%x\n", cditem); - } - /* Restore the hdc state */ SetTextColor(hdc, oldTextColor); SetBkColor(hdc, oldTextBkColor); SelectObject(hdc, hOldFont); + + if (cditem & CDRF_NOTIFYPOSTPAINT) + { + cditem = TREEVIEW_SendCustomDrawItemNotify + (infoPtr, hdc, item, CDDS_ITEMPOSTPAINT, &nmcdhdr); + TRACE("postpaint:cditem-app returns 0x%x\n", cditem); + } } /* Computes treeHeight and treeWidth and updates the scroll bars. @@ -3973,7 +3942,6 @@ static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { - HWND hwnd = infoPtr->hwnd; TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; @@ -3983,9 +3951,6 @@ if (!IsWindow(infoPtr->hwndEdit)) return FALSE; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_ENDLABELEDITW); tvdi.item.mask = 0; tvdi.item.hItem = editedItem; tvdi.item.state = editedItem->state; @@ -4013,7 +3978,7 @@ tvdi.item.cchTextMax = 0; } - bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + bCommit = TREEVIEW_SendRealNotify(infoPtr, TVN_ENDLABELEDITW, &tvdi.hdr); if (!bCancel && bCommit) /* Apply the changes */ { @@ -5219,10 +5184,14 @@ { /* If it is non-NULL and different, it will be selected and visible. */ TREEVIEW_ITEM *newSelection = NULL; - TREEVIEW_ITEM *prevItem = infoPtr->selectedItem; + NMTVKEYDOWN nmkeydown; TRACE("%lx\n", wParam); + + nmkeydown.wVKey = wParam; + nmkeydown.flags = 0; + TREEVIEW_SendRealNotify(infoPtr, TVN_KEYDOWN, &nmkeydown.hdr); if (prevItem == NULL) return FALSE; @@ -5244,8 +5213,8 @@ case VK_RETURN: TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); - break; - + break; + case VK_HOME: newSelection = infoPtr->root->firstChild; break; @@ -5526,9 +5495,6 @@ item = TREEVIEW_HitTestPoint(infoPtr, pt); memset(&nmmouse, 0, sizeof(nmmouse)); - nmmouse.hdr.hwndFrom = infoPtr->hwnd; - nmmouse.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); - nmmouse.hdr.code = NM_SETCURSOR; if (item) { nmmouse.dwItemSpec = (DWORD_PTR)item; @@ -5537,7 +5503,7 @@ nmmouse.pt.x = 0; nmmouse.pt.y = 0; nmmouse.dwHitInfo = lParam; - if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, &nmmouse.hdr)) + if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT)) 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] Sat Sep 27 00:19:40 2014 @@ -60,7 +60,7 @@ reactos/dll/win32/cabinet # Synced to Wine-1.7.17 reactos/dll/win32/clusapi # Synced to Wine-1.7.17 reactos/dll/win32/comcat # Synced to Wine-1.7.17 -reactos/dll/win32/comctl32 # Synced to Wine-1.7.17 +reactos/dll/win32/comctl32 # Synced to Wine-1.7.27 reactos/dll/win32/comdlg32 # Synced to Wine-1.7.17 reactos/dll/win32/compstui # Synced to Wine-1.7.17 reactos/dll/win32/credui # Synced to Wine-1.7.17

1 0

[akhaldi] 64321: [PSDK] * Add CDRF_NOTIFYITEMERASE. * Update commoncontrols.idl. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 00:05:34 2014 New Revision: 64321 URL: http://svn.reactos.org/svn/reactos?rev=64321&view=rev Log: [PSDK] * Add CDRF_NOTIFYITEMERASE. * Update commoncontrols.idl. CORE-8540 Modified: trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/commoncontrols.idl Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Sep 27 00:05:34 2014 @@ -247,6 +247,7 @@ #define CDRF_NOTIFYITEMDRAW 0x20 #define CDRF_NOTIFYSUBITEMDRAW 0x20 #define CDRF_NOTIFYPOSTERASE 0x40 +#define CDRF_NOTIFYITEMERASE 0x00000080 /* obsolete ??? */ #define CDDS_PREPAINT 0x1 #define CDDS_POSTPAINT 0x2 Modified: trunk/reactos/include/psdk/commoncontrols.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commoncontrol… ============================================================================== --- trunk/reactos/include/psdk/commoncontrols.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commoncontrols.idl [iso-8859-1] Sat Sep 27 00:05:34 2014 @@ -66,9 +66,7 @@ const UINT ILIF_ALPHA = 1; [ - object, - uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), - helpstring("Image List"), + uuid(46eb5926-582e-4017-9fdf-e8998daa0950), local ] interface IImageList : IUnknown @@ -200,15 +198,44 @@ } [ - uuid(BCADA15B-B428-420c-8D28-023590924C9F) + uuid(192b9d83-50fc-457b-90a0-2b82a8b5dae1), + local +] +interface IImageList2 : IImageList +{ + typedef struct tagIMAGELISTSTATS + { + DWORD cbSize; + INT cAlloc; + INT cUsed; + INT cStandby; + } IMAGELISTSTATS; + + HRESULT Resize(INT x_size, INT y_size); + HRESULT GetOriginalSize([in] INT image, [in] DWORD flags, [out] INT *cx, [out] INT *cy); + HRESULT SetOriginalSize([in] INT image, [in] INT cx, [in] INT cy); + HRESULT SetCallback([in, unique] IUnknown *callback); + HRESULT GetCallback([in] REFIID riid, [out, iid_is(riid)] void** ppv); + HRESULT ForceImagePresent([in] INT image, DWORD flags); + HRESULT DiscardImages([in] INT first_image, [in] INT last_image, [in] DWORD flags); + HRESULT PreloadImages([in] IMAGELISTDRAWPARAMS *params); + HRESULT GetStatistics([in, out] IMAGELISTSTATS *stats); + HRESULT Initialize([in] INT cx, [in] INT cy, [in] UINT flags, [in] INT initial, [in] INT grow); + HRESULT Replace2([in] INT i, [in] HBITMAP image, [in, unique] HBITMAP mask, [in, unique] IUnknown *unk, [in] DWORD flags); + HRESULT ReplaceFromImageList([in] INT i, [in] IImageList *imagelist, [in] INT src, [in, unique] IUnknown *unk, [in] DWORD flags); +} + +[ + uuid(bcada15B-b428-420c-8d28-023590924c9f) ] library CommonControlObjects { [ - uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + uuid(7c476ba2-02b1-48f4-8048-b24619ddc058) ] coclass ImageList { interface IImageList; + interface IImageList2; } }

1 0

[akhaldi] 64320: [BCRYPT_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 00:03:58 2014 New Revision: 64320 URL: http://svn.reactos.org/svn/reactos?rev=64320&view=rev Log: [BCRYPT_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/bcrypt/bcrypt.c Modified: trunk/rostests/winetests/bcrypt/bcrypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/bcrypt/bcrypt.c… ============================================================================== --- trunk/rostests/winetests/bcrypt/bcrypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/bcrypt/bcrypt.c [iso-8859-1] Sat Sep 27 00:03:58 2014 @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, ULONG cbBuffer, ULONG dwFlags); +static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); static BOOL Init(void) { @@ -38,6 +39,7 @@ } pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); return TRUE; } @@ -78,10 +80,29 @@ ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } +static void test_BCryptGetFipsAlgorithmMode(void) +{ + NTSTATUS ret; + BOOLEAN enabled; + + if (!pBCryptGetFipsAlgorithmMode) + { + win_skip("BCryptGetFipsAlgorithmMode is not available\n"); + return; + } + + ret = pBCryptGetFipsAlgorithmMode(&enabled); + ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + + ret = pBCryptGetFipsAlgorithmMode(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); +} + START_TEST(bcrypt) { if (!Init()) return; test_BCryptGenRandom(); + test_BCryptGetFipsAlgorithmMode(); }

1 0

[akhaldi] 64319: [BCRYPT] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 27 Sep '14

27 Sep '14

Author: akhaldi Date: Sat Sep 27 00:03:33 2014 New Revision: 64319 URL: http://svn.reactos.org/svn/reactos?rev=64319&view=rev Log: [BCRYPT] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec trunk/reactos/dll/win32/bcrypt/bcrypt_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/bcrypt/bcrypt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt.sp… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt.spec [iso-8859-1] Sat Sep 27 00:03:33 2014 @@ -1,6 +1,6 @@ @ stub BCryptAddContextFunction @ stub BCryptAddContextFunctionProvider -@ stub BCryptCloseAlgorithmProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext @@ -27,12 +27,12 @@ @ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey -@ stub BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stub BCryptGetProperty @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair -@ stub BCryptOpenAlgorithmProvider +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) @ stub BCryptQueryContextConfiguration @ stub BCryptQueryContextFunctionConfiguration @ stub BCryptQueryContextFunctionProperty Modified: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_ma… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Sat Sep 27 00:03:33 2014 @@ -29,20 +29,6 @@ #include <bcrypt.h> WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - - return TRUE; -} NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -90,3 +76,34 @@ FIXME("called with unsupported parameters, returning error\n"); return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWSTR algorithmId, + LPCWSTR implementation, DWORD flags) +{ + FIXME("%p, %s, %s, %08x - stub\n", algorithm, wine_dbgstr_w(algorithmId), wine_dbgstr_w(implementation), flags); + + if (!algorithm) + return STATUS_INVALID_PARAMETER; + + *algorithm = NULL; + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD flags) +{ + FIXME("%p, %08x - stub\n", algorithm, flags); + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) +{ + FIXME("%p - semi-stub\n", enabled); + + if (!enabled) + return STATUS_INVALID_PARAMETER; + + *enabled = FALSE; + return STATUS_SUCCESS; +} 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] Sat Sep 27 00:03:33 2014 @@ -55,7 +55,7 @@ reactos/dll/win32/atl80 # Synced to Wine-1.7.27 reactos/dll/win32/atl100 # Synced to Wine-1.7.27 reactos/dll/win32/avifil32 # Synced to Wine-1.7.17 -reactos/dll/win32/bcrypt # Synced to Wine-1.7.17 +reactos/dll/win32/bcrypt # Synced to Wine-1.7.27 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.7.17 reactos/dll/win32/clusapi # Synced to Wine-1.7.17

1 0

[ekohl] 64318: [LSASRV] Fix memory related issues in calls to LsaEnumerateLogonSessions. - Initialize ClientBaseAddress to NULL because we do not need to allocate a fixed memory page. - Protect Len...
by ekohl＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: ekohl Date: Fri Sep 26 23:46:59 2014 New Revision: 64318 URL: http://svn.reactos.org/svn/reactos?rev=64318&view=rev Log: [LSASRV] Fix memory related issues in calls to LsaEnumerateLogonSessions. - Initialize ClientBaseAddress to NULL because we do not need to allocate a fixed memory page. - Protect Length from being overwitten by NtWriteVirtualMemory. Modified: trunk/reactos/dll/win32/lsasrv/session.c Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Fri Sep 26 23:46:59 2014 @@ -131,8 +131,8 @@ PLIST_ENTRY SessionEntry; PLSAP_LOGON_SESSION CurrentSession; PLUID SessionList; - ULONG i, Length; - PVOID ClientBaseAddress; + ULONG i, Length, MemSize; + PVOID ClientBaseAddress = NULL; NTSTATUS Status; TRACE("LsapEnumLogonSessions()\n"); @@ -175,10 +175,11 @@ goto done; } + MemSize = Length; Status = NtAllocateVirtualMemory(ProcessHandle, &ClientBaseAddress, 0, - &Length, + &MemSize, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status))

1 0

[hbelusca] 64317: [NTVDM]: Improve diagnostics.
by hbelusca＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: hbelusca Date: Fri Sep 26 22:39:21 2014 New Revision: 64317 URL: http://svn.reactos.org/svn/reactos?rev=64317&view=rev Log: [NTVDM]: Improve diagnostics. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri Sep 26 22:39:21 2014 @@ -1117,7 +1117,7 @@ /* Enter new text mode */ if (!VgaEnterTextMode(&Resolution)) { - DisplayMessage(L"An unexpected VGA error occurred while switching into text mode."); + DisplayMessage(L"An unexpected VGA error occurred while switching into text mode. Error: %u", GetLastError()); EmulatorTerminate(); return; } @@ -1127,7 +1127,7 @@ /* Enter graphics mode */ if (!VgaEnterGraphicsMode(&Resolution)) { - DisplayMessage(L"An unexpected VGA error occurred while switching into graphics mode."); + DisplayMessage(L"An unexpected VGA error occurred while switching into graphics mode. Error: %u", GetLastError()); EmulatorTerminate(); return; }

1 0

[pschweitzer] 64316: [NTFS] - Divert NtfsLookupFile() as NtfsLookupFileAt() to allow opening relatives to a current MFT record. - Reimplement NtfsLookupFile() using NtfsLookupFileAt()
by pschweitzer＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: pschweitzer Date: Fri Sep 26 18:12:24 2014 New Revision: 64316 URL: http://svn.reactos.org/svn/reactos?rev=64316&view=rev Log: [NTFS] - Divert NtfsLookupFile() as NtfsLookupFileAt() to allow opening relatives to a current MFT record. - Reimplement NtfsLookupFile() using NtfsLookupFileAt() Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Fri Sep 26 18:12:24 2014 @@ -645,54 +645,62 @@ } NTSTATUS +NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING PathName, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext, + ULONGLONG CurrentMFTIndex) +{ + UNICODE_STRING Current, Remaining; + NTSTATUS Status; + + DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); + + FsRtlDissectName(*PathName, &Current, &Remaining); + + while (Current.Length != 0) + { + DPRINT1("Lookup: %wZ\n", &Current); + + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &CurrentMFTIndex); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + FsRtlDissectName(*PathName, &Current, &Remaining); + } + + *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (*FileRecord == NULL) + { + DPRINT("NtfsLookupFile: Can't allocate MFT record\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsLookupFile: Can't read MFT record\n"); + return Status; + } + + Status = FindAttribute(Vcb, *FileRecord, AttributeData, PathName, DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsLookupFile: Can't find data attribute\n"); + return Status; + } + + return STATUS_SUCCESS; +} + +NTSTATUS NtfsLookupFile(PDEVICE_EXTENSION Vcb, PUNICODE_STRING PathName, PFILE_RECORD_HEADER *FileRecord, PNTFS_ATTR_CONTEXT *DataContext) { - ULONGLONG CurrentMFTIndex; - UNICODE_STRING Current, Remaining; - NTSTATUS Status; - - DPRINT1("NtfsLookupFile(%p, %wZ, %p)\n", Vcb, PathName, FileRecord); - - CurrentMFTIndex = NTFS_FILE_ROOT; - FsRtlDissectName(*PathName, &Current, &Remaining); - - while (Current.Length != 0) - { - DPRINT1("Lookup: %wZ\n", &Current); - - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &CurrentMFTIndex); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - FsRtlDissectName(*PathName, &Current, &Remaining); - } - - *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); - if (*FileRecord == NULL) - { - DPRINT("NtfsLookupFile: Can't allocate MFT record\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsLookupFile: Can't read MFT record\n"); - return Status; - } - - Status = FindAttribute(Vcb, *FileRecord, AttributeData, PathName, DataContext); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtfsLookupFile: Can't find data attribute\n"); - return Status; - } - - return STATUS_SUCCESS; + return NtfsLookupFileAt(Vcb, PathName, FileRecord, DataContext, NTFS_FILE_ROOT); } /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Fri Sep 26 18:12:24 2014 @@ -634,6 +634,13 @@ PFILE_RECORD_HEADER *FileRecord, PNTFS_ATTR_CONTEXT *DataContext); +NTSTATUS +NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING PathName, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext, + ULONGLONG CurrentMFTIndex); + /* misc.c */ BOOLEAN

1 0

[pschweitzer] 64315: [NTFS] Also store the MFT index in the FCB
by pschweitzer＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: pschweitzer Date: Fri Sep 26 17:49:05 2014 New Revision: 64315 URL: http://svn.reactos.org/svn/reactos?rev=64315&view=rev Log: [NTFS] Also store the MFT index in the FCB Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Fri Sep 26 17:49:05 2014 @@ -288,6 +288,7 @@ Fcb->RFCB.FileSize.QuadPart = PAGE_SIZE;//Vcb->CdInfo.RootSize; Fcb->RFCB.ValidDataLength.QuadPart = PAGE_SIZE;//Vcb->CdInfo.RootSize; Fcb->RFCB.AllocationSize.QuadPart = PAGE_SIZE;//Vcb->CdInfo.RootSize; + Fcb->MFTIndex = NTFS_FILE_ROOT; NtfsFCBInitializeCache(Vcb, Fcb); NtfsAddFCBToTable(Vcb, Fcb); Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Fri Sep 26 17:49:05 2014 @@ -344,6 +344,7 @@ VolumeFcb->RFCB.FileSize.QuadPart = DeviceExt->NtfsInfo.SectorCount * DeviceExt->NtfsInfo.BytesPerSector; VolumeFcb->RFCB.ValidDataLength = VolumeFcb->RFCB.FileSize; VolumeFcb->RFCB.AllocationSize = VolumeFcb->RFCB.FileSize; + VolumeFcb->MFTIndex = 0; DeviceExt->VolumeFcb = VolumeFcb; /* Get volume information */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Fri Sep 26 17:49:05 2014 @@ -137,6 +137,8 @@ LONG RefCount; ULONG Flags; + + ULONGLONG MFTIndex; // DIR_RECORD Entry;

1 0

[dquintana] 64314: [BROWSEUI] * Implement SHCreateFromDesktop and supporting functions, and move those implementations to their own file. [SHELL32] * Handle message 1035 from the desktop window. [S...
by dquintana＠svn.reactos.org 26 Sep '14

26 Sep '14

Author: dquintana Date: Fri Sep 26 14:47:07 2014 New Revision: 64314 URL: http://svn.reactos.org/svn/reactos?rev=64314&view=rev Log: [BROWSEUI] * Implement SHCreateFromDesktop and supporting functions, and move those implementations to their own file. [SHELL32] * Handle message 1035 from the desktop window. [SHLWAPI] * Fix a bug in SHAllocShared, where source and destination parameters were reversed. [EXPLORER-NEW] * Use SHCreateFromDesktop to open the new window. NOTE: There appears to be some more problems with the SH*Shared implementation, beyond the swapped parameters, which prevent the opening of the new windows. These functions will have to be revised and the corrected implementation sent to WINE. Added: branches/shell-experiments/dll/win32/browseui/desktopipc.cpp (with props) Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/base/shell/explorer-new/traywnd.c branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt branches/shell-experiments/base/shell/filebrowser/filebrowser.c branches/shell-experiments/dll/win32/browseui/CMakeLists.txt branches/shell-experiments/dll/win32/browseui/browseuiord.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/desktop.cpp branches/shell-experiments/dll/win32/shell32/undocshell.h branches/shell-experiments/dll/win32/shlwapi/ordinal.c branches/shell-experiments/include/psdk/shlwapi.h branches/shell-experiments/include/psdk/shlwapi_undoc.h Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -383,6 +383,25 @@ DbgPrint("Explorer starting... Commandline: %S\n", lpCmdLine); + /* + * Set our shutdown parameters: we want to shutdown the very last, + * but before any TaskMgr instance (which has a shutdown level of 1). + */ + SetProcessShutdownParameters(2, 0); + + if (GetShellWindow() == NULL) + CreateShellDesktop = TRUE; + + /* FIXME - initialize SSO Thread */ + + if (!CreateShellDesktop) + { + EXPLORER_CMDLINE_PARSE_RESULTS parseResults = { 0 }; + + if (SHExplorerParseCmdLine(&parseResults)) + return SHCreateFromDesktop(&parseResults); + } + if (RegOpenKey(HKEY_CURRENT_USER, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"), &hkExplorer) != ERROR_SUCCESS) @@ -407,72 +426,33 @@ InitCommonControls(); OleInitialize(NULL); - /* - * Set our shutdown parameters: we want to shutdown the very last, - * but before any TaskMgr instance (which has a shutdown level of 1). - */ - SetProcessShutdownParameters(2, 0); - ProcessStartupItems(); - if (GetShellWindow() == NULL) - CreateShellDesktop = TRUE; - - /* FIXME - initialize SSO Thread */ - - if (CreateShellDesktop) - { - /* Initialize shell dde support */ - ShellDDEInit(TRUE); - - /* Initialize shell icons */ - FileIconInit(TRUE); - - /* Initialize CLSID_ShellWindows class */ - WinList_Init(); - - if (RegisterTrayWindowClass() && RegisterTaskSwitchWndClass()) - { - Tray = CreateTrayWindow(); - /* This not only hides the minimized window captions in the bottom - left screen corner, but is also needed in order to receive - HSHELL_* notification messages (which are required for taskbar - buttons to work right) */ - HideMinimizedWindows(TRUE); - - if (Tray != NULL) - hShellDesktop = DesktopCreateWindow(Tray); - } - - /* WinXP: Notify msgina to hide the welcome screen */ - if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) - SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); - } - else - { - HRESULT hr; - EXPLORER_CMDLINE_PARSE_RESULTS parseResults = { 0 }; - - if (!SHExplorerParseCmdLine(&parseResults)) - return 0; - - // TODO: Handle the case where .strPath was assigned instead of .pidlPath - - if (parseResults.dwFlags & SH_EXPLORER_CMDLINE_FLAG_IDLIST) - { - TRACE("Trying to open browser window... \n"); - - hr = SHOpenNewFrame(parseResults.pidlPath, NULL, 0, 0); - if (FAILED(hr)) - return 0; - - /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ - Sleep(1000); - ExitThread(0); - - return 0; - } - } + /* Initialize shell dde support */ + ShellDDEInit(TRUE); + + /* Initialize shell icons */ + FileIconInit(TRUE); + + /* Initialize CLSID_ShellWindows class */ + WinList_Init(); + + if (RegisterTrayWindowClass() && RegisterTaskSwitchWndClass()) + { + Tray = CreateTrayWindow(); + /* This not only hides the minimized window captions in the bottom + left screen corner, but is also needed in order to receive + HSHELL_* notification messages (which are required for taskbar + buttons to work right) */ + HideMinimizedWindows(TRUE); + + if (Tray != NULL) + hShellDesktop = DesktopCreateWindow(Tray); + } + + /* WinXP: Notify msgina to hide the welcome screen */ + if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) + SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); if (Tray != NULL) { Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -2199,7 +2199,8 @@ } } -static void ProcessMouseTracking(ITrayWindowImpl * This) +static void +ProcessMouseTracking(ITrayWindowImpl * This) { RECT rcCurrent; POINT pt; @@ -2249,7 +2250,8 @@ } } -static void ProcessAutoHide(ITrayWindowImpl * This) +static void +ProcessAutoHide(ITrayWindowImpl * This) { RECT rc = This->rcTrayWnd[This->Position]; INT w = This->TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1; Modified: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -12,4 +12,4 @@ msvcrt kernel32) -add_cd_file(TARGET explorer DESTINATION reactos FOR all) +add_cd_file(TARGET filebrowser DESTINATION reactos FOR all) Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -23,115 +23,18 @@ #include <windows.h> #include <shobjidl.h> #include <shlobj.h> +#include <shlwapi.h> +#include <shlwapi_undoc.h> +#include <stdio.h> typedef HRESULT (WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); int _tmain(int argc, _TCHAR* argv[]) { - WCHAR root[MAX_PATH]; - HRESULT hr; - LPSHELLFOLDER pDesktopFolder = NULL; - LPITEMIDLIST pidlRoot = NULL; - typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); - SH_OPEN_NEW_FRAME SHOpenNewFrame; + EXPLORER_CMDLINE_PARSE_RESULTS parseResults = { 0 }; - HMODULE hBrowseui = LoadLibraryW(L"browseui.dll"); + if (SHExplorerParseCmdLine(&parseResults)) + return SHCreateFromDesktop(&parseResults); - if (!hBrowseui) - return 1; - - - if (argc < 2) - { - SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); - LPITEMIDLIST pidlDrives; - SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives); - SHOpenNewFrame((LPITEMIDLIST) pidlDrives, NULL, 0, 0); - } - else - { - /* A shell is already loaded. Parse the command line arguments - and unless we need to do something specific simply display - the desktop in a separate explorer window */ - /* FIXME */ - - /* Commandline switches: - * - * /n Open a new window, even if an existing one still exists. - * /e Start with the explorer sidebar shown. - * /root,<object> Open a window for the given object path. - * /select,<object> Open a window with the given object selected. - */ - - /* FIXME: Do it right */ - WCHAR* tmp = wcsstr(argv[1], L"/root,"); - if (tmp) - { - WCHAR* tmp2; - - tmp += 6; // skip to beginning of path - tmp2 = wcschr(tmp, L','); - - if (tmp2) - { - wcsncpy(root, tmp, tmp2 - tmp); - } - else - { - wcscpy(root, tmp); - } - } - else - { - wcscpy(root, argv[1]); - } - - if (root[0] == L'"') - { - int len = wcslen(root) - 2; - wcsncpy(root, root + 1, len); - root[len] = 0; - } - - if (wcslen(root) > 0) - { - LPITEMIDLIST pidl; - ULONG chEaten; - ULONG dwAttributes; - - if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder))) - { - hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder, - NULL, - NULL, - root, - &chEaten, - &pidl, - &dwAttributes); - if (SUCCEEDED(hr)) - { - pidlRoot = pidl; - } - } - } - - if (!pidlRoot) - { - hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot); - if (FAILED(hr)) - return 0; - } - - SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); - - hr = SHOpenNewFrame(pidlRoot, (IUnknown*) pDesktopFolder, 0, 0); - if (FAILED(hr)) - return 0; - } - - /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ - Sleep(1000); - - ExitThread(0); + return 0; } - Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -22,6 +22,7 @@ browseui.cpp browseuiord.cpp commonbrowser.cpp + desktopipc.cpp globalfoldersettings.cpp internettoolbar.cpp parsecmdline.cpp Modified: branches/shell-experiments/dll/win32/browseui/browseuiord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/browseuiord.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/browseuiord.cpp [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -20,8 +20,6 @@ #include "precomp.h" -extern DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter); - /************************************************************************* * InitOCHostClass [BROWSEUI.101] */ @@ -31,28 +29,11 @@ } /************************************************************************* - * SHOpenFolderWindow [BROWSEUI.102] - */ -extern "C" long WINAPI SHOpenFolderWindow(IEThreadParamBlock *param8) -{ - return 0; -} - -/************************************************************************* * SHCreateSavedWindows [BROWSEUI.105] * Called to recreate explorer windows from previous session */ extern "C" void WINAPI SHCreateSavedWindows() { -} - -/************************************************************************* - * SHCreateFromDesktop [BROWSEUI.106] - * parameter is a FolderInfo - */ -extern "C" long WINAPI SHCreateFromDesktop(long param8) -{ - return -1; } /************************************************************************* @@ -92,93 +73,11 @@ } /************************************************************************* - * SHCreateIETHREADPARAM [BROWSEUI.123] - */ -extern "C" IEThreadParamBlock *WINAPI SHCreateIETHREADPARAM( - long param8, long paramC, IUnknown *param10, IUnknown *param14) -{ - IEThreadParamBlock *result; - - result = (IEThreadParamBlock *)LocalAlloc(LMEM_ZEROINIT, 256); - if (result == NULL) - return NULL; - result->offset0 = param8; - result->offset8 = paramC; - result->offsetC = param10; - if (param10 != NULL) - param10->AddRef(); - result->offset14 = param14; - if (param14 != NULL) - param14->AddRef(); - return result; -} - -/************************************************************************* - * SHCloneIETHREADPARAM [BROWSEUI.124] - */ -extern "C" IEThreadParamBlock *WINAPI SHCloneIETHREADPARAM(IEThreadParamBlock *param) -{ - IEThreadParamBlock *result; - - result = (IEThreadParamBlock *)LocalAlloc(LMEM_FIXED, 256); - if (result == NULL) - return NULL; - memcpy(result, param, 0x40 * 4); - if (result->directoryPIDL != NULL) - result->directoryPIDL = ILClone(result->directoryPIDL); - if (result->offset7C != NULL) - result->offset7C = ILClone(result->offset7C); - if (result->offset80 != NULL) - result->offset80 = ILClone(result->offset80); - if (result->offset70 != NULL) - result->offset70->AddRef(); -#if 0 - if (result->offsetC != NULL) - result->offsetC->Method2C(); -#endif - return result; -} - -/************************************************************************* * SHParseIECommandLine [BROWSEUI.125] */ extern "C" long WINAPI SHParseIECommandLine(long param8, long paramC) { return -1; -} - -/************************************************************************* - * SHDestroyIETHREADPARAM [BROWSEUI.126] - */ -extern "C" void WINAPI SHDestroyIETHREADPARAM(IEThreadParamBlock *param) -{ - if (param == NULL) - return; - if (param->directoryPIDL != NULL) - ILFree(param->directoryPIDL); - if (param->offset7C != NULL) - ILFree(param->offset7C); - if ((param->offset4 & 0x80000) == 0 && param->offset80 != NULL) - ILFree(param->offset80); - if (param->offset14 != NULL) - param->offset14->Release(); - if (param->offset70 != NULL) - param->offset70->Release(); - if (param->offset78 != NULL) - param->offset78->Release(); - if (param->offsetC != NULL) - param->offsetC->Release(); - if (param->offsetF8 != NULL) - param->offsetF8->Release(); - LocalFree(param); -} - -/************************************************************************* - * SHOnCWMCommandLine [BROWSEUI.127] - */ -extern "C" HRESULT WINAPI SHOnCWMCommandLine(long param8) -{ - return E_NOTIMPL; } /************************************************************************* @@ -261,36 +160,3 @@ { return TRUE; } - -// 75FA56C1h -// (pidl, 0, -1, 1) -// this function should handle creating a new process if needed, but I'm leaving that out for now -// this function always opens a new window - it does NOT check for duplicates -/************************************************************************* - * SHOpenNewFrame [BROWSEUI.103] - */ -extern "C" HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14) -{ - IEThreadParamBlock *parameters; - HANDLE threadHandle; - DWORD threadID; - - parameters = SHCreateIETHREADPARAM(0, 1, paramC, NULL); - if (parameters == NULL) - { - ILFree(pidl); - return E_OUTOFMEMORY; - } - if (paramC != NULL) - parameters->offset10 = param10; - parameters->directoryPIDL = pidl; - parameters->offset4 = param14; - threadHandle = CreateThread(NULL, 0x10000, BrowserThreadProc, parameters, 0, &threadID); - if (threadHandle != NULL) - { - CloseHandle(threadHandle); - return S_OK; - } - SHDestroyIETHREADPARAM(parameters); - return E_FAIL; -} Added: branches/shell-experiments/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/desktopipc.cpp (added) +++ branches/shell-experiments/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -0,0 +1,591 @@ +#include "precomp.h" +#include <shlwapi.h> +#include <shlwapi_undoc.h> + +#define PROXY_DESKTOP_CLASS L"Proxy Desktop" + +BOOL g_SeparateFolders = FALSE; + +// fields indented more are unknown ;P +struct HNFBlock +{ + UINT cbSize; + DWORD offset4; + DWORD offset8; + DWORD offsetC; + DWORD offset10; + DWORD offset14; + DWORD offset18; + DWORD offset1C; + DWORD offset20; + DWORD offset24; + DWORD offset28; + DWORD offset2C; + DWORD offset30; + UINT directoryPidlLength; + UINT pidlSize7C; + UINT pidlSize80; + UINT pathLength; +}; + +extern DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter); + +class CProxyDesktop : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl < CProxyDesktop, CWindow, CFrameWinTraits > +{ + IEThreadParamBlock * m_Parameters; + + LPITEMIDLIST m_rootPidl; + +public: + CProxyDesktop(IEThreadParamBlock * parameters) : + m_Parameters(parameters) + { + + } + + virtual ~CProxyDesktop() + { + } + + LRESULT OnMessage1037(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + DbgPrint("Proxy Desktop message 1037.\n"); + bHandled = TRUE; + return TRUE; + } + + LRESULT OnOpenNewWindow(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + DbgPrint("Proxy Desktop message 1035 received.\n"); + bHandled = TRUE; + SHOnCWMCommandLine((HANDLE) lParam); + return 0; + } + + DECLARE_WND_CLASS_EX(PROXY_DESKTOP_CLASS, CS_SAVEBITS | CS_DROPSHADOW, COLOR_3DFACE) + + BEGIN_MSG_MAP(CProxyDesktop) + MESSAGE_HANDLER(WM_EXPLORER_1037, OnMessage1037) + MESSAGE_HANDLER(WM_EXPLORER_OPEN_NEW_WINDOW, OnOpenNewWindow) + END_MSG_MAP() +}; + +static CProxyDesktop * CreateProxyDesktop(IEThreadParamBlock * parameters) +{ + return new CProxyDesktop(parameters); +} + +HWND FindShellProxy(LPITEMIDLIST pidl) +{ + if (!g_SeparateFolders) + { + HWND shell = GetShellWindow(); + + if (shell) + { + DbgPrint("Found main desktop.\n"); + return shell; + } + } + else + { + DbgPrint("Separate folders setting enabled. Ignoring main desktop.\n"); + } + + HWND proxy = FindWindow(PROXY_DESKTOP_CLASS, NULL); + if (proxy) + { + DbgPrint("Found proxy desktop.\n"); + return proxy; + } + + return NULL; +} + +HANDLE MakeSharedPacket(IEThreadParamBlock * threadParams, LPCWSTR strPath, int dwProcessId) +{ + HNFBlock* hnfData; + UINT sharedBlockSize = sizeof(*hnfData); + UINT directoryPidlLength = 0; + UINT pidlSize7C = 0; + UINT pidlSize80 = 0; + UINT pathLength = 0; + LPITEMIDLIST pidl80 = threadParams->offset80; + + // Count the total length of the message packet + + // directory PIDL + if (threadParams->directoryPIDL) + { + directoryPidlLength = ILGetSize(threadParams->directoryPIDL); + sharedBlockSize += directoryPidlLength; + DbgPrint("directoryPidlLength=%d\n", directoryPidlLength); + } + + // another PIDL + if (threadParams->offset7C) + { + pidlSize7C = ILGetSize(threadParams->offset7C); + sharedBlockSize += pidlSize7C; + DbgPrint("pidlSize7C=%d\n", pidlSize7C); + } + + // This flag indicates the presence of another pidl? + if (!(threadParams->offset84 & 0x8000)) + { + if (pidl80) + { + pidlSize80 = ILGetSize(pidl80); + sharedBlockSize += pidlSize80; + DbgPrint("pidlSize80=%d\n", pidlSize7C); + } + } + else + { + DbgPrint("pidl80 sent by value = %p\n", pidl80); + pidlSize80 = 4; + sharedBlockSize += pidlSize80; + } + + // The path string + if (strPath) + { + pathLength = 2 * lstrlenW(strPath) + 2; + sharedBlockSize += pathLength; + DbgPrint("pathLength=%d\n", pidlSize7C); + } + + DbgPrint("sharedBlockSize=%d\n", sharedBlockSize); + + // Allocate and fill the shared section + HANDLE hShared = SHAllocShared(0, sharedBlockSize, dwProcessId); + if (!hShared) + { + DbgPrint("Shared section alloc error.\n"); + return 0; + } + + PBYTE target = (PBYTE) SHLockShared(hShared, dwProcessId); + if (!target) + { + DbgPrint("Shared section lock error. %d\n", GetLastError()); + SHFreeShared(hShared, dwProcessId); + return 0; + } + + // Basic information + hnfData = (HNFBlock*) target; + hnfData->cbSize = sharedBlockSize; + hnfData->offset4 = (DWORD) (threadParams->dwFlags); + hnfData->offset8 = (DWORD) (threadParams->offset8); + hnfData->offsetC = (DWORD) (threadParams->offset74); + hnfData->offset10 = (DWORD) (threadParams->offsetD8); + hnfData->offset14 = (DWORD) (threadParams->offset84); + hnfData->offset18 = (DWORD) (threadParams->offset88); + hnfData->offset1C = (DWORD) (threadParams->offset8C); + hnfData->offset20 = (DWORD) (threadParams->offset90); + hnfData->offset24 = (DWORD) (threadParams->offset94); + hnfData->offset28 = (DWORD) (threadParams->offset98); + hnfData->offset2C = (DWORD) (threadParams->offset9C); + hnfData->offset30 = (DWORD) (threadParams->offsetA0); + hnfData->directoryPidlLength = 0; + hnfData->pidlSize7C = 0; + hnfData->pidlSize80 = 0; + hnfData->pathLength = 0; + target += sizeof(*hnfData); + + // Copy the directory pidl contents + if (threadParams->directoryPIDL) + { + memcpy(target, threadParams->directoryPIDL, directoryPidlLength); + target += directoryPidlLength; + hnfData->directoryPidlLength = directoryPidlLength; + } + + // Copy the other pidl contents + if (threadParams->offset7C) + { + memcpy(target, threadParams->offset7C, pidlSize7C); + target += pidlSize7C; + hnfData->pidlSize7C = pidlSize7C; + } + + // copy the third pidl + if (threadParams->offset84 & 0x8000) + { + *(LPITEMIDLIST*) target = pidl80; + target += pidlSize80; + hnfData->pidlSize80 = pidlSize80; + } + else if (pidl80) + { + memcpy(target, pidl80, pidlSize80); + target += pidlSize80; + hnfData->pidlSize80 = pidlSize80; + } + + // and finally the path string + if (strPath) + { + memcpy(target, strPath, pathLength); + hnfData->pathLength = pathLength; + } + + SHUnlockShared(hnfData); + + return hShared; +} + +PIE_THREAD_PARAM_BLOCK ParseSharedPacket(HANDLE hData) +{ + HNFBlock * hnfData; + PBYTE block; + int pid; + PIE_THREAD_PARAM_BLOCK params = NULL; + + if (!hData) + goto cleanup0; + + pid = GetCurrentProcessId(); + block = (PBYTE) SHLockShared(hData, pid); + + hnfData = (HNFBlock *) block; + if (!block) + goto cleanup2; + + if (hnfData->cbSize < sizeof(HNFBlock)) + goto cleanup2; + + params = SHCreateIETHREADPARAM(0, hnfData->offset8, 0, 0); + if (!params) + goto cleanup2; + + params->dwFlags = hnfData->offset4; + params->offset8 = hnfData->offset8; + params->offset74 = hnfData->offsetC; + params->offsetD8 = hnfData->offset10; + params->offset84 = hnfData->offset14; + params->offset88 = hnfData->offset18; + params->offset8C = hnfData->offset1C; + params->offset90 = hnfData->offset20; + params->offset94 = hnfData->offset24; + params->offset98 = hnfData->offset28; + params->offset9C = hnfData->offset2C; + params->offsetA0 = hnfData->offset30; + + block += sizeof(*hnfData); + if (hnfData->directoryPidlLength) + { + LPITEMIDLIST pidl = NULL; + if (*block) + pidl = ILClone((LPITEMIDLIST) block); + params->directoryPIDL = pidl; + + block += hnfData->directoryPidlLength; + } + + if (hnfData->pidlSize7C) + { + LPITEMIDLIST pidl = NULL; + if (*block) + pidl = ILClone((LPITEMIDLIST) block); + params->offset7C = pidl; + + block += hnfData->pidlSize80; + } + + if (hnfData->pidlSize80) + { + if (!(params->offset84 & 0x8000)) + { + params->offset80 = *(LPITEMIDLIST *) block; + } + else + { + LPITEMIDLIST pidl = NULL; + if (*block) + pidl = ILClone((LPITEMIDLIST) block); + params->offset80 = pidl; + } + + block += hnfData->pidlSize80; + } + + if (hnfData->pathLength) + { + CComPtr<IShellFolder> psfDesktop; + PWSTR strPath = (PWSTR) block; + + if (FAILED(SHGetDesktopFolder(&psfDesktop))) + { + params->directoryPIDL = NULL; + goto cleanup0; + } + + if (FAILED(psfDesktop->ParseDisplayName(NULL, NULL, strPath, NULL, &params->directoryPIDL, NULL))) + { + params->directoryPIDL = NULL; + goto cleanup0; + } + } + +cleanup2: + SHUnlockShared(hnfData); + SHFreeShared(hData, pid); + +cleanup0: + if (!params->directoryPIDL) + { + SHDestroyIETHREADPARAM(params); + return NULL; + } + + return params; +} + + +/************************************************************************* +* SHOnCWMCommandLine [BROWSEUI.127] +*/ +extern "C" BOOL WINAPI SHOnCWMCommandLine(HANDLE hSharedInfo) +{ + DbgPrint("SHOnCWMCommandLine\n"); + + PIE_THREAD_PARAM_BLOCK params = ParseSharedPacket(hSharedInfo); + + if (params) + return SHOpenFolderWindow(params); + + return FALSE; +} + +/************************************************************************* +* SHCreateIETHREADPARAM [BROWSEUI.123] +*/ +extern "C" IEThreadParamBlock *WINAPI SHCreateIETHREADPARAM( + long param8, long paramC, IUnknown *param10, IUnknown *param14) +{ + IEThreadParamBlock *result; + + DbgPrint("SHCreateIETHREADPARAM\n"); + + result = (IEThreadParamBlock *) LocalAlloc(LMEM_ZEROINIT, 256); + if (result == NULL) + return NULL; + result->offset0 = param8; + result->offset8 = paramC; + result->offsetC = param10; + if (param10 != NULL) + param10->AddRef(); + result->offset14 = param14; + if (param14 != NULL) + param14->AddRef(); + return result; +} + +/************************************************************************* +* SHCloneIETHREADPARAM [BROWSEUI.124] +*/ +extern "C" IEThreadParamBlock *WINAPI SHCloneIETHREADPARAM(IEThreadParamBlock *param) +{ + IEThreadParamBlock *result; + + DbgPrint("SHCloneIETHREADPARAM\n"); + + result = (IEThreadParamBlock *) LocalAlloc(LMEM_FIXED, 256); + if (result == NULL) + return NULL; + memcpy(result, param, 0x40 * 4); + if (result->directoryPIDL != NULL) + result->directoryPIDL = ILClone(result->directoryPIDL); + if (result->offset7C != NULL) + result->offset7C = ILClone(result->offset7C); + if (result->offset80 != NULL) + result->offset80 = ILClone(result->offset80); + if (result->offset70 != NULL) + result->offset70->AddRef(); +#if 0 + if (result->offsetC != NULL) + result->offsetC->Method2C(); +#endif + return result; +} + +/************************************************************************* +* SHDestroyIETHREADPARAM [BROWSEUI.126] +*/ +extern "C" void WINAPI SHDestroyIETHREADPARAM(IEThreadParamBlock *param) +{ + DbgPrint("SHDestroyIETHREADPARAM\n"); + + if (param == NULL) + return; + if (param->directoryPIDL != NULL) + ILFree(param->directoryPIDL); + if (param->offset7C != NULL) + ILFree(param->offset7C); + if ((param->dwFlags & 0x80000) == 0 && param->offset80 != NULL) + ILFree(param->offset80); + if (param->offset14 != NULL) + param->offset14->Release(); + if (param->offset70 != NULL) + param->offset70->Release(); + if (param->offset78 != NULL) + param->offset78->Release(); + if (param->offsetC != NULL) + param->offsetC->Release(); + if (param->offsetF8 != NULL) + param->offsetF8->Release(); + LocalFree(param); +} + +/************************************************************************* +* SHOpenFolderWindow [BROWSEUI.102] +* see SHOpenNewFrame below for remarks +*/ +extern "C" HRESULT WINAPI SHOpenFolderWindow(PIE_THREAD_PARAM_BLOCK parameters) +{ + HANDLE threadHandle; + DWORD threadID; + + DbgPrint("SHOpenFolderWindow\n"); + + threadHandle = CreateThread(NULL, 0x10000, BrowserThreadProc, parameters, 0, &threadID); + if (threadHandle != NULL) + { + CloseHandle(threadHandle); + return S_OK; + } + SHDestroyIETHREADPARAM(parameters); + return E_FAIL; +} + +// 75FA56C1h +// (pidl, 0, -1, 1) +// this function should handle creating a new process if needed, but I'm leaving that out for now +// this function always opens a new window - it does NOT check for duplicates +/************************************************************************* +* SHOpenNewFrame [BROWSEUI.103] +*/ +extern "C" HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags) +{ + IEThreadParamBlock *parameters; + + DbgPrint("SHOpenNewFrame\n"); + + parameters = SHCreateIETHREADPARAM(0, 1, paramC, NULL); + if (parameters == NULL) + { + ILFree(pidl); + return E_OUTOFMEMORY; + } + if (paramC != NULL) + parameters->offset10 = param10; + parameters->directoryPIDL = pidl; + parameters->dwFlags = dwFlags; + + return SHOpenFolderWindow(parameters); +} + +/************************************************************************* +* SHCreateFromDesktop [BROWSEUI.106] +* parameter is a FolderInfo +*/ +BOOL WINAPI SHCreateFromDesktop(ExplorerCommandLineParseResults * parseResults) +{ + DbgPrint("SHCreateFromDesktop\n"); + + IEThreadParamBlock * parameters = SHCreateIETHREADPARAM(0, 0, 0, 0); + if (!parameters) + return FALSE; + + PCWSTR strPath = NULL; + if (parseResults->dwFlags & SH_EXPLORER_CMDLINE_FLAG_STRING) + { + if (parseResults->pidlPath) + { + WARN("strPath and pidlPath are both assigned. This shouldn't happen.\n"); + } + + strPath = parseResults->strPath; + } + + parameters->dwFlags = parseResults->dwFlags; + parameters->offset8 = parseResults->offsetC; + + LPITEMIDLIST pidl = parseResults->pidlPath ? ILClone(parseResults->pidlPath) : NULL; + if (!pidl && parseResults->dwFlags & SH_EXPLORER_CMDLINE_FLAG_STRING) + { + if (parseResults->strPath && parseResults->strPath[0]) + { + pidl = ILCreateFromPathW(parseResults->strPath); + } + } + + parameters->directoryPIDL = pidl; + + // Try to find the owner of the idlist, if we aren't running /SEPARATE + HWND desktop = NULL; + if (!(parseResults->dwFlags & SH_EXPLORER_CMDLINE_FLAG_SEPARATE)) + desktop = FindShellProxy(parameters->directoryPIDL); + + // If found, ask it to open the new window + if (desktop) + { + DbgPrint("Found desktop hwnd=%p\n", desktop); + + DWORD dwProcessId; + + GetWindowThreadProcessId(desktop, &dwProcessId); + AllowSetForegroundWindow(dwProcessId); + + HANDLE hShared = MakeSharedPacket(parameters, strPath, dwProcessId); + if (hShared) + { + DbgPrint("Sending open message...\n"); + + PostMessageW(desktop, WM_EXPLORER_OPEN_NEW_WINDOW, 0, (LPARAM) hShared); + } + + SHDestroyIETHREADPARAM(parameters); + return TRUE; + } + + DbgPrint("Desktop not found or separate flag requested.\n"); + + // Else, start our own message loop! + HRESULT hr = CoInitialize(NULL); + CProxyDesktop * proxy = CreateProxyDesktop(parameters); + if (proxy) + { + LONG refCount; + CComPtr<IUnknown> thread; + if (SHCreateThreadRef(&refCount, &thread) >= 0) + { + SHSetInstanceExplorer(thread); + if (strPath) + parameters->directoryPIDL = ILCreateFromPath(strPath); + SHOpenFolderWindow(parameters); + parameters = NULL; + thread.Release(); + } + + MSG Msg; + while (GetMessageW(&Msg, 0, 0, 0) && refCount) + { + TranslateMessage(&Msg); + DispatchMessageW(&Msg); + } + + delete proxy; + } + + if (SUCCEEDED(hr)) + CoUninitialize(); + + SHDestroyIETHREADPARAM(parameters); + + return TRUE; +} Propchange: branches/shell-experiments/dll/win32/browseui/desktopipc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -3447,14 +3447,8 @@ { HRESULT hr; IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; - INITCOMMONCONTROLSEX iccex = - { - sizeof(iccex), - 0xFFFF /* everything! */ - }; OleInitialize(NULL); - InitCommonControlsEx(&iccex); ATLTRY(hr = ExplorerMessageLoop(parameters)); Modified: branches/shell-experiments/dll/win32/shell32/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/desktop.cpp [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -475,6 +475,11 @@ break; } + case WM_EXPLORER_OPEN_NEW_WINDOW: + DbgPrint("Proxy Desktop message 1035 received.\n"); + SHOnCWMCommandLine((HANDLE)lParam); + break; + default: DefMsgHandler: Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam); Modified: branches/shell-experiments/dll/win32/shell32/undocshell.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/undocshell.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/undocshell.h [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -127,30 +127,6 @@ DWORD dwType); /**************************************************************************** - * Memory Routines - */ - -/* The Platform SDK's shlobj.h header defines similar functions with a - * leading underscore. However those are unusable because of the leading - * underscore, because they have an incorrect calling convention, and - * because these functions are not exported by name anyway. - */ -HANDLE WINAPI SHAllocShared( - LPVOID pv, - ULONG cb, - DWORD pid); - -BOOL WINAPI SHFreeShared( - HANDLE hMem, - DWORD pid); - -LPVOID WINAPI SHLockShared( - HANDLE hMem, - DWORD pid); - -BOOL WINAPI SHUnlockShared(LPVOID pv); - -/**************************************************************************** * Cabinet Window Messages */ Modified: branches/shell-experiments/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… ============================================================================== --- branches/shell-experiments/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shlwapi/ordinal.c [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -71,7 +71,7 @@ if (dwDstProcId == dwMyProcId) hDst = GetCurrentProcess(); else - hDst = OpenProcess(PROCESS_DUP_HANDLE, 0, dwDstProcId); + hDst = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwDstProcId); if (hDst) { @@ -79,12 +79,12 @@ if (dwSrcProcId == dwMyProcId) hSrc = GetCurrentProcess(); else - hSrc = OpenProcess(PROCESS_DUP_HANDLE, 0, dwSrcProcId); + hSrc = OpenProcess(PROCESS_DUP_HANDLE, FALSE, dwSrcProcId); if (hSrc) { /* Make handle available to dest process */ - if (!DuplicateHandle(hDst, hShared, hSrc, &hRet, + if (!DuplicateHandle(hSrc, hShared, hDst, &hRet, dwAccess, 0, dwOptions | DUPLICATE_SAME_ACCESS)) hRet = NULL; @@ -175,18 +175,32 @@ { HANDLE hDup; LPVOID pMapped; + DWORD thisProcessId = GetCurrentProcessId(); TRACE("(%p %d)\n", hShared, dwProcId); - /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), - FILE_MAP_ALL_ACCESS, 0); + if (dwProcId != thisProcessId) + { + /* Get handle to shared memory for current process */ + hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + FILE_MAP_ALL_ACCESS, 0); + } + else + { + hDup = hShared; + } + /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); - CloseHandle(hDup); + + if (dwProcId != thisProcessId) + { + CloseHandle(hDup); + } if (pMapped) - return (char *) pMapped + sizeof(DWORD); /* Hide size */ + return (char *) pMapped + sizeof(DWORD); /* Hide size */ + return NULL; } @@ -231,7 +245,7 @@ /* Get a copy of the handle for our process, closing the source handle */ hClose = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), - FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); + FILE_MAP_ALL_ACCESS, DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); } Modified: branches/shell-experiments/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlwapi.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlwapi.h [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -1863,6 +1863,16 @@ #endif /* NO_SHLWAPI_STREAM */ #ifndef NO_SHLWAPI_SHARED + +// These functions are only included in this file starting with the Windows 7 platform SDK + +HANDLE +WINAPI +SHAllocShared( + _In_opt_ const void *pvData, + _In_ DWORD dwSize, + _In_ DWORD dwDestinationProcessId + ); PVOID WINAPI Modified: branches/shell-experiments/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] Fri Sep 26 14:47:07 2014 @@ -27,40 +27,50 @@ typedef struct IEThreadParamBlock { - long offset0; - long offset4; - long offset8; - IUnknown *offsetC; - long offset10; - IUnknown *offset14; - LPITEMIDLIST directoryPIDL; - char filler1[84]; // unknown contents - IUnknown *offset70; - long filler2; // unknown contents - IUnknown *offset78; - LPITEMIDLIST offset7C; - LPITEMIDLIST offset80; - char filler3[116]; // unknown contents - IUnknown *offsetF8; // instance explorer - long filler4; // unknown contents + long offset0; + DWORD dwFlags; + long offset8; + IUnknown * offsetC; + long offset10; + IUnknown * offset14; + LPITEMIDLIST directoryPIDL; // 0x18 + char offset1C[0x70-0x1C]; // unknown contents -- 0x1C..0x6c + IUnknown * offset70; + long offset74; // unknown contents + IUnknown * offset78; + LPITEMIDLIST offset7C; + LPITEMIDLIST offset80; + LONG offset84; + LONG offset88; + LONG offset8C; + LONG offset90; + LONG offset94; + LONG offset98; + LONG offset9C; + LONG offsetA0; + char offsetA4[0xD8-0xA4]; // unknown contents -- 0xA4..0xD8 + LONG offsetD8; + char offsetDC[0xF8-0xDC]; // unknown contents -- 0xDC..0xF8 + IUnknown * offsetF8; // instance explorer + LONG offsetFC; // unknown contents } IE_THREAD_PARAM_BLOCK, *PIE_THREAD_PARAM_BLOCK; typedef struct ExplorerCommandLineParseResults { - LPWSTR strPath; - LPITEMIDLIST pidlPath; - DWORD dwFlags; - DWORD unk_12; - DWORD unk_16; - DWORD unk_20; - DWORD unk_24; - DWORD unk_28; - LPITEMIDLIST pidlRoot; - DWORD unk_36; - DWORD unk_40; - DWORD unk_44; - DWORD unk_48; - GUID guidInproc; + LPWSTR strPath; + LPITEMIDLIST pidlPath; + DWORD dwFlags; + DWORD offsetC; + DWORD offset10; + DWORD offset14; + DWORD offset18; + DWORD offset1C; + LPITEMIDLIST pidlRoot; + DWORD offset24; + DWORD offset28; + DWORD offset2C; + DWORD offset30; + GUID guidInproc; } EXPLORER_CMDLINE_PARSE_RESULTS, *PEXPLORER_CMDLINE_PARSE_RESULTS; #define SH_EXPLORER_CMDLINE_FLAG_ONE 0x00000001 @@ -81,8 +91,17 @@ // unknown/unused 0x00008000 // unknown/unused 0x00010000 #define SH_EXPLORER_CMDLINE_FLAG_SEPARATE 0x00020000 +// unknown/unused 0x00040000 +// unknown/unused 0x00080000 +// unknown/unused 0x00100000 +// unknown/unused 0x00200000 +// unknown/unused 0x00400000 +// unknown/unused 0x00800000 +// unknown/unused 0x01000000 #define SH_EXPLORER_CMDLINE_FLAG_STRING 0x02000000 +#define WM_EXPLORER_OPEN_NEW_WINDOW (WM_USER+11) +#define WM_EXPLORER_1037 (WM_USER+13) BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen); BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen); @@ -122,9 +141,9 @@ BOOL WINAPI SHIsChildOrSelf(HWND hParent, HWND hChild); void WINAPI InitOCHostClass(long param8); -long WINAPI SHOpenFolderWindow(PIE_THREAD_PARAM_BLOCK param8); +long WINAPI SHOpenFolderWindow(PIE_THREAD_PARAM_BLOCK parameters); void WINAPI SHCreateSavedWindows(void); -long WINAPI SHCreateFromDesktop(long param8); +BOOL WINAPI SHCreateFromDesktop(PEXPLORER_CMDLINE_PARSE_RESULTS parseResults); UINT WINAPI SHExplorerParseCmdLine(PEXPLORER_CMDLINE_PARSE_RESULTS pParseResults); void WINAPI UEMRegisterNotify(long param8, long paramC); HRESULT WINAPI SHCreateBandForPidl(LPCITEMIDLIST param8, IUnknown *paramC, BOOL param10); @@ -134,7 +153,7 @@ PIE_THREAD_PARAM_BLOCK WINAPI SHCloneIETHREADPARAM(PIE_THREAD_PARAM_BLOCK param); long WINAPI SHParseIECommandLine(long param8, long paramC); void WINAPI SHDestroyIETHREADPARAM(PIE_THREAD_PARAM_BLOCK param); -HRESULT WINAPI SHOnCWMCommandLine(long param8); +BOOL WINAPI SHOnCWMCommandLine(HANDLE hSharedInfo); LPITEMIDLIST WINAPI Channel_GetFolderPidl(void); IUnknown *WINAPI ChannelBand_Create(LPITEMIDLIST pidl); HRESULT WINAPI Channels_SetBandInfoSFB(IUnknown *param8); @@ -145,7 +164,7 @@ HRESULT WINAPI SHEnumClassesOfCategories(long param8, long paramC, long param10, long param14, long param18); HRESULT WINAPI SHWriteClassesOfCategories(long param8, long paramC, long param10, long param14, long param18, long param1C, long param20); BOOL WINAPI SHIsExplorerBrowser(); -HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); +HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags); #ifdef __cplusplus } /* extern "C" */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs