Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66803: [COMDLG32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 12:24:05 2015 New Revision: 66803 URL: http://svn.reactos.org/svn/reactos?rev=66803&view=rev Log: [COMDLG32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/printdlg.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] Thu Mar 19 12:24:05 2015 @@ -1556,41 +1556,37 @@ /* 2. (All platforms) If initdir is not null, then use it */ if (!handledPath && fodInfos->initdir && *fodInfos->initdir) { - /* Work out the proper path as supplied one might be relative */ - /* (Here because supplying '.' as dir browses to My Computer) */ - if (!handledPath) { - WCHAR tmpBuf[MAX_PATH]; - WCHAR tmpBuf2[MAX_PATH]; - WCHAR *nameBit; - DWORD result; - - lstrcpyW(tmpBuf, fodInfos->initdir); - if( PathFileExistsW(tmpBuf) ) { - /* initdir does not have to be a directory. If a file is - * specified, the dir part is taken */ - if( PathIsDirectoryW(tmpBuf)) { - if (tmpBuf[lstrlenW(tmpBuf)-1] != '\\') { - lstrcatW(tmpBuf, szwSlash); - } - lstrcatW(tmpBuf, szwStar); - } - result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); - if (result) { - *nameBit = 0x00; - MemFree(fodInfos->initdir); - fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1)*sizeof(WCHAR)); - lstrcpyW(fodInfos->initdir, tmpBuf2); - handledPath = TRUE; - TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); - } - } - else if (fodInfos->initdir) - { - MemFree(fodInfos->initdir); - fodInfos->initdir = NULL; - TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); - } - } + /* Work out the proper path as supplied one might be relative */ + /* (Here because supplying '.' as dir browses to My Computer) */ + WCHAR tmpBuf[MAX_PATH]; + WCHAR tmpBuf2[MAX_PATH]; + WCHAR *nameBit; + DWORD result; + + lstrcpyW(tmpBuf, fodInfos->initdir); + if (PathFileExistsW(tmpBuf)) { + /* initdir does not have to be a directory. If a file is + * specified, the dir part is taken */ + if (PathIsDirectoryW(tmpBuf)) { + PathAddBackslashW(tmpBuf); + lstrcatW(tmpBuf, szwStar); + } + result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); + if (result) { + *nameBit = 0x00; + MemFree(fodInfos->initdir); + fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1) * sizeof(WCHAR)); + lstrcpyW(fodInfos->initdir, tmpBuf2); + handledPath = TRUE; + TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir)); + } + } + else if (fodInfos->initdir) + { + MemFree(fodInfos->initdir); + fodInfos->initdir = NULL; + TRACE("Value in InitDir is not an existing path, changed to (nil)\n"); + } } if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir)) @@ -3240,7 +3236,6 @@ int iIndentation; TEXTMETRICW tm; LPSFOLDER tmpFolder; - LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); UINT shgfi_flags = SHGFI_PIDL | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME; UINT icon_width, icon_height; @@ -3263,16 +3258,8 @@ shgfi_flags |= SHGFI_SMALLICON; } - if(pDIStruct->itemID == liInfos->uSelectedItem) - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } - else - { - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - } + ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, + 0, &sfi, sizeof (sfi), shgfi_flags ); /* Is this item selected ? */ if(pDIStruct->itemState & ODS_SELECTED) @@ -3290,16 +3277,10 @@ /* Do not indent item if drawing in the edit of the combo */ if(pDIStruct->itemState & ODS_COMBOBOXEDIT) - { iIndentation = 0; - ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem, - 0, &sfi, sizeof (sfi), shgfi_flags ); - - } else - { iIndentation = tmpFolder->m_iIndent; - } + /* Draw text and icon */ /* Initialise the icon display area */ Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c [iso-8859-1] Thu Mar 19 12:24:05 2015 @@ -919,7 +919,7 @@ return S_OK; /* Check if there is a mask to apply if not */ - if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) + if(!fodInfos->ShellInfos.lpstrCurrentFilter || !fodInfos->ShellInfos.lpstrCurrentFilter[0]) return S_OK; if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str))) Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Thu Mar 19 12:24:05 2015 @@ -816,8 +816,7 @@ Names = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(char)*NamesSize); Words = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WORD)); - NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, - fwCapability_Names, Names, dm); + DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Words, (LPSTR)Words, dm); @@ -927,8 +926,7 @@ Names = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WCHAR)*NamesSize); Words = HeapAlloc(GetProcessHeap(),0, NrOfEntries*sizeof(WORD)); - NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, - fwCapability_Names, Names, dm); + DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Words, Words, dm); @@ -1776,10 +1774,12 @@ case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextA(hDlg, cmb2, (char *)lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -1932,10 +1932,12 @@ case cmb2: /* Papersize */ { DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0); - if(Sel != CB_ERR) + if(Sel != CB_ERR) { lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, Sel, 0); + GetDlgItemTextW(hDlg, cmb2, lpdm->dmFormName, CCHFORMNAME); + } } break; @@ -3791,16 +3793,16 @@ { if(data->unicode) res = FindResourceW(data->u.dlgw->hInstance, - data->u.dlgw->lpPageSetupTemplateName, MAKEINTRESOURCEW(RT_DIALOG)); + data->u.dlgw->lpPageSetupTemplateName, (LPWSTR)RT_DIALOG); else res = FindResourceA(data->u.dlga->hInstance, - data->u.dlga->lpPageSetupTemplateName, MAKEINTRESOURCEA(RT_DIALOG)); + data->u.dlga->lpPageSetupTemplateName, (LPSTR)RT_DIALOG); tmpl_handle = LoadResource(data->u.dlgw->hInstance, res); } else { res = FindResourceW(COMDLG32_hInstance, MAKEINTRESOURCEW(PAGESETUPDLGORD), - MAKEINTRESOURCEW(RT_DIALOG)); + (LPWSTR)RT_DIALOG); tmpl_handle = LoadResource(COMDLG32_hInstance, res); } return LockResource(tmpl_handle); 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] Thu Mar 19 12:24:05 2015 @@ -62,7 +62,7 @@ reactos/dll/win32/clusapi # Synced to Wine-1.7.27 reactos/dll/win32/comcat # Synced to Wine-1.7.27 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/comdlg32 # Synced to Wine-1.7.27 +reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.37 reactos/dll/win32/compstui # Synced to Wine-1.7.27 reactos/dll/win32/credui # Synced to Wine-1.7.27 reactos/dll/win32/crypt32 # Synced to Wine-1.7.27

9 years, 6 months

[akhaldi] 66802: * Addendum to r66800.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 12:08:58 2015 New Revision: 66802 URL: http://svn.reactos.org/svn/reactos?rev=66802&view=rev Log: * Addendum to r66800. Added: trunk/reactos/dll/win32/comctl32/icon.c (with props) trunk/reactos/dll/win32/comctl32/theme_scrollbar.c (with props) Added: trunk/reactos/dll/win32/comctl32/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/icon.c?… ============================================================================== --- trunk/reactos/dll/win32/comctl32/icon.c (added) +++ trunk/reactos/dll/win32/comctl32/icon.c [iso-8859-1] Thu Mar 19 12:08:58 2015 @@ -0,0 +1,59 @@ +/* + * Comctl32 Icon functions + * + * Copyright 2014 Michael MÃ¼ller + * + * 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 "comctl32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(commctrl); + +HRESULT WINAPI +LoadIconMetric (HINSTANCE hinst, PCWSTR name, INT size, HICON *icon) +{ + INT width, height; + + TRACE("(%p %s %d %p)\n", hinst, debugstr_w(name), size, icon); + + if (!icon) + return E_INVALIDARG; + + /* windows sets it to zero in a case of failure */ + *icon = NULL; + + if (!name) + return E_INVALIDARG; + + if (size == LIM_SMALL) + { + width = GetSystemMetrics( SM_CXSMICON ); + height = GetSystemMetrics( SM_CYSMICON ); + } + else if (size == LIM_LARGE) + { + width = GetSystemMetrics( SM_CXICON ); + height = GetSystemMetrics( SM_CYICON ); + } + else + return E_INVALIDARG; + + *icon = LoadImageW( hinst, name, IMAGE_ICON, width, height, LR_SHARED ); + if (*icon) + return S_OK; + + return HRESULT_FROM_WIN32(GetLastError()); +} Propchange: trunk/reactos/dll/win32/comctl32/icon.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/comctl32/theme_scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_s… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_scrollbar.c (added) +++ trunk/reactos/dll/win32/comctl32/theme_scrollbar.c [iso-8859-1] Thu Mar 19 12:08:58 2015 @@ -0,0 +1,33 @@ +/* + * Theming - Scrollbar control + * + * Copyright (c) 2015 Mark Harmstone + * + * 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 "comctl32.h" + +WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); + +LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); + + return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); +} Propchange: trunk/reactos/dll/win32/comctl32/theme_scrollbar.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 6 months

[akhaldi] 66801: [COMCTL32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 12:07:45 2015 New Revision: 66801 URL: http://svn.reactos.org/svn/reactos?rev=66801&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/comctl32/button.c trunk/rostests/winetests/comctl32/comboex.c trunk/rostests/winetests/comctl32/dpa.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/misc.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/tab.c trunk/rostests/winetests/comctl32/treeview.c Modified: trunk/rostests/winetests/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/button… ============================================================================== --- trunk/rostests/winetests/comctl32/button.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/button.c [iso-8859-1] Thu Mar 19 12:07:45 2015 @@ -426,13 +426,6 @@ }; static const struct message setcheck_ignored_seq[] = -{ - { BM_SETCHECK, sent }, - { WM_APP, sent|wparam|lparam, 0, 0 }, - { 0 } -}; - -static const struct message setcheck_uncheck_seq[] = { { BM_SETCHECK, sent }, { WM_APP, sent|wparam|lparam, 0, 0 }, @@ -764,7 +757,7 @@ ok(!strcmp(buffA, "Button"), "got %s\n", buffA); DestroyWindow(hwnd); - /* explicitely create with versioned class name */ + /* explicitly create with versioned class name */ hwnd = CreateWindowExW(0, nameW, testW, BS_CHECKBOX, 0, 0, 50, 14, NULL, 0, 0, NULL); todo_wine ok(hwnd != NULL, "failed to create a window %s\n", wine_dbgstr_w(nameW)); Modified: trunk/rostests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboe… ============================================================================== --- trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] Thu Mar 19 12:07:45 2015 @@ -132,7 +132,7 @@ static void test_comboboxex(void) { HWND myHwnd = 0; - LONG res = -1; + LONG res; COMBOBOXEXITEMA cbexItem; static const char *first_item = "First Item", *second_item = "Second Item", Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/dpa.c [iso-8859-1] Thu Mar 19 12:07:45 2015 @@ -276,7 +276,7 @@ ok(rc, "dw2=0x%x\n", dw2); /* Clone into an old DPA */ - p = NULL; SetLastError(ERROR_SUCCESS); + SetLastError(ERROR_SUCCESS); p = pDPA_Clone(dpa, dpa3); ok(p == dpa3, "p=%p\n", p); rc=CheckDPA(dpa3, 0x123456, &dw3); 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] Thu Mar 19 12:07:45 2015 @@ -255,6 +255,51 @@ if (memcmp(bits, checkbits, (size * size)/8)) dump_bits(bits, checkbits, size); #endif /* VISIBLE */ +} + +static void test_begindrag(void) +{ + HIMAGELIST himl = createImageList(7,13); + HIMAGELIST drag; + BOOL ret; + int count; + POINT hotspot; + + count = ImageList_GetImageCount(himl); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* Two BeginDrag() without EndDrag() in between */ + ret = ImageList_BeginDrag(himl, 1, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList_BeginDrag() failed\n"); + ret = ImageList_BeginDrag(himl, 0, 3, 5); + ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); + drag = ImageList_GetDragImage(NULL, &hotspot); + ok(!!drag, "No active ImageList drag left\n"); + ok(hotspot.x == 0 && hotspot.y == 0, "New ImageList drag was created\n"); + ImageList_EndDrag(); + drag = ImageList_GetDragImage(NULL, NULL); + ok(!drag, "ImageList drag was not destroyed\n"); + + /* Invalid image index */ + ImageList_BeginDrag(himl, 0, 0, 0); + ret = ImageList_BeginDrag(himl, count, 3, 5); + ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); + drag = ImageList_GetDragImage(NULL, &hotspot); + ok(drag && hotspot.x == 0 && hotspot.y == 0, "Active drag should not have been canceled\n"); + ImageList_EndDrag(); + drag = ImageList_GetDragImage(NULL, NULL); + ok(!drag, "ImageList drag was not destroyed\n"); + /* Invalid negative image indexes succeed */ + ret = ImageList_BeginDrag(himl, -17, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList drag was created\n"); + ImageList_EndDrag(); + ret = ImageList_BeginDrag(himl, -1, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList drag was created\n"); + ImageList_EndDrag(); + ImageList_Destroy(himl); } static void test_hotspot(void) @@ -2091,6 +2136,7 @@ InitCommonControls(); test_create_destroy(); + test_begindrag(); test_hotspot(); test_add_remove(); test_imagecount(); Modified: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… ============================================================================== --- trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/misc.c [iso-8859-1] Thu Mar 19 12:07:45 2015 @@ -22,6 +22,9 @@ //#include <windows.h> #include <wine/test.h> +#include <wingdi.h> +#include <winuser.h> +#include <commctrl.h> #include "v6util.h" static PVOID (WINAPI * pAlloc)(LONG); @@ -33,6 +36,8 @@ static BOOL (WINAPI * pStr_SetPtrA)(LPSTR, LPCSTR); static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT); static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); + +static HRESULT (WINAPI * LoadIconMetric)(HINSTANCE, PCWSTR, INT, HICON*); static HMODULE hComctl32 = 0; @@ -75,7 +80,7 @@ static char dest[MAX_PATH]; int sourcelen; int destsize = MAX_PATH; - int count = -1; + int count; sourcelen = strlen(source) + 1; @@ -197,7 +202,12 @@ ptr = GetProcAddress(hinst, "TaskDialogIndirect"); if (!ptr) { +#ifdef __REACTOS__ + /* Skipped on 2k3 */ + skip("TaskDialogIndirect not exported by name\n"); +#else win_skip("TaskDialogIndirect not exported by name\n"); +#endif return; } @@ -205,6 +215,91 @@ ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr); } +static void test_LoadIconMetric(void) +{ + static const WCHAR nonExistingFile[] = {'d','o','e','s','n','o','t','e','x','i','s','t','.','i','c','o','\0'}; + HINSTANCE hinst; + void *ptr; + HICON icon; + HRESULT result; + ICONINFO info; + BOOL res; + INT bytes; + BITMAP bmp; + + hinst = LoadLibraryA("comctl32.dll"); + + LoadIconMetric = (void *)GetProcAddress(hinst, "LoadIconMetric"); + if (!LoadIconMetric) + { +#ifdef __REACTOS__ + /* Skipped on 2k3 */ + skip("TaskDialogIndirect not exported by name\n"); +#else + win_skip("LoadIconMetric not exported by name\n"); +#endif + return; + } + + ptr = GetProcAddress(hinst, (const CHAR*)380); + ok(ptr == LoadIconMetric, "got wrong pointer for ordinal 380, %p expected %p\n", + ptr, LoadIconMetric); + + result = LoadIconMetric(NULL, (PCWSTR)IDI_APPLICATION, LIM_SMALL, &icon); + ok(result == S_OK, "Expected S_OK, got %x\n", result); + if (result == S_OK) + { + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info\n"); + if (res && info.hbmColor) + { + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + if (bytes > 0) + { + ok(bmp.bmWidth == GetSystemMetrics( SM_CXSMICON ), "Wrong icon width\n"); + ok(bmp.bmHeight == GetSystemMetrics( SM_CYSMICON ), "Wrong icon height\n"); + } + } + DestroyIcon(icon); + } + + result = LoadIconMetric(NULL, (PCWSTR)IDI_APPLICATION, LIM_LARGE, &icon); + ok(result == S_OK, "Expected S_OK, got %x\n", result); + if (result == S_OK) + { + res = GetIconInfo(icon, &info); + ok(res, "Failed to get icon info\n"); + if (res && info.hbmColor) + { + bytes = GetObjectA(info.hbmColor, sizeof(bmp), &bmp); + ok(bytes > 0, "Failed to get bitmap info for icon\n"); + if (bytes > 0) + { + ok(bmp.bmWidth == GetSystemMetrics( SM_CXICON ), "Wrong icon width\n"); + ok(bmp.bmHeight == GetSystemMetrics( SM_CYICON ), "Wrong icon height\n"); + } + } + DestroyIcon(icon); + } + + result = LoadIconMetric(NULL, (PCWSTR)IDI_APPLICATION, 0x100, &icon); + ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", result); + if (result == S_OK) DestroyIcon(icon); + + icon = (HICON)0x1234; + result = LoadIconMetric(NULL, NULL, LIM_LARGE, &icon); + ok(result == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", result); + ok(icon == (HICON)0, "Expected 0x0, got %p\n", icon); + if (result == S_OK) DestroyIcon(icon); + + result = LoadIconMetric(NULL, nonExistingFile, LIM_LARGE, &icon); + ok(result == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + "Expected 80070715, got %x\n", result); + if (result == S_OK) DestroyIcon(icon); +} + + START_TEST(misc) { ULONG_PTR ctx_cookie; @@ -220,6 +315,7 @@ return; test_TaskDialogIndirect(); + test_LoadIconMetric(); unload_v6_module(ctx_cookie, hCtx); } 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] Thu Mar 19 12:07:45 2015 @@ -24,6 +24,7 @@ #include <wingdi.h> #include <winuser.h> #include <commctrl.h> +#include <reactos/undocuser.h> #include "msg.h" #include "resources.h" @@ -281,6 +282,37 @@ return FALSE; } +static WNDPROC old_nav_dialog_proc; + +static LRESULT CALLBACK new_nav_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case DM_SETDEFID: + ok( IsWindowEnabled( GetDlgItem(hwnd, wp) ), "button is not enabled\n" ); + break; + } + return CallWindowProcW( old_nav_dialog_proc, hwnd, msg, wp, lp ); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + static BOOL done; + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + /* The first dialog created will be the parent dialog */ + if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + { + old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); + done = TRUE; + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + static void test_wiznavigation(void) { HPROPSHEETPAGE hpsp[4]; @@ -293,6 +325,10 @@ BOOL hwndtoindex_supported = TRUE; const INT nextID = 12324; const INT backID = 12323; + HHOOK hook; + + /* set up a hook proc in order to subclass the main dialog early on */ + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); /* create the property sheet pages */ memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); @@ -402,6 +438,7 @@ ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); DestroyWindow(hdlg); + UnhookWindowsHookEx( hook ); } static void test_buttons(void) @@ -490,7 +527,7 @@ static void test_custom_default_button(void) { - HWND hdlg; + HWND hdlg, page; PROPSHEETPAGEA psp[1]; PROPSHEETHEADERA psh; MSG msg; @@ -534,7 +571,8 @@ /* At this point, the combobox should have keyboard focus, so we press ENTER. * Pull the lever, Kronk! */ - keybd_event(VK_RETURN, 0, 0, 0); + page = (HWND)SendMessageW(hdlg, PSM_GETCURRENTPAGEHWND, 0, 0); + PostMessageW(GetDlgItem(page, IDC_PS_COMBO1), WM_KEYDOWN, VK_RETURN, 0); /* Process all the messages in the queue for this thread. */ while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) Modified: trunk/rostests/winetests/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/tab.c?… ============================================================================== --- trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/tab.c [iso-8859-1] Thu Mar 19 12:07:45 2015 @@ -80,28 +80,6 @@ static HWND parent_wnd; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; - -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent}, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; static const struct message add_tab_to_parent[] = { { TCM_INSERTITEMA, sent }, @@ -159,12 +137,6 @@ }; static const struct message empty_sequence[] = { - { 0 } -}; - -static const struct message set_min_tab_width_seq[] = { - { TCM_SETMINTABWIDTH, sent|wparam, 0 }, - { TCM_SETMINTABWIDTH, sent|wparam, 0 }, { 0 } }; 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] Thu Mar 19 12:07:45 2015 @@ -663,7 +663,7 @@ static void test_get_set_bkcolor(void) { - COLORREF crColor = RGB(0,0,0); + COLORREF crColor; HWND hTree; hTree = create_treeview_control(0); @@ -719,9 +719,9 @@ static void test_get_set_indent(void) { - int ulIndent = -1; - int ulMinIndent = -1; - int ulMoreThanTwiceMin = -1; + int ulIndent; + int ulMinIndent; + int ulMoreThanTwiceMin; HWND hTree; hTree = create_treeview_control(0); @@ -914,7 +914,7 @@ static void test_get_set_textcolor(void) { /* If the value is -1, the control is using the system color for the text color. */ - COLORREF crColor = RGB(0,0,0); + COLORREF crColor; HWND hTree; hTree = create_treeview_control(0); @@ -974,8 +974,8 @@ static void test_get_set_unicodeformat(void) { - BOOL bPreviousSetting = FALSE; - BOOL bNewSetting = FALSE; + BOOL bPreviousSetting; + BOOL bNewSetting; HWND hTree; hTree = create_treeview_control(0);

9 years, 6 months

[akhaldi] 66800: [COMCTL32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 12:07:32 2015 New Revision: 66800 URL: http://svn.reactos.org/svn/reactos?rev=66800&view=rev Log: [COMCTL32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -22,6 +22,7 @@ flatsb.c header.c hotkey.c + icon.c imagelist.c ipaddress.c listview.c @@ -41,6 +42,7 @@ theme_dialog.c theme_edit.c theme_listbox.c + theme_scrollbar.c theming.c toolbar.c tooltips.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -1,53 +1,6 @@ -diff -prudN e:\Wine\dlls\comctl32/comctl32.spec e:\reactos\dll\win32\comctl32/comctl32.spec ---- e:\Wine\dlls\comctl32/comctl32.spec 2014-04-04 14:12:39.665980800 +0100 -+++ e:\reactos\dll\win32\comctl32/comctl32.spec 2014-03-27 14:27:25.808903400 +0100 -@@ -15,7 +15,7 @@ - 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) - #12 stub Cctl1632_ThunkData32 - 13 stdcall MakeDragList(long) -- 14 stdcall LBItemFromPt(long int64 long) -+ 14 stdcall LBItemFromPt(long double long) #(long int64 long) - 15 stdcall DrawInsert(long long long) - 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) - 17 stdcall InitCommonControls() -@@ -30,8 +30,8 @@ - 155 stdcall -noname FindMRUStringA(long str ptr) - 156 stdcall -noname DelMRUString(long long) - 157 stdcall -noname CreateMRUListLazyA(ptr long long long) --163 stub -noname CreatePage --164 stub -noname CreateProxyPage -+163 stdcall -noname CreatePage(long ptr) -+164 stdcall -noname CreateProxyPage(long long) - 167 stdcall -noname AddMRUData(long ptr long) - 169 stdcall -noname FindMRUData(long ptr long ptr) - 233 stdcall -noname Str_GetPtrA(str str long) -@@ -89,13 +89,13 @@ - 376 stdcall -noname -private IntlStrEqWorkerA(long str str long) - 377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) - 382 stdcall -noname SmoothScrollWindow(ptr) --383 stub -noname DoReaderMode -+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 -ordinal DSA_EnumCallback(ptr ptr long) - 388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) --389 stub -noname SHGetProcessDword -+389 stdcall -noname SHGetProcessDword(long long) - 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) - 400 stdcall -ordinal CreateMRUListW(ptr) - 401 stdcall -ordinal AddMRUStringW(long wstr) -@@ -189,5 +189,6 @@ - @ stdcall PropertySheet(ptr) PropertySheetA - @ stdcall PropertySheetA(ptr) - @ stdcall PropertySheetW(ptr) -+@ stdcall RegisterClassNameW(wstr) - @ stdcall UninitializeFlatSB(long) - @ stdcall _TrackMouseEvent(ptr) - -diff -prudN e:\Wine\dlls\comctl32/commctrl.c e:\reactos\dll\win32\comctl32/commctrl.c ---- e:\Wine\dlls\comctl32/commctrl.c 2014-04-04 14:12:39.666981500 +0100 -+++ e:\reactos\dll\win32\comctl32/commctrl.c 2014-04-06 12:07:15.451048000 +0100 +diff -pudN E:\wine\dlls\comctl32/commctrl.c E:\reactos\dll\win32\comctl32/commctrl.c +--- E:\wine\dlls\comctl32/commctrl.c 2015-02-21 17:13:08.585542200 +0100 ++++ E:\reactos\dll\win32\comctl32/commctrl.c 2015-03-18 17:10:39.955584600 +0100 @@ -52,25 +52,26 @@ * -- ICC_WIN95_CLASSES */ @@ -289,9 +242,9 @@ } /*********************************************************************** -@@ -1637,3 +1807,15 @@ HRESULT WINAPI TaskDialogIndirect(const - if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; - return S_OK; +@@ -1646,3 +1816,15 @@ HRESULT WINAPI LoadIconWithScaleDown(HIN + FIXME("stub: %p %s %d %d %p\n", hinst, wine_dbgstr_w(name), cx, cy, icon); + return E_NOTIMPL; } + +/*********************************************************************** @@ -305,10 +258,180 @@ + comctl32 classes are registered by this module anyway */ + return TRUE; +} - -diff -prudN e:\Wine\dlls\comctl32/listview.c e:\reactos\dll\win32\comctl32/listview.c ---- e:\Wine\dlls\comctl32/listview.c 2014-04-18 20:39:25.506861000 +0100 -+++ e:\reactos\dll\win32\comctl32/listview.c 2014-04-22 13:09:20.504496900 +0100 +diff -pudN E:\wine\dlls\comctl32/imagelist.c E:\reactos\dll\win32\comctl32/imagelist.c +--- E:\wine\dlls\comctl32/imagelist.c 2015-02-21 17:13:08.589542200 +0100 ++++ E:\reactos\dll\win32\comctl32/imagelist.c 2015-03-18 17:15:00.458921400 +0100 +@@ -33,27 +33,14 @@ + * + * TODO: + * - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE +- * - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE ++ * - Add support for ILS_GLOW, ILS_SHADOW + * - Thread-safe locking + */ + +-#include <stdarg.h> +-#include <stdlib.h> +-#include <string.h> +- +-#define COBJMACROS +- +-#include "winerror.h" +-#include "windef.h" +-#include "winbase.h" +-#include "objbase.h" +-#include "wingdi.h" +-#include "winuser.h" +-#include "commctrl.h" + #include "comctl32.h" +-#include "commoncontrols.h" +-#include "wine/debug.h" +-#include "wine/exception.h" ++ ++#include <commoncontrols.h> ++#include <wine/exception.h> + + WINE_DEFAULT_DEBUG_CHANNEL(imagelist); + +@@ -1246,7 +1233,7 @@ ImageList_DrawEx (HIMAGELIST himl, INT i + } + + +-static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, ++static BOOL alpha_blend_image( HIMAGELIST himl, HDC srce_dc, HDC dest_dc, int dest_x, int dest_y, + int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, + UINT style, COLORREF blend_col ) + { +@@ -1271,9 +1258,9 @@ static BOOL alpha_blend_image( HIMAGELIS + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; +- if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; ++ if (!(bmp = CreateDIBSection( srce_dc, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; + SelectObject( hdc, bmp ); +- BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); ++ BitBlt( hdc, 0, 0, cx, cy, srce_dc, src_x, src_y, SRCCOPY ); + + if (blend_col != CLR_NONE) + { +@@ -1346,6 +1333,66 @@ done: + return ret; + } + ++HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, ++ int src_x, int src_y, int cx, int cy, COLORREF rgbFg) ++{ ++ HDC hdc = NULL; ++ HBITMAP bmp = 0; ++ BITMAPINFO *info; ++ ++ unsigned int *ptr; ++ void *bits; ++ int i; ++ ++ /* create a dc and its device independent bitmap for doing the work, ++ shamelessly copied from the alpha-blending function above */ ++ if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; ++ if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; ++ info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); ++ info->bmiHeader.biWidth = cx; ++ info->bmiHeader.biHeight = cy; ++ info->bmiHeader.biPlanes = 1; ++ info->bmiHeader.biBitCount = 32; ++ info->bmiHeader.biCompression = BI_RGB; ++ info->bmiHeader.biSizeImage = cx * cy * 4; ++ info->bmiHeader.biXPelsPerMeter = 0; ++ info->bmiHeader.biYPelsPerMeter = 0; ++ info->bmiHeader.biClrUsed = 0; ++ info->bmiHeader.biClrImportant = 0; ++ if (!(bmp = CreateDIBSection(himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done; ++ ++ /* bind both surfaces */ ++ SelectObject(hdc, bmp); ++ ++ /* copy into our dc the section that covers just the icon we we're asked for */ ++ BitBlt(hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY); ++ ++ /* loop every pixel of the bitmap */ ++ for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) ++ { ++ COLORREF orig_color = *ptr; ++ ++ /* calculate the effective luminance using the constants from here, adapted to the human eye: ++ <http://bobpowell.net/grayscale.aspx> */ ++ float mixed_color = (GetRValue(orig_color) * .30 + ++ GetGValue(orig_color) * .59 + ++ GetBValue(orig_color) * .11); ++ ++ *ptr = RGBA(mixed_color, mixed_color, mixed_color, GetAValue(orig_color)); ++ } ++ ++done: ++ ++ if (bmp) ++ DeleteObject(bmp); ++ ++ if (info) ++ HeapFree(GetProcessHeap(), 0, info); ++ ++ /* return the handle to our desaturated dc, that will substitute its original counterpart in the next calls */ ++ return hdc; ++} ++ + /************************************************************************* + * ImageList_DrawIndirect [COMCTL32.@] + * +@@ -1422,6 +1469,21 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR + oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); + oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); + ++ /* ++ * If the ILS_SATURATE bit is enabled we should multiply the ++ * RGB colors of the original image by the contents of rgbFg. ++ */ ++ if (fState & ILS_SATURATE) ++ { ++ hImageListDC = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, ++ pt.x, pt.y, cx, cy, pimldp->rgbFg); ++ ++ /* shitty way of getting subroutines to blit at the right place (top left corner), ++ as our modified imagelist only contains a single image for performance reasons */ ++ pt.x = 0; ++ pt.y = 0; ++ } ++ + has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); + if (!bMask && (has_alpha || (fState & ILS_ALPHA))) + { +@@ -1442,7 +1504,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR + + if (bIsTransparent) + { +- bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, ++ bResult = alpha_blend_image( himl, hImageListDC, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, func, fStyle, blend_col ); + goto end; + } +@@ -1452,7 +1514,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR + + hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); + PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); +- alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); ++ alpha_blend_image( himl, hImageListDC, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); + DeleteObject (SelectObject (hImageDC, hOldBrush)); + bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); + goto end; +@@ -1546,7 +1608,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR + } + } + +- if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); + if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); + if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); + +diff -pudN E:\wine\dlls\comctl32/listview.c E:\reactos\dll\win32\comctl32/listview.c +--- E:\wine\dlls\comctl32/listview.c 2015-02-21 17:13:08.593542200 +0100 ++++ E:\reactos\dll\win32\comctl32/listview.c 2015-03-18 17:19:17.656744600 +0100 @@ -307,6 +288,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; @@ -317,7 +440,7 @@ /* font */ HFONT hDefaultFont; -@@ -1693,8 +1675,19 @@ static inline BOOL LISTVIEW_GetItemW(con +@@ -1699,8 +1681,19 @@ static inline BOOL LISTVIEW_GetItemW(con /* used to handle collapse main item column case */ static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) { @@ -339,21 +462,21 @@ } /* Listview invalidation functions: use _only_ these functions to invalidate */ -@@ -4727,7 +4720,12 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I +@@ -4669,7 +4662,12 @@ static void LISTVIEW_DrawItemPart(LISTVI if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) rcLabel.bottom--; -- DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); +- DrawTextW(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format); +#ifdef __REACTOS__ -+ if ((!(lvItem.state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) -+ DrawShadowText(hdc, lvItem.pszText, -1, &rcLabel, uFormat, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); ++ if ((!(item->state & LVIS_SELECTED) || !infoPtr->bFocus) && (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTSHADOWTEXT)) ++ DrawShadowText(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format, RGB(255, 255, 255), RGB(0, 0, 0), 2, 2); + else +#endif -+ DrawTextW(hdc, lvItem.pszText, -1, &rcLabel, uFormat); - - postpaint: - if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) -@@ -5136,7 +5134,11 @@ enddraw: ++ DrawTextW(nmlvcd->nmcd.hdc, item->pszText, -1, &rcLabel, format); + } + + /*** +@@ -5214,7 +5212,11 @@ enddraw: /* Draw marquee rectangle if appropriate */ if (infoPtr->bMarqueeSelect) @@ -365,7 +488,7 @@ if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); -@@ -7939,6 +7941,7 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW +@@ -8017,6 +8019,7 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW { TRACE("(color=%x)\n", color); @@ -373,7 +496,7 @@ if(infoPtr->clrBk != color) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); infoPtr->clrBk = color; -@@ -8600,7 +8603,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS +@@ -8678,7 +8681,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS return oldspacing; } @@ -382,7 +505,7 @@ { INT cx, cy; -@@ -8611,8 +8614,8 @@ static inline void set_icon_size(SIZE *s +@@ -8689,8 +8692,8 @@ static inline void set_icon_size(SIZE *s } else { @@ -393,7 +516,7 @@ } } -@@ -9349,6 +9352,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hw +@@ -9427,6 +9430,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hw infoPtr->clrText = CLR_DEFAULT; infoPtr->clrTextBk = CLR_DEFAULT; LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); @@ -401,7 +524,7 @@ /* set default values */ infoPtr->nFocusedItem = -1; -@@ -11631,6 +11635,12 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg +@@ -11709,6 +11713,12 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); @@ -414,42 +537,41 @@ return 0; /* case WM_TIMER: */ - -diff -prudN e:\Wine\dlls\comctl32/propsheet.c e:\reactos\dll\win32\comctl32/propsheet.c ---- e:\Wine\dlls\comctl32/propsheet.c 2014-04-04 14:12:39.676987100 +0100 -+++ e:\reactos\dll\win32\comctl32/propsheet.c 2014-04-22 13:11:33.830045900 +0100 -@@ -2430,6 +2414,11 @@ static void PROPSHEET_SetWizButtons(HWND - HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); - HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); +diff -pudN E:\wine\dlls\comctl32/propsheet.c E:\reactos\dll\win32\comctl32/propsheet.c +--- E:\wine\dlls\comctl32/propsheet.c 2015-02-21 17:13:08.597542200 +0100 ++++ E:\reactos\dll\win32\comctl32/propsheet.c 2015-03-18 17:24:03.692899000 +0100 +@@ -2432,12 +2416,19 @@ static void PROPSHEET_SetWizButtons(HWND HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); + +#ifdef __REACTOS__ + HWND hwndCancel = GetDlgItem(hwndDlg, IDCANCEL); + INT iDefItem = 0; + HWND hwndFocus; +#endif - ++ TRACE("%d\n", dwFlags); -@@ -2437,6 +2426,7 @@ static void PROPSHEET_SetWizButtons(HWND - EnableWindow(hwndNext, FALSE); - EnableWindow(hwndFinish, FALSE); + EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); + EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); + EnableWindow(hwndFinish, enable_finish); +#ifndef __REACTOS__ /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); -@@ -2446,6 +2436,7 @@ static void PROPSHEET_SetWizButtons(HWND +@@ -2447,6 +2438,7 @@ static void PROPSHEET_SetWizButtons(HWND SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); else SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); +#endif - - if (dwFlags & PSWIZB_BACK) -@@ -2477,6 +2468,25 @@ static void PROPSHEET_SetWizButtons(HWND + if (!psInfo->hasFinish) + { +@@ -2466,6 +2458,25 @@ static void PROPSHEET_SetWizButtons(HWND + ShowWindow(hwndNext, SW_SHOW); + } } - else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); + +#ifdef __REACTOS__ + /* set the default pushbutton to an enabled button */ @@ -472,9 +594,9 @@ } /****************************************************************************** -diff -prudN e:\Wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c ---- e:\Wine\dlls\comctl32/rebar.c 2014-04-04 14:12:39.678989500 +0100 -+++ e:\reactos\dll\win32\comctl32/rebar.c 2014-04-22 13:17:59.092589800 +0100 +diff -pudN E:\wine\dlls\comctl32/rebar.c E:\reactos\dll\win32\comctl32/rebar.c +--- E:\wine\dlls\comctl32/rebar.c 2015-02-21 17:13:08.597542200 +0100 ++++ E:\reactos\dll\win32\comctl32/rebar.c 2015-02-26 09:25:01.687100100 +0100 @@ -50,7 +50,6 @@ * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN @@ -483,7 +605,78 @@ * - WM_VKEYTOITEM * - WM_WININICHANGE * Notifications: -@@ -2912,12 +2896,22 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT +@@ -1844,16 +1828,24 @@ static LRESULT REBAR_EraseBkGnd (const R + RECT cr; + COLORREF old = CLR_NONE, new; + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); ++ HRGN hrgn; + + GetClientRect (infoPtr->hwndSelf, &cr); ++ hrgn = CreateRectRgn(cr.left, cr.top, cr.right, cr.bottom); + + oldrow = -1; + for(i=0; i<infoPtr->uNumBands; i++) { + RECT rcBand; ++ RECT rcBandReal; ++ HRGN hrgnBand; ++ + lpBand = REBAR_GetBand(infoPtr, i); ++ + if (HIDDENBAND(lpBand)) continue; + translate_rect(infoPtr, &rcBand, &lpBand->rcBand); + ++ rcBandReal = rcBand; ++ + /* draw band separator between rows */ + if (lpBand->iRow != oldrow) { + oldrow = lpBand->iRow; +@@ -1878,6 +1870,7 @@ static LRESULT REBAR_EraseBkGnd (const R + } + TRACE ("drawing band separator bottom (%s)\n", + wine_dbgstr_rect(&rcRowSep)); ++ rcBandReal = rcRowSep; + } + } + +@@ -1888,6 +1881,7 @@ static LRESULT REBAR_EraseBkGnd (const R + if (infoPtr->dwStyle & CCS_VERT) { + rcSep.bottom = rcSep.top; + rcSep.top -= SEP_WIDTH_SIZE; ++ rcBandReal.top -= SEP_WIDTH_SIZE; + if (theme) + DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_BOTTOM, NULL); + else +@@ -1896,6 +1890,7 @@ static LRESULT REBAR_EraseBkGnd (const R + else { + rcSep.right = rcSep.left; + rcSep.left -= SEP_WIDTH_SIZE; ++ rcBandReal.left -= SEP_WIDTH_SIZE; + if (theme) + DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcSep, EDGE_ETCHED, BF_RIGHT, NULL); + else +@@ -1943,7 +1938,21 @@ static LRESULT REBAR_EraseBkGnd (const R + if (lpBand->clrBack != CLR_NONE) + SetBkColor (hdc, old); + } ++ ++ hrgnBand = CreateRectRgn(rcBandReal.left, rcBandReal.top, rcBandReal.right, rcBandReal.bottom); ++ CombineRgn(hrgn, hrgn, hrgnBand, RGN_DIFF); ++ DeleteObject(hrgnBand); + } ++ ++#if 1 ++ { ++ //FIXME: Apparently painting the remaining area is a v6 feature ++ HBRUSH hbrush = CreateSolidBrush(new); ++ FillRgn(hdc, hrgn, hbrush); ++ DeleteObject(hbrush); ++ DeleteObject(hrgn); ++ } ++#endif + return TRUE; + } + +@@ -2912,12 +2921,22 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT static LRESULT @@ -507,7 +700,7 @@ return TRUE; } -@@ -3675,7 +3669,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, +@@ -3675,7 +3694,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, return REBAR_ShowBand (infoPtr, wParam, lParam); case RB_SIZETORECT: @@ -516,7 +709,7 @@ /* Messages passed to parent */ -@@ -3758,6 +3752,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, +@@ -3758,6 +3777,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); @@ -528,10 +721,837 @@ return 0; /* case WM_VKEYTOITEM: supported according to ControlSpy */ - -diff -prudN e:\Wine\dlls\comctl32/tooltips.c e:\reactos\dll\win32\comctl32/tooltips.c ---- e:\Wine\dlls\comctl32/tooltips.c 2014-04-04 14:12:39.707008100 +0100 -+++ e:\reactos\dll\win32\comctl32/tooltips.c 2014-04-06 12:20:33.342535700 +0100 +diff -pudN E:\wine\dlls\comctl32/toolbar.c E:\reactos\dll\win32\comctl32/toolbar.c +--- E:\wine\dlls\comctl32/toolbar.c 2015-02-21 17:13:08.617542200 +0100 ++++ E:\reactos\dll\win32\comctl32/toolbar.c 2015-03-18 17:50:35.210152200 +0100 +@@ -33,11 +33,9 @@ + * - TBSTYLE_REGISTERDROP + * - TBSTYLE_EX_DOUBLEBUFFER + * - Messages: +- * - TB_GETMETRICS + * - TB_GETOBJECT + * - TB_INSERTMARKHITTEST + * - TB_SAVERESTORE +- * - TB_SETMETRICS + * - WM_WININICHANGE + * - Notifications: + * - NM_CHAR +@@ -140,6 +124,8 @@ typedef struct + INT nOldHit; + INT nHotItem; /* index of the "hot" item */ + SIZE szPadding; /* padding values around button */ ++ SIZE szBarPadding; /* padding values around the toolbar (NOT USED BUT STORED) */ ++ SIZE szSpacing; /* spacing values between buttons */ + INT iTopMargin; /* the top margin */ + INT iListGap; /* default gap between text and image for toolbar with list style */ + HFONT hDefaultFont; +@@ -205,12 +191,18 @@ typedef enum + #define ARROW_HEIGHT 3 + #define INSERTMARK_WIDTH 2 + ++/* default padding inside a button */ + #define DEFPAD_CX 7 + #define DEFPAD_CY 6 ++ ++/* default space between buttons and between rows */ ++#define DEFSPACE_CX 7 ++#define DEFSPACE_CY 6 ++ + #define DEFLISTGAP 4 + + /* vertical padding used in list mode when image is present */ +-#define LISTPAD_CY 9 ++#define LISTPAD_CY 2 + + /* how wide to treat the bitmap if it isn't present */ + #define NONLIST_NOTEXT_OFFSET 2 +@@ -252,7 +244,12 @@ static void TOOLBAR_TooltipSetRect(const + + static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) + { ++#ifndef __REACTOS__ + return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); ++#else /* r65766 */ ++ /* This is the behaviour in comctl32 v6 */ ++ return 0; ++#endif + } + + static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) +@@ -699,10 +696,12 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in + const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) + { + HIMAGELIST himl = NULL; +- BOOL draw_masked = FALSE; ++ BOOL draw_masked = FALSE, draw_desaturated = FALSE; + INT index; + INT offset = 0; + UINT draw_flags = ILD_TRANSPARENT; ++ IMAGEINFO info = {0}; ++ BITMAP bm = {0}; + + if (tbcd->nmcd.uItemState & (CDIS_DISABLED | CDIS_INDETERMINATE)) + { +@@ -710,7 +709,18 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in + if (!himl) + { + himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DEFAULT, &index); +- draw_masked = TRUE; ++ ++ ImageList_GetImageInfo(himl, index, &info); ++ GetObjectW(info.hbmImage, sizeof(bm), &bm); ++ ++ if (bm.bmBitsPixel == 32) ++ { ++ draw_desaturated = TRUE; ++ } ++ else ++ { ++ draw_masked = TRUE; ++ } + } + } + else if (tbcd->nmcd.uItemState & CDIS_CHECKED || +@@ -741,9 +751,34 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in + index, himl, left, top, offset); + + if (draw_masked) ++ { ++ /* code path for drawing flat disabled icons without alpha channel */ + TOOLBAR_DrawMasked (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags); ++ } ++ else if (draw_desaturated) ++ { ++ /* code path for drawing disabled, alpha-blended (32bpp) icons */ ++ IMAGELISTDRAWPARAMS imldp = {0}; ++ ++ imldp.cbSize = sizeof(imldp); ++ imldp.himl = himl; ++ imldp.i = index; ++ imldp.hdcDst = tbcd->nmcd.hdc, ++ imldp.x = offset + left; ++ imldp.y = offset + top; ++ imldp.rgbBk = CLR_NONE; ++ imldp.rgbFg = CLR_DEFAULT; ++ imldp.fStyle = ILD_TRANSPARENT; ++ imldp.fState = ILS_ALPHA | ILS_SATURATE; ++ imldp.Frame = 192; ++ ++ ImageList_DrawIndirect (&imldp); ++ } + else ++ { ++ /* code path for drawing standard icons as-is */ + ImageList_Draw (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags); ++ } + } + + /* draws a blank frame for a toolbar button */ +@@ -862,14 +897,15 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * + InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy); + TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr); + } +- else +- TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); +- } +- else if (btnPtr->fsStyle != BTNS_SEP) { +- FIXME("Draw some kind of separator: fsStyle=%x\n", +- btnPtr->fsStyle); +- } +- return; ++ else { ++ TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); ++ } ++ } ++ else if (btnPtr->fsStyle != BTNS_SEP) { ++ FIXME("Draw some kind of separator: fsStyle=%x\n", ++ btnPtr->fsStyle); ++ } ++ return; + } + + /* get a pointer to the text */ +@@ -1289,11 +1325,11 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPt + /* When the toolbar window style is not TBSTYLE_WRAPABLE, */ + /* no layout is necessary. Applications may use this style */ + /* to perform their own layout on the toolbar. */ +- if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && +- !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; ++ if (!(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && ++ !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) return; + + btnPtr = infoPtr->buttons; +- x = infoPtr->nIndent; ++ x = infoPtr->nIndent; + + if (GetParent(infoPtr->hwndSelf)) + { +@@ -1301,144 +1337,145 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPt + * this toolbar. We cannot use its height, as there may be multiple + * toolbars in a rebar control + */ +- GetClientRect( GetParent(infoPtr->hwndSelf), &rc ); ++ GetClientRect(GetParent(infoPtr->hwndSelf), &rc); + infoPtr->nWidth = rc.right - rc.left; + } + else + { +- GetWindowRect( infoPtr->hwndSelf, &rc ); ++ GetWindowRect(infoPtr->hwndSelf, &rc); + infoPtr->nWidth = rc.right - rc.left; + } + + bButtonWrap = FALSE; + + TRACE("start ButtonWidth=%d, BitmapWidth=%d, nWidth=%d, nIndent=%d\n", +- infoPtr->nButtonWidth, infoPtr->nBitmapWidth, infoPtr->nWidth, +- infoPtr->nIndent); ++ infoPtr->nButtonWidth, infoPtr->nBitmapWidth, infoPtr->nWidth, ++ infoPtr->nIndent); + +- for (i = 0; i < infoPtr->nNumButtons; i++ ) ++ for (i = 0; i < infoPtr->nNumButtons; i++) + { +- btnPtr[i].fsState &= ~TBSTATE_WRAP; ++ btnPtr[i].fsState &= ~TBSTATE_WRAP; + +- if (btnPtr[i].fsState & TBSTATE_HIDDEN) +- continue; ++ if (btnPtr[i].fsState & TBSTATE_HIDDEN) ++ continue; + + if (btnPtr[i].cx > 0) + cx = btnPtr[i].cx; + /* horizontal separators are treated as buttons for width */ +- else if ((btnPtr[i].fsStyle & BTNS_SEP) && +- !(infoPtr->dwStyle & CCS_VERT)) ++ else if ((btnPtr[i].fsStyle & BTNS_SEP) && ++ !(infoPtr->dwStyle & CCS_VERT)) + cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; +- else +- cx = infoPtr->nButtonWidth; ++ else ++ cx = infoPtr->nButtonWidth; + +- /* Two or more adjacent separators form a separator group. */ +- /* The first separator in a group should be wrapped to the */ +- /* next row if the previous wrapping is on a button. */ +- if( bButtonWrap && +- (btnPtr[i].fsStyle & BTNS_SEP) && +- (i + 1 < infoPtr->nNumButtons ) && +- (btnPtr[i + 1].fsStyle & BTNS_SEP) ) +- { +- TRACE("wrap point 1 btn %d style %02x\n", i, btnPtr[i].fsStyle); +- btnPtr[i].fsState |= TBSTATE_WRAP; +- x = infoPtr->nIndent; +- i++; +- bButtonWrap = FALSE; +- continue; +- } ++ /* Two or more adjacent separators form a separator group. */ ++ /* The first separator in a group should be wrapped to the */ ++ /* next row if the previous wrapping is on a button. */ ++ if (bButtonWrap && ++ (btnPtr[i].fsStyle & BTNS_SEP) && ++ (i + 1 < infoPtr->nNumButtons) && ++ (btnPtr[i + 1].fsStyle & BTNS_SEP)) ++ { ++ TRACE("wrap point 1 btn %d style %02x\n", i, btnPtr[i].fsStyle); ++ btnPtr[i].fsState |= TBSTATE_WRAP; ++ x = infoPtr->nIndent; ++ i++; ++ bButtonWrap = FALSE; ++ continue; ++ } + +- /* The layout makes sure the bitmap is visible, but not the button. */ +- /* Test added to also wrap after a button that starts a row but */ +- /* is bigger than the area. - GA 8/01 */ +- if (( x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 +- > infoPtr->nWidth ) || +- ((x == infoPtr->nIndent) && (cx > infoPtr->nWidth))) +- { +- BOOL bFound = FALSE; ++ /* The layout makes sure the bitmap is visible, but not the button. */ ++ /* Test added to also wrap after a button that starts a row but */ ++ /* is bigger than the area. - GA 8/01 */ ++ if ((x + cx - (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2 ++ > infoPtr->nWidth) || ++ ((x == infoPtr->nIndent) && (cx > infoPtr->nWidth))) ++ { ++ BOOL bFound = FALSE; + +- /* If the current button is a separator and not hidden, */ +- /* go to the next until it reaches a non separator. */ +- /* Wrap the last separator if it is before a button. */ +- while( ( ((btnPtr[i].fsStyle & BTNS_SEP) && +- !(btnPtr[i].fsStyle & BTNS_DROPDOWN)) || +- (btnPtr[i].fsState & TBSTATE_HIDDEN) ) && +- i < infoPtr->nNumButtons ) +- { +- i++; +- bFound = TRUE; +- } ++ /* If the current button is a separator and not hidden, */ ++ /* go to the next until it reaches a non separator. */ ++ /* Wrap the last separator if it is before a button. */ ++ while ((((btnPtr[i].fsStyle & BTNS_SEP) && ++ !(btnPtr[i].fsStyle & BTNS_DROPDOWN)) || ++ (btnPtr[i].fsState & TBSTATE_HIDDEN)) && ++ i < infoPtr->nNumButtons) ++ { ++ i++; ++ bFound = TRUE; ++ } + +- if( bFound && i < infoPtr->nNumButtons ) +- { +- i--; +- TRACE("wrap point 2 btn %d style %02x, x=%d, cx=%d\n", +- i, btnPtr[i].fsStyle, x, cx); +- btnPtr[i].fsState |= TBSTATE_WRAP; +- x = infoPtr->nIndent; +- bButtonWrap = FALSE; +- continue; +- } +- else if ( i >= infoPtr->nNumButtons) +- break; ++ if (bFound && i < infoPtr->nNumButtons) ++ { ++ i--; ++ TRACE("wrap point 2 btn %d style %02x, x=%d, cx=%d\n", ++ i, btnPtr[i].fsStyle, x, cx); ++ btnPtr[i].fsState |= TBSTATE_WRAP; ++ x = infoPtr->nIndent; ++ bButtonWrap = FALSE; ++ continue; ++ } ++ else if (i >= infoPtr->nNumButtons) ++ break; + +- /* If the current button is not a separator, find the last */ +- /* separator and wrap it. */ +- for ( j = i - 1; j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--) +- { +- if ((btnPtr[j].fsStyle & BTNS_SEP) && +- !(btnPtr[j].fsState & TBSTATE_HIDDEN)) +- { +- bFound = TRUE; +- i = j; +- TRACE("wrap point 3 btn %d style %02x, x=%d, cx=%d\n", +- i, btnPtr[i].fsStyle, x, cx); +- x = infoPtr->nIndent; +- btnPtr[j].fsState |= TBSTATE_WRAP; +- bButtonWrap = FALSE; +- break; +- } +- } ++ /* If the current button is not a separator, find the last */ ++ /* separator and wrap it. */ ++ for (j = i - 1; j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--) ++ { ++ if ((btnPtr[j].fsStyle & BTNS_SEP) && ++ !(btnPtr[j].fsState & TBSTATE_HIDDEN)) ++ { ++ bFound = TRUE; ++ i = j; ++ TRACE("wrap point 3 btn %d style %02x, x=%d, cx=%d\n", ++ i, btnPtr[i].fsStyle, x, cx); ++ x = infoPtr->nIndent; ++ btnPtr[j].fsState |= TBSTATE_WRAP; ++ bButtonWrap = FALSE; ++ break; ++ } ++ } + +- /* If no separator available for wrapping, wrap one of */ +- /* non-hidden previous button. */ +- if (!bFound) +- { +- for ( j = i - 1; +- j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--) +- { +- if (btnPtr[j].fsState & TBSTATE_HIDDEN) +- continue; ++ /* If no separator available for wrapping, wrap one of */ ++ /* non-hidden previous button. */ ++ if (!bFound) ++ { ++ for (j = i - 1; ++ j >= 0 && !(btnPtr[j].fsState & TBSTATE_WRAP); j--) ++ { ++ if (btnPtr[j].fsState & TBSTATE_HIDDEN) ++ continue; + +- bFound = TRUE; +- i = j; +- TRACE("wrap point 4 btn %d style %02x, x=%d, cx=%d\n", +- i, btnPtr[i].fsStyle, x, cx); +- x = infoPtr->nIndent; +- btnPtr[j].fsState |= TBSTATE_WRAP; +- bButtonWrap = TRUE; +- break; +- } +- } ++ bFound = TRUE; ++ i = j; ++ TRACE("wrap point 4 btn %d style %02x, x=%d, cx=%d\n", ++ i, btnPtr[i].fsStyle, x, cx); ++ x = infoPtr->nIndent; ++ btnPtr[j].fsState |= TBSTATE_WRAP; ++ bButtonWrap = TRUE; ++ break; ++ } ++ } + +- /* If all above failed, wrap the current button. */ +- if (!bFound) +- { +- TRACE("wrap point 5 btn %d style %02x, x=%d, cx=%d\n", +- i, btnPtr[i].fsStyle, x, cx); +- btnPtr[i].fsState |= TBSTATE_WRAP; +- x = infoPtr->nIndent; +- if (btnPtr[i].fsStyle & BTNS_SEP ) +- bButtonWrap = FALSE; +- else +- bButtonWrap = TRUE; +- } +- } +- else { +- TRACE("wrap point 6 btn %d style %02x, x=%d, cx=%d\n", +- i, btnPtr[i].fsStyle, x, cx); +- x += cx; +- } ++ /* If all above failed, wrap the current button. */ ++ if (!bFound) ++ { ++ TRACE("wrap point 5 btn %d style %02x, x=%d, cx=%d\n", ++ i, btnPtr[i].fsStyle, x, cx); ++ btnPtr[i].fsState |= TBSTATE_WRAP; ++ x = infoPtr->nIndent; ++ if (btnPtr[i].fsStyle & BTNS_SEP) ++ bButtonWrap = FALSE; ++ else ++ bButtonWrap = TRUE; ++ } ++ } ++ else ++ { ++ TRACE("wrap point 6 btn %d style %02x, x=%d, cx=%d\n", ++ i, btnPtr[i].fsStyle, x, cx); ++ x += cx; ++ } + } + } + +@@ -1564,9 +1601,8 @@ static inline SIZE TOOLBAR_MeasureButton + /* ... add on the necessary padding */ + if (bValidImageList) + { +- if (bHasBitmap) +- sizeButton.cy += DEFPAD_CY; +- else ++ sizeButton.cy += infoPtr->szPadding.cy; ++ if (!bHasBitmap) + sizeButton.cy += LISTPAD_CY; + } + else +@@ -1583,7 +1619,7 @@ static inline SIZE TOOLBAR_MeasureButton + { + if (bHasBitmap) + { +- sizeButton.cy = infoPtr->nBitmapHeight + DEFPAD_CY; ++ sizeButton.cy = infoPtr->nBitmapHeight + infoPtr->szPadding.cy; + if (sizeString.cy > 0) + sizeButton.cy += 1 + sizeString.cy; + sizeButton.cx = infoPtr->szPadding.cx + +@@ -1640,17 +1676,17 @@ static void + TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) + { + TBUTTON_INFO *btnPtr; +- SIZE sizeButton; +- INT i, nRows, nSepRows; +- INT x, y, cx, cy; +- BOOL bWrap; +- BOOL validImageList = TOOLBAR_IsValidImageList(infoPtr, 0); +- BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle); ++ SIZE sizeButton; ++ INT i, nRows, nSepRows; ++ INT x, y, cx, cy; ++ BOOL bWrap; ++ BOOL validImageList = TOOLBAR_IsValidImageList(infoPtr, 0); ++ BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle); + + TOOLBAR_WrapToolbar(infoPtr); + +- x = infoPtr->nIndent; +- y = infoPtr->iTopMargin; ++ x = infoPtr->nIndent; ++ y = infoPtr->iTopMargin; + cx = infoPtr->nButtonWidth; + cy = infoPtr->nButtonHeight; + +@@ -1665,106 +1701,112 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info + + TRACE("cy=%d\n", cy); + +- for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++ ) ++ for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) + { +- bWrap = FALSE; +- if (btnPtr->fsState & TBSTATE_HIDDEN) +- { +- SetRectEmpty (&btnPtr->rect); +- continue; +- } ++ bWrap = FALSE; ++ if (btnPtr->fsState & TBSTATE_HIDDEN) ++ { ++ SetRectEmpty(&btnPtr->rect); ++ continue; ++ } + +- cy = infoPtr->nButtonHeight; ++ cy = infoPtr->nButtonHeight; + +- if (btnPtr->fsStyle & BTNS_SEP) { +- if (infoPtr->dwStyle & CCS_VERT) { ++ if (btnPtr->fsStyle & BTNS_SEP) ++ { ++ if (infoPtr->dwStyle & CCS_VERT) ++ { + cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; +- } +- else ++ } ++ else ++ { + cx = (btnPtr->cx > 0) ? btnPtr->cx : + (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; +- } +- else +- { ++ } ++ } ++ else ++ { + if (btnPtr->cx) +- cx = btnPtr->cx; +- else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || +- (btnPtr->fsStyle & BTNS_AUTOSIZE)) + { +- SIZE sz; +- HDC hdc; +- HFONT hOldFont; ++ cx = btnPtr->cx; ++ } ++ else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || ++ (btnPtr->fsStyle & BTNS_AUTOSIZE)) ++ { ++ SIZE sz; ++ HDC hdc; ++ HFONT hOldFont; + +- hdc = GetDC (infoPtr->hwndSelf); +- hOldFont = SelectObject (hdc, infoPtr->hFont); ++ hdc = GetDC(infoPtr->hwndSelf); ++ hOldFont = SelectObject(hdc, infoPtr->hFont); + +- TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz); ++ TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz); + +- SelectObject (hdc, hOldFont); +- ReleaseDC (infoPtr->hwndSelf, hdc); ++ SelectObject(hdc, hOldFont); ++ ReleaseDC(infoPtr->hwndSelf, hdc); + +- sizeButton = TOOLBAR_MeasureButton(infoPtr, sz, +- TOOLBAR_IsValidBitmapIndex(infoPtr, infoPtr->buttons[i].iBitmap), +- validImageList); +- cx = sizeButton.cx; ++ sizeButton = TOOLBAR_MeasureButton(infoPtr, sz, ++ TOOLBAR_IsValidBitmapIndex(infoPtr, infoPtr->buttons[i].iBitmap), ++ validImageList); ++ cx = sizeButton.cx; + } + else +- cx = infoPtr->nButtonWidth; ++ cx = infoPtr->nButtonWidth; + + /* if size has been set manually then don't add on extra space + * for the drop down arrow */ +- if (!btnPtr->cx && hasDropDownArrows && ++ if (!btnPtr->cx && hasDropDownArrows && + ((btnPtr->fsStyle & BTNS_DROPDOWN) || (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN))) +- cx += DDARROW_WIDTH; +- } +- if (btnPtr->fsState & TBSTATE_WRAP ) +- bWrap = TRUE; ++ cx += DDARROW_WIDTH; ++ } ++ if (btnPtr->fsState & TBSTATE_WRAP) ++ bWrap = TRUE; + +- SetRect (&btnPtr->rect, x, y, x + cx, y + cy); ++ SetRect(&btnPtr->rect, x, y, x + cx, y + cy); + +- if (infoPtr->rcBound.left > x) +- infoPtr->rcBound.left = x; +- if (infoPtr->rcBound.right < x + cx) +- infoPtr->rcBound.right = x + cx; +- if (infoPtr->rcBound.bottom < y + cy) +- infoPtr->rcBound.bottom = y + cy; ++ if (infoPtr->rcBound.left > x) ++ infoPtr->rcBound.left = x; ++ if (infoPtr->rcBound.right < x + cx) ++ infoPtr->rcBound.right = x + cx; ++ if (infoPtr->rcBound.bottom < y + cy) ++ infoPtr->rcBound.bottom = y + cy; + + TOOLBAR_TooltipSetRect(infoPtr, btnPtr); + +- /* btnPtr->nRow is zero based. The space between the rows is */ +- /* also considered as a row. */ +- btnPtr->nRow = nRows + nSepRows; ++ /* btnPtr->nRow is zero based. The space between the rows is */ ++ /* also considered as a row. */ ++ btnPtr->nRow = nRows + nSepRows; + +- TRACE("button %d style=%x, bWrap=%d, nRows=%d, nSepRows=%d, btnrow=%d, (%d,%d)-(%d,%d)\n", +- i, btnPtr->fsStyle, bWrap, nRows, nSepRows, btnPtr->nRow, +- x, y, x+cx, y+cy); ++ TRACE("button %d style=%x, bWrap=%d, nRows=%d, nSepRows=%d, btnrow=%d, (%d,%d)-(%d,%d)\n", ++ i, btnPtr->fsStyle, bWrap, nRows, nSepRows, btnPtr->nRow, ++ x, y, x + cx, y + cy); + +- if( bWrap ) +- { +- if ( !(btnPtr->fsStyle & BTNS_SEP) ) +- y += cy; +- else +- { +- if ( !(infoPtr->dwStyle & CCS_VERT)) +- y += cy + ( (btnPtr->cx > 0 ) ? +- btnPtr->cx : SEPARATOR_WIDTH) * 2 /3; +- else +- y += cy; ++ if (bWrap) ++ { ++ if (!(btnPtr->fsStyle & BTNS_SEP)) ++ y += cy; ++ else ++ { ++ if (!(infoPtr->dwStyle & CCS_VERT)) ++ y += cy + ((btnPtr->cx > 0) ? ++ btnPtr->cx : SEPARATOR_WIDTH) * 2 / 3; ++ else ++ y += cy; + +- /* nSepRows is used to calculate the extra height following */ +- /* the last row. */ +- nSepRows++; +- } +- x = infoPtr->nIndent; ++ /* nSepRows is used to calculate the extra height following */ ++ /* the last row. */ ++ nSepRows++; ++ } ++ x = infoPtr->nIndent; + +- /* Increment row number unless this is the last button */ +- /* and it has Wrap set. */ +- if (i != infoPtr->nNumButtons-1) +- nRows++; +- } +- else +- x += cx; ++ /* Increment row number unless this is the last button */ ++ /* and it has Wrap set. */ ++ if (i != infoPtr->nNumButtons - 1) ++ nRows++; ++ } ++ else ++ x += cx; + } + + /* infoPtr->nRows is the number of rows on the toolbar */ +@@ -1954,6 +1996,16 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h + SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); + } + ++ ++static LRESULT ++TOOLBAR_ThemeChanged(HWND hwnd) ++{ ++ HTHEME theme = GetWindowTheme(hwnd); ++ CloseThemeData(theme); ++ OpenThemeData(hwnd, themeClass); ++ return 0; ++} ++ + static void + TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button) + { +@@ -3543,6 +3595,36 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * + } + + ++static LRESULT ++TOOLBAR_GetMetrics (const TOOLBAR_INFO *infoPtr, TBMETRICS *pMetrics) ++{ ++ if (pMetrics == NULL) ++ return FALSE; ++ ++ /* TODO: check if cbSize is a valid value */ ++ ++ if (pMetrics->dwMask & TBMF_PAD) ++ { ++ pMetrics->cxPad = infoPtr->szPadding.cx; ++ pMetrics->cyPad = infoPtr->szPadding.cy; ++ } ++ ++ if (pMetrics->dwMask & TBMF_BARPAD) ++ { ++ pMetrics->cxBarPad = infoPtr->szBarPadding.cx; ++ pMetrics->cyBarPad = infoPtr->szBarPadding.cy; ++ } ++ ++ if (pMetrics->dwMask & TBMF_BUTTONSPACING) ++ { ++ pMetrics->cxButtonSpacing = infoPtr->szSpacing.cx; ++ pMetrics->cyButtonSpacing = infoPtr->szSpacing.cy; ++ } ++ ++ return TRUE; ++} ++ ++ + /* << TOOLBAR_GetObject >> */ + + +@@ -4724,6 +4806,43 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in + } + + ++static LRESULT ++TOOLBAR_SetMetrics (TOOLBAR_INFO *infoPtr, TBMETRICS *pMetrics) ++{ ++ BOOL changed = FALSE; ++ ++ if (!pMetrics) ++ return FALSE; ++ ++ /* TODO: check if cbSize is a valid value */ ++ ++ if (pMetrics->dwMask & TBMF_PAD) ++ { ++ infoPtr->szPadding.cx = pMetrics->cxPad; ++ infoPtr->szPadding.cy = pMetrics->cyPad; ++ changed = TRUE; ++ } ++ ++ if (pMetrics->dwMask & TBMF_PAD) ++ { ++ infoPtr->szBarPadding.cx = pMetrics->cxBarPad; ++ infoPtr->szBarPadding.cy = pMetrics->cyBarPad; ++ changed = TRUE; ++ } ++ ++ if (pMetrics->dwMask & TBMF_BUTTONSPACING) ++ { ++ infoPtr->szSpacing.cx = pMetrics->cxButtonSpacing; ++ infoPtr->szSpacing.cy = pMetrics->cyButtonSpacing; ++ changed = TRUE; ++ } ++ ++ if (changed) ++ TOOLBAR_CalcToolbar(infoPtr); ++ ++ return TRUE; ++} ++ + /* MSDN gives slightly wrong info on padding. + * 1. It is not only used on buttons with the BTNS_AUTOSIZE style + * 2. It is not used to create a blank area between the edge of the button +@@ -5937,6 +6056,8 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar + infoPtr->clrBtnShadow = CLR_DEFAULT; + infoPtr->szPadding.cx = DEFPAD_CX; + infoPtr->szPadding.cy = DEFPAD_CY; ++ infoPtr->szSpacing.cx = DEFSPACE_CX; ++ infoPtr->szSpacing.cy = DEFSPACE_CY; + infoPtr->iListGap = DEFLISTGAP; + infoPtr->iTopMargin = default_top_margin(infoPtr); + infoPtr->dwStyle = lpcs->style; +@@ -6370,16 +6491,6 @@ TOOLBAR_SysColorChange (void) + } + + +-/* update theme after a WM_THEMECHANGED message */ +-static LRESULT theme_changed (HWND hwnd) +-{ +- HTHEME theme = GetWindowTheme (hwnd); +- CloseThemeData (theme); +- OpenThemeData (hwnd, themeClass); +- return 0; +-} +- +- + static LRESULT WINAPI + ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) + { +@@ -6483,6 +6594,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + + case TB_GETMAXSIZE: + return TOOLBAR_GetMaxSize (infoPtr, (LPSIZE)lParam); ++ ++ case TB_GETMETRICS: ++ return TOOLBAR_GetMetrics (infoPtr, (TBMETRICS*)lParam); + + /* case TB_GETOBJECT: */ /* 4.71 */ + +@@ -6499,7 +6613,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + return TOOLBAR_GetState (infoPtr, wParam); + + case TB_GETSTRINGA: +- return TOOLBAR_GetStringA (infoPtr, wParam, (LPSTR)lParam); ++ return TOOLBAR_GetStringA (infoPtr, wParam, (LPSTR)lParam); + + case TB_GETSTRINGW: + return TOOLBAR_GetStringW (infoPtr, wParam, (LPWSTR)lParam); +@@ -6624,6 +6738,9 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + case TB_SETMAXTEXTROWS: + return TOOLBAR_SetMaxTextRows (infoPtr, wParam); + ++ case TB_SETMETRICS: ++ return TOOLBAR_SetMetrics (infoPtr, (TBMETRICS*)lParam); ++ + case TB_SETPADDING: + return TOOLBAR_SetPadding (infoPtr, lParam); + +@@ -6749,7 +6866,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + return TOOLBAR_SetFocus (infoPtr); + + case WM_SETFONT: +- return TOOLBAR_SetFont(infoPtr, (HFONT)wParam, (WORD)lParam); ++ return TOOLBAR_SetFont(infoPtr, (HFONT)wParam, (WORD)lParam); + + case WM_SETREDRAW: + return TOOLBAR_SetRedraw (infoPtr, wParam); +@@ -6763,8 +6880,8 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + case WM_SYSCOLORCHANGE: + return TOOLBAR_SysColorChange (); + +- case WM_THEMECHANGED: +- return theme_changed (hwnd); ++ case WM_THEMECHANGED: ++ return TOOLBAR_ThemeChanged(hwnd); + + /* case WM_WININICHANGE: */ + +diff -pudN E:\wine\dlls\comctl32/tooltips.c E:\reactos\dll\win32\comctl32/tooltips.c +--- E:\wine\dlls\comctl32/tooltips.c 2015-02-21 17:13:08.617542200 +0100 ++++ E:\reactos\dll\win32\comctl32/tooltips.c 2015-03-18 18:00:07.323512400 +0100 @@ -2007,7 +1994,32 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO static LRESULT TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) @@ -566,10 +1586,10 @@ return 0; } -diff -prudN e:\Wine\dlls\comctl32/treeview.c e:\reactos\dll\win32\comctl32/treeview.c ---- e:\Wine\dlls\comctl32/treeview.c 2014-04-04 14:12:39.709009500 +0100 -+++ e:\reactos\dll\win32\comctl32/treeview.c 2014-04-06 12:22:08.977839700 +0100 -@@ -2921,7 +2899,12 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, +diff -pudN E:\wine\dlls\comctl32/treeview.c E:\reactos\dll\win32\comctl32/treeview.c +--- E:\wine\dlls\comctl32/treeview.c 2015-02-21 17:13:08.621542200 +0100 ++++ E:\reactos\dll\win32\comctl32/treeview.c 2014-09-27 00:41:17.418102200 +0100 +@@ -2890,7 +2868,12 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, } } Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -666,8 +666,8 @@ /* get values from key 'MRUList' */ if (newkey) { datasize = (mp->extview.uMax + 1) * sizeof(WCHAR); - if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, - (LPBYTE)mp->realMRU, &datasize))) { + if (RegQueryValueExW( newkey, strMRUList, 0, &type, + (LPBYTE)mp->realMRU, &datasize)) { /* not present - set size to 1 (will become 0 later) */ datasize = 1; *mp->realMRU = 0; Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -1809,6 +1809,15 @@ } /*********************************************************************** + * LoadIconWithScaleDown [COMCTL32.@] + */ +HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, PCWSTR name, int cx, int cy, HICON *icon) +{ + FIXME("stub: %p %s %d %d %p\n", hinst, wine_dbgstr_w(name), cx, cy, icon); + return E_NOTIMPL; +} + +/*********************************************************************** * RegisterClassNameW [COMCTL32.@] * * Register window class again while using as SxS module. Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -378,10 +378,7 @@ if (ret) return phdi->rect.right; } else - { - HEADER_FillItemFrame(infoPtr, hdc, &r, phdi, bHotTrack); HEADER_DrawItemFrame(infoPtr, hdc, &r, phdi); - } if (phdi->bDown) { r.left += 2; @@ -399,7 +396,7 @@ BITMAP bmp; HEADER_PrepareCallbackItems(infoPtr, iItem, HDI_TEXT|HDI_IMAGE); - cw = tw = iw = bw = 0; + cw = iw = bw = 0; rw = r.right - r.left; rh = r.bottom - r.top; 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] Thu Mar 19 12:07:32 2015 @@ -586,6 +586,7 @@ INT dxHotspot, INT dyHotspot) { INT cx, cy; + POINT src, dst; TRACE("(himlTrack=%p iTrack=%d dx=%d dy=%d)\n", himlTrack, iTrack, dxHotspot, dyHotspot); @@ -593,8 +594,11 @@ if (!is_valid(himlTrack)) return FALSE; + if (iTrack >= himlTrack->cCurImage) + return FALSE; + if (InternalDrag.himl) - ImageList_EndDrag (); + return FALSE; cx = himlTrack->cx; cy = himlTrack->cy; @@ -609,10 +613,12 @@ InternalDrag.dyHotspot = dyHotspot; /* copy image */ - BitBlt (InternalDrag.himl->hdcImage, 0, 0, cx, cy, himlTrack->hdcImage, iTrack * cx, 0, SRCCOPY); - - /* copy mask */ - BitBlt (InternalDrag.himl->hdcMask, 0, 0, cx, cy, himlTrack->hdcMask, iTrack * cx, 0, SRCCOPY); + imagelist_point_from_index(InternalDrag.himl, 0, &dst); + imagelist_point_from_index(himlTrack, iTrack, &src); + BitBlt(InternalDrag.himl->hdcImage, dst.x, dst.y, cx, cy, himlTrack->hdcImage, src.x, src.y, + SRCCOPY); + BitBlt(InternalDrag.himl->hdcMask, dst.x, dst.y, cx, cy, himlTrack->hdcMask, src.x, src.y, + SRCCOPY); InternalDrag.himl->cCurImage = 1; Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… ============================================================================== --- trunk/reactos/dll/win32/comctl32/ipaddress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/ipaddress.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -136,22 +136,43 @@ static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; COLORREF bgCol, fgCol; - int i; + HTHEME theme; + int i, state = ETS_NORMAL; TRACE("\n"); GetClientRect (infoPtr->Self, &rect); - if (infoPtr->Enabled) { - bgCol = comctl32_color.clrWindow; - fgCol = comctl32_color.clrWindowText; + theme = OpenThemeData(infoPtr->Self, WC_EDITW); + + if (theme) { + DWORD dwStyle = GetWindowLongW (infoPtr->Self, GWL_STYLE); + + if (!infoPtr->Enabled) + state = ETS_DISABLED; + else if (dwStyle & ES_READONLY) + state = ETS_READONLY; + else if (GetFocus() == infoPtr->Self) + state = ETS_FOCUSED; + + GetThemeColor(theme, EP_EDITTEXT, state, TMT_FILLCOLOR, &bgCol); + GetThemeColor(theme, EP_EDITTEXT, state, TMT_TEXTCOLOR, &fgCol); + + if (IsThemeBackgroundPartiallyTransparent (theme, EP_EDITTEXT, state)) + DrawThemeParentBackground(infoPtr->Self, hdc, &rect); + DrawThemeBackground (theme, hdc, EP_EDITTEXT, state, &rect, 0); } else { - bgCol = comctl32_color.clr3dFace; - fgCol = comctl32_color.clrGrayText; - } - - FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); - DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + if (infoPtr->Enabled) { + bgCol = comctl32_color.clrWindow; + fgCol = comctl32_color.clrWindowText; + } else { + bgCol = comctl32_color.clr3dFace; + fgCol = comctl32_color.clrGrayText; + } + + FillRect (hdc, &rect, (HBRUSH)(DWORD_PTR)(bgCol+1)); + DrawEdge (hdc, &rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST); + } SetBkColor (hdc, bgCol); SetTextColor(hdc, fgCol); @@ -159,12 +180,19 @@ for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); - rect.left = rcPart.right; - GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); + rect.left = rcPart.right; + GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); - rect.right = rcPart.left; - DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); - } + rect.right = rcPart.left; + + if (theme) + DrawThemeText(theme, hdc, EP_EDITTEXT, state, dotW, 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); + else + DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); + } + + if (theme) + CloseThemeData(theme); return 0; } Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -3998,10 +3998,7 @@ rect.top = rect.bottom = infoPtr->ptClickPos.y; InflateRect(&rect, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); - } - - if (infoPtr->bLButtonDown) - { + if (infoPtr->bMarqueeSelect) { POINT coords_orig; Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… ============================================================================== --- trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/progress.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -269,23 +269,33 @@ /* draw themed horizontal background from 'start' to 'end' */ static void draw_theme_bkg_H (const ProgressDrawInfo* di, int start, int end) { - RECT r; + RECT bgrect, r; + r.left = di->rect.left + start; r.top = di->rect.top; r.right = di->rect.left + end; r.bottom = di->rect.bottom; - DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &di->bgRect, &r); + + bgrect = di->bgRect; + OffsetRect(&bgrect, -bgrect.left, -bgrect.top); + + DrawThemeBackground (di->theme, di->hdc, PP_BAR, 0, &bgrect, &r); } /* draw themed vertical background from 'start' to 'end' */ static void draw_theme_bkg_V (const ProgressDrawInfo* di, int start, int end) { - RECT r; + RECT bgrect, r; + r.left = di->rect.left; r.top = di->rect.bottom - end; r.right = di->rect.right; r.bottom = di->rect.bottom - start; - DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &di->bgRect, &r); + + bgrect = di->bgRect; + OffsetRect(&bgrect, -bgrect.left, -bgrect.top); + + DrawThemeBackground (di->theme, di->hdc, PP_BARVERT, 0, &bgrect, &r); } /* drawing functions for themed style */ 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] Thu Mar 19 12:07:32 2015 @@ -2414,6 +2414,8 @@ HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); + #ifdef __REACTOS__ HWND hwndCancel = GetDlgItem(hwndDlg, IDCANCEL); INT iDefItem = 0; @@ -2422,13 +2424,13 @@ TRACE("%d\n", dwFlags); - EnableWindow(hwndBack, FALSE); - EnableWindow(hwndNext, FALSE); - EnableWindow(hwndFinish, FALSE); + EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); + EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); + EnableWindow(hwndFinish, enable_finish); #ifndef __REACTOS__ /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); else if (dwFlags & PSWIZB_NEXT) SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); @@ -2438,13 +2440,6 @@ SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); #endif - - if (dwFlags & PSWIZB_BACK) - EnableWindow(hwndBack, TRUE); - - if (dwFlags & PSWIZB_NEXT) - EnableWindow(hwndNext, TRUE); - if (!psInfo->hasFinish) { if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH)) @@ -2454,9 +2449,6 @@ /* Show the Finish button */ ShowWindow(hwndFinish, SW_SHOW); - - if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } else { @@ -2466,8 +2458,6 @@ ShowWindow(hwndNext, SW_SHOW); } } - else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); #ifdef __REACTOS__ /* set the default pushbutton to an enabled button */ Modified: trunk/reactos/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/string.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -275,7 +275,7 @@ * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -307,13 +307,15 @@ INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; + LPCSTR end; if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; iLen = strlen(lpszSearch); - - while (*lpszStr) + end = lpszStr + strlen(lpszStr); + + while (lpszStr + iLen <= end) { if (!pStrCmpFn(lpszStr, lpszSearch, iLen)) return (LPSTR)lpszStr; @@ -366,6 +368,7 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { int iLen; + LPCWSTR end; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -373,8 +376,9 @@ return NULL; iLen = strlenW(lpszSearch); - - while (*lpszStr) + end = lpszStr + strlenW(lpszStr); + + while (lpszStr + iLen <= end) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) return (LPWSTR)lpszStr; @@ -464,7 +468,7 @@ * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -654,18 +658,20 @@ if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; - if (!lpszEnd) - lpszEnd = lpszStr + lstrlenA(lpszStr); - if (IsDBCSLeadByte(*lpszSearch)) - ch1 = *lpszSearch << 8 | lpszSearch[1]; + ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) - { - ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; + if (!lpszEnd) + lpszEnd = lpszStr + lstrlenA(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenA(lpszEnd)); + + while (lpszStr + iLen <= lpszEnd && *lpszStr) + { + ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | (UCHAR)lpszStr[1] : *lpszStr; if (!COMCTL32_ChrCmpIA(ch1, ch2)) { if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) @@ -691,12 +697,15 @@ if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; + iLen = strlenW(lpszSearch); + if (!lpszEnd) lpszEnd = lpszStr + strlenW(lpszStr); - - iLen = strlenW(lpszSearch); - - while (lpszStr <= lpszEnd && *lpszStr) + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenW(lpszEnd)); + + + while (lpszStr + iLen <= lpszEnd && *lpszStr) { if (!COMCTL32_ChrCmpIW(*lpszSearch, *lpszStr)) { @@ -839,16 +848,15 @@ BOOL WINAPI IntlStrEqWorkerA(BOOL bCase, LPCSTR lpszStr, LPCSTR lpszComp, int iLen) { - DWORD dwFlags = LOCALE_USE_CP_ACP; + DWORD dwFlags; int iRet; TRACE("(%d,%s,%s,%d)\n", bCase, debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringA(GetThreadLocale(), @@ -875,9 +883,8 @@ debugstr_w(lpszStr),debugstr_w(lpszComp), iLen); /* FIXME: This flag is undocumented and unknown by our CompareString. - * We need a define for it. */ - dwFlags = 0x10000000; + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringW(GetThreadLocale(), 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] Thu Mar 19 12:07:32 2015 @@ -174,6 +174,26 @@ } /*********************************************************************** + * 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. @@ -193,7 +213,7 @@ { if(*current == '<') { - if(!StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) + if(!SYSLINK_StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -221,14 +241,14 @@ CheckParameter: /* compare the current position with all known parameters */ - if(!StrCmpNIW(tmp, SL_HREF, 6)) + if(!SYSLINK_StrCmpNIW(tmp, SL_HREF, 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!StrCmpNIW(tmp, SL_ID, 4)) + else if(!SYSLINK_StrCmpNIW(tmp, SL_ID, 4)) { taglen += 4; ValidParam = TRUE; @@ -302,7 +322,7 @@ } } } - else if(!StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) + else if(!SYSLINK_StrCmpNIW(current, SL_LINKCLOSE, 4) && (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/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -20,6 +20,7 @@ */ #include "comctl32.h" +WINE_DEFAULT_DEBUG_CHANNEL(theme_button); #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ @@ -33,7 +34,7 @@ STATE_DEFAULTED } ButtonState; -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags); +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); static UINT get_drawtext_flags(DWORD style, DWORD ex_style) { @@ -86,7 +87,7 @@ return text; } -static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; @@ -108,10 +109,25 @@ HeapFree(GetProcessHeap(), 0, text); } + if (focused) + { + MARGINS margins; + RECT focusRect = bgRect; + + GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); + + focusRect.left += margins.cxLeftWidth; + focusRect.top += margins.cyTopHeight; + focusRect.right -= margins.cxRightWidth; + focusRect.bottom -= margins.cyBottomHeight; + + DrawFocusRect( hDC, &focusRect ); + } + if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int cb_states[3][5] = { @@ -129,8 +145,7 @@ static const int cb_size = 13; RECT bgRect, textRect; - HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + HFONT font, hPrevFont = NULL; LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) @@ -140,6 +155,23 @@ ? cb_states[ checkState ][ drawState ] : rb_states[ checkState ][ drawState ]; WCHAR *text = get_button_text(hwnd); + LOGFONTW lf; + BOOL created_font = FALSE; + + HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); + if (SUCCEEDED(hr)) { + font = CreateFontIndirectW(&lf); + if (!font) + TRACE("Failed to create font\n"); + else { + TRACE("font = %s\n", debugstr_w(lf.lfFaceName)); + hPrevFont = SelectObject(hDC, font); + created_font = TRUE; + } + } else { + font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); @@ -152,27 +184,58 @@ bgRect.right = bgRect.left + cb_size; textRect.left = bgRect.right + 6; - if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (text) { DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + + if (focused) + { + RECT focusRect; + + focusRect = textRect; + + DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); + + if (focusRect.right < textRect.right) focusRect.right++; + focusRect.bottom = textRect.bottom; + + DrawFocusRect( hDC, &focusRect ); + } + HeapFree(GetProcessHeap(), 0, text); } + if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; RECT bgRect, textRect, contentRect; - HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; int state = states[ drawState ]; WCHAR *text = get_button_text(hwnd); + LOGFONTW lf; + HFONT font, hPrevFont = NULL; + BOOL created_font = FALSE; + + HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); + if (SUCCEEDED(hr)) { + font = CreateFontIndirectW(&lf); + if (!font) + TRACE("Failed to create font\n"); + else { + hPrevFont = SelectObject(hDC, font); + created_font = TRUE; + } + } else { + font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + hPrevFont = SelectObject(hDC, font); + } GetClientRect(hwnd, &bgRect); textRect = bgRect; @@ -206,6 +269,7 @@ HeapFree(GetProcessHeap(), 0, text); } + if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } @@ -253,7 +317,7 @@ else drawState = STATE_DISABLED; hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags); + paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; } Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_e… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_edit.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -108,6 +108,8 @@ break; case WM_ENABLE: + case WM_KILLFOCUS: + case WM_SETFOCUS: theme = GetWindowTheme( hwnd ); if (theme) RedrawWindow (hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Thu Mar 19 12:07:32 2015 @@ -36,6 +36,8 @@ ULONG_PTR) DECLSPEC_HIDDEN; extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; +extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; static const WCHAR dialogClass[] = {'#','3','2','7','7','0',0}; static const WCHAR comboLboxClass[] = {'C','o','m','b','o','L','b','o','x',0}; @@ -51,7 +53,8 @@ {WC_COMBOBOXW, THEMING_ComboSubclassProc}, {comboLboxClass, THEMING_ListBoxSubclassProc}, {WC_EDITW, THEMING_EditSubclassProc}, - {WC_LISTBOXW, THEMING_ListBoxSubclassProc} + {WC_LISTBOXW, THEMING_ListBoxSubclassProc}, + {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; #define NUM_SUBCLASSES (sizeof(subclasses)/sizeof(subclasses[0])) @@ -87,6 +90,7 @@ MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) MAKE_SUBCLASS_PROC(5) +MAKE_SUBCLASS_PROC(6) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, @@ -94,7 +98,8 @@ subclass_proc2, subclass_proc3, subclass_proc4, - subclass_proc5 + subclass_proc5, + subclass_proc6 }; /*********************************************************************** 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] Thu Mar 19 12:07:32 2015 @@ -5186,8 +5186,6 @@ TOOLBAR_SetHotItemEx(infoPtr, nHotItem, lParam); - GetFocus(); - return (nOldHotItem < 0) ? -1 : (LRESULT)nOldHotItem; } 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] Thu Mar 19 12:07:32 2015 @@ -221,7 +221,7 @@ static inline DWORD TOOLTIPS_notify_customdraw (DWORD dwDrawStage, NMTTCUSTOMDRAW *lpnmttcd) { - LRESULT result = CDRF_DODEFAULT; + LRESULT result; lpnmttcd->nmcd.dwDrawStage = dwDrawStage; TRACE("Notifying stage %d, flags %x, id %x\n", lpnmttcd->nmcd.dwDrawStage, @@ -471,12 +471,13 @@ { TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool]; - if (IS_INTRESOURCE(toolPtr->lpszText) && toolPtr->hinst) { - /* load a resource */ - TRACE("load res string %p %x\n", - toolPtr->hinst, LOWORD(toolPtr->lpszText)); - LoadStringW (toolPtr->hinst, LOWORD(toolPtr->lpszText), - buffer, INFOTIPSIZE); + /* always NULL-terminate the buffer, just in case we fail to load the string */ + buffer[0] = '\0'; + if (IS_INTRESOURCE(toolPtr->lpszText)) { + HINSTANCE hinst = toolPtr->hinst ? toolPtr->hinst : GetModuleHandleW(NULL); + /* load a resource */ + TRACE("load res string %p %x\n", hinst, LOWORD(toolPtr->lpszText)); + LoadStringW (hinst, LOWORD(toolPtr->lpszText), buffer, INFOTIPSIZE); } else if (toolPtr->lpszText) { if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) { @@ -492,7 +493,6 @@ } else { /* no text available */ - buffer[0] = '\0'; } TRACE("%s\n", debugstr_w(buffer)); 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] Thu Mar 19 12:07:32 2015 @@ -61,7 +61,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-1.7.37 reactos/dll/win32/clusapi # Synced to Wine-1.7.27 reactos/dll/win32/comcat # Synced to Wine-1.7.27 -reactos/dll/win32/comctl32 # Synced to Wine-1.7.27 +reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.37 reactos/dll/win32/comdlg32 # Synced to Wine-1.7.27 reactos/dll/win32/compstui # Synced to Wine-1.7.27 reactos/dll/win32/credui # Synced to Wine-1.7.27

9 years, 6 months

[tkreuzer] 66799: [NTOSKRNL] Fix shutdown.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 19 11:58:00 2015 New Revision: 66799 URL: http://svn.reactos.org/svn/reactos?rev=66799&view=rev Log: [NTOSKRNL] Fix shutdown. Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Thu Mar 19 11:58:00 2015 @@ -524,7 +524,7 @@ _Inout_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

9 years, 6 months

[akhaldi] 66798: [PSDK] Add missing _LI_METRIC enum.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 11:51:24 2015 New Revision: 66798 URL: http://svn.reactos.org/svn/reactos?rev=66798&view=rev Log: [PSDK] Add missing _LI_METRIC enum. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Thu Mar 19 11:51:24 2015 @@ -5095,6 +5095,14 @@ #endif /* NOTASKDIALOG */ +#if (NTDDI_VERSION >= NTDDI_VISTA) +enum _LI_METRIC +{ + LIM_SMALL, + LIM_LARGE, +}; +#endif + #ifdef __cplusplus } #endif

9 years, 6 months

[tkreuzer] 66797: Merge the following revisions from kernel-fun branch: r62291 [NTOSKRNL] Start implementing the built-in WMI driver r62294 [NTOSKRNL] Add basic code for the WMI GUID object r62301 ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 19 10:47:36 2015 New Revision: 66797 URL: http://svn.reactos.org/svn/reactos?rev=66797&view=rev Log: Merge the following revisions from kernel-fun branch: r62291 [NTOSKRNL] Start implementing the built-in WMI driver r62294 [NTOSKRNL] Add basic code for the WMI GUID object r62301 [NTOSKRNK] Halfplement WmipSecurityMethod, implement WmipGUIDFromString as a wrapper around RtlGUIDFromString due to different format requirements, fix usage of RtlPrefixUnicodeString. r62302 [NTOSKRNL] Implement WmipFastIoDeviceControl, start implementing WmipIoControl r62321 [NTOSKRNL] Stubplement IOCTL_WMI_UNREGISTER_GUIDS and IOCTL_WMI_RECEIVE_NOTIFICATIONS, just enough that the callers don't error out. r62322 [NTOSKRNL] Zero out the guid object, remove debug breakpoints in WmipDeleteMethod and WmipCloseMethod (for now there's nothing to do), factor out the code to capture the guid object attributes into WmipCaptureGuidObjectAttributes, ignore ioctl 0x228168 for now and stubplement IOCTL_WMI_OPEN_GUID_FOR_EVENTS Added: trunk/reactos/include/reactos/wmiioctl.h - copied, changed from r62302, branches/kernel-fun/reactos/include/reactos/wmiioctl.h trunk/reactos/ntoskrnl/wmi/guidobj.c - copied, changed from r62294, branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c trunk/reactos/ntoskrnl/wmi/wmidrv.c - copied, changed from r62291, branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c trunk/reactos/ntoskrnl/wmi/wmip.h - copied, changed from r62291, branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h Modified: trunk/reactos/ (props changed) trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/ntos.cmake trunk/reactos/ntoskrnl/wmi/wmi.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 10:47:36 2015 @@ -6,7 +6,7 @@ /branches/condrv_restructure:63104-65657 /branches/header-work:45691-47721 /branches/kd++:58883-58973 -/branches/kernel-fun/reactos:62304,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 /branches/ntvdm:59241-63176 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 /branches/reactx/reactos:49994-49995 Copied: trunk/reactos/include/reactos/wmiioctl.h (from r62302, branches/kernel-fun/reactos/include/reactos/wmiioctl.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wmiioctl.h… ============================================================================== --- branches/kernel-fun/reactos/include/reactos/wmiioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wmiioctl.h [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -25,13 +25,13 @@ #define IOCTL_WMI_4e CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4e, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224138 #define IOCTL_WMI_4f CTL_CODE(FILE_DEVICE_UNKNOWN, 0x4f, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22413C #define IOCTL_WMI_OPEN_GUID_FOR_EVENTS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x50, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224140 -#define IOCTL_WMI_51 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x51, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228144 +#define IOCTL_WMI_RECEIVE_NOTIFICATIONS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x51, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228144 #define IOCTL_WMI_52 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x52, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224148 #define IOCTL_WMI_REGISTER_GUIDS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x53, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22414C, called from ntdll!EtwpRegisterGuids #define IOCTL_WMI_54 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x54, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224150 #define IOCTL_WMI_55 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x55, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224154 #define IOCTL_WMI_56 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x56, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224158 -#define IOCTL_WMI_57 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x57, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22415C +#define IOCTL_WMI_UNREGISTER_GUIDS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x57, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x22415C, called from ntdll!WmiUnregisterGuids #define IOCTL_WMI_58 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x58, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224160 #define IOCTL_WMI_59 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x59, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224164 #define IOCTL_WMI_5a CTL_CODE(FILE_DEVICE_UNKNOWN, 0x5a, METHOD_BUFFERED, FILE_WRITE_ACCESS) // 0x228168 Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -24,6 +24,11 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2 ); + +BOOLEAN +NTAPI +WmiInitialize( + VOID); /* DATA ********************************************************************/ @@ -526,6 +531,9 @@ /* Initialize PnP manager */ IopInitializePlugPlayServices(); + /* Initialize WMI */ + WmiInitialize(); + /* Initialize HAL Root Bus Driver */ HalInitPnpDriver(); Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -269,7 +269,9 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c) + ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/guidobj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmi.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/wmidrv.c) list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/zw.S) Copied: trunk/reactos/ntoskrnl/wmi/guidobj.c (from r62294, branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/guidobj.c?p2=… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/guidobj.c [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -10,7 +10,6 @@ #include <ntoskrnl.h> #include <wmistr.h> -#include <wmiguid.h> #include "wmip.h" #define NDEBUG @@ -37,8 +36,43 @@ _In_ POOL_TYPE PoolType, _In_ PGENERIC_MAPPING GenericMapping) { - UNIMPLEMENTED_DBGBREAK(); - return STATUS_NOT_IMPLEMENTED; + PAGED_CODE(); + + ASSERT((PoolType == PagedPool) || (PoolType == NonPagedPool)); + ASSERT((OperationType == QuerySecurityDescriptor) || + (OperationType == SetSecurityDescriptor) || + (OperationType == AssignSecurityDescriptor) || + (OperationType == DeleteSecurityDescriptor)); + + if (OperationType == QuerySecurityDescriptor) + { + return ObQuerySecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + CapturedLength, + ObjectSecurityDescriptor); + } + else if (OperationType == SetSecurityDescriptor) + { + return ObSetSecurityDescriptorInfo(Object, + SecurityInformation, + SecurityDescriptor, + ObjectSecurityDescriptor, + PoolType, + GenericMapping); + } + else if (OperationType == AssignSecurityDescriptor) + { + ObAssignObjectSecurityDescriptor(Object, SecurityDescriptor, PoolType); + return STATUS_SUCCESS; + } + else if (OperationType == DeleteSecurityDescriptor) + { + return ObDeassignSecurity(ObjectSecurityDescriptor); + } + + ASSERT(FALSE); + return STATUS_INVALID_PARAMETER; } VOID @@ -46,7 +80,14 @@ WmipDeleteMethod( _In_ PVOID Object) { - UNIMPLEMENTED_DBGBREAK(); + PWMIP_GUID_OBJECT GuidObject = Object; + + /* Check if the object is attached to an IRP */ + if (GuidObject->Irp != NULL) + { + /* This is not supported yet */ + ASSERT(FALSE); + } } VOID @@ -58,7 +99,7 @@ _In_ ULONG ProcessHandleCount, _In_ ULONG SystemHandleCount) { - UNIMPLEMENTED_DBGBREAK(); + /* For now nothing */ } NTSTATUS @@ -99,6 +140,32 @@ static NTSTATUS +WmipGUIDFromString( + _In_ PUNICODE_STRING GuidString, + _Out_ PGUID Guid) +{ + WCHAR Buffer[GUID_STRING_LENGTH + 2]; + UNICODE_STRING String; + + /* Validate string length */ + if (GuidString->Length != GUID_STRING_LENGTH * sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Copy the string and wrap it in {} */ + RtlCopyMemory(&Buffer[1], GuidString->Buffer, GuidString->Length); + Buffer[0] = L'{'; + Buffer[GUID_STRING_LENGTH + 1] = L'}'; + + String.Buffer = Buffer; + String.Length = String.MaximumLength = sizeof(Buffer); + + return RtlGUIDFromString(&String, Guid); +} + +static +NTSTATUS WmipCreateGuidObject( _In_ PUNICODE_STRING GuidString, _Out_ PWMIP_GUID_OBJECT *OutGuidObject) @@ -109,7 +176,7 @@ NTSTATUS Status; /* Convert the string into a GUID structure */ - Status = RtlGUIDFromString(GuidString, &Guid); + Status = WmipGUIDFromString(GuidString, &Guid); if (!NT_SUCCESS(Status)) { DPRINT1("WMI: Invalid uuid format for guid '%wZ'\n", GuidString); @@ -139,6 +206,7 @@ return Status; } + RtlZeroMemory(GuidObject, sizeof(*GuidObject)); GuidObject->Guid = Guid; *OutGuidObject = GuidObject; @@ -163,7 +231,7 @@ PAGED_CODE(); /* Check if we have the expected prefix */ - if (!RtlPrefixUnicodeString(ObjectAttributes->ObjectName, &Prefix, FALSE)) + if (!RtlPrefixUnicodeString(&Prefix, ObjectAttributes->ObjectName, FALSE)) { DPRINT1("WMI: Invalid prefix for guid object '%wZ'\n", ObjectAttributes->ObjectName); Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=667… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -9,10 +9,39 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#include "wmip.h" + #define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +WmiInitialize( + VOID) +{ + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\WMIxWDM"); + NTSTATUS Status; + + /* Initialize the GUID object type */ + Status = WmipInitializeGuidObjectType(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipInitializeGuidObjectType() failed: 0x%lx\n", Status); + return FALSE; + } + + /* Create the WMI driver */ + Status = IoCreateDriver(&DriverName, WmipDriverEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create WMI driver: 0x%lx\n", Status); + return FALSE; + } + + return TRUE; +} /* * @unimplemented Copied: trunk/reactos/ntoskrnl/wmi/wmidrv.c (from r62291, branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?p2=t… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -10,10 +10,58 @@ #include <ntoskrnl.h> #include <wmistr.h> -#include <wmiguid.h> +#include <wmiioctl.h> +#include "wmip.h" #define NDEBUG #include <debug.h> + +// FIXME: these should go to a shared header +typedef struct _WMIP_REGISTER_GUIDS +{ + POBJECT_ATTRIBUTES ObjectAttributes; + ULONG Unknown04; + ULONG Unknown08; + ULONG Unknown0C; + ULONG Unknown10; + ULONG Unknown14; + + WMIREGINFOW RegInfo; +} WMIP_REGISTER_GUIDS, *PWMIP_REGISTER_GUIDS; + +typedef struct _WMIP_RESULT +{ + HANDLE Handle; + ULONG Unknown04; + TRACEHANDLE TraceHandle; + BOOLEAN Unknown10; +} WMIP_RESULT, *PWMIP_RESULT; + +typedef struct _WMI_UNREGISTER_GUID +{ + GUID Guid; + ULONG Unknown10; + ULONG Unknown14; + ULONG Unknown18; + ULONG Unknown1C; +} WMI_UNREGISTER_GUID, *PWMI_UNREGISTER_GUID; + +typedef struct _WMI_GUID_OBJECT_ENTRY +{ + HANDLE Handle; + ULONG Unknown04; +} WMI_GUID_OBJECT_ENTRY, *PWMI_GUID_OBJECT_ENTRY; + +typedef struct _WMI_NOTIFICATION +{ + ULONG NumberOfGuidObjects; + ULONG Unknown04; + ULONG Unknown08; + ULONG Unknown0C; + ULONG Unknown10; + ULONG Unknown14; + WMI_GUID_OBJECT_ENTRY GuidObjects[0]; +} WMI_NOTIFICATION, *PWMI_NOTIFICATION; PDEVICE_OBJECT WmipServiceDeviceObject; PDEVICE_OBJECT WmipAdminDeviceObject; @@ -42,14 +90,422 @@ return STATUS_SUCCESS; } +static +NTSTATUS +WmiTraceEvent( + PVOID InputBuffer, + KPROCESSOR_MODE PreviousMode) +{ + UNIMPLEMENTED_DBGBREAK(); + return STATUS_SUCCESS; +} + +static +NTSTATUS +WmiTraceUserMessage( + PVOID InputBuffer, + ULONG InputBufferLength) +{ + UNIMPLEMENTED_DBGBREAK(); + return STATUS_SUCCESS; +} + +static +NTSTATUS +WmipCaptureGuidObjectAttributes( + _In_ POBJECT_ATTRIBUTES GuidObjectAttributes, + _Out_ POBJECT_ATTRIBUTES CapuredObjectAttributes, + _Out_ PUNICODE_STRING CapturedObjectName, + _Out_ PWSTR ObjectNameBuffer, + _In_ KPROCESSOR_MODE AccessMode) +{ + NT_ASSERT(AccessMode != KernelMode); + + _SEH2_TRY + { + /* Probe and copy the object attributes structure */ + ProbeForRead(GuidObjectAttributes, + sizeof(OBJECT_ATTRIBUTES), + sizeof(PVOID)); + *CapuredObjectAttributes = *GuidObjectAttributes; + + /* Probe and copy the object name UNICODE_STRING */ + ProbeForRead(CapuredObjectAttributes->ObjectName, + sizeof(UNICODE_STRING), + sizeof(PVOID)); + *CapturedObjectName = *CapuredObjectAttributes->ObjectName; + + /* Check if the object name has the expected length */ + if (CapturedObjectName->Length != 45 * sizeof(WCHAR)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Probe and copy the object name buffer */ + ProbeForRead(CapturedObjectName->Buffer, + CapturedObjectName->Length, + sizeof(WCHAR)); + RtlCopyMemory(ObjectNameBuffer, + CapturedObjectName->Buffer, + CapturedObjectName->Length); + + /* Fix pointers */ + CapturedObjectName->Buffer = ObjectNameBuffer; + GuidObjectAttributes->ObjectName = CapturedObjectName; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + +static +NTSTATUS +WmipRegisterGuids( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PVOID Buffer, + _In_ ULONG InputLength, + _Inout_ PULONG OutputLength) +{ + PWMIP_REGISTER_GUIDS RegisterGuids = (PWMIP_REGISTER_GUIDS)Buffer; + PWMIP_RESULT Result = (PWMIP_RESULT)Buffer; + OBJECT_ATTRIBUTES LocalObjectAttributes; + UNICODE_STRING LocalObjectName; + WCHAR LocalObjectNameBuffer[45 + 1]; + KPROCESSOR_MODE PreviousMode; + HANDLE GuidObjectHandle; + PVOID GuidObject; + NTSTATUS Status; + + /* Make sure the input buffer is large enough */ + if ((InputLength < sizeof(WMIP_REGISTER_GUIDS)) || + (RegisterGuids->RegInfo.BufferSize > + (InputLength - FIELD_OFFSET(WMIP_REGISTER_GUIDS, RegInfo)))) + { + return STATUS_UNSUCCESSFUL; + } + + /* Make sure we have a resonable GUID count */ + if ((RegisterGuids->RegInfo.GuidCount == 0) || + (RegisterGuids->RegInfo.GuidCount > 0x10000)) + { + return STATUS_UNSUCCESSFUL; + } + + /* Capture object attributes */ + PreviousMode = ExGetPreviousMode(); + Status = WmipCaptureGuidObjectAttributes(RegisterGuids->ObjectAttributes, + &LocalObjectAttributes, + &LocalObjectName, + LocalObjectNameBuffer, + PreviousMode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipCaptureGuidObjectAttributes failed: 0x%lx\n", Status); + return Status; + } + + /* Open a new GUID object */ + Status = WmipOpenGuidObject(&LocalObjectAttributes, + SPECIFIC_RIGHTS_ALL, + PreviousMode, + &GuidObjectHandle, + &GuidObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status); + return Status; + } + + /* Dereference the GUID object */ + ObDereferenceObject(GuidObject); + + /* Return the handle (user mode will close it) */ + Result->Handle = GuidObjectHandle; + Result->TraceHandle = 0; + *OutputLength = 24; + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +WmipUnregisterGuids( + _In_ PVOID Buffer, + _In_ ULONG InputLength, + _Inout_ PULONG OutputLength) +{ + /* For now we have nothing to do */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +WmipClearIrpObjectList( + _In_ PIRP Irp) +{ + PWMIP_IRP_CONTEXT IrpContext; + PLIST_ENTRY ListEntry; + PWMIP_GUID_OBJECT GuidObject; + + /* Get the IRP context */ + IrpContext = (PWMIP_IRP_CONTEXT)Irp->Tail.Overlay.DriverContext; + + /* Loop all GUID objects attached to this IRP */ + for (ListEntry = IrpContext->GuidObjectListHead.Flink; + ListEntry != &IrpContext->GuidObjectListHead; + ListEntry = ListEntry->Flink) + { + /* Get the GUID object */ + GuidObject = CONTAINING_RECORD(ListEntry, WMIP_GUID_OBJECT, IrpLink); + + /* Make sure the IRP matches and clear it */ + ASSERT(GuidObject->Irp == Irp); + GuidObject->Irp = NULL; + + /* Remove the entry */ + RemoveEntryList(ListEntry); + } +} + +VOID +NTAPI +WmipNotificationIrpCancel( + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + /* Clear the list */ + WmipClearIrpObjectList(Irp); + + /* Release the cancel spin lock */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* Set the status to cancelled and complete the IRP */ + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +static +VOID +WmipInitializeIrpContext( + PWMIP_IRP_CONTEXT IrpContext) +{ + /* Initialize the list head for GUID objects */ + InitializeListHead(&IrpContext->GuidObjectListHead); +} + +static +NTSTATUS +WmipReceiveNotifications( + _Inout_ PIRP Irp, + _In_ PVOID Buffer, + _In_ ULONG InputLength, + _Inout_ PULONG OutputLength) +{ + PWMI_NOTIFICATION Notification; + PWMIP_IRP_CONTEXT IrpContext; + NTSTATUS Status; + + //__debugbreak(); + if ((InputLength < sizeof(WMI_NOTIFICATION)) || (*OutputLength < 0x38)) + { + return STATUS_INVALID_DEVICE_REQUEST; + } + + /// FIXME: For now we don't do any actual work, but simply pretend we are + /// waiting for notifications. We won't ever deliver any though. + Notification = (PWMI_NOTIFICATION)Buffer; + DBG_UNREFERENCED_LOCAL_VARIABLE(Notification); + + // loop all objects + // reference the object + // on failure, fail the whole request + + // loop all objects + // update the irp (synchronization!) + // if we had one before complete the old irp with an error + + /* Get the IRP context and initialize it */ + IrpContext = (PWMIP_IRP_CONTEXT)Irp->Tail.Overlay.DriverContext; + WmipInitializeIrpContext(IrpContext); + + // loop all objects + // insert the objects into the IRP list + + /* Set our cancel routine for cleanup */ + IoSetCancelRoutine(Irp, WmipNotificationIrpCancel); + + /* Check if the IRP is already being cancelled */ + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + Status = STATUS_CANCELLED; + } + else + { + /* Mark the IRP as pending */ + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + } + + return Status; +} + +typedef struct _WMI_OPEN_GUID_FOR_EVENTS +{ + POBJECT_ATTRIBUTES ObjectAttributes; + ACCESS_MASK DesiredAccess; + ULONG Unknown08; + ULONG Unknown0C; +} WMI_OPEN_GUID_FOR_EVENTS, *PWMI_OPEN_GUID_FOR_EVENTS; + +typedef struct _WMIP_RESULT2 +{ + ULONG Unknown00; + ULONG Unknown04; + HANDLE Handle; + ULONG Unknown0C; +} WMIP_RESULT2, *PWMIP_RESULT2; + +static +NTSTATUS +WmipOpenGuidForEvents( + PVOID Buffer, + ULONG InputLength, + PULONG OutputLength) +{ + PWMI_OPEN_GUID_FOR_EVENTS OpenGuidForEvents = Buffer; + PWMIP_RESULT2 Result = (PWMIP_RESULT2)Buffer; + OBJECT_ATTRIBUTES LocalObjectAttributes; + UNICODE_STRING LocalObjectName; + WCHAR LocalObjectNameBuffer[45 + 1]; + KPROCESSOR_MODE PreviousMode; + HANDLE GuidObjectHandle; + PVOID GuidObject; + NTSTATUS Status; + + if ((InputLength != sizeof(WMI_OPEN_GUID_FOR_EVENTS)) || + (*OutputLength != sizeof(WMIP_RESULT2))) + { + return STATUS_UNSUCCESSFUL; + } + + /* Capture object attributes */ + PreviousMode = ExGetPreviousMode(); + Status = WmipCaptureGuidObjectAttributes(OpenGuidForEvents->ObjectAttributes, + &LocalObjectAttributes, + &LocalObjectName, + LocalObjectNameBuffer, + PreviousMode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ProbeAndCaptureGuidObjectAttributes failed: 0x%lx\n", Status); + return Status; + } + + /* Open a new GUID object */ + Status = WmipOpenGuidObject(&LocalObjectAttributes, + OpenGuidForEvents->DesiredAccess, + PreviousMode, + &GuidObjectHandle, + &GuidObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WmipOpenGuidObject failed: 0x%lx\n", Status); + return Status; + } + + Result->Handle = GuidObjectHandle; + + ObDereferenceObject(GuidObject); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI WmipIoControl( - _Inout_ PDEVICE_OBJECT DeviceObject, - _Inout_ PIRP Irp) -{ - UNIMPLEMENTED_DBGBREAK(); - return STATUS_NOT_IMPLEMENTED; + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IoStackLocation; + ULONG IoControlCode; + PVOID Buffer; + ULONG InputLength, OutputLength; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the current stack location */ + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + /* Get the io control parameters */ + IoControlCode = IoStackLocation->Parameters.DeviceIoControl.IoControlCode; + Buffer = Irp->AssociatedIrp.SystemBuffer; + InputLength = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; + OutputLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + + switch (IoControlCode) + { + + case IOCTL_WMI_REGISTER_GUIDS: + { + Status = WmipRegisterGuids(DeviceObject, + Buffer, + InputLength, + &OutputLength); + break; + } + + case IOCTL_WMI_UNREGISTER_GUIDS: + { + Status = WmipUnregisterGuids(Buffer, + InputLength, + &OutputLength); + break; + } + + case IOCTL_WMI_RECEIVE_NOTIFICATIONS: + { + Status = WmipReceiveNotifications(Irp, + Buffer, + InputLength, + &OutputLength); + break; + } + + case 0x228168: + { + DPRINT1("IOCTL 0x228168 is unimplemented, ignoring\n"); + Status = STATUS_SUCCESS; + break; + } + + case IOCTL_WMI_OPEN_GUID_FOR_EVENTS: + { + Status = WmipOpenGuidForEvents(Buffer, InputLength, &OutputLength); + break; + } + + default: + DPRINT1("Unsupported yet IOCTL: 0x%lx\n", IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + __debugbreak(); + break; + } + + if (Status == STATUS_PENDING) + return Status; + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = NT_SUCCESS(Status) ? OutputLength : 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS @@ -87,7 +543,32 @@ _Out_ PIO_STATUS_BLOCK IoStatus, _In_ PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED_DBGBREAK(); + PAGED_CODE(); + + if (IoControlCode == IOCTL_WMI_TRACE_EVENT) + { + if (InputBufferLength < 0x30) + { + DPRINT1("Buffer too small\n"); + return FALSE; + } + + IoStatus->Status = WmiTraceEvent(InputBuffer, ExGetPreviousMode()); + return TRUE; + } + else if (IoControlCode == IOCTL_WMI_TRACE_USER_MESSAGE) + { + if (InputBufferLength < 0x30) + { + DPRINT1("Buffer too small\n"); + return FALSE; + } + + IoStatus->Status = WmiTraceUserMessage(InputBuffer, InputBufferLength); + return TRUE; + } + + DPRINT1("Invalid io control code for fast dispatch: 0x%lx\n", IoControlCode); return FALSE; } Copied: trunk/reactos/ntoskrnl/wmi/wmip.h (from r62291, branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmip.h?p2=tru… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmip.h [iso-8859-1] Thu Mar 19 10:47:36 2015 @@ -1,5 +1,19 @@ #pragma once + +#define GUID_STRING_LENGTH 36 + +typedef struct _WMIP_IRP_CONTEXT +{ + LIST_ENTRY GuidObjectListHead; +} WMIP_IRP_CONTEXT, *PWMIP_IRP_CONTEXT; + +typedef struct _WMIP_GUID_OBJECT +{ + GUID Guid; + PIRP Irp; + LIST_ENTRY IrpLink; +} WMIP_GUID_OBJECT, *PWMIP_GUID_OBJECT; _Function_class_(DRIVER_INITIALIZE) @@ -10,3 +24,16 @@ _In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING RegistryPath); +NTSTATUS +NTAPI +WmipInitializeGuidObjectType( + VOID); + +NTSTATUS +NTAPI +WmipOpenGuidObject( + POBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK DesiredAccess, + KPROCESSOR_MODE AccessMode, + PHANDLE OutGuidObjectHandle, + PVOID *OutGuidObject);

9 years, 6 months

[akhaldi] 66796: [CLT2015] Grab r66795 (ieframe improvements).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 10:37:30 2015 New Revision: 66796 URL: http://svn.reactos.org/svn/reactos?rev=66796&view=rev Log: [CLT2015] Grab r66795 (ieframe improvements). Added: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resources/ - copied from r66795, trunk/reactos/dll/win32/ieframe/resources/ Removed: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ietoolbar.bmp Modified: branches/ReactOS-0.3.17-CLT2015/reactos/ (props changed) branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h Propchange: branches/ReactOS-0.3.17-CLT2015/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 10:37:30 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:66727-66770,66776-66779 +/trunk/reactos:66727-66770,66776-66779,66795 Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Mar 19 10:37:30 2015 @@ -92,6 +92,9 @@ { LTEXT "Specify the URL you wish to open in Internet Explorer",-1, 35,5,160,25 LTEXT "Open:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 145, 50, 50, 14 @@ -110,7 +113,11 @@ #include <wine/wine_common_ver.rc> /* @makedep: ietoolbar.bmp */ -IDB_IETOOLBAR BITMAP ietoolbar.bmp +IDB_IETOOLBAR BITMAP resources/ietoolbar.bmp + +#ifdef __REACTOS__ +IDC_PAGEICO ICON "resources/pages.ico" +#endif /* @makedep: ieframe.rgs */ 1 WINE_REGISTRY ieframe.rgs Removed: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ietoolbar.bmp URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== Binary file - no diff available. Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Thu Mar 19 10:37:30 2015 @@ -382,6 +382,13 @@ DestroyIcon(icon); } +#ifdef __REACTOS__ +static void ie_dialog_properties(HWND hwnd) +{ + ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), TEXT("shell32.dll, Control_RunDLL inetcpl.cpl"), NULL, SW_SHOWNORMAL); +} +#endif + static void add_tb_separator(HWND hwnd) { TBBUTTON btn; @@ -605,6 +612,12 @@ case ID_BROWSE_ABOUT: ie_dialog_about(hwnd); break; + +#ifdef __REACTOS__ + case ID_BROWSE_PROPERTIES: + ie_dialog_properties(hwnd); + break; +#endif case ID_BROWSE_QUIT: ShowWindow(hwnd, SW_HIDE); Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/… ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h [iso-8859-1] Thu Mar 19 10:37:30 2015 @@ -62,6 +62,9 @@ #define IDS_ADDRESS 1106 #define IDB_IETOOLBAR 1400 +#ifdef __REACTOS__ +#define IDC_PAGEICO 1401 +#endif /* update status text in BINDSTATUS_* callback */ #define IDS_STATUSFMT_FIRST 4096

9 years, 6 months

[akhaldi] 66795: [IEFRAME] Add some icons to dialogs. Load inetcpl when clicking on Properties. Brought to you by Jared with slight changes by me. CORE-9372

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Mar 19 10:28:41 2015 New Revision: 66795 URL: http://svn.reactos.org/svn/reactos?rev=66795&view=rev Log: [IEFRAME] Add some icons to dialogs. Load inetcpl when clicking on Properties. Brought to you by Jared with slight changes by me. CORE-9372 Added: trunk/reactos/dll/win32/ieframe/resources/ (with props) trunk/reactos/dll/win32/ieframe/resources/ietoolbar.bmp - copied unchanged from r66783, trunk/reactos/dll/win32/ieframe/ietoolbar.bmp trunk/reactos/dll/win32/ieframe/resources/pages.ico (with props) Removed: trunk/reactos/dll/win32/ieframe/ietoolbar.bmp Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc trunk/reactos/dll/win32/ieframe/iexplore.c trunk/reactos/dll/win32/ieframe/resource.h Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Mar 19 10:28:41 2015 @@ -92,6 +92,9 @@ { LTEXT "Specify the URL you wish to open in Internet Explorer",-1, 35,5,160,25 LTEXT "Open:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 145, 50, 50, 14 @@ -110,7 +113,11 @@ #include <wine/wine_common_ver.rc> /* @makedep: ietoolbar.bmp */ -IDB_IETOOLBAR BITMAP ietoolbar.bmp +IDB_IETOOLBAR BITMAP resources/ietoolbar.bmp + +#ifdef __REACTOS__ +IDC_PAGEICO ICON "resources/pages.ico" +#endif /* @makedep: ieframe.rgs */ 1 WINE_REGISTRY ieframe.rgs Removed: trunk/reactos/dll/win32/ieframe/ietoolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ietoolba… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/ieframe/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore… ============================================================================== --- trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Thu Mar 19 10:28:41 2015 @@ -382,6 +382,13 @@ DestroyIcon(icon); } +#ifdef __REACTOS__ +static void ie_dialog_properties(HWND hwnd) +{ + ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"), TEXT("shell32.dll, Control_RunDLL inetcpl.cpl"), NULL, SW_SHOWNORMAL); +} +#endif + static void add_tb_separator(HWND hwnd) { TBBUTTON btn; @@ -605,6 +612,12 @@ case ID_BROWSE_ABOUT: ie_dialog_about(hwnd); break; + +#ifdef __REACTOS__ + case ID_BROWSE_PROPERTIES: + ie_dialog_properties(hwnd); + break; +#endif case ID_BROWSE_QUIT: ShowWindow(hwnd, SW_HIDE); Modified: trunk/reactos/dll/win32/ieframe/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/resource… ============================================================================== --- trunk/reactos/dll/win32/ieframe/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/resource.h [iso-8859-1] Thu Mar 19 10:28:41 2015 @@ -62,6 +62,9 @@ #define IDS_ADDRESS 1106 #define IDB_IETOOLBAR 1400 +#ifdef __REACTOS__ +#define IDC_PAGEICO 1401 +#endif /* update status text in BINDSTATUS_* callback */ #define IDS_STATUSFMT_FIRST 4096 Propchange: trunk/reactos/dll/win32/ieframe/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 19 10:28:41 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/ieframe/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/ieframe/resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/ieframe/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/ieframe/resources/pages.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/resource… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/ieframe/resources/pages.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

9 years, 6 months

[hbelusca] 66794: [NTOS]: Heh Arch, use the Process parameter of the function, instead of PsGetCurrentProcess()!! (bug found by Thomas, because I quickly copied the code from ke/i386/v86vdm.c funct...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 19 00:06:54 2015 New Revision: 66794 URL: http://svn.reactos.org/svn/reactos?rev=66794&view=rev Log: [NTOS]: Heh Arch, use the Process parameter of the function, instead of PsGetCurrentProcess()!! (bug found by Thomas, because I quickly copied the code from ke/i386/v86vdm.c function Ke386CallBios lines 693 and below without adapting it to the present case ^^). Modified: trunk/reactos/ntoskrnl/ps/i386/psldt.c Modified: trunk/reactos/ntoskrnl/ps/i386/psldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/i386/psldt.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/i386/psldt.c [iso-8859-1] Thu Mar 19 00:06:54 2015 @@ -27,15 +27,15 @@ PspDeleteVdmObjects(PEPROCESS Process) { /* If there are no VDM objects, just exit */ - if (PsGetCurrentProcess()->VdmObjects == NULL) + if (Process->VdmObjects == NULL) return; /* FIXME: Need to do more than just freeing the main VdmObjects member! */ UNIMPLEMENTED; /* Free VDM objects */ - ExFreePoolWithTag(PsGetCurrentProcess()->VdmObjects, ' eK'); - PsGetCurrentProcess()->VdmObjects = NULL; + ExFreePoolWithTag(Process->VdmObjects, ' eK'); + Process->VdmObjects = NULL; } NTSTATUS

9 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2015