Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 60119: [NETAPI32] NetLocalGroupGetMembers: Fix heap corruption by calculationg the proper buffer size.
by ekohl＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: ekohl Date: Sat Sep 14 21:35:01 2013 New Revision: 60119 URL: http://svn.reactos.org/svn/reactos?rev=60119&view=rev Log: [NETAPI32] NetLocalGroupGetMembers: Fix heap corruption by calculationg the proper buffer size. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sat Sep 14 21:35:01 2013 @@ -1515,27 +1515,27 @@ switch (level) { case 0: - Size = sizeof(LOCALGROUP_MEMBERS_INFO_0) + - RtlLengthSid(EnumContext->Sids[i]); + Size += sizeof(LOCALGROUP_MEMBERS_INFO_0) + + RtlLengthSid(EnumContext->Sids[i]); break; case 1: - Size = sizeof(LOCALGROUP_MEMBERS_INFO_1) + - RtlLengthSid(EnumContext->Sids[i]) + - EnumContext->Names[i].Name.Length + sizeof(WCHAR); + Size += sizeof(LOCALGROUP_MEMBERS_INFO_1) + + RtlLengthSid(EnumContext->Sids[i]) + + EnumContext->Names[i].Name.Length + sizeof(WCHAR); break; case 2: - Size = sizeof(LOCALGROUP_MEMBERS_INFO_2) + - RtlLengthSid(EnumContext->Sids[i]) + - EnumContext->Names[i].Name.Length + sizeof(WCHAR) + - EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); + Size += sizeof(LOCALGROUP_MEMBERS_INFO_2) + + RtlLengthSid(EnumContext->Sids[i]) + + EnumContext->Names[i].Name.Length + sizeof(WCHAR) + + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); break; case 3: - Size = sizeof(LOCALGROUP_MEMBERS_INFO_3) + - EnumContext->Names[i].Name.Length + sizeof(WCHAR) + - EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); + Size += sizeof(LOCALGROUP_MEMBERS_INFO_3) + + EnumContext->Names[i].Name.Length + sizeof(WCHAR) + + EnumContext->Domains->Domains[EnumContext->Names[i].DomainIndex].Name.Length + sizeof(WCHAR); break; default:

1 0

[akhaldi] 60118: [COMCTL32_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 20:07:14 2013 New Revision: 60118 URL: http://svn.reactos.org/svn/reactos?rev=60118&view=rev Log: [COMCTL32_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/comctl32/comboex.c trunk/rostests/winetests/comctl32/datetime.c trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/misc.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/pager.c trunk/rostests/winetests/comctl32/progress.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/rebar.c trunk/rostests/winetests/comctl32/trackbar.c Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -29,18 +29,13 @@ updown.c testlist.c) -add_executable(comctl32_winetest - ${SOURCE} - rsrc.rc) - -target_link_libraries(comctl32_winetest wine) +add_executable(comctl32_winetest ${SOURCE} rsrc.rc) +set_module_type(comctl32_winetest win32cui) +add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32) +add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(comctl32_winetest "-Wno-format") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") endif() - -set_module_type(comctl32_winetest win32cui) -add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboe… ============================================================================== --- trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -280,8 +280,6 @@ GetLastError()); hList = cbInfo.hwndList; - trace("hWnd=%p, hComboEx=%p, hCombo=%p, hList=%p, hEdit=%p\n", - hComboExParentWnd, hComboEx, hCombo, hList, hEdit); ok(GetFocus() == hComboExParentWnd, "Focus not on Main Window, instead on %p\n", GetFocus()); Modified: trunk/rostests/winetests/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dateti… ============================================================================== --- trunk/rostests/winetests/comctl32/datetime.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/datetime.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -145,8 +145,6 @@ LRESULT ret; struct message msg; - trace("datetime: %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/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… ============================================================================== --- trunk/rostests/winetests/comctl32/header.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/header.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -412,7 +412,6 @@ LRESULT ret; struct message msg; - trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -444,8 +443,6 @@ 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; 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 14 20:07:14 2013 @@ -30,7 +30,6 @@ //#include <stdarg.h> #include <stdio.h> -#include <assert.h> #include <windef.h> #include <winbase.h> @@ -655,26 +654,26 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static ULONG STDMETHODCALLTYPE Test_Stream_AddRef(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 2; } static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 1; } static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -707,13 +706,13 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -721,46 +720,46 @@ ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Commit(IStream *iface, DWORD grfCommitFlags) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Revert(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Clone(IStream *iface, IStream **ppstm) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } 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 14 20:07:14 2013 @@ -398,8 +398,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); add_message(sequences, COMBINED_SEQ_INDEX, &msg); } @@ -586,8 +584,6 @@ LRESULT ret; struct message msg; - trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - /* some debug output for style changing */ if ((message == WM_STYLECHANGING || message == WM_STYLECHANGED) && lParam) @@ -663,8 +659,6 @@ static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; - - trace("header: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam; @@ -1757,8 +1751,8 @@ if(msg == WM_NOTIFY) { NMHDR *nmhdr = (PVOID)lp; if(nmhdr->code == NM_CUSTOMDRAW) { - NMLVCUSTOMDRAW *nmlvcd = (PVOID)nmhdr; - trace("NMCUSTOMDRAW (0x%.8x)\n", nmlvcd->nmcd.dwDrawStage); + NMLVCUSTOMDRAW *nmlvcd = (NMLVCUSTOMDRAW*)nmhdr; + switch(nmlvcd->nmcd.dwDrawStage) { case CDDS_PREPAINT: SetBkColor(nmlvcd->nmcd.hdc, c0ffee); Modified: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… ============================================================================== --- trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -22,6 +22,7 @@ //#include <windows.h> #include <wine/test.h> +#include "v6util.h" static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG); @@ -186,13 +187,39 @@ ok(res == TRUE, "Expected TRUE, got %d\n", res); } +static void test_TaskDialogIndirect(void) +{ + HINSTANCE hinst; + void *ptr, *ptr2; + + hinst = LoadLibraryA("comctl32.dll"); + + ptr = GetProcAddress(hinst, "TaskDialogIndirect"); + if (!ptr) + { + win_skip("TaskDialogIndirect not exported by name\n"); + return; + } + + ptr2 = GetProcAddress(hinst, (const CHAR*)345); + ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr); +} + START_TEST(misc) { + ULONG_PTR ctx_cookie; + HANDLE hCtx; + if(!InitFunctionPtrs()) return; test_GetPtrAW(); test_Alloc(); - FreeLibrary(hComctl32); -} + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_TaskDialogIndirect(); + + unload_v6_module(ctx_cookie, hCtx); +} Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… ============================================================================== --- trunk/rostests/winetests/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/monthcal.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -461,8 +461,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; @@ -883,7 +881,6 @@ /* check for locale first day */ if(GetLocaleInfoA(lcid, LOCALE_IFIRSTDAYOFWEEK, b, 128)){ fday = atoi(b); - trace("fday: %d\n", fday); res = SendMessage(hwnd, MCM_GETFIRSTDAYOFWEEK, 0, 0); expect(fday, res); prev = fday; @@ -1329,6 +1326,9 @@ HWND hwnd; hwnd = create_monthcal_control(0); + + res = SendMessage(hwnd, MCM_GETMONTHDELTA, 0, 0); + expect(2, res); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1977,7 +1977,6 @@ for(i = 0; i < sizeof styles / sizeof styles[0]; i++) { - trace("%s\n", styles[i].name); hwnd = create_monthcal_control(styles[i].val); SetWindowLongPtr(hwnd, GWLP_ID, SEL_NOTIFY_TEST_ID); assert(hwnd); Modified: trunk/rostests/winetests/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/pager.… ============================================================================== --- trunk/rostests/winetests/comctl32/pager.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/pager.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -77,8 +77,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|parent; if (defwndproc_counter) msg.flags |= defwinproc; @@ -127,8 +125,6 @@ WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); struct message msg; - trace("pager: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; msg.flags = sent|wparam|lparam; msg.wParam = wParam; Modified: trunk/rostests/winetests/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/progre… ============================================================================== --- trunk/rostests/winetests/comctl32/progress.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/progress.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -32,6 +32,11 @@ static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; +static HWND create_progress(DWORD style) +{ + return CreateWindowExA(0, PROGRESS_CLASSA, "", WS_VISIBLE | style, + 0, 0, 100, 20, NULL, NULL, GetModuleHandleA(NULL), 0); +} /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) @@ -224,12 +229,40 @@ ok(erased, "Progress bar should have erased the background\n"); } +static void test_setcolors(void) +{ + HWND progress; + COLORREF clr; + + progress = create_progress(PBS_SMOOTH); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, 0); + ok(clr == CLR_DEFAULT, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, RGB(0, 255, 0)); + ok(clr == 0, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBARCOLOR, 0, CLR_DEFAULT); + ok(clr == RGB(0, 255, 0), "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, 0); + ok(clr == CLR_DEFAULT, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, RGB(255, 0, 0)); + ok(clr == 0, "got %x\n", clr); + + clr = SendMessageA(progress, PBM_SETBKCOLOR, 0, CLR_DEFAULT); + ok(clr == RGB(255, 0, 0), "got %x\n", clr); + + DestroyWindow(progress); +} START_TEST(progress) { init(); test_redraw(); - + test_setcolors(); + cleanup(); } Modified: trunk/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… ============================================================================== --- trunk/rostests/winetests/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/propsheet.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -669,8 +669,6 @@ (message < WM_MOUSEFIRST || message > WM_MOUSEHWHEEL) && message != 0x90) { - /*trace("check_message: %04x, %04x\n", message, receiver);*/ - msg.message = message; msg.flags = sent|wparam|lparam|id; msg.wParam = wParam; Modified: trunk/rostests/winetests/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rebar.… ============================================================================== --- trunk/rostests/winetests/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/rebar.c [iso-8859-1] Sat Sep 14 20:07:14 2013 @@ -126,7 +126,9 @@ return hToolbar; } -static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static int g_parent_measureitem; + +static LRESULT CALLBACK parent_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -136,6 +138,9 @@ if (lpnm->code == RBN_HEIGHTCHANGE) GetClientRect(lpnm->hwndFrom, &height_change_notify_rect); } + break; + case WM_MEASUREITEM: + g_parent_measureitem++; break; } return DefWindowProcA(hWnd, msg, wParam, lParam); @@ -1058,7 +1063,7 @@ wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd"; - wc.lpfnWndProc = MyWndProc; + wc.lpfnWndProc = parent_wndproc; return RegisterClassA(&wc); } @@ -1108,6 +1113,20 @@ DestroyWindow(hRebar); } +static void test_notification(void) +{ + MEASUREITEMSTRUCT mis; + HWND rebar; + + rebar = create_rebar_control(); + + g_parent_measureitem = 0; + SendMessageA(rebar, WM_MEASUREITEM, 0, (LPARAM)&mis); + ok(g_parent_measureitem == 1, "got %d\n", g_parent_measureitem); + + DestroyWindow(rebar); +} + START_TEST(rebar) { HMODULE hComctl32; @@ -1134,6 +1153,7 @@ test_bandinfo(); test_colors(); test_showband(); + test_notification(); if(!is_font_installed("System") || !is_font_installed("Tahoma")) { 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 14 20:07:14 2013 @@ -394,6 +394,7 @@ if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); }

1 0

[akhaldi] 60117: [COMCTL32] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 20:06:00 2013 New Revision: 60117 URL: http://svn.reactos.org/svn/reactos?rev=60117&view=rev Log: [COMCTL32] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -48,21 +48,12 @@ treeview.c updown.c stubs.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) -add_library(comctl32 SHARED ${SOURCE}) +add_library(comctl32 SHARED ${SOURCE} rsrc.rc) set_module_type(comctl32 win32dll UNICODE) target_link_libraries(comctl32 uuid wine ${PSEH_LIB}) add_delay_importlibs(comctl32 winmm uxtheme) - -add_importlibs(comctl32 - user32 - gdi32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(comctl32 comctl32.h) add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comboex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comboex.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -75,7 +75,7 @@ INT nb_items; /* Number of items */ BOOL unicode; /* TRUE if this window is Unicode */ BOOL NtfUnicode; /* TRUE if parent wants notify in Unicode */ - CBE_ITEMDATA *edit; /* item data for edit item */ + CBE_ITEMDATA edit; /* item data for edit item */ CBE_ITEMDATA *items; /* Array of items */ } COMBOEX_INFO; @@ -273,9 +273,9 @@ static void COMBOEX_FreeText (CBE_ITEMDATA *item) { if (is_textW(item->pszText)) Free(item->pszText); - item->pszText = 0; + item->pszText = NULL; Free(item->pszTemp); - item->pszTemp = 0; + item->pszTemp = NULL; } @@ -455,15 +455,15 @@ } -static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR index) +static CBE_ITEMDATA *COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA *item; INT i; if ((index >= infoPtr->nb_items) || (index < -1)) - return 0; + return NULL; if (index == -1) - return infoPtr->edit; + return &infoPtr->edit; item = infoPtr->items; i = infoPtr->nb_items - 1; @@ -481,7 +481,7 @@ /* *** CBEM_xxx message support *** */ -static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) +static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) { CBE_ITEMDATA *item; LPCWSTR str; @@ -519,7 +519,7 @@ } -static INT COMBOEX_DeleteItem (const COMBOEX_INFO *infoPtr, INT_PTR index) +static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) { TRACE("(index=%ld)\n", index); @@ -534,7 +534,7 @@ } -static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -555,7 +555,7 @@ } -static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) { COMBOBOXEXITEMW tmpcit; @@ -754,7 +754,7 @@ return himlTemp; } -static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -805,7 +805,7 @@ return TRUE; } -static BOOL COMBOEX_SetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) +static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -863,7 +863,7 @@ } -static DWORD_PTR COMBOEX_GetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index) +static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA const *item1; CBE_ITEMDATA const *item2; @@ -903,7 +903,7 @@ } -static DWORD_PTR COMBOEX_SetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) +static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) { CBE_ITEMDATA *item1; CBE_ITEMDATA const *item2; @@ -1003,23 +1003,13 @@ /* (allow space for the icons). */ infoPtr->hwndCombo = CreateWindowW (WC_COMBOBOXW, NIL, - /* following line added to match native */ WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL | CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST | - /* was base and is necessary */ WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | GetWindowLongW (hwnd, GWL_STYLE), cs->y, cs->x, cs->cx, cs->cy, hwnd, (HMENU) GetWindowLongPtrW (hwnd, GWLP_ID), (HINSTANCE)GetWindowLongPtrW (hwnd, GWLP_HINSTANCE), NULL); - - /* - * native does the following at this point according to trace: - * GetWindowThreadProcessId(hwndCombo,0) - * GetCurrentThreadId() - * GetWindowThreadProcessId(hwndCombo, &???) - * GetCurrentProcessId() - */ SetWindowSubclass(infoPtr->hwndCombo, COMBOEX_ComboWndProc, COMBO_SUBCLASSID, (DWORD_PTR)hwnd); @@ -1037,12 +1027,6 @@ (HMENU) GetWindowLongPtrW (hwnd, GWLP_ID), (HINSTANCE)GetWindowLongPtrW (hwnd, GWLP_HINSTANCE), NULL); - /* native does the following at this point according to trace: - * GetWindowThreadProcessId(hwndEdit,0) - * GetCurrentThreadId() - * GetWindowThreadProcessId(hwndEdit, &???) - * GetCurrentProcessId() - */ SetWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID, (DWORD_PTR)hwnd); @@ -1089,16 +1073,6 @@ SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE); COMBOEX_AdjustEditPos (infoPtr); - - /* - * Create an item structure to represent the data in the - * EDIT control. It is allocated zero-filled. - */ - infoPtr->edit = Alloc (sizeof (CBE_ITEMDATA)); - if (!infoPtr->edit) { - COMBOEX_Destroy(infoPtr); - return -1; - } return 0; } @@ -1127,19 +1101,6 @@ return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); case CBN_CLOSEUP: SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); - /* - * from native trace of first dropdown after typing in URL in IE4 - * CB_GETCURSEL(Combo) - * GetWindowText(Edit) - * CB_GETCURSEL(Combo) - * CB_GETCOUNT(Combo) - * CB_GETITEMDATA(Combo, n) - * WM_NOTIFY(parent, CBEN_ENDEDITA|W) - * CB_GETCURSEL(Combo) - * CB_SETCURSEL(COMBOEX, n) - * SetFocus(Combo) - * the rest is supposition - */ ShowWindow (infoPtr->hwndEdit, SW_SHOW); InvalidateRect (infoPtr->hwndCombo, 0, TRUE); if (infoPtr->hwndEdit) InvalidateRect (infoPtr->hwndEdit, 0, TRUE); @@ -1225,17 +1186,6 @@ return SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); case CBN_KILLFOCUS: - /* - * from native trace: - * - * pass to parent - * WM_GETTEXT(Edit, 104) - * CB_GETCURSEL(Combo) rets -1 - * WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS - * CB_GETCURSEL(Combo) - * InvalidateRect(Combo, 0, 0) - * return 0 - */ SendMessageW (parent, WM_COMMAND, wParam, (LPARAM)infoPtr->hwndSelf); if (infoPtr->flags & WCBE_ACTEDIT) { GetWindowTextW (infoPtr->hwndEdit, wintext, 260); @@ -1316,17 +1266,17 @@ } -static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) +static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) { static const WCHAR nil[] = { 0 }; - CBE_ITEMDATA *item = 0; + CBE_ITEMDATA *item = NULL; SIZE txtsize; RECT rect; LPCWSTR str = nil; UINT xbase, x, y; INT len; COLORREF nbkc, ntxc, bkc, txc; - int drawimage, drawstate, xioff; + int drawimage, drawstate, xioff, selected; TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", dis->CtlType, dis->CtlID); @@ -1378,7 +1328,7 @@ /* If draw item is -1 (edit control) setup the item pointer */ if (dis->itemID == 0xffffffff) { - item = infoPtr->edit; + item = &infoPtr->edit; if (infoPtr->hwndEdit) { /* free previous text of edit item */ @@ -1427,36 +1377,30 @@ drawimage = -2; drawstate = ILD_NORMAL; + selected = infoPtr->selected == dis->itemID; + if (item->mask & CBEIF_IMAGE) drawimage = item->iImage; + if (item->mask & CBEIF_SELECTEDIMAGE && selected) + drawimage = item->iSelectedImage; if (dis->itemState & ODS_COMBOEXLBOX) { /* drawing listbox entry */ - if (dis->itemState & ODS_SELECTED) { - if (item->mask & CBEIF_SELECTEDIMAGE) - drawimage = item->iSelectedImage; + if (dis->itemState & ODS_SELECTED) drawstate = ILD_SELECTED; - } } else { /* drawing combo/edit entry */ if (IsWindowVisible(infoPtr->hwndEdit)) { /* if we have an edit control, the slave the * selection state to the Edit focus state */ - if (infoPtr->flags & WCBE_EDITFOCUSED) { - if (item->mask & CBEIF_SELECTEDIMAGE) - drawimage = item->iSelectedImage; + if (infoPtr->flags & WCBE_EDITFOCUSED) drawstate = ILD_SELECTED; - } - } else { + } else /* if we don't have an edit control, use * the requested state. */ - if (dis->itemState & ODS_SELECTED) { - if (item->mask & CBEIF_SELECTEDIMAGE) - drawimage = item->iSelectedImage; + if (dis->itemState & ODS_SELECTED) drawstate = ILD_SELECTED; - } - } } if (infoPtr->himl && !(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGEINDENT)) { @@ -1479,17 +1423,17 @@ if (drawimage == I_IMAGECALLBACK) { NMCOMBOBOXEXW nmce; ZeroMemory(&nmce, sizeof(nmce)); - nmce.ceItem.mask = (drawstate == ILD_NORMAL) ? CBEIF_IMAGE : CBEIF_SELECTEDIMAGE; + nmce.ceItem.mask = selected ? CBEIF_SELECTEDIMAGE : CBEIF_IMAGE; nmce.ceItem.lParam = item->lParam; nmce.ceItem.iItem = dis->itemID; COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce); - if (drawstate == ILD_NORMAL) { + if (!selected) { if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iImage = nmce.ceItem.iImage; drawimage = nmce.ceItem.iImage; - } else if (drawstate == ILD_SELECTED) { + } else { if (nmce.ceItem.mask & CBEIF_DI_SETITEM) item->iSelectedImage = nmce.ceItem.iSelectedImage; - drawimage = nmce.ceItem.iSelectedImage; - } else ERR("Bad draw state = %d\n", drawstate); + drawimage = nmce.ceItem.iSelectedImage; + } } if (overlay == I_IMAGECALLBACK) { @@ -1576,10 +1520,7 @@ if (infoPtr->hwndEdit) RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); - COMBOEX_FreeText (infoPtr->edit); - Free (infoPtr->edit); - infoPtr->edit = 0; - + COMBOEX_FreeText (&infoPtr->edit); COMBOEX_ResetContent (infoPtr); if (infoPtr->defaultFont) @@ -1666,6 +1607,15 @@ return 0; } +static LRESULT COMBOEX_SetFont( COMBOEX_INFO *infoPtr, HFONT font, BOOL redraw ) +{ + infoPtr->font = font; + SendMessageW( infoPtr->hwndCombo, WM_SETFONT, (WPARAM)font, 0 ); + if (infoPtr->hwndEdit) SendMessageW( infoPtr->hwndEdit, WM_SETFONT, (WPARAM)font, 0 ); + COMBOEX_ReSize( infoPtr ); + if (redraw) InvalidateRect( infoPtr->hwndCombo, NULL, TRUE ); + return 0; +} static LRESULT COMBOEX_SetRedraw(const COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { @@ -1743,9 +1693,6 @@ return DefSubclassProc(hwnd, uMsg, wParam, lParam); case WM_ERASEBKGND: - /* - * The following was determined by traces of the native - */ hDC = (HDC) wParam; obkc = SetBkColor (hDC, comctl32_color.clrWindow); GetClientRect (hwnd, &rect); @@ -1761,23 +1708,6 @@ switch ((INT)wParam) { case VK_ESCAPE: - /* native version seems to do following for COMBOEX */ - /* - * GetWindowTextW(Edit,&?, 0x104) x - * CB_GETCURSEL to Combo rets -1 x - * WM_NOTIFY to COMBOEX parent (rebar) x - * (CBEN_ENDEDIT{A|W} - * fChanged = FALSE x - * inewSelection = -1 x - * txt="www.hoho" x - * iWhy = 3 x - * CB_GETCURSEL to Combo rets -1 x - * InvalidateRect(Combo, 0) x - * WM_SETTEXT to Edit x - * EM_SETSEL to Edit (0,0) x - * EM_SETSEL to Edit (0,-1) x - * RedrawWindow(Combo, 0, 0, 5) x - */ TRACE("special code for VK_ESCAPE\n"); GetWindowTextW (infoPtr->hwndEdit, edit_text, 260); @@ -1802,27 +1732,6 @@ break; case VK_RETURN: - /* native version seems to do following for COMBOEX */ - /* - * GetWindowTextW(Edit,&?, 0x104) x - * CB_GETCURSEL to Combo rets -1 x - * CB_GETCOUNT to Combo rets 0 - * if >0 loop - * CB_GETITEMDATA to match - * *** above 3 lines simulated by FindItem x - * WM_NOTIFY to COMBOEX parent (rebar) x - * (CBEN_ENDEDIT{A|W} x - * fChanged = TRUE (-1) x - * iNewSelection = -1 or selected x - * txt= x - * iWhy = 2 (CBENF_RETURN) x - * CB_GETCURSEL to Combo rets -1 x - * if -1 send CB_SETCURSEL to Combo -1 x - * InvalidateRect(Combo, 0, 0) x - * SetFocus(Edit) x - * CallWindowProc(406615a8, Edit, 0x100, 0xd, 0x1c0001) - */ - TRACE("special code for VK_RETURN\n"); GetWindowTextW (infoPtr->hwndEdit, edit_text, 260); @@ -1850,7 +1759,7 @@ if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) { /* abort the change, restore previous */ TRACE("Notify requested abort of change\n"); - COMBOEX_SetEditText (infoPtr, infoPtr->edit); + COMBOEX_SetEditText (infoPtr, &infoPtr->edit); RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE); return 0; @@ -1942,9 +1851,6 @@ return DefSubclassProc(hwnd, uMsg, wParam, lParam); case WM_ERASEBKGND: - /* - * The following was determined by traces of the native - */ hDC = (HDC) wParam; obkc = SetBkColor (hDC, comctl32_color.clrWindow); GetClientRect (hwnd, &rect); @@ -2013,18 +1919,6 @@ return 0; case EN_KILLFOCUS: - /* - * Native does: - * - * GetFocus() retns AA - * GetWindowTextW(Edit) - * CB_GETCURSEL(Combo) (got -1) - * WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS - * CB_GETCURSEL(Combo) (got -1) - * InvalidateRect(Combo, 0, 0) - * WM_KILLFOCUS(Combo, AA) - * return 0; - */ focusedhwnd = GetFocus(); if (infoPtr->flags & WCBE_ACTEDIT) { GetWindowTextW (infoPtr->hwndEdit, edit_text, 260); @@ -2044,21 +1938,6 @@ return 0; case EN_SETFOCUS: { - /* - * For EN_SETFOCUS this issues the same calls and messages - * as the native seems to do. - * - * for some cases however native does the following: - * (noticed after SetFocus during LBUTTONDOWN on - * on dropdown arrow) - * WM_GETTEXTLENGTH (Edit); - * WM_GETTEXT (Edit, len+1, str); - * EM_SETSEL (Edit, 0, 0); - * WM_GETTEXTLENGTH (Edit); - * WM_GETTEXT (Edit, len+1, str); - * EM_SETSEL (Edit, 0, len); - * WM_NOTIFY (parent, CBEN_BEGINEDIT) - */ NMHDR hdr; SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0); @@ -2070,10 +1949,6 @@ } case EN_CHANGE: { - /* - * For EN_CHANGE this issues the same calls and messages - * as the native seems to do. - */ LPCWSTR lastwrk; cmp_func_t cmptext = get_cmp_func(infoPtr); @@ -2084,7 +1959,7 @@ GetWindowTextW (infoPtr->hwndEdit, edit_text, 260); if (selected == -1) { - lastwrk = infoPtr->edit->pszText; + lastwrk = infoPtr->edit.pszText; } else { CBE_ITEMDATA *item = COMBOEX_FindItem (infoPtr, selected); @@ -2109,37 +1984,6 @@ } case LBN_SELCHANGE: - /* - * Therefore from traces there is no additional code here - */ - - /* - * Using native COMCTL32 gets the following: - * 1 == SHDOCVW.DLL issues call/message - * 2 == COMCTL32.DLL issues call/message - * 3 == WINE issues call/message - * - * - * for LBN_SELCHANGE: - * 1 CB_GETCURSEL(ComboEx) - * 1 CB_GETDROPPEDSTATE(ComboEx) - * 1 CallWindowProc( *2* for WM_COMMAND(LBN_SELCHANGE) - * 2 CallWindowProc( *3* for WM_COMMAND(LBN_SELCHANGE) - ** call CBRollUp( xxx, TRUE for LBN_SELCHANGE, TRUE) - * 3 WM_COMMAND(ComboEx, CBN_SELENDOK) - * WM_USER+49(ComboLB, 1,0) <=============!!!!!!!!!!! - * 3 ShowWindow(ComboLB, SW_HIDE) - * 3 RedrawWindow(Combo, RDW_UPDATENOW) - * 3 WM_COMMAND(ComboEX, CBN_CLOSEUP) - ** end of CBRollUp - * 3 WM_COMMAND(ComboEx, CBN_SELCHANGE) (echo to parent) - * ? LB_GETCURSEL <==| - * ? LB_GETTEXTLEN | - * ? LB_GETTEXT | Needs to be added to - * ? WM_CTLCOLOREDIT(ComboEx) | Combo processing - * ? LB_GETITEMDATA | - * ? WM_DRAWITEM(ComboEx) <==| - */ default: break; }/* fall through */ @@ -2301,6 +2145,12 @@ case WM_SIZE: return COMBOEX_Size (infoPtr, LOWORD(lParam), HIWORD(lParam)); + case WM_GETFONT: + return (LRESULT)infoPtr->font; + + case WM_SETFONT: + return COMBOEX_SetFont( infoPtr, (HFONT)wParam, LOWORD(lParam) != 0 ); + case WM_SETREDRAW: return COMBOEX_SetRedraw(infoPtr, wParam, lParam); Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -41,9 +41,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; - -/* has a value of: 0, CCS_TOP, CCS_NOMOVEY, CCS_BOTTOM */ -#define CCS_LAYOUT_MASK 0x3 /* Property sheet / Wizard */ #define IDD_PROPSHEET 1006 @@ -79,23 +76,6 @@ #define IDB_VIEW_LARGE 125 #define IDB_HIST_SMALL 130 #define IDB_HIST_LARGE 131 - - -/* Month calendar month menu popup */ -#define IDD_MCMONTHMENU 300 - -#define IDM_JAN 301 -#define IDM_FEB 302 -#define IDM_MAR 303 -#define IDM_APR 304 -#define IDM_MAY 305 -#define IDM_JUN 306 -#define IDM_JUL 307 -#define IDM_AUG 308 -#define IDM_SEP 309 -#define IDM_OCT 310 -#define IDM_NOV 311 -#define IDM_DEC 312 #define IDM_TODAY 4163 #define IDM_GOTODAY 4164 Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -61,6 +61,7 @@ 340 stdcall -ordinal DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) +345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) 350 stdcall -noname StrChrA(str str) 351 stdcall -noname StrRChrA(str str long) 352 stdcall -noname StrCmpNA(str str long) @@ -189,6 +190,5 @@ @ stdcall PropertySheetA(ptr) @ stdcall PropertySheetW(ptr) @ stdcall RegisterClassNameW(wstr) -@ stdcall TaskDialogIndirect(ptr ptr ptr ptr) @ stdcall UninitializeFlatSB(long) @ stdcall _TrackMouseEvent(ptr) Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -235,7 +235,8 @@ break; case DLL_PROCESS_DETACH: - /* clean up subclassing */ + if (lpvReserved) break; + /* clean up subclassing */ THEMING_Uninitialize(); /* unregister all common control classes */ @@ -263,14 +264,11 @@ /* delete local pattern brush */ DeleteObject (COMCTL32_hPattern55AABrush); - COMCTL32_hPattern55AABrush = NULL; DeleteObject (COMCTL32_hPattern55AABitmap); - COMCTL32_hPattern55AABitmap = NULL; /* delete global subclassing atom */ GlobalDeleteAtom (LOWORD(COMCTL32_wSubclass)); TRACE("Subclassing atom deleted: %p\n", COMCTL32_wSubclass); - COMCTL32_wSubclass = NULL; break; } @@ -1013,7 +1011,7 @@ ERR("create_manifest failed!\n"); return HRESULT_FROM_WIN32(GetLastError()); } - + return S_OK; } Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -293,6 +293,41 @@ } } +static void +HEADER_FillItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM *item, BOOL hottrack) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + + if (theme) { + int state = (item->bDown) ? HIS_PRESSED : (hottrack ? HIS_HOT : HIS_NORMAL); + DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, r, NULL); + GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, r, r); + } + else + { + HBRUSH hbr = CreateSolidBrush(GetBkColor(hdc)); + FillRect(hdc, r, hbr); + DeleteObject(hbr); + } +} + +static void +HEADER_DrawItemFrame(HEADER_INFO *infoPtr, HDC hdc, RECT *r, const HEADER_ITEM *item) +{ + if (GetWindowTheme(infoPtr->hwndSelf)) return; + + if (!(infoPtr->dwStyle & HDS_FLAT)) + { + if (infoPtr->dwStyle & HDS_BUTTONS) { + if (item->bDown) + DrawEdge (hdc, r, BDR_RAISEDOUTER, BF_RECT | BF_FLAT | BF_ADJUST); + else + DrawEdge (hdc, r, EDGE_RAISED, BF_RECT | BF_SOFT | BF_ADJUST); + } + else + DrawEdge (hdc, r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); + } +} static INT HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESULT lCDFlags) @@ -329,43 +364,13 @@ return phdi->rect.right; } - if (theme != NULL) { - int state = (phdi->bDown) ? HIS_PRESSED : - (bHotTrack ? HIS_HOT : HIS_NORMAL); - DrawThemeBackground (theme, hdc, HP_HEADERITEM, state, - &r, NULL); - GetThemeBackgroundContentRect (theme, hdc, HP_HEADERITEM, state, - &r, &r); - } - else { - HBRUSH hbr; - - if (!(infoPtr->dwStyle & HDS_FLAT)) - { - if (infoPtr->dwStyle & HDS_BUTTONS) { - if (phdi->bDown) { - DrawEdge (hdc, &r, BDR_RAISEDOUTER, - BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_RAISED, - BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); - } - else - DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); - } - - hbr = CreateSolidBrush(GetBkColor(hdc)); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); - } - if (phdi->bDown) { - r.left += 2; - r.top += 2; - } - - if (phdi->fmt & HDF_OWNERDRAW) { + /* Fill background, owner could draw over it. */ + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + + if (phdi->fmt & HDF_OWNERDRAW) + { DRAWITEMSTRUCT dis; + BOOL ret; dis.CtlType = ODT_HEADER; dis.CtlID = GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_ID); @@ -377,11 +382,32 @@ dis.rcItem = phdi->rect; dis.itemData = phdi->lParam; oldBkMode = SetBkMode(hdc, TRANSPARENT); - SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); + ret = SendMessageW (infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); - } - else { + + if (!ret) + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + + /* Edges are always drawn if we don't have attached theme. */ + HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); + /* If application processed WM_DRAWITEM we should skip label painting, + edges are drawn no matter what. */ + if (ret) return phdi->rect.right; + } + else + { + HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); + HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); + } + + if (phdi->bDown) { + r.left += 2; + r.top += 2; + } + + /* Now text and image */ + { UINT rw, rh, /* width and height of r */ *x = NULL, *w = NULL; /* x and width of the pic (bmp or img) which is part of cnt */ /* cnt,txt,img,bmp */ @@ -499,7 +525,7 @@ SetBkMode(hdc, oldBkMode); } HEADER_FreeCallbackItems(phdi); - }/*Ownerdrawn*/ + } return phdi->rect.right; } 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 14 20:06:00 2013 @@ -132,13 +132,6 @@ * * Functions: * -- LVGroupComparE - * - * Known differences in message stream from native control (not known if - * these differences cause problems): - * LVM_INSERTITEM issues LVM_SETITEMSTATE and LVM_SETITEM in certain cases. - * LVM_SETITEM does not always issue LVN_ITEMCHANGING/LVN_ITEMCHANGED. - * WM_CREATE does not issue WM_QUERYUISTATE and associated registry - * processing for "USEDOUBLECLICKTIME". */ #include <config.h> @@ -6284,6 +6277,7 @@ { lvItem.iItem = nItem; lvItem.iSubItem = 0; + lvItem.pszText = szDispText; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue; if (lvItem.mask & LVIF_PARAM) @@ -7923,17 +7917,6 @@ * nearest number of pixels that are a whole line. Ex: if line height * is 16 and an 8 is passed, the list will be scrolled by 16. If a 7 * is passed, then the scroll will be 0. (per MSDN 7/2002) - * - * For: (per experimentation with native control and CSpy ListView) - * LV_VIEW_ICON scrolling in any direction is allowed - * LV_VIEW_SMALLICON scrolling in any direction is allowed - * LV_VIEW_LIST dx=1 = 1 column (horizontal only) - * but will only scroll 1 column per message - * no matter what the value. - * dy must be 0 or FALSE returned. - * LV_VIEW_DETAILS dx=1 = 1 pixel - * dy= see above - * */ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) { Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -123,7 +123,6 @@ int width_increment; INT delta; /* scroll rate; # of months that the */ /* control moves when user clicks a scroll button */ - int visible; /* # of months visible */ int firstDay; /* Start month calendar with firstDay's day, stored in SYSTEMTIME format */ BOOL firstDaySet; /* first week day differs from locale defined */ @@ -1302,8 +1301,8 @@ if(infoPtr->delta) return infoPtr->delta; - else - return infoPtr->visible; + + return MONTHCAL_GetMonthRange(infoPtr, GMR_VISIBLE, NULL); } 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 14 20:06:00 2013 @@ -544,7 +544,7 @@ case WM_CREATE: { DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - + theme = OpenThemeData (hwnd, themeClass); dwExStyle &= ~(WS_EX_CLIENTEDGE | WS_EX_WINDOWEDGE); @@ -690,17 +690,25 @@ return infoPtr->CurVal; case PBM_SETBARCOLOR: + { + COLORREF clr = infoPtr->ColorBar; + infoPtr->ColorBar = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); - return 0; + return clr; + } case PBM_GETBARCOLOR: return infoPtr->ColorBar; case PBM_SETBKCOLOR: + { + COLORREF clr = infoPtr->ColorBk; + infoPtr->ColorBk = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); - return 0; + return clr; + } case PBM_GETBKCOLOR: return infoPtr->ColorBk; Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -46,11 +46,11 @@ * - RB_SETTOOLTIPS * - WM_CHARTOITEM * - WM_LBUTTONDBLCLK - * - WM_MEASUREITEM * - WM_PALETTECHANGED * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN * - WM_RBUTTONUP + * - WM_SYSCOLORCHANGE * - WM_VKEYTOITEM * - WM_WININICHANGE * Notifications: @@ -136,6 +136,9 @@ LPWSTR lpText; HWND hwndPrevParent; } REBAR_BAND; + +/* has a value of: 0, CCS_TOP, CCS_NOMOVEY, CCS_BOTTOM */ +#define CCS_LAYOUT_MASK 0x3 /* fStatus flags */ #define HAS_GRIPPER 0x00000001 @@ -1049,14 +1052,6 @@ lpBand->rcChild = rbcz.rcChild; /* *** ??? */ } - /* native (IE4 in "Favorites" frame **1) does: - * SetRect (&rc, -1, -1, -1, -1) - * EqualRect (&rc,band->rc???) - * if ret==0 - * CopyRect (band->rc????, &rc) - * set flag outside of loop - */ - GetClassNameW (lpBand->hwndChild, szClassName, sizeof(szClassName)/sizeof(szClassName[0])); if (!lstrcmpW (szClassName, strComboBox) || !lstrcmpW (szClassName, WC_COMBOBOXEXW)) { @@ -1108,15 +1103,6 @@ if (infoPtr->DoRedraw) UpdateWindow (infoPtr->hwndSelf); - - /* native (from **1 above) does: - * UpdateWindow(rebar) - * REBAR_ForceResize - * RBN_HEIGHTCHANGE if necessary - * if ret from any EqualRect was 0 - * Goto "BeginDeferWindowPos" - */ - } /* Returns the next visible band (the first visible band in [i+1; infoPtr->uNumBands) ) @@ -3317,29 +3303,6 @@ infoPtr->hFont = infoPtr->hDefaultFont = tfont; } -/* native does: - GetSysColor (numerous); - GetSysColorBrush (numerous) (see WM_SYSCOLORCHANGE); - *GetStockObject (SYSTEM_FONT); - *SetWindowLong (hwnd, 0, info ptr); - *WM_NOTIFYFORMAT; - *SetWindowLong (hwnd, GWL_STYLE, style+0x10000001); - WS_VISIBLE = 0x10000000; - CCS_TOP = 0x00000001; - *SystemParametersInfo (SPI_GETNONCLIENTMETRICS...); - *CreateFontIndirect (lfCaptionFont from above); - GetDC (); - SelectObject (hdc, fontabove); - GetTextMetrics (hdc, ); guessing is tmHeight - SelectObject (hdc, oldfont); - ReleaseDC (); - GetWindowRect (); - MapWindowPoints (0, parent, rectabove, 2); - GetWindowRect (); - GetClientRect (); - ClientToScreen (clientrect); - SetWindowPos (hwnd, 0, 0, 0, 0, 0, SWP_NOZORDER); - */ return TRUE; } @@ -3725,6 +3688,7 @@ case WM_COMMAND: case WM_DRAWITEM: case WM_NOTIFY: + case WM_MEASUREITEM: return SendMessageW(REBAR_GetNotifyParent (infoPtr), uMsg, wParam, lParam); @@ -3749,8 +3713,6 @@ case WM_LBUTTONUP: return REBAR_LButtonUp (infoPtr); - -/* case WM_MEASUREITEM: supported according to ControlSpy */ case WM_MOUSEMOVE: return REBAR_MouseMove (infoPtr, lParam); Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tab.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -1023,37 +1023,18 @@ /* * Calculate the position of the scroll control. */ - if(infoPtr->dwStyle & TCS_VERTICAL) - { - controlPos.right = clientRect->right; - controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - - if (infoPtr->dwStyle & TCS_BOTTOM) - { - controlPos.top = clientRect->bottom - infoPtr->tabHeight; - controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); - } - else - { - controlPos.bottom = clientRect->top + infoPtr->tabHeight; - controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); - } + controlPos.right = clientRect->right; + controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); + + if (infoPtr->dwStyle & TCS_BOTTOM) + { + controlPos.top = clientRect->bottom - infoPtr->tabHeight; + controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); } else { - controlPos.right = clientRect->right; - controlPos.left = controlPos.right - 2 * GetSystemMetrics(SM_CXHSCROLL); - - if (infoPtr->dwStyle & TCS_BOTTOM) - { - controlPos.top = clientRect->bottom - infoPtr->tabHeight; - controlPos.bottom = controlPos.top + GetSystemMetrics(SM_CYHSCROLL); - } - else - { - controlPos.bottom = clientRect->top + infoPtr->tabHeight; - controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); - } + controlPos.bottom = clientRect->top + infoPtr->tabHeight; + controlPos.top = controlPos.bottom - GetSystemMetrics(SM_CYHSCROLL); } /* @@ -1917,9 +1898,8 @@ /* Draw the text */ if(infoPtr->dwStyle & TCS_VERTICAL) /* if we are vertical rotate the text and each character */ { - static const WCHAR ArialW[] = { 'A','r','i','a','l',0 }; LOGFONTW logfont; - HFONT hFont = 0; + HFONT hFont; INT nEscapement = 900; INT nOrientation = 900; @@ -1930,21 +1910,9 @@ } /* to get a font with the escapement and orientation we are looking for, we need to */ - /* call CreateFontIndirectA, which requires us to set the values of the logfont we pass in */ - if (!GetObjectW((infoPtr->hFont) ? - infoPtr->hFont : GetStockObject(SYSTEM_FONT), - sizeof(LOGFONTW),&logfont)) - { - INT iPointSize = 9; - - lstrcpyW(logfont.lfFaceName, ArialW); - logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY), - 72); - logfont.lfWeight = FW_NORMAL; - logfont.lfItalic = 0; - logfont.lfUnderline = 0; - logfont.lfStrikeOut = 0; - } + /* call CreateFontIndirect, which requires us to set the values of the logfont we pass in */ + if (!GetObjectW(infoPtr->hFont, sizeof(logfont), &logfont)) + GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(logfont), &logfont); logfont.lfEscapement = nEscapement; logfont.lfOrientation = nOrientation; 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 14 20:06:00 2013 @@ -945,11 +945,6 @@ tbcd.clrHighlightHotTrack = 0; tbcd.nStringBkMode = TRANSPARENT; tbcd.nHLStringBkMode = OPAQUE; - /* MSDN says that this is the text rectangle. - * But (why always a but) tracing of v5.7 of native shows - * that this is really a *relative* rectangle based on the - * the nmcd.rc. Also the left and top are always 0 ignoring - * any bitmap that might be present. */ tbcd.rcText.left = 0; tbcd.rcText.top = 0; tbcd.rcText.right = rcText.right - rc.left; @@ -5118,7 +5113,6 @@ switch(wParam) { case 0: if (lpsize->cx == -1) { - /* **** this is wrong, native measures each button and sets it */ lpsize->cx = infoPtr->rcBound.right - infoPtr->rcBound.left; } else if(HIWORD(lpsize->cx)) { @@ -5481,8 +5475,7 @@ btnPtr->bDropDownPressed = FALSE; InvalidateRect(infoPtr->hwndSelf, &btnPtr->rect, TRUE); - /* find and set hot item - * NOTE: native doesn't do this, but that is a bug */ + /* find and set hot item */ GetCursorPos(&pt); ScreenToClient(infoPtr->hwndSelf, &pt); nHit = TOOLBAR_InternalHitTest(infoPtr, &pt, &button); @@ -5663,9 +5656,6 @@ TOOLBAR_SendNotify (&hdr, infoPtr, NM_RELEASEDCAPTURE); - /* native issues TBN_ENDDRAG here, if _LBUTTONDOWN issued the - * TBN_BEGINDRAG - */ memset(&nmtb, 0, sizeof(nmtb)); nmtb.iItem = btnPtr->idCommand; TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, @@ -5956,39 +5946,6 @@ HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW (GetParent (hwnd), GWLP_HINSTANCE); SetWindowLongPtrW (hwnd, GWLP_HINSTANCE, (LONG_PTR)hInst); } - - /* native control does: - * Get a lot of colors and brushes - * WM_NOTIFYFORMAT - * SystemParametersInfoW(0x1f, 0x3c, adr1, 0) - * CreateFontIndirectW(adr1) - * CreateBitmap(0x27, 0x24, 1, 1, 0) - * hdc = GetDC(toolbar) - * GetSystemMetrics(0x48) - * fnt2=CreateFontW(0xe, 0, 0, 0, 0x190, 0, 0, 0, 0, 2, - * 0, 0, 0, 0, "MARLETT") - * oldfnt = SelectObject(hdc, fnt2) - * GetCharWidthW(hdc, 0x36, 0x36, adr2) - * GetTextMetricsW(hdc, adr3) - * SelectObject(hdc, oldfnt) - * DeleteObject(fnt2) - * ReleaseDC(hdc) - * InvalidateRect(toolbar, 0, 1) - * SetWindowLongW(toolbar, 0, addr) - * SetWindowLongW(toolbar, -16, xxx) **sometimes** - * WM_STYLECHANGING - * CallWinEx old new - * ie 1 0x56000a4c 0x46000a4c 0x56008a4d - * ie 2 0x4600094c 0x4600094c 0x4600894d - * ie 3 0x56000b4c 0x46000b4c 0x56008b4d - * rebar 0x50008844 0x40008844 0x50008845 - * pager 0x50000844 0x40000844 0x50008845 - * IC35mgr 0x5400084e **nochange** - * on entry to _NCCREATE 0x5400084e - * rowlist 0x5400004e **nochange** - * on entry to _NCCREATE 0x5400004e - * - */ /* I think the code below is a bug, but it is the way that the native * controls seem to work. The effect is that if the user of TBSTYLE_FLAT Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c [iso-8859-1] Sat Sep 14 20:06:00 2013 @@ -499,12 +499,12 @@ offsetthumb = (infoPtr->rcThumb.bottom - infoPtr->rcThumb.top)/2; rcTics.left = infoPtr->rcThumb.left - 2; rcTics.right = infoPtr->rcThumb.right + 2; - rcTics.top = infoPtr->rcChannel.top + offsetthumb + 1; - rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb; + rcTics.top = infoPtr->rcChannel.top + offsetthumb; + rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb - 1; } else { offsetthumb = (infoPtr->rcThumb.right - infoPtr->rcThumb.left)/2; - rcTics.left = infoPtr->rcChannel.left + offsetthumb + 1; - rcTics.right = infoPtr->rcChannel.right - offsetthumb; + rcTics.left = infoPtr->rcChannel.left + offsetthumb; + rcTics.right = infoPtr->rcChannel.right - offsetthumb - 1; rcTics.top = infoPtr->rcThumb.top - 2; rcTics.bottom = infoPtr->rcThumb.bottom + 2; } @@ -612,19 +612,105 @@ } } +#define POINT_COUNT 6 +static int +TRACKBAR_FillThumb (const TRACKBAR_INFO *infoPtr, HDC hdc, HBRUSH hbrush) +{ + const RECT *thumb = &infoPtr->rcThumb; + POINT points[6]; + int PointDepth; + HBRUSH oldbr; + + if (infoPtr->dwStyle & TBS_BOTH) + { + FillRect(hdc, thumb, hbrush); + return 0; + } + + if (infoPtr->dwStyle & TBS_VERT) + { + PointDepth = (thumb->bottom - thumb->top) / 2; + if (infoPtr->dwStyle & TBS_LEFT) + { + points[0].x = thumb->right-1; + points[0].y = thumb->top; + points[1].x = thumb->right-1; + points[1].y = thumb->bottom-1; + points[2].x = thumb->left + PointDepth; + points[2].y = thumb->bottom-1; + points[3].x = thumb->left; + points[3].y = thumb->top + PointDepth; + points[4].x = thumb->left + PointDepth; + points[4].y = thumb->top; + points[5].x = points[0].x; + points[5].y = points[0].y; + } + else + { + points[0].x = thumb->right; + points[0].y = thumb->top + PointDepth; + points[1].x = thumb->right - PointDepth; + points[1].y = thumb->bottom-1; + points[2].x = thumb->left; + points[2].y = thumb->bottom-1; + points[3].x = thumb->left; + points[3].y = thumb->top; + points[4].x = thumb->right - PointDepth; + points[4].y = thumb->top; + points[5].x = points[0].x; + points[5].y = points[0].y; + } + } + else + { + PointDepth = (thumb->right - thumb->left) / 2; + if (infoPtr->dwStyle & TBS_TOP) + { + points[0].x = thumb->left + PointDepth; + points[0].y = thumb->top+1; + points[1].x = thumb->right-1; + points[1].y = thumb->top + PointDepth + 1; + points[2].x = thumb->right-1; + points[2].y = thumb->bottom-1; + points[3].x = thumb->left; + points[3].y = thumb->bottom-1; + points[4].x = thumb->left; + points[4].y = thumb->top + PointDepth + 1; + points[5].x = points[0].x; + points[5].y = points[0].y; + } + else + { + points[0].x = thumb->right-1; + points[0].y = thumb->top; + points[1].x = thumb->right-1; + points[1].y = thumb->bottom - PointDepth - 1; + points[2].x = thumb->left + PointDepth; + points[2].y = thumb->bottom-1; + points[3].x = thumb->left; + points[3].y = thumb->bottom - PointDepth - 1; + points[4].x = thumb->left; + points[4].y = thumb->top; + points[5].x = points[0].x; + points[5].y = points[0].y; + } + } + + oldbr = SelectObject(hdc, hbrush); + SetPolyFillMode(hdc, WINDING); + Polygon(hdc, points, sizeof(points) / sizeof(points[0])); + SelectObject(hdc, oldbr); + + return PointDepth; +} + static void -TRACKBAR_DrawThumb (const TRACKBAR_INFO *infoPtr, HDC hdc) -{ - HBRUSH oldbr; - HPEN oldpen; - RECT thumb = infoPtr->rcThumb; - int BlackUntil = 3; - int PointCount = 6; - POINT points[6]; - int fillClr; +TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); int PointDepth; - HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); - + HBRUSH brush; + if (theme) { int partId; @@ -645,113 +731,115 @@ else stateId = TUS_NORMAL; - DrawThemeBackground (theme, hdc, partId, stateId, &thumb, 0); + DrawThemeBackground (theme, hdc, partId, stateId, &infoPtr->rcThumb, NULL); return; } - fillClr = infoPtr->flags & TB_DRAG_MODE ? COLOR_BTNHILIGHT : COLOR_BTNFACE; - oldbr = SelectObject (hdc, GetSysColorBrush(fillClr)); - SetPolyFillMode (hdc, WINDING); + if (infoPtr->dwStyle & WS_DISABLED || infoPtr->flags & TB_DRAG_MODE) + { + if (comctl32_color.clr3dHilight == comctl32_color.clrWindow) + brush = COMCTL32_hPattern55AABrush; + else + brush = GetSysColorBrush(COLOR_SCROLLBAR); + + SetTextColor(hdc, comctl32_color.clr3dFace); + SetBkColor(hdc, comctl32_color.clr3dHilight); + } + else + brush = GetSysColorBrush(COLOR_BTNFACE); + + PointDepth = TRACKBAR_FillThumb(infoPtr, hdc, brush); if (infoPtr->dwStyle & TBS_BOTH) { - points[0].x=thumb.right; - points[0].y=thumb.top; - points[1].x=thumb.right; - points[1].y=thumb.bottom; - points[2].x=thumb.left; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=thumb.top; - points[4].x=points[0].x; - points[4].y=points[0].y; - PointCount = 5; - BlackUntil = 3; + DrawEdge(hdc, &infoPtr->rcThumb, EDGE_RAISED, BF_RECT | BF_SOFT); + return; } else { + RECT thumb = infoPtr->rcThumb; + if (infoPtr->dwStyle & TBS_VERT) { - PointDepth = (thumb.bottom - thumb.top) / 2; if (infoPtr->dwStyle & TBS_LEFT) { - points[0].x=thumb.right; - points[0].y=thumb.top; - points[1].x=thumb.right; - points[1].y=thumb.bottom; - points[2].x=thumb.left + PointDepth; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=(thumb.bottom - thumb.top) / 2 + thumb.top + 1; - points[4].x=thumb.left + PointDepth; - points[4].y=thumb.top; - points[5].x=points[0].x; - points[5].y=points[0].y; - BlackUntil = 4; + /* rectangular part */ + thumb.left += PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_TOP | BF_RIGHT | BF_BOTTOM | BF_SOFT); + + /* light edge */ + thumb.left -= PointDepth; + thumb.right = thumb.left + PointDepth; + thumb.bottom = infoPtr->rcThumb.top + PointDepth + 1; + thumb.top = infoPtr->rcThumb.top; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPRIGHT | BF_SOFT); + + /* shadowed edge */ + thumb.top += PointDepth; + thumb.bottom += PointDepth; + DrawEdge(hdc, &thumb, EDGE_SUNKEN, BF_DIAGONAL_ENDTOPLEFT | BF_SOFT); + return; } else { - points[0].x=thumb.right; - points[0].y=(thumb.bottom - thumb.top) / 2 + thumb.top + 1; - points[1].x=thumb.right - PointDepth; - points[1].y=thumb.bottom; - points[2].x=thumb.left; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=thumb.top; - points[4].x=thumb.right - PointDepth; - points[4].y=thumb.top; - points[5].x=points[0].x; - points[5].y=points[0].y; + /* rectangular part */ + thumb.right -= PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_TOP | BF_LEFT | BF_BOTTOM | BF_SOFT); + + /* light edge */ + thumb.left = thumb.right; + thumb.right += PointDepth + 1; + thumb.bottom = infoPtr->rcThumb.top + PointDepth + 1; + thumb.top = infoPtr->rcThumb.top; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPLEFT | BF_SOFT); + + /* shadowed edge */ + thumb.top += PointDepth; + thumb.bottom += PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDBOTTOMLEFT | BF_SOFT); } } else { - PointDepth = (thumb.right - thumb.left) / 2; if (infoPtr->dwStyle & TBS_TOP) { - points[0].x=(thumb.right - thumb.left) / 2 + thumb.left + 1; - points[0].y=thumb.top; - points[1].x=thumb.right; - points[1].y=thumb.top + PointDepth; - points[2].x=thumb.right; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=thumb.bottom; - points[4].x=thumb.left; - points[4].y=thumb.top + PointDepth; - points[5].x=points[0].x; - points[5].y=points[0].y; - BlackUntil = 4; + /* rectangular part */ + thumb.top += PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_LEFT | BF_BOTTOM | BF_RIGHT | BF_SOFT); + + /* light edge */ + thumb.left = infoPtr->rcThumb.left; + thumb.right = thumb.left + PointDepth; + thumb.bottom = infoPtr->rcThumb.top + PointDepth + 1; + thumb.top -= PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPRIGHT | BF_SOFT); + + /* shadowed edge */ + thumb.left += PointDepth; + thumb.right += PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDBOTTOMRIGHT | BF_SOFT); } else { - points[0].x=thumb.right; - points[0].y=thumb.top; - points[1].x=thumb.right; - points[1].y=thumb.bottom - PointDepth; - points[2].x=(thumb.right - thumb.left) / 2 + thumb.left + 1; - points[2].y=thumb.bottom; - points[3].x=thumb.left; - points[3].y=thumb.bottom - PointDepth; - points[4].x=thumb.left; - points[4].y=thumb.top; - points[5].x=points[0].x; - points[5].y=points[0].y; + /* rectangular part */ + thumb.bottom -= PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_LEFT | BF_TOP | BF_RIGHT | BF_SOFT); + + /* light edge */ + thumb.left = infoPtr->rcThumb.left; + thumb.right = thumb.left + PointDepth; + thumb.top = infoPtr->rcThumb.bottom - PointDepth - 1; + thumb.bottom += PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDTOPLEFT | BF_SOFT); + + /* shadowed edge */ + thumb.left += PointDepth; + thumb.right += PointDepth; + DrawEdge(hdc, &thumb, EDGE_RAISED, BF_DIAGONAL_ENDBOTTOMLEFT | BF_SOFT); } } - - } - - /* Draw the thumb now */ - Polygon (hdc, points, PointCount); - oldpen = SelectObject(hdc, GetStockObject(BLACK_PEN)); - Polyline(hdc,points, BlackUntil); - SelectObject(hdc, GetStockObject(WHITE_PEN)); - Polyline(hdc, &points[BlackUntil-1], PointCount+1-BlackUntil); - SelectObject(hdc, oldpen); - SelectObject(hdc, oldbr); + } } @@ -1295,9 +1383,11 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength) { if (infoPtr->dwStyle & TBS_FIXEDLENGTH) { + /* We're not supposed to check if it's really changed or not, + just repaint in any case. */ infoPtr->uThumbLen = iLength; infoPtr->flags |= TB_THUMBSIZECHANGED; - InvalidateRect (infoPtr->hwndSelf, &infoPtr->rcThumb, FALSE); + TRACKBAR_InvalidateAll(infoPtr); } return 0; @@ -1571,9 +1661,15 @@ static LRESULT TRACKBAR_Size (TRACKBAR_INFO *infoPtr) { - TRACKBAR_CalcChannel (infoPtr); - TRACKBAR_UpdateThumb (infoPtr); + if (infoPtr->dwStyle & TBS_FIXEDLENGTH) + { + TRACKBAR_CalcChannel(infoPtr); + TRACKBAR_UpdateThumb(infoPtr); + } + else + TRACKBAR_InitializeThumb(infoPtr); TRACKBAR_AlignBuddies (infoPtr); + TRACKBAR_InvalidateAll(infoPtr); return 0; } @@ -1747,6 +1843,19 @@ } +static LRESULT +TRACKBAR_Enable (TRACKBAR_INFO *infoPtr, BOOL enable) +{ + if (enable) + infoPtr->dwStyle &= ~WS_DISABLED; + else + infoPtr->dwStyle |= WS_DISABLED; + + InvalidateRect(infoPtr->hwndSelf, &infoPtr->rcThumb, TRUE); + + return 1; +} + static LRESULT WINAPI TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1874,7 +1983,8 @@ case WM_DESTROY: return TRACKBAR_Destroy (infoPtr); -/* case WM_ENABLE: */ + case WM_ENABLE: + return TRACKBAR_Enable (infoPtr, (BOOL)wParam); case WM_ERASEBKGND: return 0; 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 14 20:06:00 2013 @@ -2526,7 +2526,7 @@ * - Otherwise - use background color */ if ((item->state & TVIS_DROPHILITED) || ((item == infoPtr->focusedItem) && !(item->state & TVIS_SELECTED)) || - ((item->state & TVIS_SELECTED) && (!infoPtr->focusedItem) && + ((item->state & TVIS_SELECTED) && (!infoPtr->focusedItem || item == infoPtr->focusedItem) && (inFocus || (infoPtr->dwStyle & TVS_SHOWSELALWAYS)))) { if ((item->state & TVIS_DROPHILITED) || inFocus) @@ -3301,6 +3301,8 @@ TREEVIEW_RemoveAllChildren(infoPtr, item); item->cChildren = old_cChildren; } + if (!wasExpanded) + return FALSE; if (item->firstChild) { 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 14 20:06:00 2013 @@ -59,7 +59,7 @@ reactos/dll/win32/cabinet # Synced to Wine-1.5.26 reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/comcat # Synced to Wine-1.7.1 -reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 +reactos/dll/win32/comctl32 # Synced to Wine 1.7.1 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/credui # Synced to Wine-1.5.4

1 0

[akhaldi] 60116: [COMCAT_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 19:00:31 2013 New Revision: 60116 URL: http://svn.reactos.org/svn/reactos?rev=60116&view=rev Log: [COMCAT_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/comcat/CMakeLists.txt trunk/rostests/winetests/comcat/comcat.c trunk/rostests/winetests/comcat/testlist.c Modified: trunk/rostests/winetests/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/CMakeLis… ============================================================================== --- trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] Sat Sep 14 19:00:31 2013 @@ -1,10 +1,7 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(comcat_winetest comcat.c testlist.c) -target_link_libraries(comcat_winetest wine uuid) +target_link_libraries(comcat_winetest uuid) set_module_type(comcat_winetest win32cui) -add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32) add_cd_file(TARGET comcat_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/comcat/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.c… ============================================================================== --- trunk/rostests/winetests/comcat/comcat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/comcat.c [iso-8859-1] Sat Sep 14 19:00:31 2013 @@ -18,16 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include <stdio.h> -#include <initguid.h> -#include <windows.h> +#include <wine/test.h> -#include "objbase.h" -#include "comcat.h" - -#include "wine/test.h" +//#include <stdio.h> +//#include <initguid.h> +//#include <windows.h> +#include <winreg.h> +//#include "objbase.h" +#include <ole2.h> +#include <comcat.h> #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) Modified: trunk/rostests/winetests/comcat/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/testlist… ============================================================================== --- trunk/rostests/winetests/comcat/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/testlist.c [iso-8859-1] Sat Sep 14 19:00:31 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_comcat(void);

1 0

[akhaldi] 60115: [COMCAT] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 18:59:47 2013 New Revision: 60115 URL: http://svn.reactos.org/svn/reactos?rev=60115&view=rev Log: [COMCAT] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/comcat/CMakeLists.txt trunk/reactos/dll/win32/comcat/comcat_main.c trunk/reactos/dll/win32/comcat/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/comcat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:59:47 2013 @@ -1,25 +1,14 @@ add_definitions(-D__WINESRC__) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(comcat.dll comcat.spec) list(APPEND SOURCE comcat_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/comcat.def) -add_library(comcat SHARED ${SOURCE}) - +add_library(comcat SHARED ${SOURCE} version.rc) set_module_type(comcat win32dll) - -target_link_libraries(comcat uuid wine) - -add_importlibs(comcat msvcrt ole32 user32 advapi32 kernel32 ntdll) - -add_dependencies(comcat psdk) +add_importlibs(comcat ole32 msvcrt kernel32) add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/comcat/comcat_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_ma… ============================================================================== --- trunk/reactos/dll/win32/comcat/comcat_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/comcat_main.c [iso-8859-1] Sat Sep 14 18:59:47 2013 @@ -22,14 +22,8 @@ //#include <stdarg.h> -#define COBJMACROS - #include <windef.h> //#include "winbase.h" -//#include "winuser.h" -//#include "winreg.h" -//#include "winerror.h" -//#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@) Modified: trunk/reactos/dll/win32/comcat/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/version.r… ============================================================================== --- trunk/reactos/dll/win32/comcat/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comcat/version.rc [iso-8859-1] Sat Sep 14 18:59:47 2013 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_OLESELFREGISTER #define WINE_FILENAME_STR "comcat.dll" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include <wine/wine_common_ver.rc> 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 14 18:59:47 2013 @@ -58,7 +58,7 @@ reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.26 reactos/dll/win32/clusapi # Synced to Wine-1.7.1 -reactos/dll/win32/comcat # Synced to Wine-1.5.4 +reactos/dll/win32/comcat # Synced to Wine-1.7.1 reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/compstui # Synced to Wine-1.5.19

1 0

[akhaldi] 60114: [CLUSAPI] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 18:39:19 2013 New Revision: 60114 URL: http://svn.reactos.org/svn/reactos?rev=60114&view=rev Log: [CLUSAPI] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/clusapi/clusapi.c trunk/reactos/dll/win32/clusapi/clusapi.spec trunk/reactos/include/psdk/clusapi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/clusapi/clusapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.c [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -28,6 +28,20 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(clusapi); + +/*********************************************************************** + * GetClusterInformation (CLUSAPI.@) + * + */ +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo) +{ + FIXME("(%p, %p, %p, %p) stub!\n", hCluster, lpszClusterName, lpcchClusterName, lpClusterInfo); + + *lpcchClusterName = 0; + + return ERROR_SUCCESS; +} /*********************************************************************** * GetNodeClusterState (CLUSAPI.@) Modified: trunk/reactos/dll/win32/clusapi/clusapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/clusapi.… ============================================================================== --- trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/clusapi/clusapi.spec [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -70,7 +70,7 @@ @ stub GetClusterFromResource @ stub GetClusterGroupKey @ stub GetClusterGroupState -@ stub GetClusterInformation +@ stdcall GetClusterInformation(ptr ptr ptr ptr) @ stub GetClusterKey @ stub GetClusterNetInterface @ stub GetClusterNetInterfaceKey Modified: trunk/reactos/include/psdk/clusapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/clusapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/clusapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/clusapi.h [iso-8859-1] Sat Sep 14 18:39:19 2013 @@ -26,7 +26,24 @@ typedef struct _HCLUSTER *HCLUSTER; typedef struct _HCLUSENUM *HCLUSENUM; + +typedef struct _CLUSTERVERSIONINFO +{ + DWORD dwVersionInfoSize; + WORD MajorVersion; + WORD MinorVersion; + WORD BuildNumber; + WCHAR szVendorId[64]; + WCHAR szCSDVersion[64]; + DWORD dwClusterHighestVersion; + DWORD dwClusterLowestVersion; + DWORD dwFlags; + DWORD dwReserved; +} CLUSTERVERSIONINFO, *LPCLUSTERVERSIONINFO; + BOOL WINAPI CloseCluster(HCLUSTER hCluster); +DWORD WINAPI GetClusterInformation(HCLUSTER hCluster, LPWSTR lpszClusterName, + LPDWORD lpcchClusterName, LPCLUSTERVERSIONINFO lpClusterInfo); DWORD WINAPI GetNodeClusterState(LPCWSTR lpszNodeName, LPDWORD pdwClusterState); HCLUSTER WINAPI OpenCluster(LPCWSTR lpszClusterName); HCLUSENUM WINAPI ClusterOpenEnum(HCLUSTER hCluster, DWORD dwType); 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 14 18:39:19 2013 @@ -57,7 +57,7 @@ reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.26 -reactos/dll/win32/clusapi # Synced to Wine-1.5.26 +reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/comcat # Synced to Wine-1.5.4 reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37

1 0

[akhaldi] 60113: [AVIFIL32] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 18:34:12 2013 New Revision: 60113 URL: http://svn.reactos.org/svn/reactos?rev=60113&view=rev Log: [AVIFIL32] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Sat Sep 14 18:34:12 2013 @@ -227,8 +227,6 @@ DisableThreadLibraryCalls(hInstDll); AVIFILE_hModule = hInstDll; break; - case DLL_PROCESS_DETACH: - break; }; return TRUE; 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 14 18:34:12 2013 @@ -53,7 +53,7 @@ reactos/dll/win32/atl # Synced to Wine-1.7.1 reactos/dll/win32/atl100 # Synced to Wine-1.7.1 reactos/dll/win32/atl80 # Synced to Wine-1.7.1 -reactos/dll/win32/avifil32 # Synced to Wine-1.5.26 +reactos/dll/win32/avifil32 # Synced to Wine-1.7.1 reactos/dll/win32/bcrypt # Synced to Wine-1.5.26 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.26

1 0

[akhaldi] 60112: * Silence some debug prints.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 18:27:10 2013 New Revision: 60112 URL: http://svn.reactos.org/svn/reactos?rev=60112&view=rev Log: * Silence some debug prints. Modified: trunk/reactos/dll/ntdll/csr/connect.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Sat Sep 14 18:27:10 2013 @@ -233,7 +233,7 @@ if (InsideCsrProcess) { /* We're inside, so let's find csrsrv */ - DPRINT1("Next-GEN CSRSS support\n"); + DPRINT("Next-GEN CSRSS support\n"); RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); Status = LdrGetDllHandle(NULL, NULL, @@ -456,7 +456,7 @@ else { /* This is a server-to-server call. Save our CID and do a direct call. */ - DPRINT1("Next gen server-to-server call\n"); + DPRINT("Next gen server-to-server call\n"); /* We check this equality inside CsrValidateMessageBuffer */ ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId;

1 0

[akhaldi] 60111: [ATL_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 18:23:41 2013 New Revision: 60111 URL: http://svn.reactos.org/svn/reactos?rev=60111&view=rev Log: [ATL_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/atl/atl_ax.c trunk/rostests/winetests/atl/module.c trunk/rostests/winetests/atl/registrar.c trunk/rostests/winetests/atl/testlist.c Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE atl_ax.c @@ -8,9 +6,7 @@ testlist.c) add_executable(atl_winetest ${SOURCE}) - target_link_libraries(atl_winetest wine uuid) - set_module_type(atl_winetest win32cui) add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32) add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/atl/atl_ax.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/atl_ax.c?re… ============================================================================== --- trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/atl_ax.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -18,22 +18,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> #define COBJMACROS #include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> +//#include <winnls.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> #include <exdisp.h> static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); Modified: trunk/rostests/winetests/atl/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/module.c?re… ============================================================================== --- trunk/rostests/winetests/atl/module.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/module.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -19,22 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> #define COBJMACROS #include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> +//#include <winnls.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> struct _ATL_OBJMAP_ENTRYW; struct _AtlCreateWndData; Modified: trunk/rostests/winetests/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/registrar.c… ============================================================================== --- trunk/rostests/winetests/atl/registrar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/registrar.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -18,23 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <stdarg.h> +//#include <stdio.h> #define COBJMACROS #include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> +//#include <windef.h> +//#include <winbase.h> +//#include <winuser.h> +//#include <wingdi.h> #include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> -#include <initguid.h> +#include <winreg.h> +//#include <winerror.h> +//#include <winnt.h> +//#include <wtypes.h> +#include <objbase.h> +//#include <olectl.h> +//#include <ocidl.h> +//#include <initguid.h> #include <atliface.h> static const char textA[] = Modified: trunk/rostests/winetests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/testlist.c?… ============================================================================== --- trunk/rostests/winetests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/testlist.c [iso-8859-1] Sat Sep 14 18:23:41 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_atl_ax(void); extern void func_module(void);

1 0

[akhaldi] 60110: [ATL] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 18:22:37 2013 New Revision: 60110 URL: http://svn.reactos.org/svn/reactos?rev=60110&view=rev Log: [ATL] * Sync with Wine 1.7.1. Removed: trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/atl/atl_main.c trunk/reactos/dll/win32/atl/atl_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -12,13 +12,12 @@ list(APPEND SOURCE atl_main.c - registrar.c ${CMAKE_CURRENT_BINARY_DIR}/atl_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/atl.def) add_library(atl SHARED ${SOURCE} rsrc.rc) set_module_type(atl win32dll) target_link_libraries(atl uuid wine) -add_importlibs(atl atl100 oleaut32 ole32 user32 msvcrt kernel32 ntdll) +add_importlibs(atl atl100 atl80 oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(atl atl_atliface_header) add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -16,7 +16,7 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stub AtlWaitWithMessageLoop +24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC 27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel @@ -26,26 +26,26 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW +36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW 38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl -42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) Modified: trunk/reactos/dll/win32/atl/atl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_main.c [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -2,6 +2,7 @@ * Implementation of Active Template Library (atl.dll) * * Copyright 2004 Aric Stewart for CodeWeavers + * Copyright 2005 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +29,7 @@ #include <windef.h> #include <winbase.h> -#include <objbase.h> +#include <ole2.h> #include <oleauto.h> //#include "objidl.h" @@ -40,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -DECLSPEC_HIDDEN HINSTANCE hInst; +static HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -60,7 +61,7 @@ INT i; UINT size; - //FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + TRACE("(%p %p %p)\n", pM, p, h); size = pM->cbSize; switch (size) @@ -120,57 +121,50 @@ HRESULT WINAPI AtlModuleLoadTypeLib(_ATL_MODULEW *pM, LPCOLESTR lpszIndex, BSTR *pbstrPath, ITypeLib **ppTypeLib) { - HRESULT hRes; - OLECHAR path[MAX_PATH+8]; /* leave some space for index */ - TRACE("(%p, %s, %p, %p)\n", pM, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); if (!pM) return E_INVALIDARG; - GetModuleFileNameW(pM->m_hInstTypeLib, path, MAX_PATH); - if (lpszIndex) - lstrcatW(path, lpszIndex); - - hRes = LoadTypeLib(path, ppTypeLib); - if (FAILED(hRes)) - return hRes; - - *pbstrPath = SysAllocString(path); + return AtlLoadTypeLib(pM->m_hInstTypeLib, lpszIndex, pbstrPath, ppTypeLib); +} + +HRESULT WINAPI AtlModuleTerm(_ATL_MODULE *pM) +{ + _ATL_TERMFUNC_ELEM *iter, *tmp; + + TRACE("(%p)\n", pM); + + if (pM->cbSize > ATLVer1Size) + { + iter = pM->m_pTermFuncs; + + while(iter) { + iter->pFunc(iter->dw); + tmp = iter; + iter = iter->pNext; + HeapFree(GetProcessHeap(), 0, tmp); + } + } return S_OK; } -HRESULT WINAPI AtlModuleTerm(_ATL_MODULEW* pM) -{ - _ATL_TERMFUNC_ELEM *iter = pM->m_pTermFuncs, *tmp; - - TRACE("(%p)\n", pM); - - while(iter) { - iter->pFunc(iter->dw); - tmp = iter; - iter = iter->pNext; - HeapFree(GetProcessHeap(), 0, tmp); - } - - HeapFree(GetProcessHeap(), 0, pM); - - return S_OK; -} - HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULEW *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) { _ATL_TERMFUNC_ELEM *termfunc_elem; TRACE("(%p %p %ld)\n", pM, pFunc, dw); - termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); - termfunc_elem->pFunc = pFunc; - termfunc_elem->dw = dw; - termfunc_elem->pNext = pM->m_pTermFuncs; - - pM->m_pTermFuncs = termfunc_elem; + if (pM->cbSize > ATLVer1Size) + { + termfunc_elem = HeapAlloc(GetProcessHeap(), 0, sizeof(_ATL_TERMFUNC_ELEM)); + termfunc_elem->pFunc = pFunc; + termfunc_elem->dw = dw; + termfunc_elem->pNext = pM->m_pTermFuncs; + + pM->m_pTermFuncs = termfunc_elem; + } return S_OK; } @@ -242,12 +236,23 @@ hRes = obj->pfnUpdateRegistry(TRUE); /* register */ if (FAILED(hRes)) return hRes; + + if(pM->cbSize > ATLVer1Size) { + const struct _ATL_CATMAP_ENTRY *catmap; + + catmap = ((const _ATL_OBJMAP_ENTRYW*)obj)->pfnGetCategoryMap(); + if(catmap) { + hRes = AtlRegisterClassCategoriesHelper(obj->pclsid, catmap, TRUE); + if(FAILED(hRes)) + return hRes; + } + } } } if (bRegTypeLib) { - hRes = AtlModuleRegisterTypeLib(pM, NULL); + hRes = AtlRegisterTypeLib(pM->m_hInstTypeLib, NULL); if (FAILED(hRes)) return hRes; } @@ -298,25 +303,12 @@ */ HRESULT WINAPI AtlModuleRegisterTypeLib(_ATL_MODULEW *pm, LPCOLESTR lpszIndex) { - HRESULT hRes; - BSTR path; - ITypeLib *typelib; - TRACE("%p %s\n", pm, debugstr_w(lpszIndex)); if (!pm) return E_INVALIDARG; - hRes = AtlModuleLoadTypeLib(pm, lpszIndex, &path, &typelib); - - if (SUCCEEDED(hRes)) - { - hRes = RegisterTypeLib(typelib, path, NULL); /* FIXME: pass help directory */ - ITypeLib_Release(typelib); - SysFreeString(path); - } - - return hRes; + return AtlRegisterTypeLib(pm->m_hInstTypeLib, lpszIndex); } /*********************************************************************** @@ -452,23 +444,28 @@ pData->m_pThis = pvObject; pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); pData->m_pNext = pM->m_pCreateWndList; pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); } /*********************************************************************** * AtlModuleExtractCreateWndData [ATL.@] * - * NOTE: I failed to find any good description of this function. - * Tests show that this function extracts one of _AtlCreateWndData + * NOTE: Tests show that this function extracts one of _AtlCreateWndData * records from the current thread from a list * */ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) { _AtlCreateWndData **ppData; + void *ret = NULL; TRACE("(%p)\n", pM); + + EnterCriticalSection(&pM->m_csWindowCreate); for(ppData = &pM->m_pCreateWndList; *ppData!=NULL; ppData = &(*ppData)->m_pNext) { @@ -476,10 +473,172 @@ { _AtlCreateWndData *pData = *ppData; *ppData = pData->m_pNext; - return pData->m_pThis; - } - } - return NULL; + ret = pData->m_pThis; + break; + } + } + + LeaveCriticalSection(&pM->m_csWindowCreate); + return ret; +} + +/*********************************************************************** + * AtlModuleUpdateRegistryFromResourceD [ATL.@] + * + */ +HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, + BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) +{ + TRACE("(%p %s %d %p %p)\n", pM, debugstr_w(lpszRes), bRegister, pMapEntries, pReg); + + return AtlUpdateRegistryFromResourceD(pM->m_hInst, lpszRes, bRegister, pMapEntries, pReg); +} + +static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObject) +{ + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { + *ppvObject = iface; + IClassFactory_AddRef( iface ); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, + REFIID riid, void **ppv) +{ + IRegistrar *registrar; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if(pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + + hres = IRegistrar_QueryInterface(registrar, riid, ppv); + IRegistrar_Release(registrar); + return hres; +} + +static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) +{ + TRACE("(%p)->(%x)\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl IRegistrarCFVtbl = { + RegistrarCF_QueryInterface, + RegistrarCF_AddRef, + RegistrarCF_Release, + RegistrarCF_CreateInstance, + RegistrarCF_LockServer +}; + +static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; + +static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, + LPCOLESTR wszId, BOOL do_register, + const struct _ATL_REGMAP_ENTRY* pMapEntries) +{ + IRegistrar *registrar; + HRESULT hres; + const struct _ATL_REGMAP_ENTRY *pMapEntry; + + static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; + static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; + + if(pRegistrar) { + registrar = pRegistrar; + }else { + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + } + + IRegistrar_AddReplacement(registrar, wszModule, wszDll); + + for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) + IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); + + if(do_register) + hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); + else + hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); + + if(registrar != pRegistrar) + IRegistrar_Release(registrar); + return hres; +} + +static HRESULT do_register_server(BOOL do_register) +{ + static const WCHAR CLSID_RegistrarW[] = + {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; + static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; + + WCHAR clsid_str[40]; + const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; + + StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); + return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); +} + +/************************************************************** + * DllGetClassObject (ATL.2) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) +{ + TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); + + if(IsEqualGUID(&CLSID_Registrar, clsid)) + return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); + + FIXME("Not supported class %s\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (ATL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ + return do_register_server(TRUE); +} + +/*********************************************************************** + * DllUnRegisterServer (ATL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return do_register_server(FALSE); +} + +/*********************************************************************** + * DllCanUnloadNow (ATL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; } /*********************************************************************** @@ -487,5 +646,53 @@ */ DWORD WINAPI AtlGetVersion(void *pReserved) { - return 0x0300; -} + return _ATL_VER; +} + +/********************************************************************** + * AtlAxWin class window procedure + */ +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +{ + if ( wMsg == WM_CREATE ) + { + DWORD len = GetWindowTextLengthW( hWnd ) + 1; + WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!ptr) + return 1; + GetWindowTextW( hWnd, ptr, len ); + AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ptr ); + return 0; + } + return DefWindowProcW( hWnd, wMsg, wParam, lParam ); +} + +BOOL WINAPI AtlAxWinInit(void) +{ + WNDCLASSEXW wcex; + const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n',0}; + + FIXME("semi-stub\n"); + + if ( FAILED( OleInitialize(NULL) ) ) + return FALSE; + + wcex.cbSize = sizeof(wcex); + wcex.style = CS_GLOBALCLASS; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = GetModuleHandleW( NULL ); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.hIconSm = 0; + + wcex.lpfnWndProc = AtlAxWin_wndproc; + wcex.lpszClassName = AtlAxWin; + if ( !RegisterClassExW( &wcex ) ) + return FALSE; + + return TRUE; +} Modified: trunk/reactos/dll/win32/atl/atl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/atl/atl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl_ros.diff [iso-8859-1] Sat Sep 14 18:22:37 2013 @@ -1,24 +1,44 @@ -Index: atl_main.c -=================================================================== ---- atl_main.c (revision 48273) -+++ atl_main.c (working copy) -@@ -60,7 +60,7 @@ - INT i; - UINT size; +diff -prudN e:\Wine\dlls\atl/atl_main.c e:\reactos\dll\win32\atl/atl_main.c +--- e:\Wine\dlls\atl/atl_main.c 2013-09-03 23:09:36.308717300 +0100 ++++ e:\reactos\dll\win32\atl/atl_main.c 2013-09-12 12:15:17.112785700 +0100 +@@ -547,6 +555,53 @@ static const IClassFactoryVtbl IRegistra -- FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); -+ //FIXME("SEMI-STUB (%p %p %p)\n",pM,p,h); + static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; - size = pM->cbSize; - switch (size) -Index: registrar.c -=================================================================== ---- registrar.c (revision 48273) -+++ registrar.c (revision 48273) -@@ -819,6 +819,19 @@ - return hres; - } - ++static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, ++ LPCOLESTR wszId, BOOL do_register, ++ const struct _ATL_REGMAP_ENTRY* pMapEntries) ++{ ++ IRegistrar *registrar; ++ HRESULT hres; ++ const struct _ATL_REGMAP_ENTRY *pMapEntry; ++ ++ static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; ++ static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; ++ ++ if(pRegistrar) { ++ registrar = pRegistrar; ++ }else { ++ hres = AtlCreateRegistrar(&registrar); ++ if(FAILED(hres)) ++ return hres; ++ } ++ ++ IRegistrar_AddReplacement(registrar, wszModule, wszDll); ++ ++ for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) ++ IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); ++ ++ if(do_register) ++ hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); ++ else ++ hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); ++ ++ if(registrar != pRegistrar) ++ IRegistrar_Release(registrar); ++ return hres; ++} ++ +static HRESULT do_register_server(BOOL do_register) +{ + static const WCHAR CLSID_RegistrarW[] = @@ -32,10 +52,10 @@ + return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); +} + - /*********************************************************************** - * AtlModuleUpdateRegistryFromResourceD [ATL.@] - * -@@ -849,7 +862,8 @@ + /************************************************************** + * DllGetClassObject (ATL.2) + */ +@@ -566,7 +621,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI */ HRESULT WINAPI DllRegisterServer(void) { @@ -45,7 +65,7 @@ } /*********************************************************************** -@@ -857,7 +871,7 @@ +@@ -574,7 +630,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { Removed: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c (removed) @@ -1,215 +0,0 @@ -/* - * Copyright 2005 Jacek Caban - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <objbase.h> - -//#include "oaidl.h" -//#include "rpcproxy.h" -#include <atlbase.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/************************************************************** - * ClassFactory implementation - */ - -static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObject) -{ - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { - *ppvObject = iface; - IClassFactory_AddRef( iface ); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) -{ - return 2; -} - -static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) -{ - return 1; -} - -static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, - REFIID riid, void **ppv) -{ - IRegistrar *registrar; - HRESULT hres; - - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - - if(pUnkOuter) { - *ppv = NULL; - return CLASS_E_NOAGGREGATION; - } - - hres = AtlCreateRegistrar(&registrar); - if(FAILED(hres)) - return hres; - - hres = IRegistrar_QueryInterface(registrar, riid, ppv); - IRegistrar_Release(registrar); - return hres; -} - -static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) -{ - TRACE("(%p)->(%x)\n", iface, lock); - return S_OK; -} - -static const IClassFactoryVtbl IRegistrarCFVtbl = { - RegistrarCF_QueryInterface, - RegistrarCF_AddRef, - RegistrarCF_Release, - RegistrarCF_CreateInstance, - RegistrarCF_LockServer -}; - -static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; - -/************************************************************** - * DllGetClassObject (ATL.2) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) -{ - TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); - - if(IsEqualGUID(&CLSID_Registrar, clsid)) - return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); - - FIXME("Not supported class %s\n", debugstr_guid(clsid)); - return CLASS_E_CLASSNOTAVAILABLE; -} - -extern HINSTANCE hInst; - -static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, - LPCOLESTR wszId, BOOL do_register, - const struct _ATL_REGMAP_ENTRY* pMapEntries) -{ - IRegistrar *registrar; - HRESULT hres; - const struct _ATL_REGMAP_ENTRY *pMapEntry; - - static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; - static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - - if(pRegistrar) { - registrar = pRegistrar; - }else { - hres = AtlCreateRegistrar(&registrar); - if(FAILED(hres)) - return hres; - } - - IRegistrar_AddReplacement(registrar, wszModule, wszDll); - - for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) - IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); - - if(do_register) - hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); - else - hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); - - if(registrar != pRegistrar) - IRegistrar_Release(registrar); - return hres; -} - -static HRESULT do_register_server(BOOL do_register) -{ - static const WCHAR CLSID_RegistrarW[] = - {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0}; - static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; - - WCHAR clsid_str[40]; - const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}}; - - StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); - return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); -} - -/*********************************************************************** - * AtlModuleUpdateRegistryFromResourceD [ATL.@] - * - */ -HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, - BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) -{ - HINSTANCE lhInst = pM->m_hInst; - /* everything inside this function below this point - * should go into atl71.AtlUpdateRegistryFromResourceD - */ - WCHAR module_name[MAX_PATH]; - - if(!GetModuleFileNameW(lhInst, module_name, MAX_PATH)) { - FIXME("hinst %p: did not get module name\n", - lhInst); - return E_FAIL; - } - - TRACE("%p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name), - debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - - return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); -} - -/*********************************************************************** - * DllRegisterServer (ATL.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ - return do_register_server(TRUE); -} - -/*********************************************************************** - * DllUnRegisterServer (ATL.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - return do_register_server(FALSE); -} - -/*********************************************************************** - * DllCanUnloadNow (ATL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} 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 14 18:22:37 2013 @@ -50,7 +50,7 @@ reactos/dll/win32/activeds # Synced to Wine-1.1.43? reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 reactos/dll/win32/advpack # Synced to Wine-1.7.1 -reactos/dll/win32/atl # Synced to Wine-1.5.19 +reactos/dll/win32/atl # Synced to Wine-1.7.1 reactos/dll/win32/atl100 # Synced to Wine-1.7.1 reactos/dll/win32/atl80 # Synced to Wine-1.7.1 reactos/dll/win32/avifil32 # Synced to Wine-1.5.26

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