Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 74093: [COMDLG32_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:57:57 2017 New Revision: 74093 URL: http://svn.reactos.org/svn/reactos?rev=74093&view=rev Log: [COMDLG32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/comdlg32/filedlg.c Modified: trunk/rostests/winetests/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/filedl… ============================================================================== --- trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/filedlg.c [iso-8859-1] Sun Mar 5 20:57:57 2017 @@ -36,6 +36,9 @@ #include <shlguid.h> #define COBJMACROS #include <shobjidl.h> + +#include <ole2.h> +#include <reactos/undocuser.h> /* ##### */ @@ -1274,6 +1277,73 @@ todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); } +static UINT_PTR WINAPI test_ole_init_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HRESULT hr; + + hr = OleInitialize(NULL); + ok(hr == S_FALSE, "OleInitialize() returned %#x\n", hr); + OleUninitialize(); + + if (msg == WM_NOTIFY) + PostMessageA(GetParent(dlg), WM_COMMAND, IDCANCEL, 0); + return FALSE; +} + +static LRESULT CALLBACK hook_proc(int code, WPARAM wp, LPARAM lp) +{ + static BOOL first_dlg = TRUE; + HRESULT hr; + + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + if (c->lpcs->lpszClass == (LPWSTR)WC_DIALOG) + { + /* OleInitialize() creates a window for the main apartment. Since + * Vista OleInitialize() is called before the file dialog is + * created. SimCity 2000 expects that the first window created + * after GetOpenFileA() is a file dialog window. Mark Vista+ + * behavior as broken. */ + hr = OleInitialize(NULL); + ok((first_dlg ? hr == S_OK : hr == S_FALSE) + || broken(first_dlg && hr == S_FALSE), + "OleInitialize() returned %#x (first dialog %#x)\n", hr, first_dlg); + OleUninitialize(); + first_dlg = FALSE; + } + } + + return CallNextHookEx(NULL, code, wp, lp); +} + +static void test_ole_initialization(void) +{ + char file[MAX_PATH] = {0}; + OPENFILENAMEA ofn = {0}; + HRESULT hr; + HHOOK hook; + BOOL ret; + + hook = SetWindowsHookExW(WH_CBT, hook_proc, NULL, GetCurrentThreadId()); + + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofn.lpstrFile = file; + ofn.nMaxFile = MAX_PATH; + ofn.lpfnHook = test_ole_init_wndproc; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofn.hInstance = GetModuleHandleA(NULL); + ret = GetOpenFileNameA(&ofn); + ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "OleInitialize() returned %#x\n", hr); + OleUninitialize(); + + UnhookWindowsHookEx(hook); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1288,4 +1358,5 @@ test_extension(); test_null_filename(); test_directory_filename(); -} + test_ole_initialization(); +}

1 0

[akhaldi] 74092: [COMDLG32] Sync with Wine Staging 2.2. CORE-12823 e07d20f comdlg32: Don't crash if an IShellFolder could not be created. bd1b3c1 comdlg32: Use localized "Path does not exist" strin...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:57:05 2017 New Revision: 74092 URL: http://svn.reactos.org/svn/reactos?rev=74092&view=rev Log: [COMDLG32] Sync with Wine Staging 2.2. CORE-12823 e07d20f comdlg32: Don't crash if an IShellFolder could not be created. bd1b3c1 comdlg32: Use localized "Path does not exist" string. 1707df3 comdlg32: Delay OleInitialize() until after file dialog window is created. 6c4aaf7 comdlg32: Always use original Open File dialog template. eff2ecc comdlg32: Avoid some superfluous pointer casts. Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h trunk/reactos/dll/win32/comdlg32/itemdlg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlg.c [iso-8859-1] Sun Mar 5 20:57:05 2017 @@ -219,14 +219,10 @@ */ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { - LRESULT lRes; - LPCVOID origTemplate; - DWORD dwSize; - LPDLGTEMPLATEW template; + void *template; HRSRC hRes; HANDLE hDlgTmpl = 0; - HRESULT hr; /* test for missing functionality */ if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) @@ -242,36 +238,25 @@ COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; } - if (!(dwSize = SizeofResource(COMDLG32_hInstance, hRes)) || - !(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes)) || - !(origTemplate = LockResource(hDlgTmpl))) + if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || + !(template = LockResource( hDlgTmpl ))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - if (!(template = HeapAlloc(GetProcessHeap(), 0, dwSize))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - return FALSE; - } - memcpy(template, origTemplate, dwSize); /* msdn: explorer style dialogs permit sizing by default. * The OFN_ENABLESIZING flag is only needed when a hook or - * custom tmeplate is provided */ + * custom template is provided */ if( (fodInfos->ofnInfos->Flags & OFN_EXPLORER) && !(fodInfos->ofnInfos->Flags & ( OFN_ENABLEHOOK | OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) fodInfos->ofnInfos->Flags |= OFN_ENABLESIZING; if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - template->style |= WS_SIZEBOX; fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } - else - template->style &= ~WS_SIZEBOX; - /* old style hook messages */ if (IsHooked(fodInfos)) @@ -281,9 +266,6 @@ fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageW(HELPMSGSTRINGW); fodInfos->HookMsg.sharevistring = RegisterWindowMessageW(SHAREVISTRINGW); } - - /* Some shell namespace extensions depend on COM being initialized. */ - hr = OleInitialize(NULL); if (fodInfos->unicode) lRes = DialogBoxIndirectParamW(COMDLG32_hInstance, @@ -297,10 +279,8 @@ fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); - if (SUCCEEDED(hr)) + if (fodInfos->ole_initialized) OleUninitialize(); - - HeapFree(GetProcessHeap(), 0, template); /* Unable to create the dialog */ if( lRes == -1) @@ -1263,7 +1243,11 @@ int gripx = GetSystemMetrics( SM_CYHSCROLL); int gripy = GetSystemMetrics( SM_CYVSCROLL); - /* Adds the FileOpenDlgInfos in the property list of the dialog + /* Some shell namespace extensions depend on COM being initialized. */ + if (SUCCEEDED(OleInitialize(NULL))) + fodInfos->ole_initialized = TRUE; + + /* Adds the FileOpenDlgInfos in the property list of the dialog so it will be easily accessible through a GetPropA(...) */ SetPropA(hwnd, FileOpenDlgInfosStr, fodInfos); @@ -1271,7 +1255,31 @@ if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - GetWindowRect( hwnd, &rc); + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + DWORD ex_style = GetWindowLongW(hwnd, GWL_EXSTYLE); + RECT client, client_adjusted; + + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + style |= WS_SIZEBOX; + ex_style |= WS_EX_WINDOWEDGE; + } + else + style &= ~WS_SIZEBOX; + SetWindowLongW(hwnd, GWL_STYLE, style); + SetWindowLongW(hwnd, GWL_EXSTYLE, ex_style); + + GetClientRect( hwnd, &client ); + GetClientRect( hwnd, &client_adjusted ); + AdjustWindowRectEx( &client_adjusted, style, FALSE, ex_style ); + + GetWindowRect( hwnd, &rc ); + rc.right += client_adjusted.right - client.right; + rc.bottom += client_adjusted.bottom - client.bottom; + SetWindowPos(hwnd, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_FRAMECHANGED | SWP_NOACTIVATE | + SWP_NOZORDER | SWP_NOMOVE); + + GetWindowRect( hwnd, &rc ); fodInfos->DlgInfos.hwndGrip = CreateWindowExA( 0, "SCROLLBAR", NULL, WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | @@ -2911,7 +2919,8 @@ IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); IShellView_Release(fodInfos->Shell.FOIShellView); } - IShellFolder_Release(fodInfos->Shell.FOIShellFolder); + if (fodInfos->Shell.FOIShellFolder) + IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) IDataObject_Release(fodInfos->Shell.FOIDataObject); @@ -3987,9 +3996,9 @@ if ( FAILED( IShellBrowser_BrowseObject( fodInfos->Shell.FOIShellBrowser, pidlSelection, SBSP_RELATIVE ) ) ) { - static const WCHAR notexist[] = {'P','a','t','h',' ','d','o','e','s', - ' ','n','o','t',' ','e','x','i','s','t',0}; - MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); + WCHAR buf[64]; + LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, sizeof(buf)/sizeof(WCHAR) ); + MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] Sun Mar 5 20:57:05 2017 @@ -81,6 +81,7 @@ UINT sharevistring; } HookMsg; + BOOL ole_initialized; } FileOpenDlgInfos; /*********************************************************************** Modified: trunk/reactos/dll/win32/comdlg32/itemdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/itemdlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/itemdlg.c [iso-8859-1] Sun Mar 5 20:57:05 2017 @@ -1958,7 +1958,7 @@ if (umessage == WM_LBUTTONDOWN) { - FileDialogImpl *This = (FileDialogImpl*)GetPropW(hwnd, prop_this); + FileDialogImpl *This = GetPropW(hwnd, prop_this); SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); show_opendropdown(This); @@ -2051,7 +2051,7 @@ SendMessageW(dropdown_hwnd, WM_SETFONT, (LPARAM)This->hfont_opendropdown, 0); /* Subclass button so we can handle LBUTTONDOWN */ - SetPropW(dropdown_hwnd, prop_this, (HANDLE)This); + SetPropW(dropdown_hwnd, prop_this, This); SetPropW(dropdown_hwnd, prop_oldwndproc, (HANDLE)SetWindowLongPtrW(dropdown_hwnd, GWLP_WNDPROC, (LONG_PTR)dropdown_subclass_proc)); } 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] Sun Mar 5 20:57:05 2017 @@ -55,7 +55,7 @@ reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-2.2 -reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/comdlg32 # Synced to WineStaging-2.2 reactos/dll/win32/compstui # Synced to WineStaging-2.2 reactos/dll/win32/credui # Synced to WineStaging-2.2 reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.23

1 0

[akhaldi] 74091: [COMCTL32_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:53:49 2017 New Revision: 74091 URL: http://svn.reactos.org/svn/reactos?rev=74091&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: 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/monthcal.c trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/comctl32/pager.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.c trunk/rostests/winetests/comctl32/treeview.c 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] Sun Mar 5 20:53:49 2017 @@ -532,23 +532,14 @@ { LRESULT r; SYSTEMTIME st, getSt, ref; - HWND hWnd, hWndDateTime_test_gdt_none; - - hWndDateTime_test_gdt_none = create_datetime_control(0); - - ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); - if(hWndDateTime_test_gdt_none) { - r = SendMessageA(hWndDateTime_test_gdt_none, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); - expect(0, r); - } - else { - skip("hWndDateTime_test_gdt_none is NULL\n"); - flush_sequences(sequences, NUM_MSG_SEQUENCES); - - return; - } - - DestroyWindow(hWndDateTime_test_gdt_none); + HWND hWnd; + + hWnd = create_datetime_control(0); + ok(hWnd !=NULL, "Expected non NULL, got %p\n", hWnd); + r = SendMessageA(hWnd, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); + expect(0, r); + + DestroyWindow(hWnd); hWnd = create_datetime_control(DTS_SHOWNONE); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -802,7 +793,7 @@ pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return; } iccex.dwSize = sizeof(iccex); 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] Sun Mar 5 20:53:49 2017 @@ -1673,7 +1673,7 @@ pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return FALSE; } 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] Sun Mar 5 20:53:49 2017 @@ -34,9 +34,9 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> -#include <winuser.h> #include <objbase.h> #include <commctrl.h> /* must be included after objbase.h to get ImageList_Write */ +#include <ole2.h> #include <initguid.h> #include <commoncontrols.h> #include <shellapi.h> @@ -70,6 +70,7 @@ static HRESULT (WINAPI *pImageList_CoCreateInstance)(REFCLSID,const IUnknown *, REFIID,void **); static HRESULT (WINAPI *pHIMAGELIST_QueryInterface)(HIMAGELIST,REFIID,void **); +static int (WINAPI *pImageList_SetColorTable)(HIMAGELIST,int,int,RGBQUAD*); static HINSTANCE hinst; @@ -678,16 +679,15 @@ #define BMP_CX 48 -struct my_IStream +struct memstream { IStream IStream_iface; - char *iml_data; /* written imagelist data */ - ULONG iml_data_size; + IStream *stream; }; -static struct my_IStream *impl_from_IStream(IStream *iface) -{ - return CONTAINING_RECORD(iface, struct my_IStream, IStream_iface); +static struct memstream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct memstream, IStream_iface); } static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, @@ -712,34 +712,15 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; -} - -static BOOL allocate_storage(struct my_IStream *my_is, ULONG add) -{ - my_is->iml_data_size += add; - - if (!my_is->iml_data) - my_is->iml_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, my_is->iml_data_size); - else - my_is->iml_data = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, my_is->iml_data, my_is->iml_data_size); - - return my_is->iml_data != NULL; + struct memstream *stream = impl_from_IStream(iface); + return IStream_Read(stream->stream, pv, cb, pcbRead); } static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) { - struct my_IStream *my_is = impl_from_IStream(iface); - ULONG current_iml_data_size = my_is->iml_data_size; - - if (!allocate_storage(my_is, cb)) return E_FAIL; - - memcpy(my_is->iml_data + current_iml_data_size, pv, cb); - if (pcbWritten) *pcbWritten = cb; - - return S_OK; + struct memstream *stream = impl_from_IStream(iface); + return IStream_Write(stream->stream, pv, cb, pcbWritten); } static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, @@ -820,7 +801,17 @@ Test_Stream_Clone }; -static struct my_IStream Test_Stream = { { &Test_Stream_Vtbl }, 0, 0 }; +static void init_memstream(struct memstream *stream) +{ + stream->IStream_iface.lpVtbl = &Test_Stream_Vtbl; + CreateStreamOnHGlobal(NULL, TRUE, &stream->stream); +} + +static void cleanup_memstream(struct memstream *stream) +{ + IStream_Release(stream->stream); +} + static INT DIB_GetWidthBytes( int width, int bpp ) { @@ -919,15 +910,17 @@ return hbmp; } -#define iml_clear_stream_data() \ - HeapFree(GetProcessHeap(), 0, Test_Stream.iml_data); \ - Test_Stream.iml_data = NULL; \ - Test_Stream.iml_data_size = 0; - static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, INT grow, INT width, INT height, INT flags, const char *comment) { INT ret, cxx, cyy, size; + struct memstream stream; + LARGE_INTEGER mv; + HIMAGELIST himl2; + HGLOBAL hglobal; + STATSTG stat; + char *data; + HRESULT hr; trace("%s\n", comment); @@ -939,25 +932,39 @@ ok(cxx == cx, "wrong cx %d (expected %d)\n", cxx, cx); ok(cyy == cy, "wrong cy %d (expected %d)\n", cyy, cy); - iml_clear_stream_data(); - ret = ImageList_Write(himl, &Test_Stream.IStream_iface); + init_memstream(&stream); + ret = ImageList_Write(himl, &stream.IStream_iface); ok(ret, "ImageList_Write failed\n"); - ok(Test_Stream.iml_data != 0, "ImageList_Write didn't write any data\n"); - ok(Test_Stream.iml_data_size > sizeof(ILHEAD), "ImageList_Write wrote not enough data\n"); - - check_ilhead_data(Test_Stream.iml_data, cx, cy, cur, max, grow, flags); - size = check_bitmap_data(Test_Stream.iml_data + sizeof(ILHEAD), - Test_Stream.iml_data_size - sizeof(ILHEAD), - width, height, flags & 0xfe, comment); - if (size < Test_Stream.iml_data_size - sizeof(ILHEAD)) /* mask is present */ + hr = GetHGlobalFromStream(stream.stream, &hglobal); + ok(hr == S_OK, "Failed to get hglobal, %#x\n", hr); + + IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); + + data = GlobalLock(hglobal); + + ok(data != 0, "ImageList_Write didn't write any data\n"); + ok(stat.cbSize.LowPart > sizeof(ILHEAD), "ImageList_Write wrote not enough data\n"); + + check_ilhead_data(data, cx, cy, cur, max, grow, flags); + size = check_bitmap_data(data + sizeof(ILHEAD), stat.cbSize.LowPart - sizeof(ILHEAD), + width, height, flags & 0xfe, comment); + if (size < stat.cbSize.LowPart - sizeof(ILHEAD)) /* mask is present */ { - ok( flags & ILC_MASK, "extra data %u/%u but mask not expected\n", - Test_Stream.iml_data_size, size ); - check_bitmap_data(Test_Stream.iml_data + sizeof(ILHEAD) + size, - Test_Stream.iml_data_size - sizeof(ILHEAD) - size, + ok( flags & ILC_MASK, "extra data %u/%u but mask not expected\n", stat.cbSize.LowPart, size ); + check_bitmap_data(data + sizeof(ILHEAD) + size, stat.cbSize.LowPart - sizeof(ILHEAD) - size, width, height, 1, comment); } + + /* rewind and reconstruct from stream */ + mv.QuadPart = 0; + IStream_Seek(stream.stream, mv, STREAM_SEEK_SET, NULL); + himl2 = ImageList_Read(&stream.IStream_iface); + ok(himl2 != NULL, "Failed to deserialize imagelist\n"); + ImageList_Destroy(himl2); + + GlobalUnlock(hglobal); + cleanup_memstream(&stream); } static void image_list_init(HIMAGELIST himl) @@ -1062,8 +1069,6 @@ ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); - /* test ImageList_Create storage allocation */ himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 0, 32); @@ -1076,7 +1081,6 @@ DeleteObject(hbm); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 4); ok(himl != 0, "ImageList_Create failed\n"); @@ -1091,70 +1095,60 @@ DeleteObject(hbm); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 207, 209); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 208, 212, BMP_CX * 4, BMP_CX * 52, ILC_COLOR24, "init 207 grow 209"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 209, 207); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 210, 208, BMP_CX * 4, BMP_CX * 53, ILC_COLOR24, "init 209 grow 207"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 14, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 15, 4, BMP_CX * 4, BMP_CX * 4, ILC_COLOR24, "init 14 grow 4"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 5, 9); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 6, 12, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 5 grow 9"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 9, 5); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 10, 8, BMP_CX * 4, BMP_CX * 3, ILC_COLOR24, "init 9 grow 5"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 2, 4); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 3, 4, BMP_CX * 4, BMP_CX * 1, ILC_COLOR24, "init 2 grow 4"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR24, "init 4 grow 2"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR8, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR8, "bpp 8"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); check_iml_data(himl, BMP_CX, BMP_CX, 0, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp 4"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, 0, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); @@ -1166,7 +1160,6 @@ check_iml_data(himl, BMP_CX, BMP_CX, 2, 5, 4, BMP_CX * 4, BMP_CX * 2, ILC_COLOR4, "bpp default"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR24|ILC_MASK, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); @@ -1180,7 +1173,6 @@ "bpp 24 + mask"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 4, 2); ok(himl != 0, "ImageList_Create failed\n"); @@ -1194,7 +1186,6 @@ "bpp 4 + mask"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 99); ok(himl != 0, "ImageList_Create failed\n"); @@ -1223,7 +1214,6 @@ "init 2 grow 99 set count 42"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65536+12); ok(himl != 0, "ImageList_Create failed\n"); @@ -1231,7 +1221,6 @@ "init 2 grow 65536+12"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, 65535); ok(himl != 0, "ImageList_Create failed\n"); @@ -1239,7 +1228,6 @@ "init 2 grow 65535"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); himl = ImageList_Create(BMP_CX, BMP_CX, ILC_COLOR4|ILC_MASK, 2, -20); ok(himl != 0, "ImageList_Create failed\n"); @@ -1247,7 +1235,6 @@ "init 2 grow -20"); ret = ImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); - iml_clear_stream_data(); } static void test_shell_imagelist(void) @@ -2034,6 +2021,205 @@ ok(himl == NULL, "got %p\n", himl); } +static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT ilc, + RGBQUAD *expect, RGBQUAD *broken_expect) +{ + IMAGEINFO info; + INT ret; + char bmi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)bmi_buffer; + int i, depth = ilc & 0xfe; + + ret = ImageList_GetImageInfo(himl, 0, &info); + ok(ret, "got %d\n", ret); + ok(info.hbmImage != NULL, "got %p\n", info.hbmImage); + + memset(bmi_buffer, 0, sizeof(bmi_buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + ret = GetDIBits(hdc, info.hbmImage, 0, 0, NULL, bmi, DIB_RGB_COLORS); + ok(ret, "got %d\n", ret); + ok(bmi->bmiHeader.biBitCount == depth, "got %d\n", bmi->bmiHeader.biBitCount); + + ret = GetDIBits(hdc, info.hbmImage, 0, 0, NULL, bmi, DIB_RGB_COLORS); + ok(ret, "got %d\n", ret); + ok(bmi->bmiHeader.biBitCount == depth, "got %d\n", bmi->bmiHeader.biBitCount); + + for (i = 0; i < (1 << depth); i++) + ok((bmi->bmiColors[i].rgbRed == expect[i].rgbRed && + bmi->bmiColors[i].rgbGreen == expect[i].rgbGreen && + bmi->bmiColors[i].rgbBlue == expect[i].rgbBlue) || + broken(bmi->bmiColors[i].rgbRed == broken_expect[i].rgbRed && + bmi->bmiColors[i].rgbGreen == broken_expect[i].rgbGreen && + bmi->bmiColors[i].rgbBlue == broken_expect[i].rgbBlue), + "%d: %s: got color[%d] %02x %02x %02x expect %02x %02x %02x\n", depth, name, i, + bmi->bmiColors[i].rgbRed, bmi->bmiColors[i].rgbGreen, bmi->bmiColors[i].rgbBlue, + expect[i].rgbRed, expect[i].rgbGreen, expect[i].rgbBlue); +} + +static void get_default_color_table(HDC hdc, int bpp, RGBQUAD *table) +{ + char bmi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)bmi_buffer; + HBITMAP tmp; + int i; + HPALETTE pal; + PALETTEENTRY entries[256]; + + switch (bpp) + { + case 4: + tmp = CreateBitmap( 1, 1, 1, 1, NULL ); + memset(bmi_buffer, 0, sizeof(bmi_buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = 1; + bmi->bmiHeader.biWidth = 1; + bmi->bmiHeader.biBitCount = bpp; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + GetDIBits( hdc, tmp, 0, 0, NULL, bmi, DIB_RGB_COLORS ); + + memcpy(table, bmi->bmiColors, (1 << bpp) * sizeof(RGBQUAD)); + table[7] = bmi->bmiColors[8]; + table[8] = bmi->bmiColors[7]; + DeleteObject( tmp ); + break; + + case 8: + pal = CreateHalftonePalette(hdc); + GetPaletteEntries(pal, 0, 256, entries); + for (i = 0; i < 256; i++) + { + table[i].rgbRed = entries[i].peRed; + table[i].rgbGreen = entries[i].peGreen; + table[i].rgbBlue = entries[i].peBlue; + table[i].rgbReserved = 0; + } + DeleteObject(pal); + break; + + default: + ok(0, "unhandled depth %d\n", bpp); + } +} + +static void test_color_table(UINT ilc) +{ + HIMAGELIST himl; + INT ret; + char bmi_buffer[FIELD_OFFSET(BITMAPINFO, bmiColors) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)bmi_buffer; + HDC hdc = CreateCompatibleDC(0); + HBITMAP dib4, dib8, dib32; + RGBQUAD rgb[256], default_table[256]; + + get_default_color_table(hdc, ilc & 0xfe, default_table); + + himl = ImageList_Create(16, 16, ilc, 0, 3); + ok(himl != NULL, "got %p\n", himl); + + memset(bmi_buffer, 0, sizeof(bmi_buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = 16; + bmi->bmiHeader.biWidth = 16; + bmi->bmiHeader.biBitCount = 8; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[0].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[2].rgbBlue = 0xff; + + dib8 = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + + bmi->bmiHeader.biBitCount = 4; + bmi->bmiColors[0].rgbRed = 0xff; + bmi->bmiColors[0].rgbGreen = 0x00; + bmi->bmiColors[0].rgbBlue = 0xff; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0x00; + bmi->bmiColors[2].rgbRed = 0x00; + bmi->bmiColors[2].rgbGreen = 0xff; + bmi->bmiColors[2].rgbBlue = 0xff; + + dib4 = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + + bmi->bmiHeader.biBitCount = 32; + + dib32 = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + + /* add 32 first then 8. This won't set the color table */ + ret = ImageList_Add(himl, dib32, NULL); + ok(ret == 0, "got %d\n", ret); + ret = ImageList_Add(himl, dib8, NULL); + ok(ret == 1, "got %d\n", ret); + + check_color_table("add 32, 8", hdc, himl, ilc, default_table, NULL); + + /* since the previous _Adds didn't set the color table, this one will */ + ret = ImageList_Remove(himl, -1); + ok(ret, "got %d\n", ret); + ret = ImageList_Add(himl, dib8, NULL); + ok(ret == 0, "got %d\n", ret); + + memset(rgb, 0, sizeof(rgb)); + rgb[0].rgbRed = 0xff; + rgb[1].rgbGreen = 0xff; + rgb[2].rgbBlue = 0xff; + check_color_table("remove all, add 8", hdc, himl, ilc, rgb, default_table); + + /* remove all, add 4. Color table remains the same since it's inplicitly + been set by the previous _Add */ + ret = ImageList_Remove(himl, -1); + ok(ret, "got %d\n", ret); + ret = ImageList_Add(himl, dib4, NULL); + ok(ret == 0, "got %d\n", ret); + check_color_table("remove all, add 4", hdc, himl, ilc, rgb, default_table); + + ImageList_Destroy(himl); + himl = ImageList_Create(16, 16, ilc, 0, 3); + ok(himl != NULL, "got %p\n", himl); + + /* add 4 */ + ret = ImageList_Add(himl, dib4, NULL); + ok(ret == 0, "got %d\n", ret); + + memset(rgb, 0, 16 * sizeof(rgb[0])); + rgb[0].rgbRed = 0xff; + rgb[0].rgbBlue = 0xff; + rgb[1].rgbRed = 0xff; + rgb[1].rgbGreen = 0xff; + rgb[2].rgbGreen = 0xff; + rgb[2].rgbBlue = 0xff; + memcpy(rgb + 16, default_table + 16, 240 * sizeof(rgb[0])); + + check_color_table("add 4", hdc, himl, ilc, rgb, default_table); + + ImageList_Destroy(himl); + himl = ImageList_Create(16, 16, ilc, 0, 3); + ok(himl != NULL, "got %p\n", himl); + + /* set color table, add 8 */ + ret = ImageList_Remove(himl, -1); + ok(ret, "got %d\n", ret); + memset(rgb, 0, sizeof(rgb)); + rgb[0].rgbRed = 0xcc; + rgb[1].rgbBlue = 0xcc; + ret = pImageList_SetColorTable(himl, 0, 2, rgb); + ok(ret == 2, "got %d\n", ret); + /* the table is set, so this doesn't change it */ + ret = ImageList_Add(himl, dib8, NULL); + ok(ret == 0, "got %d\n", ret); + + memcpy(rgb + 2, default_table + 2, 254 * sizeof(rgb[0])); + check_color_table("SetColorTable", hdc, himl, ilc, rgb, NULL); + + DeleteObject(dib32); + DeleteObject(dib8); + DeleteObject(dib4); + DeleteDC(hdc); + ImageList_Destroy(himl); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2166,6 +2352,7 @@ pImageList_Add = NULL; pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); + pImageList_SetColorTable = (void*)GetProcAddress(hComCtl32, (const char*)390); hinst = GetModuleHandleA(NULL); @@ -2181,6 +2368,8 @@ test_merge_colors(); test_imagelist_storage(); test_iconsize(); + test_color_table(ILC_COLOR4); + test_color_table(ILC_COLOR8); FreeLibrary(hComCtl32); 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] Sun Mar 5 20:53:49 2017 @@ -558,7 +558,10 @@ } defwndproc_counter++; - ret = DefWindowProcA(hwnd, message, wParam, lParam); + if (IsWindowUnicode(hwnd)) + ret = DefWindowProcW(hwnd, message, wParam, lParam); + else + ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; return ret; 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] Sun Mar 5 20:53:49 2017 @@ -2056,7 +2056,7 @@ pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return; } iccex.dwSize = sizeof(iccex); Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/mru.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/mru.c [iso-8859-1] Sun Mar 5 20:53:49 2017 @@ -236,7 +236,7 @@ if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUListA) { - skip("MRU entry points not found\n"); + win_skip("MRU entry points not found\n"); return; } 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] Sun Mar 5 20:53:49 2017 @@ -86,6 +86,28 @@ add_message(sequences, PAGER_SEQ_INDEX, &msg); } + if (message == WM_NOTIFY) + { + NMHDR *nmhdr = (NMHDR *)lParam; + + switch (nmhdr->code) + { + case PGN_CALCSIZE: + { + NMPGCALCSIZE *nmpgcs = (NMPGCALCSIZE *)lParam; + DWORD style = GetWindowLongA(nmpgcs->hdr.hwndFrom, GWL_STYLE); + + if (style & PGS_HORZ) + ok(nmpgcs->dwFlag == PGF_CALCWIDTH, "Unexpected flags %#x.\n", nmpgcs->dwFlag); + else + ok(nmpgcs->dwFlag == PGF_CALCHEIGHT, "Unexpected flags %#x.\n", nmpgcs->dwFlag); + break; + } + default: + ; + } + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; @@ -151,7 +173,7 @@ static void test_pager(void) { HWND pager, child; - RECT rect; + RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); if (!pager) @@ -185,6 +207,29 @@ ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE); DestroyWindow( pager ); + + /* Test if resizing works */ + pager = create_pager_control( CCS_NORESIZE ); + ok(pager != NULL, "failed to create pager control\n"); + + GetWindowRect( pager, &rect ); + MoveWindow( pager, 0, 0, 200, 100, TRUE ); + GetWindowRect( pager, &rect2 ); + ok(rect2.right - rect2.left > rect.right - rect.left, "expected pager window to resize, %s\n", + wine_dbgstr_rect( &rect2 )); + + DestroyWindow( pager ); + + pager = create_pager_control( CCS_NORESIZE | PGS_HORZ ); + ok(pager != NULL, "failed to create pager control\n"); + + GetWindowRect( pager, &rect ); + MoveWindow( pager, 0, 0, 100, 200, TRUE ); + GetWindowRect( pager, &rect2 ); + ok(rect2.bottom - rect2.top > rect.bottom - rect.top, "expected pager window to resize, %s\n", + wine_dbgstr_rect( &rect2 )); + + DestroyWindow( pager ); } START_TEST(pager) 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] Sun Mar 5 20:53:49 2017 @@ -58,6 +58,21 @@ { switch(msg) { + case PSCB_PRECREATE: + { + HMODULE module = GetModuleHandleA("comctl32.dll"); + DWORD size, buffer_size; + HRSRC hrsrc; + + hrsrc = FindResourceA(module, MAKEINTRESOURCEA(1006 /* IDD_PROPSHEET */), + (LPSTR)RT_DIALOG); + size = SizeofResource(module, hrsrc); + ok(size != 0, "Failed to get size of propsheet dialog resource\n"); + buffer_size = HeapSize(GetProcessHeap(), 0, (void *)lparam); + ok(buffer_size == 2 * size, "Unexpected template buffer size %u, resource size %u\n", + buffer_size, size); + break; + } case PSCB_INITIALIZED: { char caption[256]; Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Sun Mar 5 20:53:49 2017 @@ -1710,12 +1710,13 @@ static void test_getbuttoninfo(void) { HWND hToolbar = NULL; + TBBUTTONINFOW tbiW; + TBBUTTONINFOA tbi; int i; rebuild_toolbar_with_buttons(&hToolbar); for (i = 0; i < 128; i++) { - TBBUTTONINFOA tbi; int ret; tbi.cbSize = i; @@ -1727,6 +1728,14 @@ compare(ret, -1, "%d"); } } + + /* TBIF_TEXT with NULL pszText */ + memset(&tbiW, 0, sizeof(tbiW)); + tbiW.cbSize = sizeof(tbiW); + tbiW.dwMask = TBIF_BYINDEX | TBIF_STYLE | TBIF_COMMAND | TBIF_TEXT; + i = SendMessageA(hToolbar, TB_GETBUTTONINFOW, 1, (LPARAM)&tbiW); + ok(i == 1, "Got index %d\n", i); + DestroyWindow(hToolbar); } @@ -2358,6 +2367,47 @@ RegCloseKey( key ); } +static void test_drawtext_flags(void) +{ + HWND hwnd = NULL; + UINT flags; + + rebuild_toolbar(&hwnd); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + + /* zero mask, flags are retained */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, 0, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + /* set/remove */ + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, DT_BOTTOM); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == DT_BOTTOM, "Unexpected draw text flags %#x\n", flags); + ok(flags & DT_BOTTOM, "Expected DT_BOTTOM style, %#x\n", flags); + + flags = SendMessageA(hwnd, TB_SETDRAWTEXTFLAGS, DT_BOTTOM, 0); +todo_wine + ok(flags == 0, "Unexpected draw text flags %#x\n", flags); + ok(!(flags & DT_BOTTOM), "Unexpected DT_BOTTOM style\n"); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2402,6 +2452,7 @@ test_TB_GET_SET_EXTENDEDSTYLE(); test_noresize(); test_save(); + test_drawtext_flags(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… ============================================================================== --- trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tooltips.c [iso-8859-1] Sun Mar 5 20:53:49 2017 @@ -301,7 +301,7 @@ TTTOOLINFOA toolinfoA; TTTOOLINFOW toolinfoW; LRESULT r; - CHAR bufA[10] = ""; + CHAR bufA[16] = ""; WCHAR bufW[10] = { 0 }; DWORD length, style; 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] Sun Mar 5 20:53:49 2017 @@ -778,6 +778,32 @@ SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + /* test position update on range change */ + + /* set to [20, 50], position at 30, reduce range to [20,25] */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip max to 10 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 20, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip min to 70 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 70); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 70, "Unexpected position %d\n", r); + DestroyWindow(hWndTrackbar); } @@ -893,7 +919,7 @@ static void test_tic_settings(void) { HWND hWndTrackbar; - int r; + int r, i; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -958,6 +984,50 @@ SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); r = SendMessageA(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(3, r); + + DestroyWindow(hWndTrackbar); + + /* Test to show that TBM_SETTICFREQ updates thumb */ + for (i = 0; i < 2; i++) + { + DWORD style = i ? defaultstyle : defaultstyle & ~TBS_AUTOTICKS; + RECT rect, rect1; + WNDPROC oldproc; + + hWndTrackbar = create_trackbar2(style, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-100, 100)); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Old position is also 0, but thumb position will be different after range change */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Previous frequency is also 1, yet thumb is updated */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)oldproc); + + DestroyWindow(hWndTrackbar); + } } static void test_tic_placement(void) Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… ============================================================================== --- trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/treeview.c [iso-8859-1] Sun Mar 5 20:53:49 2017 @@ -42,6 +42,7 @@ static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; static HFONT g_customdraw_font; +static BOOL g_v6; #define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 @@ -328,6 +329,8 @@ { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, { 0 } }; @@ -1259,6 +1262,7 @@ { NMTVCUSTOMDRAW *nmcd = (NMTVCUSTOMDRAW*)lParam; COLORREF c0ffee = RGB(0xc0,0xff,0xee), cafe = RGB(0xca,0xfe,0x00); + COLORREF text = GetTextColor(nmcd->nmcd.hdc), bkgnd = GetBkColor(nmcd->nmcd.hdc); msg.flags |= custdraw; msg.stage = nmcd->nmcd.dwDrawStage; @@ -1269,15 +1273,23 @@ case CDDS_PREPAINT: return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYITEMERASE|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: + ok(text == nmcd->clrText || (g_v6 && nmcd->clrText == 0xffffffff), + "got %08x vs %08x\n", text, nmcd->clrText); + ok(bkgnd == nmcd->clrTextBk || (g_v6 && nmcd->clrTextBk == 0xffffffff), + "got %08x vs %08x\n", bkgnd, nmcd->clrTextBk); + nmcd->clrText = cafe; nmcd->clrTextBk = c0ffee; - nmcd->clrText = cafe; + SetTextColor(nmcd->nmcd.hdc, c0ffee); + SetBkColor(nmcd->nmcd.hdc, cafe); if (g_customdraw_font) SelectObject(nmcd->nmcd.hdc, g_customdraw_font); return CDRF_NOTIFYPOSTPAINT|CDRF_NEWFONT; case CDDS_ITEMPOSTPAINT: /* at the point of post paint notification colors are already restored */ - ok(GetTextColor(nmcd->nmcd.hdc) != cafe, "got 0%x\n", GetTextColor(nmcd->nmcd.hdc)); - ok(GetBkColor(nmcd->nmcd.hdc) != c0ffee, "got 0%x\n", GetBkColor(nmcd->nmcd.hdc)); + ok(nmcd->clrText == cafe, "got 0%x\n", nmcd->clrText); + ok(nmcd->clrTextBk == c0ffee, "got 0%x\n", nmcd->clrTextBk); + ok(text != cafe, "got 0%x\n", text); + ok(bkgnd != c0ffee, "got 0%x\n", bkgnd); if (g_customdraw_font) ok(GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT) != g_customdraw_font, "got %p\n", GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT)); @@ -2317,20 +2329,12 @@ static void test_customdraw(void) { - static const char *rootA = "root"; - TVINSERTSTRUCTA ins; - HTREEITEM hRoot; LOGFONTA lf; HWND hwnd; hwnd = create_treeview_control(0); - - ins.hParent = TVI_ROOT; - ins.hInsertAfter = TVI_ROOT; - U(ins).item.mask = TVIF_TEXT; - U(ins).item.pszText = (char*)rootA; - hRoot = TreeView_InsertItemA(hwnd, &ins); - ok(hRoot != NULL, "got %p\n", hRoot); + fill_tree(hwnd); + SendMessageA(hwnd, TVM_EXPAND, TVE_EXPAND, (WPARAM)hRoot); /* create additional font, custom draw handler will select it */ SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); @@ -2477,6 +2481,7 @@ } /* comctl32 version 6 tests start here */ + g_v6 = TRUE; test_expandedimage(); test_htreeitem_layout(); test_WM_GETDLGCODE();

1 0

[akhaldi] 74090: [COMCTL32] Sync with Wine Staging 2.2. CORE-12823 cc055c4 comctl32: Add support for PSPCB_ADDREF/PSPCB_RELEASE callback notifications. (v2) 83cde06 comctl32/propsheet: Implement PS...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:52:24 2017 New Revision: 74090 URL: http://svn.reactos.org/svn/reactos?rev=74090&view=rev Log: [COMCTL32] Sync with Wine Staging 2.2. CORE-12823 cc055c4 comctl32: Add support for PSPCB_ADDREF/PSPCB_RELEASE callback notifications. (v2) 83cde06 comctl32/propsheet: Implement PSM_SETHEADERSUBTITLE. ce9c06b comctl32/propsheet: Implement PSM_SETHEADERTITLE. 1a750f7 comctl32/propsheet: Add helpers to do string duplication. 14a6c98 comctl32/pager: Don't block window size changes. a6661ba comctl32/propsheet: Added PSM_INSERTPAGE implementation. 34dd326 comctl32/propsheet: Only use header bitmap when asked for it. 6eafebe comctl32/propsheet: Force wizard header if any of pages has title/subtitle. 70c9a96 comctl32: Fix some more spec file entries. 2dd0fb8 comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists. a0e73a1 comctl32/syslink: Don't use exported StrCmpNIW(). 970029b comctl32/toolbar: Fix TB_SETDRAWTEXTFLAGS handler. 99913e8 comctl32: Fix some spec file entries. 9d404dd comctl32/propsheet: Double size of a template buffer passed to PSCB_PRECREATE. bb1d68e comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary. 26067cc comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler. a6aabe0 comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ. c7c8994 comctl32: Recompute the text width if necessary. 3ed6ba5 comctl32: Set the text and bkgnd colours to the default before the item pre-paint notification. 8915404 comctl32: Use wine_dbgstr_point in TRACES. Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/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] Sun Mar 5 20:52:24 2017 @@ -1,12 +1,12 @@ 2 stdcall MenuHelp(long long long long long long ptr) 3 stdcall ShowHideMenuCtl(long long ptr) -4 stdcall GetEffectiveClientRect(long long long) +4 stdcall GetEffectiveClientRect(long ptr ptr) 5 stdcall DrawStatusTextA(long ptr str long) 6 stdcall CreateStatusWindowA(long str long long) 7 stdcall CreateToolbar(long long long long long long ptr long) 8 stdcall CreateMappedBitmap(long long long ptr long) -9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) -10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) +9 stdcall -noname DPA_LoadStream(ptr ptr ptr ptr) +10 stdcall -noname DPA_SaveStream(ptr ptr ptr ptr) 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) 12 stdcall CreatePropertySheetPage(ptr) CreatePropertySheetPageA 13 stdcall MakeDragList(long) @@ -105,10 +105,10 @@ 236 stdcall -ordinal Str_SetPtrW(wstr wstr) 320 stdcall -ordinal DSA_Create(long long) 321 stdcall -ordinal DSA_Destroy(ptr) -322 stdcall -noname DSA_GetItem(ptr long long) +322 stdcall -noname DSA_GetItem(ptr long ptr) 323 stdcall -ordinal DSA_GetItemPtr(ptr long) -324 stdcall -ordinal DSA_InsertItem(ptr long long) -325 stdcall -noname DSA_SetItem (ptr long long) +324 stdcall -ordinal DSA_InsertItem(ptr long ptr) +325 stdcall -noname DSA_SetItem (ptr long ptr) 326 stdcall -noname DSA_DeleteItem(ptr long) 327 stdcall -ordinal DSA_DeleteAllItems(ptr) 328 stdcall -ordinal DPA_Create(long) @@ -126,7 +126,7 @@ 340 stdcall -noname DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) -350 stdcall -noname -private StrChrA(str str) +350 stdcall -noname -private StrChrA(str long) 351 stdcall -noname -private StrRChrA(str str long) 352 stdcall -noname -private StrCmpNA(str str long) 353 stdcall -noname -private StrCmpNIA(str str long) @@ -155,10 +155,10 @@ 382 stdcall -noname SmoothScrollWindow(ptr) 383 stdcall -noname DoReaderMode(ptr) 384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -ordinal DPA_EnumCallback(long long long) -386 stdcall -ordinal DPA_DestroyCallback(ptr ptr long) -387 stdcall -noname DSA_EnumCallback(ptr ptr long) -388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) +385 stdcall -ordinal DPA_EnumCallback(ptr ptr ptr) +386 stdcall -ordinal DPA_DestroyCallback(ptr ptr ptr) +387 stdcall -noname DSA_EnumCallback(ptr ptr ptr) +388 stdcall -ordinal DSA_DestroyCallback(ptr ptr ptr) #389 CControl::v_OnNotify 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) 400 stdcall -ordinal CreateMRUListW(ptr) Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c [iso-8859-1] Sun Mar 5 20:52:24 2017 @@ -804,7 +804,7 @@ { int i; - TRACE ("%d, %d\n", pt.x, pt.y); + TRACE ("%s\n", wine_dbgstr_point(&pt)); if (PtInRect (&infoPtr->calbutton, pt)) return DTHT_MCPOPUP; if (PtInRect (&infoPtr->checkbox, pt)) return DTHT_CHECKBOX; Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sun Mar 5 20:52:24 2017 @@ -72,6 +72,7 @@ INT cInitial; UINT uBitsPixel; char *has_alpha; + BOOL color_table_set; LONG ref; /* reference count */ }; @@ -298,6 +299,9 @@ return ret; } +UINT WINAPI +ImageList_SetColorTable(HIMAGELIST himl, UINT uStartIndex, UINT cEntries, const RGBQUAD *prgb); + /************************************************************************* * IMAGELIST_InternalExpandBitmaps [Internal] * @@ -420,7 +424,8 @@ nImageCount = bmp.bmWidth / himl->cx; - TRACE("%p has %d images (%d x %d)\n", hbmImage, nImageCount, bmp.bmWidth, bmp.bmHeight); + TRACE("%p has %d images (%d x %d) bpp %d\n", hbmImage, nImageCount, bmp.bmWidth, bmp.bmHeight, + bmp.bmBitsPixel); IMAGELIST_InternalExpandBitmaps(himl, nImageCount); @@ -436,6 +441,14 @@ { hdcTemp = CreateCompatibleDC(0); SelectObject(hdcTemp, hbmMask); + } + + if (himl->uBitsPixel <= 8 && bmp.bmBitsPixel <= 8 && + !himl->color_table_set && himl->cCurImage == 0) + { + RGBQUAD colors[256]; + UINT num = GetDIBColorTable( hdcBitmap, 0, 1 << bmp.bmBitsPixel, colors ); + if (num) ImageList_SetColorTable( himl, 0, num, colors ); } for (i=0; i<nImageCount; i++) @@ -787,6 +800,7 @@ himl->cGrow = cGrow; himl->clrFg = CLR_DEFAULT; himl->clrBk = CLR_NONE; + himl->color_table_set = FALSE; /* initialize overlay mask indices */ for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) @@ -3219,11 +3233,25 @@ if (himl->uBitsPixel <= ILC_COLOR8) { - /* retrieve the default color map */ - HBITMAP tmp = CreateBitmap( 1, 1, 1, 1, NULL ); - GetDIBits( hdc, tmp, 0, 0, NULL, bmi, DIB_RGB_COLORS ); - DeleteObject( tmp ); - } + if (!himl->color_table_set) + { + /* retrieve the default color map */ + HBITMAP tmp = CreateBitmap( 1, 1, 1, 1, NULL ); + GetDIBits( hdc, tmp, 0, 0, NULL, bmi, DIB_RGB_COLORS ); + DeleteObject( tmp ); + if (ilc == ILC_COLOR4) + { + RGBQUAD tmp; + tmp = bmi->bmiColors[7]; + bmi->bmiColors[7] = bmi->bmiColors[8]; + bmi->bmiColors[8] = tmp; + } + } + else + { + GetDIBColorTable(himl->hdcImage, 0, 1 << himl->uBitsPixel, bmi->bmiColors); + } + } hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0); } else /*if (ilc == ILC_COLORDDB)*/ @@ -3258,6 +3286,8 @@ UINT WINAPI ImageList_SetColorTable(HIMAGELIST himl, UINT uStartIndex, UINT cEntries, const RGBQUAD *prgb) { + TRACE("(%p, %d, %d, %p)\n", himl, uStartIndex, cEntries, prgb); + himl->color_table_set = TRUE; return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb); } 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] Sun Mar 5 20:52:24 2017 @@ -2157,7 +2157,7 @@ hit = MONTHCAL_HitTest(infoPtr, &ht); - TRACE("%x at (%d, %d)\n", hit, ht.pt.x, ht.pt.y); + TRACE("%x at %s\n", hit, wine_dbgstr_point(&ht.pt)); switch(hit) { Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/pager.c [iso-8859-1] Sun Mar 5 20:52:24 2017 @@ -379,34 +379,6 @@ return 0; } -static LRESULT -PAGER_WindowPosChanging(PAGER_INFO* infoPtr, WINDOWPOS *winpos) -{ - if ((infoPtr->dwStyle & CCS_NORESIZE) && !(winpos->flags & SWP_NOSIZE)) - { - /* don't let the app resize the nonscrollable dimension of a control - * that was created with CCS_NORESIZE style - * (i.e. height for a horizontal pager, or width for a vertical one) */ - - /* except if the current dimension is 0 and app is setting for - * first time, then save amount as dimension. - GA 8/01 */ - - if (infoPtr->dwStyle & PGS_HORZ) - if (!infoPtr->nHeight && winpos->cy) - infoPtr->nHeight = winpos->cy; - else - winpos->cy = infoPtr->nHeight; - else - if (!infoPtr->nWidth && winpos->cx) - infoPtr->nWidth = winpos->cx; - else - winpos->cx = infoPtr->nWidth; - return 0; - } - - return DefWindowProcW (infoPtr->hwndSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM)winpos); -} - /****************************************************************** * For the PGM_RECALCSIZE message (but not the other uses in * * this module), the native control does only the following: * @@ -1027,6 +999,8 @@ { PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0); + TRACE("(%p, %#x, %#lx, %#lx)\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); @@ -1084,9 +1058,6 @@ case WM_NCPAINT: return PAGER_NCPaint (infoPtr, (HRGN)wParam); - - case WM_WINDOWPOSCHANGING: - return PAGER_WindowPosChanging (infoPtr, (WINDOWPOS*)lParam); case WM_STYLECHANGED: return PAGER_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sun Mar 5 20:52:24 2017 @@ -32,10 +32,7 @@ * - Wizard 97 header resizing * - Enforcing of minimal wizard size * - Messages: - * o PSM_INSERTPAGE * o PSM_RECALCPAGESIZES - * o PSM_SETHEADERSUBTITLE - * o PSM_SETHEADERTITLE * o WM_HELP * o WM_CONTEXTMENU * - Notifications: @@ -156,12 +153,31 @@ static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage); -static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage); static INT_PTR CALLBACK PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); WINE_DEFAULT_DEBUG_CHANNEL(propsheet); + +static WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = Alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +static WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret; + INT len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, 0, 0); + ret = Alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** @@ -256,23 +272,6 @@ } /****************************************************************************** - * PROPSHEET_AtoW - * - * Convert ASCII to Unicode since all data is saved as Unicode. - */ -static void PROPSHEET_AtoW(LPCWSTR *tostr, LPCSTR frstr) -{ - INT len; - WCHAR *to; - - TRACE("<%s>\n", frstr); - len = MultiByteToWideChar(CP_ACP, 0, frstr, -1, 0, 0); - to = Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, frstr, -1, to, len); - *tostr = to; -} - -/****************************************************************************** * PROPSHEET_CollectSheetInfoCommon * * Common code for PROPSHEET_CollectSheetInfoA/W @@ -360,12 +359,7 @@ else { if (!IS_INTRESOURCE(lppsh->pszCaption)) - { - int len = strlenW(lppsh->pszCaption); - WCHAR *caption = Alloc( (len+1)*sizeof(WCHAR) ); - - psInfo->ppshheader.pszCaption = strcpyW( caption, lppsh->pszCaption ); - } + psInfo->ppshheader.pszCaption = heap_strdupW( lppsh->pszCaption ); } psInfo->nPages = lppsh->nPages; @@ -470,6 +464,9 @@ p++; /* y */ width = (WORD)*p; p++; height = (WORD)*p; p++; + + if (lppsp->dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) + psInfo->ppshheader.dwFlags |= PSH_HEADER; /* Special calculation for interior wizard pages so the largest page is * calculated correctly. We need to add all the padding and space occupied @@ -535,8 +532,6 @@ WCHAR szTitle[256]; const WCHAR *pTitle; static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; - WCHAR *text; - int len; if (IS_INTRESOURCE( lppsp->pszTitle )) { @@ -550,9 +545,7 @@ else pTitle = lppsp->pszTitle; - len = strlenW(pTitle); - text = Alloc( (len+1)*sizeof (WCHAR) ); - psInfo->proppage[index].pszText = strcpyW( text, pTitle); + psInfo->proppage[index].pszText = heap_strdupW( pTitle ); } /* @@ -624,7 +617,7 @@ */ resSize = SizeofResource(COMCTL32_hModule, hRes); - temp = Alloc(resSize); + temp = Alloc(2 * resSize); if (!temp) return -1; @@ -2226,16 +2219,108 @@ return msgResult; } +/****************************************************************************** + * PROPSHEET_InsertPage + */ +static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) +{ + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PropPageInfo *ppi, *prev_ppi = psInfo->proppage; + HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); + LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)hpage; + TCITEMW item; + int index; + + TRACE("hwndDlg %p, hpageInsertAfter %p, hpage %p\n", hwndDlg, hpageInsertAfter, hpage); + + if (IS_INTRESOURCE(hpageInsertAfter)) + index = LOWORD(hpageInsertAfter); + else + { + index = PROPSHEET_GetPageIndex(hpageInsertAfter, psInfo, -1); + if (index < 0) + { + TRACE("Could not find page to insert after!\n"); + return FALSE; + } + index++; + } + + if (index > psInfo->nPages) + index = psInfo->nPages; + + ppi = Alloc(sizeof(PropPageInfo) * (psInfo->nPages + 1)); + if (!ppi) + return FALSE; + + /* + * Fill in a new PropPageInfo entry. + */ + if (index > 0) + memcpy(ppi, prev_ppi, index * sizeof(PropPageInfo)); + memset(&ppi[index], 0, sizeof(PropPageInfo)); + if (index < psInfo->nPages) + memcpy(&ppi[index + 1], &prev_ppi[index], (psInfo->nPages - index) * sizeof(PropPageInfo)); + psInfo->proppage = ppi; + + if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, index, FALSE)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } + + psInfo->proppage[index].hpage = hpage; + + if (ppsp->dwFlags & PSP_PREMATURE) + { + /* Create the page but don't show it */ + if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppsp)) + { + psInfo->proppage = prev_ppi; + Free(ppi); + return FALSE; + } + } + + Free(prev_ppi); + psInfo->nPages++; + if (index <= psInfo->active_page) + psInfo->active_page++; + + /* + * Add a new tab to the tab control. + */ + item.mask = TCIF_TEXT; + item.pszText = (LPWSTR) psInfo->proppage[index].pszText; + item.cchTextMax = MAX_TABTEXT_LENGTH; + + if (psInfo->hImageList) + SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList); + + if (psInfo->proppage[index].hasIcon) + { + item.mask |= TCIF_IMAGE; + item.iImage = index; + } + + SendMessageW(hwndTabControl, TCM_INSERTITEMW, index, (LPARAM)&item); + + /* If it is the only page - show it */ + if (psInfo->nPages == 1) + PROPSHEET_SetCurSel(hwndDlg, 0, 1, 0); + + return TRUE; +} /****************************************************************************** * PROPSHEET_AddPage */ -static BOOL PROPSHEET_AddPage(HWND hwndDlg, - HPROPSHEETPAGE hpage) +static BOOL PROPSHEET_AddPage(HWND hwndDlg, HPROPSHEETPAGE hpage) { PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - TRACE("hpage %p\n", hpage); - return PROPSHEET_InsertPage(hwndDlg, (HPROPSHEETPAGE)(ULONG_PTR)psInfo->nPages, hpage); + TRACE("hwndDlg %p, hpage %p\n", hwndDlg, hpage); + return PROPSHEET_InsertPage(hwndDlg, UlongToPtr(psInfo->nPages), hpage); } /****************************************************************************** @@ -2419,135 +2504,75 @@ } /****************************************************************************** - * PROPSHEET_InsertPage - */ -static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, HPROPSHEETPAGE hpage) -{ - PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); - PropPageInfo * ppi, * prev_ppi = psInfo->proppage; - HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); - LPCPROPSHEETPAGEW ppsp = (LPCPROPSHEETPAGEW)hpage; - TCITEMW item; - int index; - - TRACE("hwndDlg %p, hpageInsertAfter %p, hpage %p\n", hwndDlg, hpageInsertAfter, hpage); - - if (IS_INTRESOURCE(hpageInsertAfter)) - index = LOWORD(hpageInsertAfter); - else - { - index = PROPSHEET_GetPageIndex(hpageInsertAfter, psInfo, -1); - if (index < 0) - { - TRACE("Could not find page to insert after!\n"); - return FALSE; - } - index++; - } - - if (index > psInfo->nPages) - index = psInfo->nPages; - - /* - * Allocate a new PropPageInfo entry. - */ - ppi = Alloc(sizeof(PropPageInfo) * (psInfo->nPages + 1)); - if (!ppi) - return FALSE; - - /* - * Fill in a new PropPageInfo entry. - */ - if (index > 0) - memcpy(ppi, prev_ppi, index * sizeof(PropPageInfo)); - memset(&ppi[index], 0, sizeof(PropPageInfo)); - if (index < psInfo->nPages) - memcpy(&ppi[index + 1], &prev_ppi[index], (psInfo->nPages - index) * sizeof(PropPageInfo)); - psInfo->proppage = ppi; - - if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, index, FALSE)) - { - psInfo->proppage = prev_ppi; - Free(ppi); - return FALSE; - } - - psInfo->proppage[index].hpage = hpage; - - if (ppsp->dwFlags & PSP_PREMATURE) - { - /* Create the page but don't show it */ - if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppsp)) - { - psInfo->proppage = prev_ppi; - Free(ppi); - return FALSE; - } - } - - Free(prev_ppi); - psInfo->nPages++; - if (index <= psInfo->active_page) - psInfo->active_page++; - - /* - * Add a new tab to the tab control. - */ - item.mask = TCIF_TEXT; - item.pszText = (LPWSTR) psInfo->proppage[index].pszText; - item.cchTextMax = MAX_TABTEXT_LENGTH; - - if (psInfo->hImageList) - { - SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList); - } - - if (psInfo->proppage[index].hasIcon) - { - item.mask |= TCIF_IMAGE; - item.iImage = index; - } - - SendMessageW(hwndTabControl, TCM_INSERTITEMW, index, - (LPARAM)&item); - - /* If it is the only page - show it */ - if (psInfo->nPages == 1) - PROPSHEET_SetCurSel(hwndDlg, 0, 1, 0); - - return TRUE; -} - -/****************************************************************************** * PROPSHEET_SetHeaderTitleW */ -static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderTitle) -{ - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderTitle)); +static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, UINT page_index, const WCHAR *title) +{ + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PROPSHEETPAGEW *page; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(title)); + + if (page_index >= psInfo->nPages) + return; + + page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + + if (!IS_INTRESOURCE(page->pszHeaderTitle)) + Free((void *)page->pszHeaderTitle); + + page->pszHeaderTitle = heap_strdupW(title); + page->dwFlags |= PSP_USEHEADERTITLE; } /****************************************************************************** * PROPSHEET_SetHeaderTitleA */ -static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHeaderTitle) -{ - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderTitle)); +static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, UINT page_index, const char *title) +{ + WCHAR *titleW; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_a(title)); + + titleW = heap_strdupAtoW(title); + PROPSHEET_SetHeaderTitleW(hwndDlg, page_index, titleW); + Free(titleW); } /****************************************************************************** * PROPSHEET_SetHeaderSubTitleW */ -static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderSubTitle) -{ - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderSubTitle)); +static void PROPSHEET_SetHeaderSubTitleW(HWND hwndDlg, UINT page_index, const WCHAR *subtitle) +{ + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PROPSHEETPAGEW *page; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(subtitle)); + + if (page_index >= psInfo->nPages) + return; + + page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + + if (!IS_INTRESOURCE(page->pszHeaderSubTitle)) + Free((void *)page->pszHeaderSubTitle); + + page->pszHeaderSubTitle = heap_strdupW(subtitle); + page->dwFlags |= PSP_USEHEADERSUBTITLE; } /****************************************************************************** * PROPSHEET_SetHeaderSubTitleA */ -static void PROPSHEET_SetHeaderSubTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHeaderSubTitle) -{ - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderSubTitle)); +static void PROPSHEET_SetHeaderSubTitleA(HWND hwndDlg, UINT page_index, const char *subtitle) +{ + WCHAR *subtitleW; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_a(subtitle)); + + subtitleW = heap_strdupAtoW(subtitle); + PROPSHEET_SetHeaderSubTitleW(hwndDlg, page_index, subtitleW); + Free(subtitleW); } /****************************************************************************** @@ -2963,15 +2988,15 @@ if (ppsp->dwFlags & PSP_USEICONID) { if (!IS_INTRESOURCE( ppsp->u2.pszIcon )) - PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); + ppsp->u2.pszIcon = heap_strdupAtoW( lpPropSheetPage->u2.pszIcon ); } if (ppsp->dwFlags & PSP_USETITLE) { - if (!IS_INTRESOURCE( ppsp->pszTitle )) - PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle ); + if (IS_INTRESOURCE( ppsp->pszTitle )) + ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle ); else - ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle ); + ppsp->pszTitle = heap_strdupAtoW( lpPropSheetPage->pszTitle ); } else ppsp->pszTitle = NULL; @@ -2981,24 +3006,27 @@ if (ppsp->dwFlags & PSP_USEHEADERTITLE) { - if (!IS_INTRESOURCE( ppsp->pszHeaderTitle )) - PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle); + if (IS_INTRESOURCE( ppsp->pszHeaderTitle )) + ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle ); else - ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle ); + ppsp->pszHeaderTitle = heap_strdupAtoW( lpPropSheetPage->pszHeaderTitle ); } else ppsp->pszHeaderTitle = NULL; if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE) { - if (!IS_INTRESOURCE( ppsp->pszHeaderSubTitle )) - PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle); + if (IS_INTRESOURCE( ppsp->pszHeaderSubTitle )) + ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle ); else - ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle ); + ppsp->pszHeaderSubTitle = heap_strdupAtoW( lpPropSheetPage->pszHeaderSubTitle ); } else ppsp->pszHeaderSubTitle = NULL; + if ((ppsp->dwFlags & PSH_USECALLBACK) && ppsp->pfnCallback) + ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp); + return (HPROPSHEETPAGE)ppsp; } @@ -3018,23 +3046,13 @@ if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { if (!IS_INTRESOURCE( ppsp->u.pszTemplate )) - { - int len = strlenW(lpPropSheetPage->u.pszTemplate) + 1; - WCHAR *template = Alloc( len * sizeof (WCHAR) ); - - ppsp->u.pszTemplate = strcpyW( template, lpPropSheetPage->u.pszTemplate ); - } + ppsp->u.pszTemplate = heap_strdupW( lpPropSheetPage->u.pszTemplate ); } if ( ppsp->dwFlags & PSP_USEICONID ) { if (!IS_INTRESOURCE( ppsp->u2.pszIcon )) - { - int len = strlenW(lpPropSheetPage->u2.pszIcon) + 1; - WCHAR *icon = Alloc( len * sizeof (WCHAR) ); - - ppsp->u2.pszIcon = strcpyW( icon, lpPropSheetPage->u2.pszIcon ); - } + ppsp->u2.pszIcon = heap_strdupW( lpPropSheetPage->u2.pszIcon ); } if (ppsp->dwFlags & PSP_USETITLE) @@ -3055,6 +3073,9 @@ else ppsp->pszHeaderSubTitle = NULL; + if ((ppsp->dwFlags & PSH_USECALLBACK) && ppsp->pfnCallback) + ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp); + return (HPROPSHEETPAGE)ppsp; } @@ -3075,6 +3096,9 @@ if (!psp) return FALSE; + + if ((psp->dwFlags & PSH_USECALLBACK) && psp->pfnCallback) + psp->pfnCallback(0, PSPCB_RELEASE, psp); if (!(psp->dwFlags & PSP_DLGINDIRECT) && !IS_INTRESOURCE( psp->u.pszTemplate )) Free ((LPVOID)psp->u.pszTemplate); @@ -3251,61 +3275,65 @@ COLORREF clrOld = 0; int oldBkMode = 0; - hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); - hOldFont = SelectObject(hdc, psInfo->hFontBold); - - GetClientRect(hwndLineHeader, &r); - MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); - SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); - - GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); - - if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) - { - /* Fill the unoccupied part of the header with color of the - * left-top pixel, but do it only when needed. - */ - if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) - { - hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - r = rzone; - if (bm.bmWidth < r.right) - { - r.left = bm.bmWidth; - FillRect(hdc, &r, hbr); - } - if (bm.bmHeight < r.bottom) - { - r.left = 0; - r.top = bm.bmHeight; - FillRect(hdc, &r, hbr); - } - DeleteObject(hbr); - } - - /* Draw the header itself. */ - BitBlt(hdc, 0, 0, - bm.bmWidth, min(bm.bmHeight, rzone.bottom), - hdcSrc, 0, 0, SRCCOPY); - } - else - { - int margin; - hbr = GetSysColorBrush(COLOR_WINDOW); - FillRect(hdc, &rzone, hbr); - - /* Draw the header bitmap. It's always centered like a - * common 49 x 49 bitmap. */ - margin = (rzone.bottom - 49) / 2; - BitBlt(hdc, rzone.right - 49 - margin, margin, - min(bm.bmWidth, 49), min(bm.bmHeight, 49), - hdcSrc, 0, 0, SRCCOPY); - - /* NOTE: Native COMCTL32 draws a white stripe over the bitmap - * if its height is smaller than 49 pixels. Because the reason - * for this bug is unknown the current code doesn't try to - * replicate it. */ - } + GetClientRect(hwndLineHeader, &r); + MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); + SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); + + hOldFont = SelectObject(hdc, psInfo->hFontBold); + + if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) + { + hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); + + GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); + if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) + { + /* Fill the unoccupied part of the header with color of the + * left-top pixel, but do it only when needed. + */ + if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) + { + hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); + r = rzone; + if (bm.bmWidth < r.right) + { + r.left = bm.bmWidth; + FillRect(hdc, &r, hbr); + } + if (bm.bmHeight < r.bottom) + { + r.left = 0; + r.top = bm.bmHeight; + FillRect(hdc, &r, hbr); + } + DeleteObject(hbr); + } + + /* Draw the header itself. */ + BitBlt(hdc, 0, 0, bm.bmWidth, min(bm.bmHeight, rzone.bottom), + hdcSrc, 0, 0, SRCCOPY); + } + else + { + int margin; + hbr = GetSysColorBrush(COLOR_WINDOW); + FillRect(hdc, &rzone, hbr); + + /* Draw the header bitmap. It's always centered like a + * common 49 x 49 bitmap. */ + margin = (rzone.bottom - 49) / 2; + BitBlt(hdc, rzone.right - 49 - margin, margin, + min(bm.bmWidth, 49), min(bm.bmHeight, 49), + hdcSrc, 0, 0, SRCCOPY); + + /* NOTE: Native COMCTL32 draws a white stripe over the bitmap + * if its height is smaller than 49 pixels. Because the reason + * for this bug is unknown the current code doesn't try to + * replicate it. */ + } + + SelectObject(hdcSrc, hbmp); + } clrOld = SetTextColor (hdc, 0x00000000); oldBkMode = SetBkMode (hdc, TRANSPARENT); @@ -3346,7 +3374,6 @@ SetTextColor(hdc, clrOld); SetBkMode(hdc, oldBkMode); SelectObject(hdc, hOldFont); - SelectObject(hdcSrc, hbmp); } if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && @@ -3754,19 +3781,19 @@ } case PSM_SETHEADERTITLEW: - PROPSHEET_SetHeaderTitleW(hwnd, (int)wParam, (LPCWSTR)lParam); + PROPSHEET_SetHeaderTitleW(hwnd, wParam, (LPCWSTR)lParam); return TRUE; case PSM_SETHEADERTITLEA: - PROPSHEET_SetHeaderTitleA(hwnd, (int)wParam, (LPCSTR)lParam); + PROPSHEET_SetHeaderTitleA(hwnd, wParam, (LPCSTR)lParam); return TRUE; case PSM_SETHEADERSUBTITLEW: - PROPSHEET_SetHeaderSubTitleW(hwnd, (int)wParam, (LPCWSTR)lParam); + PROPSHEET_SetHeaderSubTitleW(hwnd, wParam, (LPCWSTR)lParam); return TRUE; case PSM_SETHEADERSUBTITLEA: - PROPSHEET_SetHeaderSubTitleA(hwnd, (int)wParam, (LPCSTR)lParam); + PROPSHEET_SetHeaderSubTitleA(hwnd, wParam, (LPCSTR)lParam); return TRUE; case PSM_HWNDTOINDEX: 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] Sun Mar 5 20:52:24 2017 @@ -3386,7 +3386,7 @@ ret, i); ret = (LRESULT) i; } - TRACE("returning %ld, client point (%d,%d)\n", ret, clpt.x, clpt.y); + TRACE("returning %ld, client point %s\n", ret, wine_dbgstr_point(&clpt)); return ret; } Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c [iso-8859-1] Sun Mar 5 20:52:24 2017 @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(syslink); -INT WINAPI StrCmpNIW(LPCWSTR,LPCWSTR,INT); - typedef struct { int nChars; @@ -90,11 +88,6 @@ BOOL IgnoreReturn; /* (infoPtr->Style & LWS_IGNORERETURN) on creation */ } SYSLINK_INFO; -static const WCHAR SL_LINKOPEN[] = { '<','a', 0 }; -static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"',0 }; -static const WCHAR SL_ID[] = { 'i','d','=','\"',0 }; -static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>',0 }; - /* Control configuration constants */ #define SL_LEFTMARGIN (0) @@ -167,32 +160,16 @@ } /*********************************************************************** - * SYSLINK_StrCmpNIW - * Wrapper for StrCmpNIW to ensure 'len' is not too big. - */ -static INT SYSLINK_StrCmpNIW (LPCWSTR str, LPCWSTR comp, INT len) -{ - INT i; - - for(i = 0; i < len; i++) - { - if(!str[i]) - { - len = i + 1; - break; - } - } - - return StrCmpNIW(str, comp, len); -} - -/*********************************************************************** * SYSLINK_ParseText * Parses the window text string and creates a document. Returns the * number of document items created. */ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { + static const WCHAR SL_LINKOPEN[] = { '<','a' }; + static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"' }; + static const WCHAR SL_ID[] = { 'i','d','=','\"' }; + static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>' }; LPCWSTR current, textstart = NULL, linktext = NULL, firsttag = NULL; int taglen = 0, textlen = 0, linklen = 0, docitems = 0; PDOC_ITEM Last = NULL; @@ -206,7 +183,7 @@ { if(*current == '<') { - if(!SYSLINK_StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) + if(!strncmpiW(current, SL_LINKOPEN, sizeof(SL_LINKOPEN)/sizeof(SL_LINKOPEN[0])) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -234,14 +211,14 @@ CheckParameter: /* compare the current position with all known parameters */ - if(!SYSLINK_StrCmpNIW(tmp, SL_HREF, 6)) + if(!strncmpiW(tmp, SL_HREF, sizeof(SL_HREF)/sizeof(SL_HREF[0]))) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!SYSLINK_StrCmpNIW(tmp, SL_ID, 4)) + else if(!strncmpiW(tmp, SL_ID, sizeof(SL_ID)/sizeof(SL_ID[0]))) { taglen += 4; ValidParam = TRUE; @@ -315,7 +292,7 @@ } } } - else if(!SYSLINK_StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) + else if(!strncmpiW(current, SL_LINKCLOSE, sizeof(SL_LINKCLOSE)/sizeof(SL_LINKCLOSE[0])) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart) 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] Sun Mar 5 20:52:24 2017 @@ -3484,7 +3484,7 @@ Str_GetPtrW(lpText, lpTbInfo->pszText, lpTbInfo->cchText); else Str_GetPtrWtoA(lpText, (LPSTR)lpTbInfo->pszText, lpTbInfo->cchText); - } else + } else if (!bUnicode || lpTbInfo->pszText) lpTbInfo->pszText[0] = '\0'; } return nIndex; @@ -4663,17 +4663,16 @@ static LRESULT -TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) -{ - DWORD dwTemp; - - TRACE("hwnd = %p, dwMask = 0x%08x, dwDTFlags = 0x%08x\n", infoPtr->hwndSelf, (DWORD)wParam, (DWORD)lParam); - - dwTemp = infoPtr->dwDTFlags; - infoPtr->dwDTFlags = - (infoPtr->dwDTFlags & (DWORD)wParam) | (DWORD)lParam; - - return (LRESULT)dwTemp; +TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD flags) +{ + DWORD old_flags; + + TRACE("hwnd = %p, mask = 0x%08x, flags = 0x%08x\n", infoPtr->hwndSelf, mask, flags); + + old_flags = infoPtr->dwDTFlags; + infoPtr->dwDTFlags = (old_flags & ~mask) | (flags & mask); + + return (LRESULT)old_flags; } /* This function differs a bit from what MSDN says it does: Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Sun Mar 5 20:52:24 2017 @@ -1521,7 +1521,7 @@ &pt); TRACE("tool (%p) %d %d %d\n", infoPtr->hwndSelf, nOldTool, infoPtr->nTool, infoPtr->nCurrentTool); - TRACE("WM_MOUSEMOVE (%p %d %d)\n", infoPtr->hwndSelf, pt.x, pt.y); + TRACE("WM_MOUSEMOVE (%p %s)\n", infoPtr->hwndSelf, wine_dbgstr_point(&pt)); if (infoPtr->nTool != nOldTool) { if(infoPtr->nTool == -1) { /* Moved out of all tools */ 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] Sun Mar 5 20:52:24 2017 @@ -436,7 +436,7 @@ LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint); LONG prevPos = infoPtr->lPos; - TRACE("x=%d, y=%d, dir=%d\n", clickPoint.x, clickPoint.y, dir); + TRACE("clickPoint=%s, dir=%d\n", wine_dbgstr_point(&clickPoint), dir); if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT)) TRACKBAR_PageDown(infoPtr); @@ -1261,10 +1261,11 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) { BOOL changed = infoPtr->lRangeMax != lMax; + LONG rightmost = max(lMax, infoPtr->lRangeMin); infoPtr->lRangeMax = lMax; - if (infoPtr->lPos > infoPtr->lRangeMax) { - infoPtr->lPos = infoPtr->lRangeMax; + if (infoPtr->lPos > rightmost) { + infoPtr->lPos = rightmost; infoPtr->flags |= TB_THUMBPOSCHANGED; } @@ -1415,6 +1416,7 @@ TRACKBAR_InvalidateAll(infoPtr); } + TRACKBAR_UpdateThumb (infoPtr); 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] Sun Mar 5 20:52:24 2017 @@ -2531,6 +2531,8 @@ } hOldFont = SelectObject(hdc, TREEVIEW_FontForItem(infoPtr, item)); + oldTextColor = SetTextColor(hdc, nmcdhdr.clrText); + oldTextBkColor = SetBkColor(hdc, nmcdhdr.clrTextBk); /* The custom draw handler can query the text rectangle, * so get ready. */ @@ -2565,9 +2567,9 @@ TREEVIEW_DrawItemLines(infoPtr, hdc, item); - /* Set colors. Custom draw handler can change these so we do this after it. */ - oldTextColor = SetTextColor(hdc, nmcdhdr.clrText); - oldTextBkColor = SetBkColor(hdc, nmcdhdr.clrTextBk); + /* reset colors. Custom draw handler can change them */ + SetTextColor(hdc, nmcdhdr.clrText); + SetBkColor(hdc, nmcdhdr.clrTextBk); centery = (item->rect.top + item->rect.bottom) / 2; @@ -3686,6 +3688,9 @@ lpht->flags = TVHT_NOWHERE; return NULL; } + + if (!item->textWidth) + TREEVIEW_ComputeTextWidth(infoPtr, item, 0); if (x >= item->textOffset + item->textWidth) { 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] Sun Mar 5 20:52:24 2017 @@ -54,7 +54,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-2.2 reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 -reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/comctl32 # Synced to WineStaging-2.2 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.9.23 reactos/dll/win32/compstui # Synced to WineStaging-2.2 reactos/dll/win32/credui # Synced to WineStaging-2.2

1 0

[akhaldi] 74089: [PSDK] Add missing PSPCB_ADDREF. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:49:12 2017 New Revision: 74089 URL: http://svn.reactos.org/svn/reactos?rev=74089&view=rev Log: [PSDK] Add missing PSPCB_ADDREF. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/prsht.h Modified: trunk/reactos/sdk/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/prsht.h?r… ============================================================================== --- trunk/reactos/sdk/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/prsht.h [iso-8859-1] Sun Mar 5 20:49:12 2017 @@ -168,6 +168,8 @@ #define PSM_SETTITLEA (WM_USER+111) #define PSM_SETTITLEW (WM_USER+120) +#define PSPCB_ADDREF 0 + #ifndef RC_INVOKED #pragma pack(push,8)

1 0

[akhaldi] 74088: [MSI_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:45:43 2017 New Revision: 74088 URL: http://svn.reactos.org/svn/reactos?rev=74088&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/msi/package.c Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Sun Mar 5 20:45:43 2017 @@ -8293,13 +8293,21 @@ static void test_MsiGetProductProperty(void) { + static const WCHAR prodcode_propW[] = {'P','r','o','d','u','c','t','C','o','d','e',0}; + static const WCHAR nonexistentW[] = {'I','D','o','n','t','E','x','i','s','t',0}; + static const WCHAR newpropW[] = {'N','e','w','P','r','o','p','e','r','t','y',0}; + static const WCHAR appleW[] = {'a','p','p','l','e',0}; + static const WCHAR emptyW[] = {0}; + WCHAR valW[MAX_PATH]; MSIHANDLE hprod, hdb; CHAR val[MAX_PATH]; CHAR path[MAX_PATH]; CHAR query[MAX_PATH]; CHAR keypath[MAX_PATH*2]; CHAR prodcode[MAX_PATH]; + WCHAR prodcodeW[MAX_PATH]; CHAR prod_squashed[MAX_PATH]; + WCHAR prod_squashedW[MAX_PATH]; HKEY prodkey, userkey, props; DWORD size; LONG res; @@ -8310,6 +8318,8 @@ lstrcatA(path, "\\"); create_test_guid(prodcode, prod_squashed); + MultiByteToWideChar(CP_ACP, 0, prodcode, -1, prodcodeW, MAX_PATH); + squash_guid(prodcodeW, prod_squashedW); if (is_wow64) access |= KEY_WOW64_64KEY; @@ -8400,6 +8410,15 @@ "Expected val to be unchanged, got \"%s\"\n", val); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(0xdeadbeef, prodcode_propW, valW, &size); + ok(r == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", r); + ok(!lstrcmpW(valW, appleW), + "Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW)); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + /* szProperty is NULL */ size = MAX_PATH; lstrcpyA(val, "apple"); @@ -8410,12 +8429,28 @@ "Expected val to be unchanged, got \"%s\"\n", val); ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, NULL, valW, &size); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpW(valW, appleW), + "Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW)); + ok(size == MAX_PATH, "Expected size to be unchanged, got %d\n", size); + /* szProperty is empty */ size = MAX_PATH; lstrcpyA(val, "apple"); r = MsiGetProductPropertyA(hprod, "", val, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, emptyW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(*valW == 0, "Expected \"\", got %s\n", wine_dbgstr_w(valW)); ok(size == 0, "Expected 0, got %d\n", size); /* get the property */ @@ -8428,12 +8463,27 @@ ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, prodcodeW), + "Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* lpValueBuf is NULL */ size = MAX_PATH; r = MsiGetProductPropertyA(hprod, "ProductCode", NULL, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + + size = MAX_PATH; + r = MsiGetProductPropertyW(hprod, prodcode_propW, NULL, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); /* pcchValueBuf is NULL */ lstrcpyA(val, "apple"); @@ -8445,6 +8495,15 @@ ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, NULL); + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(!lstrcmpW(valW, appleW), + "Expected val to be unchanged, got %s\n", wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf is too small */ size = 4; lstrcpyA(val, "apple"); @@ -8455,6 +8514,15 @@ ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = 4; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!memcmp(valW, prodcodeW, 3 * sizeof(WCHAR)), + "Expected first 3 chars of %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf does not leave room for NULL terminator */ size = lstrlenA(prodcode); lstrcpyA(val, "apple"); @@ -8465,6 +8533,15 @@ ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = lstrlenW(prodcodeW); + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); + ok(!memcmp(valW, prodcodeW, lstrlenW(prodcodeW) - 1), + "Expected first 37 chars of %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* pcchValueBuf has enough room for NULL terminator */ size = lstrlenA(prodcode) + 1; lstrcpyA(val, "apple"); @@ -8475,6 +8552,15 @@ ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + size = lstrlenW(prodcodeW) + 1; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, prodcodeW), + "Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); + /* nonexistent property */ size = MAX_PATH; lstrcpyA(val, "apple"); @@ -8483,6 +8569,13 @@ ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); ok(size == 0, "Expected 0, got %d\n", size); + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, nonexistentW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, emptyW), "Expected \"\", got %s\n", wine_dbgstr_w(valW)); + ok(size == 0, "Expected 0, got %d\n", size); + r = MsiSetPropertyA(hprod, "NewProperty", "value"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8492,6 +8585,13 @@ r = MsiGetProductPropertyA(hprod, "NewProperty", val, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(val, ""), "Expected \"\", got \"%s\"\n", val); + ok(size == 0, "Expected 0, got %d\n", size); + + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, newpropW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, emptyW), "Expected \"\", got %s\n", wine_dbgstr_w(valW)); ok(size == 0, "Expected 0, got %d\n", size); r = MsiSetPropertyA(hprod, "ProductCode", "value"); @@ -8506,6 +8606,15 @@ "Expected \"%s\", got \"%s\"\n", prodcode, val); ok(size == lstrlenA(prodcode), "Expected %d, got %d\n", lstrlenA(prodcode), size); + + size = MAX_PATH; + lstrcpyW(valW, appleW); + r = MsiGetProductPropertyW(hprod, prodcode_propW, valW, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpW(valW, prodcodeW), + "Expected %s, got %s\n", wine_dbgstr_w(prodcodeW), wine_dbgstr_w(valW)); + ok(size == lstrlenW(prodcodeW), + "Expected %d, got %d\n", lstrlenW(prodcodeW), size); MsiCloseHandle(hprod);

1 0

[akhaldi] 74087: [MSI] Sync with Wine Staging 2.2. CORE-12823 fe50dbf msi: Do not sign extend after multiplying. c659222 msi: Fix some spec file entries. 167de42 msi: Make reg_get_{multi}sz() stati...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:45:25 2017 New Revision: 74087 URL: http://svn.reactos.org/svn/reactos?rev=74087&view=rev Log: [MSI] Sync with Wine Staging 2.2. CORE-12823 fe50dbf msi: Do not sign extend after multiplying. c659222 msi: Fix some spec file entries. 167de42 msi: Make reg_get_{multi}sz() static. f5e4dad msi: Fix handling of NULL buffer in MsiGetProductPropertyW() (Coverity). 3b5b3ef msi: Fix MSIREG_OpenUserComponentsKey and MSIREG_DeleteUpgradeCodesKey for Wow64. 5ac0242 msi: Correctly size packagecode as it's an unsquashed guid. Modified: trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/registry.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -3165,13 +3165,13 @@ MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &each_cost))) { /* each_cost is in 512-byte units */ - total_cost += each_cost * 512; + total_cost += ((LONGLONG)each_cost) * 512; } if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, MSICOSTTREE_SELFONLY, INSTALLSTATE_ABSENT, &each_cost))) { /* each_cost is in 512-byte units */ - total_cost -= each_cost * 512; + total_cost -= ((LONGLONG)each_cost) * 512; } } return total_cost; Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=74… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -1084,7 +1084,7 @@ MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; - WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[SQUASHED_GUID_SIZE]; + WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[GUID_SIZE]; BOOL badconfig = FALSE; LONG res; DWORD type = REG_NONE; @@ -2690,16 +2690,16 @@ if (lstrlenW(val) >= *pccbValue) { - lstrcpynW(szValue, val, *pccbValue); - *pccbValue = lstrlenW(val); + if (szValue) lstrcpynW(szValue, val, *pccbValue); r = ERROR_MORE_DATA; } else { - lstrcpyW(szValue, val); - *pccbValue = lstrlenW(val); + if (szValue) lstrcpyW(szValue, val); r = ERROR_SUCCESS; } + + *pccbValue = lstrlenW(val); done: if (view) @@ -3326,7 +3326,7 @@ return MsiUseFeatureExA(szProduct, szFeature, 0, 0); } -WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type; @@ -3335,7 +3335,7 @@ return ret; } -WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type; Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -7,7 +7,7 @@ 11 stdcall MsiConfigureFeatureA(str str long) 12 stub MsiConfigureFeatureFromDescriptorA 13 stub MsiConfigureFeatureFromDescriptorW -14 stdcall MsiConfigureFeatureW(wstr wstr ptr) +14 stdcall MsiConfigureFeatureW(wstr wstr long) 15 stdcall MsiConfigureProductA(str long long) 16 stdcall MsiConfigureProductW(wstr long long) 17 stdcall MsiCreateRecord(long) @@ -60,10 +60,10 @@ 64 stdcall MsiGetMode(long long) 65 stdcall MsiGetProductCodeA(str str) 66 stdcall MsiGetProductCodeW(wstr wstr) -67 stdcall MsiGetProductInfoA(str str ptr long) +67 stdcall MsiGetProductInfoA(str str ptr ptr) 68 stub MsiGetProductInfoFromScriptA 69 stub MsiGetProductInfoFromScriptW -70 stdcall MsiGetProductInfoW(wstr wstr ptr long) +70 stdcall MsiGetProductInfoW(wstr wstr ptr ptr) 71 stdcall MsiGetProductPropertyA(long str ptr ptr) 72 stdcall MsiGetProductPropertyW(long wstr ptr ptr) 73 stdcall MsiGetPropertyA(ptr str ptr ptr) @@ -82,8 +82,8 @@ 86 stub MsiInstallMissingFileW 87 stdcall MsiInstallProductA(str str) 88 stdcall MsiInstallProductW(wstr wstr) -89 stdcall MsiLocateComponentA(str ptr long) -90 stdcall MsiLocateComponentW(wstr ptr long) +89 stdcall MsiLocateComponentA(str ptr ptr) +90 stdcall MsiLocateComponentW(wstr ptr ptr) 91 stdcall MsiOpenDatabaseA(str str ptr) 92 stdcall MsiOpenDatabaseW(wstr wstr ptr) 93 stdcall MsiOpenPackageA(str ptr) Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -637,6 +637,7 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) { WCHAR squashed_cc[SQUASHED_GUID_SIZE], keypath[0x200]; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; UINT ret; if (!squash_guid( szComponent, squashed_cc)) return ERROR_FUNCTION_FAILED; @@ -651,7 +652,7 @@ strcpyW(keypath, szInstaller_Components); strcatW( keypath, squashed_cc ); - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + return RegOpenKeyExW( HKEY_LOCAL_MACHINE, keypath, 0, access, key ); } UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) @@ -926,14 +927,18 @@ UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) { - WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; + WCHAR squashed_code[SQUASHED_GUID_SIZE]; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; + HKEY hkey; + LONG ret; if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); - strcpyW( keypath, szInstaller_UpgradeCodes ); - strcatW( keypath, squashed_code ); - return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, szInstaller_UpgradeCodes, 0, access, &hkey )) return ERROR_SUCCESS; + ret = RegDeleteTreeW( hkey, squashed_code ); + RegCloseKey( hkey ); + return ret; } UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) 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] Sun Mar 5 20:45:25 2017 @@ -112,7 +112,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-1.9.23 +reactos/dll/win32/msi # Synced to WineStaging-2.2 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msimtf # Synced to WineStaging-1.9.23 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74086: [RPCRT4_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:43:17 2017 New Revision: 74086 URL: http://svn.reactos.org/svn/reactos?rev=74086&view=rev Log: [RPCRT4_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Removed: trunk/rostests/winetests/rpcrt4/rpc_protseq.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/testlist.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -14,7 +14,6 @@ ndr_marshall.c rpc.c rpc_async.c - rpc_protseq.c server.c testlist.c ${CMAKE_CURRENT_BINARY_DIR}/server_c.c @@ -28,7 +27,7 @@ add_executable(rpcrt4_winetest ${SOURCE}) target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui) -add_importlibs(rpcrt4_winetest ole32 rpcrt4 secur32 msvcrt kernel32 ntdll) +add_importlibs(rpcrt4_winetest oleaut32 ole32 rpcrt4 secur32 advapi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET rpcrt4_winetest) if(NOT MSVC) Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -2,6 +2,7 @@ * Unit test suite for rpc functions * * Copyright 2002 Greg Turner + * Copyright 2008-2009 Robert Shearman * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,7 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS #include <ntstatus.h> #define WIN32_NO_STATUS #include "wine/test.h" @@ -28,6 +30,11 @@ #include <winbase.h> #include <winnt.h> #include <winerror.h> +#include <ole2.h> +#include <oleauto.h> +#include <ntsecapi.h> +#include <initguid.h> +#include <netfw.h> #include "rpc.h" #include "rpcdce.h" @@ -907,11 +914,293 @@ ok(status == RPC_S_UNKNOWN_AUTHN_SERVICE, "status = %x\n", status); } +static void test_RpcServerUseProtseq(void) +{ + RPC_STATUS status; + RPC_BINDING_VECTOR *bindings; + ULONG i; + ULONG binding_count_before; + ULONG binding_count_after1; + ULONG binding_count_after2; + ULONG endpoints_registered = 0; + static unsigned char iptcp[] = "ncacn_ip_tcp"; + static unsigned char np[] = "ncacn_np"; + static unsigned char ncalrpc[] = "ncalrpc"; + BOOL iptcp_registered = FALSE, np_registered = FALSE, ncalrpc_registered = FALSE; + + status = RpcServerInqBindings(&bindings); + if (status == RPC_S_NO_BINDINGS) + binding_count_before = 0; + else + { + binding_count_before = bindings->Count; + ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); + for (i = 0; i < bindings->Count; i++) + { + RPC_CSTR str_bind; + status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); + ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); + if (lstrlenA((const char *)str_bind) > 12 && !memcmp(str_bind, "ncacn_ip_tcp", 12)) + iptcp_registered = TRUE; + if (lstrlenA((const char *)str_bind) > 8 && !memcmp(str_bind, "ncacn_np", 8)) + np_registered = TRUE; + if (lstrlenA((const char *)str_bind) > 7 && !memcmp(str_bind, "ncalrpc", 7)) + ncalrpc_registered = TRUE; + RpcStringFreeA(&str_bind); + } + RpcBindingVectorFree(&bindings); + } + + /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as + * RpcServerUseProtseq(...) */ + status = RpcServerUseProtseqEpA(ncalrpc, 0, NULL, NULL); + ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), + "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", + status); + + /* register protocol sequences without explicit endpoints */ + status = RpcServerUseProtseqA(np, 0, NULL); + if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) + win_skip("ncacn_np not supported\n"); + else + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); + if (status == RPC_S_OK && !np_registered) endpoints_registered++; + + status = RpcServerUseProtseqA(iptcp, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); + if (status == RPC_S_OK && !iptcp_registered) endpoints_registered++; + + status = RpcServerUseProtseqA(ncalrpc, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); + if (status == RPC_S_OK && !ncalrpc_registered) endpoints_registered++; + + status = RpcServerInqBindings(&bindings); + ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); + binding_count_after1 = bindings->Count; + ok(binding_count_after1 == binding_count_before + endpoints_registered, + "wrong binding count - before: %u, after %u, endpoints registered %u\n", + binding_count_before, binding_count_after1, endpoints_registered); + for (i = 0; i < bindings->Count; i++) + { + RPC_CSTR str_bind; + status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); + ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); + trace("string binding: %s\n", str_bind); + RpcStringFreeA(&str_bind); + } + RpcBindingVectorFree(&bindings); + + /* re-register - endpoints should be reused */ + status = RpcServerUseProtseqA(np, 0, NULL); + if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) + win_skip("ncacn_np not supported\n"); + else + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); + + status = RpcServerUseProtseqA(iptcp, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); + + status = RpcServerUseProtseqA(ncalrpc, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); + + status = RpcServerInqBindings(&bindings); + ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); + binding_count_after2 = bindings->Count; + ok(binding_count_after2 == binding_count_after1, + "bindings should have been re-used - after1: %u after2: %u\n", + binding_count_after1, binding_count_after2); + RpcBindingVectorFree(&bindings); +} + +static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) +{ + static unsigned char annotation[] = "Test annotation string."; + RPC_STATUS status; + RPC_BINDING_VECTOR *binding_vector; + handle_t handle; + unsigned char *binding; + + status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "%s: RpcServerRegisterIf failed (%u)\n", protseq, status); + + status = RpcServerInqBindings(&binding_vector); + ok(status == RPC_S_OK, "%s: RpcServerInqBindings failed with error %u\n", protseq, status); + + /* register endpoints created in test_RpcServerUseProtseq */ + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); + /* reregister the same endpoint with no annotation */ + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); + + status = RpcStringBindingComposeA(NULL, protseq, address, + NULL, NULL, &binding); + ok(status == RPC_S_OK, "%s: RpcStringBindingCompose failed (%u)\n", protseq, status); + + status = RpcBindingFromStringBindingA(binding, &handle); + ok(status == RPC_S_OK, "%s: RpcBindingFromStringBinding failed (%u)\n", protseq, status); + + RpcStringFreeA(&binding); + + status = RpcBindingReset(handle); + ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); + + status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); + ok(status == RPC_S_OK || broken(status == RPC_S_SERVER_UNAVAILABLE), /* win9x */ + "%s: RpcEpResolveBinding failed with error %u\n", protseq, status); + + status = RpcBindingReset(handle); + ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); + + status = RpcBindingFree(&handle); + ok(status == RPC_S_OK, "%s: RpcBindingFree failed with error %u\n", protseq, status); + + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + ok(status == RPC_S_OK, "%s: RpcServerUnregisterIf failed (%u)\n", protseq, status); + + status = RpcEpUnregister(IFoo_v0_0_s_ifspec, binding_vector, NULL); + ok(status == RPC_S_OK, "%s: RpcEpUnregisterA failed with error %u\n", protseq, status); + + status = RpcBindingVectorFree(&binding_vector); + ok(status == RPC_S_OK, "%s: RpcBindingVectorFree failed with error %u\n", protseq, status); +} + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST( rpc ) { + static unsigned char ncacn_np[] = "ncacn_np"; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char np_address[] = "."; + BOOL firewall_enabled = is_firewall_enabled(); + + if (firewall_enabled && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + UuidConversionAndComparison(); TestDceErrorInqText(); - test_rpc_ncacn_ip_tcp(); test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); @@ -922,4 +1211,21 @@ test_RpcBindingFree(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo(); -} + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + + test_rpc_ncacn_ip_tcp(); + test_RpcServerUseProtseq(); + test_endpoint_mapper(ncacn_np, np_address); + test_endpoint_mapper(ncalrpc, NULL); + + if (firewall_enabled) set_firewall(APP_REMOVE); +} Removed: trunk/rostests/winetests/rpcrt4/rpc_protseq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_prot… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc_protseq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc_protseq.c (removed) @@ -1,205 +0,0 @@ -/* - * RPC Protocol Sequence Server Tests - * - * Copyright 2008-2009 Robert Shearman - * - * 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 - */ - -#include <stdarg.h> -#include <stdio.h> - -#include "wine/test.h" -#include <windef.h> -#include <winbase.h> -#include <winnt.h> -#include <winerror.h> - -#include "rpc.h" -#include "rpcdce.h" - -static void test_RpcServerUseProtseq(void) -{ - RPC_STATUS status; - RPC_BINDING_VECTOR *bindings; - ULONG i; - ULONG binding_count_before; - ULONG binding_count_after1; - ULONG binding_count_after2; - ULONG endpoints_registered = 0; - static unsigned char iptcp[] = "ncacn_ip_tcp"; - static unsigned char np[] = "ncacn_np"; - static unsigned char ncalrpc[] = "ncalrpc"; - - status = RpcServerInqBindings(&bindings); - if (status == RPC_S_NO_BINDINGS) - binding_count_before = 0; - else - { - binding_count_before = bindings->Count; - ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); - RpcBindingVectorFree(&bindings); - } - - /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as - * RpcServerUseProtseq(...) */ - status = RpcServerUseProtseqEpA(ncalrpc, 0, NULL, NULL); - ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), - "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", - status); - - /* register protocol sequences without explicit endpoints */ - status = RpcServerUseProtseqA(np, 0, NULL); - if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) - win_skip("ncacn_np not supported\n"); - else - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); - if (status == RPC_S_OK) endpoints_registered++; - - status = RpcServerUseProtseqA(iptcp, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); - if (status == RPC_S_OK) endpoints_registered++; - - status = RpcServerUseProtseqA(ncalrpc, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); - if (status == RPC_S_OK) endpoints_registered++; - - status = RpcServerInqBindings(&bindings); - ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); - binding_count_after1 = bindings->Count; - ok(binding_count_after1 == binding_count_before + endpoints_registered, - "wrong binding count - before: %u, after %u, endpoints registered %u\n", - binding_count_before, binding_count_after1, endpoints_registered); - for (i = 0; i < bindings->Count; i++) - { - RPC_CSTR str_bind; - status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); - ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); - trace("string binding: %s\n", str_bind); - RpcStringFreeA(&str_bind); - } - RpcBindingVectorFree(&bindings); - - /* re-register - endpoints should be reused */ - status = RpcServerUseProtseqA(np, 0, NULL); - if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) - win_skip("ncacn_np not supported\n"); - else - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); - - status = RpcServerUseProtseqA(iptcp, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); - - status = RpcServerUseProtseqA(ncalrpc, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); - - status = RpcServerInqBindings(&bindings); - ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); - binding_count_after2 = bindings->Count; - ok(binding_count_after2 == binding_count_after1, - "bindings should have been re-used - after1: %u after2: %u\n", - binding_count_after1, binding_count_after2); - RpcBindingVectorFree(&bindings); -} - -static RPC_DISPATCH_FUNCTION IFoo_table[] = -{ - 0 -}; - -static RPC_DISPATCH_TABLE IFoo_v0_0_DispatchTable = -{ - 0, - IFoo_table -}; - -static const RPC_SERVER_INTERFACE IFoo___RpcServerInterface = -{ - sizeof(RPC_SERVER_INTERFACE), - {{0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x34}},{0,0}}, - {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, - &IFoo_v0_0_DispatchTable, - 0, - 0, - 0, - 0, - 0, -}; - -static RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; - -static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) -{ - static unsigned char annotation[] = "Test annotation string."; - RPC_STATUS status; - RPC_BINDING_VECTOR *binding_vector; - handle_t handle; - unsigned char *binding; - - status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); - ok(status == RPC_S_OK, "%s: RpcServerRegisterIf failed (%u)\n", protseq, status); - - status = RpcServerInqBindings(&binding_vector); - ok(status == RPC_S_OK, "%s: RpcServerInqBindings failed with error %u\n", protseq, status); - - /* register endpoints created in test_RpcServerUseProtseq */ - status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); - ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); - /* reregister the same endpoint with no annotation */ - status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); - ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); - - status = RpcStringBindingComposeA(NULL, protseq, address, - NULL, NULL, &binding); - ok(status == RPC_S_OK, "%s: RpcStringBindingCompose failed (%u)\n", protseq, status); - - status = RpcBindingFromStringBindingA(binding, &handle); - ok(status == RPC_S_OK, "%s: RpcBindingFromStringBinding failed (%u)\n", protseq, status); - - RpcStringFreeA(&binding); - - status = RpcBindingReset(handle); - ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); - - status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); - ok(status == RPC_S_OK || broken(status == RPC_S_SERVER_UNAVAILABLE), /* win9x */ - "%s: RpcEpResolveBinding failed with error %u\n", protseq, status); - - status = RpcBindingReset(handle); - ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); - - status = RpcBindingFree(&handle); - ok(status == RPC_S_OK, "%s: RpcBindingFree failed with error %u\n", protseq, status); - - status = RpcServerUnregisterIf(NULL, NULL, FALSE); - ok(status == RPC_S_OK, "%s: RpcServerUnregisterIf failed (%u)\n", protseq, status); - - status = RpcEpUnregister(IFoo_v0_0_s_ifspec, binding_vector, NULL); - ok(status == RPC_S_OK, "%s: RpcEpUnregisterA failed with error %u\n", protseq, status); - - status = RpcBindingVectorFree(&binding_vector); - ok(status == RPC_S_OK, "%s: RpcBindingVectorFree failed with error %u\n", protseq, status); -} - -START_TEST( rpc_protseq ) -{ - static unsigned char ncacn_np[] = "ncacn_np"; - static unsigned char ncalrpc[] = "ncalrpc"; - static unsigned char np_address[] = "."; - - test_RpcServerUseProtseq(); - test_endpoint_mapper(ncacn_np, np_address); - test_endpoint_mapper(ncalrpc, NULL); -} Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -18,9 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <windows.h> +#include <ole2.h> +#include <oleauto.h> #include <secext.h> #include <rpcdce.h> +#include <netfw.h> #include "wine/test.h" #include "server_s.h" #include "server_defines.h" @@ -1524,6 +1528,15 @@ } ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "level unchanged\n"); ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientA(NULL, &privs, &principal, &level, &authnsvc, NULL); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientExA(NULL, &privs, &principal, &level, &authnsvc, NULL, 0); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); status = RpcImpersonateClient(NULL); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); @@ -1745,13 +1758,141 @@ } } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(server) { ULONG size = 0; int argc; char **argv; + BOOL firewall_enabled = is_firewall_enabled(); InitFunctionPointers(); + + if (firewall_enabled && !is_process_elevated()) + { + trace("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); @@ -1773,7 +1914,20 @@ RpcEndExcept } else + { + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + HeapFree(GetProcessHeap(), 0, domain_and_user); + return; + } + } server(); + if (firewall_enabled) set_firewall(APP_REMOVE); + } HeapFree(GetProcessHeap(), 0, domain_and_user); } Modified: trunk/rostests/winetests/rpcrt4/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/testlist… ============================================================================== --- trunk/rostests/winetests/rpcrt4/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/testlist.c [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -8,7 +8,6 @@ extern void func_ndr_marshall(void); extern void func_rpc(void); extern void func_rpc_async(void); -extern void func_rpc_protseq(void); extern void func_server(void); const struct test winetest_testlist[] = @@ -18,7 +17,6 @@ { "ndr_marshall", func_ndr_marshall }, { "rpc", func_rpc }, { "rpc_async", func_rpc_async }, - { "rpc_protseq", func_rpc_protseq }, { "server", func_server }, { 0, 0 } };

1 0

[akhaldi] 74085: [RPCRT4] Sync with Wine Staging 2.2. CORE-12823 b85c2f7 rpcrt4: Fix some spec file entries. 042b41d rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint. c32cd...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 20:42:41 2017 New Revision: 74085 URL: http://svn.reactos.org/svn/reactos?rev=74085&view=rev Log: [RPCRT4] Sync with Wine Staging 2.2. CORE-12823 b85c2f7 rpcrt4: Fix some spec file entries. 042b41d rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint. c32cd11 rpcrt4: Acquire new credential handle for each connection. da05dfd rpcrt4: Store security package name in rpc_server_registered_auth_info. f8450fa rpcrt4: Handle NULL binding in RpcBindingInqAuthClient{,Ex}. Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -1603,11 +1603,15 @@ RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, ULONG *AuthzSvc, ULONG Flags ) { - RpcBinding *bind = ClientBinding; + RpcBinding *bind; TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); + if (!ClientBinding) ClientBinding = I_RpcGetCurrentCallHandle(); + if (!ClientBinding) return RPC_S_INVALID_BINDING; + + bind = ClientBinding; if (!bind->FromConn) return RPC_S_INVALID_BINDING; return rpcrt4_conn_inquire_auth_client(bind->FromConn, Privs, Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -1047,7 +1047,10 @@ auth_data_in->auth_type, cred, exp, max_token, NULL, &conn->AuthInfo); if (status != RPC_S_OK) + { + FreeCredentialsHandle(&cred); return status; + } /* FIXME: should auth_data_in->auth_context_id be checked in the !start case? */ conn->auth_context_id = auth_data_in->auth_context_id; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -1287,12 +1287,10 @@ struct rpc_server_registered_auth_info { struct list entry; - TimeStamp exp; - BOOL cred_acquired; - CredHandle cred; + USHORT auth_type; + WCHAR *package_name; + WCHAR *principal; ULONG max_token; - USHORT auth_type; - WCHAR *principal; }; static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) @@ -1331,36 +1329,22 @@ { RPC_STATUS status = RPC_S_UNKNOWN_AUTHN_SERVICE; struct rpc_server_registered_auth_info *auth_info; + SECURITY_STATUS sec_status; EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY(auth_info, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { if (auth_info->auth_type == auth_type) { - if (!auth_info->cred_acquired) + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, + SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, + cred, exp); + if (sec_status != SEC_E_OK) { - SecPkgInfoW *packages, *package; - SECURITY_STATUS sec_status; - - status = find_security_package(auth_info->auth_type, &packages, &package); - if (status != RPC_S_OK) - break; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, package->Name, - SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, - &auth_info->cred, &auth_info->exp); - FreeContextBuffer(packages); - if (sec_status != SEC_E_OK) - { - status = RPC_S_SEC_PKG_ERROR; - break; - } - - auth_info->cred_acquired = TRUE; + status = RPC_S_SEC_PKG_ERROR; + break; } - *cred = auth_info->cred; - *exp = auth_info->exp; *max_token = auth_info->max_token; status = RPC_S_OK; break; @@ -1378,8 +1362,7 @@ EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY_SAFE(auth_info, cursor2, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { - if (auth_info->cred_acquired) - FreeCredentialsHandle(&auth_info->cred); + HeapFree(GetProcessHeap(), 0, auth_info->package_name); HeapFree(GetProcessHeap(), 0, auth_info->principal); HeapFree(GetProcessHeap(), 0, auth_info); } @@ -1415,6 +1398,7 @@ { struct rpc_server_registered_auth_info *auth_info; SecPkgInfoW *packages, *package; + WCHAR *package_name; ULONG max_token; RPC_STATUS status; @@ -1424,20 +1408,27 @@ if (status != RPC_S_OK) return status; + package_name = RPCRT4_strdupW(package->Name); max_token = package->cbMaxToken; FreeContextBuffer(packages); + if (!package_name) + return RPC_S_OUT_OF_RESOURCES; auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); - if (!auth_info) + if (!auth_info) { + HeapFree(GetProcessHeap(), 0, package_name); return RPC_S_OUT_OF_RESOURCES; + } if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + HeapFree(GetProcessHeap(), 0, package_name); HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; } + auth_info->auth_type = AuthnSvc; + auth_info->package_name = package_name; auth_info->max_token = max_token; - auth_info->auth_type = AuthnSvc; EnterCriticalSection(&server_auth_info_cs); list_add_tail(&server_registered_auth_info, &auth_info->entry); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -390,7 +390,7 @@ RPC_STATUS r; LPSTR pname; RpcConnection *Connection; - char generated_endpoint[21]; + char generated_endpoint[26]; if (!endpoint) { Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -118,9 +118,9 @@ 118 stdcall NDRSContextMarshall2(ptr ptr ptr ptr ptr long) 119 stdcall NDRSContextMarshall(ptr ptr ptr) 120 stdcall NDRSContextMarshallEx(ptr ptr ptr ptr) -121 stdcall NDRSContextUnmarshall2(ptr ptr ptr ptr long) -122 stdcall NDRSContextUnmarshall(ptr ptr) -123 stdcall NDRSContextUnmarshallEx(ptr ptr ptr) +121 stdcall NDRSContextUnmarshall2(ptr ptr long ptr long) +122 stdcall NDRSContextUnmarshall(ptr long) +123 stdcall NDRSContextUnmarshallEx(ptr ptr long) 124 stub NDRcopy 125 stdcall NdrAllocate(ptr long) 126 varargs NdrAsyncClientCall(ptr ptr) 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] Sun Mar 5 20:42:41 2017 @@ -160,7 +160,7 @@ reactos/dll/win32/resutils # Synced to WineStaging-1.9.11 reactos/dll/win32/riched20 # Synced to WineStaging-1.9.23 reactos/dll/win32/riched32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.23 +reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.2 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11

1 0

[hbelusca] 74084: [INF]: Disable hdaudbus.inf registration, because the driver currently crashes on the demo laptops Dell Latitude D531.
by hbelusca＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: hbelusca Date: Sun Mar 5 19:43:33 2017 New Revision: 74084 URL: http://svn.reactos.org/svn/reactos?rev=74084&view=rev Log: [INF]: Disable hdaudbus.inf registration, because the driver currently crashes on the demo laptops Dell Latitude D531. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt Modified: branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sun Mar 5 19:43:33 2017 @@ -13,7 +13,7 @@ fdc.inf flpydisk.inf hal.inf - hdaudbus.inf +# hdaudbus.inf hdc.inf input.inf keyboard.inf

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