wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Nikolay Sivov : shell32: Use array for icon lists.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: ff5cfaab56e31e8ec8dda88f81bbdd70e187d407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5cfaab56e31e8ec8dda88f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 09:27:11 2018 +0300 shell32: Use array for icon lists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 114 +++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 8b864df..562f9b2 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -61,8 +61,7 @@ typedef struct static HDPA sic_hdpa; static INIT_ONCE sic_init_once = INIT_ONCE_STATIC_INIT; -static HIMAGELIST ShellSmallIconList; -static HIMAGELIST ShellBigIconList; +static HIMAGELIST shell_imagelists[SHIL_SMALL+1]; static CRITICAL_SECTION SHELL32_SicCS; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -158,8 +157,9 @@ static int SIC_LoadOverlayIcon(int icon_idx); * Creates a new icon as a copy of the passed-in icon, overlaid with a * shortcut image. */ -static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) -{ ICONINFO SourceIconInfo, ShortcutIconInfo, TargetIconInfo; +static HICON SIC_OverlayShortcutImage(HICON SourceIcon, int type) +{ + ICONINFO SourceIconInfo, ShortcutIconInfo, TargetIconInfo; HICON ShortcutIcon, TargetIcon; BITMAP SourceBitmapInfo, ShortcutBitmapInfo; HDC SourceDC = NULL, @@ -186,21 +186,16 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) resource id, but not all icons are present yet so we can't use icon indices */ - if (s_imgListIdx != -1) - { - if (large) - ShortcutIcon = ImageList_GetIcon(ShellBigIconList, s_imgListIdx, ILD_TRANSPARENT); - else - ShortcutIcon = ImageList_GetIcon(ShellSmallIconList, s_imgListIdx, ILD_TRANSPARENT); - } else - ShortcutIcon = NULL; - - if (NULL == ShortcutIcon - || ! GetIconInfo(ShortcutIcon, &ShortcutIconInfo) - || 0 == GetObjectW(ShortcutIconInfo.hbmColor, sizeof(BITMAP), &ShortcutBitmapInfo)) - { - return NULL; - } + if (s_imgListIdx != -1) + ShortcutIcon = ImageList_GetIcon(shell_imagelists[type], s_imgListIdx, ILD_TRANSPARENT); + else + ShortcutIcon = NULL; + + if (NULL == ShortcutIcon || ! GetIconInfo(ShortcutIcon, &ShortcutIconInfo) + || 0 == GetObjectW(ShortcutIconInfo.hbmColor, sizeof(BITMAP), &ShortcutBitmapInfo)) + { + return NULL; + } TargetIconInfo = SourceIconInfo; TargetIconInfo.hbmMask = NULL; @@ -308,7 +303,8 @@ fail: * appends an icon pair to the end of the cache */ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallIcon, HICON hBigIcon, DWORD dwFlags) -{ LPSIC_ENTRY lpsice; +{ + LPSIC_ENTRY lpsice; INT ret, index, index1; WCHAR path[MAX_PATH]; TRACE("%s %i %p %p\n", debugstr_w(sSourceFile), dwSourceIndex, hSmallIcon ,hBigIcon); @@ -333,8 +329,8 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI } else { - index = ImageList_AddIcon (ShellSmallIconList, hSmallIcon); - index1= ImageList_AddIcon (ShellBigIconList, hBigIcon); + index = ImageList_AddIcon(shell_imagelists[SHIL_SMALL], hSmallIcon); + index1 = ImageList_AddIcon(shell_imagelists[SHIL_LARGE], hBigIcon); if (index!=index1) { @@ -350,12 +346,9 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI static BOOL get_imagelist_icon_size(int list, SIZE *size) { - HIMAGELIST image_list; - if (list < SHIL_LARGE || list > SHIL_SMALL) return FALSE; - image_list = (list == SHIL_LARGE) ? ShellBigIconList : ShellSmallIconList; - return ImageList_GetIconSize( image_list, &size->cx, &size->cy ); + return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); } /**************************************************************************** @@ -364,7 +357,7 @@ static BOOL get_imagelist_icon_size(int list, SIZE *size) * NOTES * gets small/big icon by number from a file */ -static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) +static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD flags) { HICON hiconLarge=0; HICON hiconSmall=0; @@ -384,10 +377,11 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) return -1; } - if (0 != (dwFlags & GIL_FORSHORTCUT)) - { - hiconLargeShortcut = SIC_OverlayShortcutImage(hiconLarge, TRUE); - hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, FALSE); + if (flags & GIL_FORSHORTCUT) + { + hiconLargeShortcut = SIC_OverlayShortcutImage(hiconLarge, SHIL_LARGE); + hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, SHIL_SMALL); + if (NULL != hiconLargeShortcut && NULL != hiconSmallShortcut) { DestroyIcon( hiconLarge ); @@ -400,14 +394,14 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) WARN("Failed to create shortcut overlaid icons\n"); if (NULL != hiconLargeShortcut) DestroyIcon(hiconLargeShortcut); if (NULL != hiconSmallShortcut) DestroyIcon(hiconSmallShortcut); - dwFlags &= ~ GIL_FORSHORTCUT; + flags &= ~ GIL_FORSHORTCUT; } - } + } - ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags ); - DestroyIcon( hiconLarge ); - DestroyIcon( hiconSmall ); - return ret; + ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, flags ); + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); + return ret; } static int get_shell_icon_size(void) @@ -436,6 +430,7 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context HICON hSm, hLg; int cx_small, cy_small; int cx_large, cy_large; + unsigned int i; if (!IsProcessDPIAware()) { @@ -460,11 +455,11 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context return(FALSE); } - ShellSmallIconList = ImageList_Create(cx_small,cy_small,ILC_COLOR32|ILC_MASK,0,0x20); - ShellBigIconList = ImageList_Create(cx_large,cy_large,ILC_COLOR32|ILC_MASK,0,0x20); + shell_imagelists[SHIL_SMALL] = ImageList_Create(cx_small, cy_small, ILC_COLOR32 | ILC_MASK, 0, 0x20); + shell_imagelists[SHIL_LARGE] = ImageList_Create(cx_large, cy_large, ILC_COLOR32 | ILC_MASK, 0, 0x20); - ImageList_SetBkColor(ShellSmallIconList, CLR_NONE); - ImageList_SetBkColor(ShellBigIconList, CLR_NONE); + for (i = 0; i < ARRAY_SIZE(shell_imagelists); i++) + ImageList_SetBkColor(shell_imagelists[i], CLR_NONE); /* Load the document icon, which is used as the default if an icon isn't found. */ hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), @@ -480,10 +475,10 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); - - TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); - return TRUE; + TRACE("small list=%p, large list=%p\n", shell_imagelists[SHIL_SMALL], shell_imagelists[SHIL_LARGE]); + + return TRUE; } /************************************************************************* * SIC_Destroy @@ -499,19 +494,22 @@ static INT CALLBACK sic_free( LPVOID ptr, LPVOID lparam ) void SIC_Destroy(void) { - TRACE("\n"); + unsigned int i; - EnterCriticalSection(&SHELL32_SicCS); + TRACE("\n"); - if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); + EnterCriticalSection(&SHELL32_SicCS); - if (ShellSmallIconList) - ImageList_Destroy(ShellSmallIconList); - if (ShellBigIconList) - ImageList_Destroy(ShellBigIconList); + if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - LeaveCriticalSection(&SHELL32_SicCS); - DeleteCriticalSection(&SHELL32_SicCS); + for (i = 0; i < ARRAY_SIZE(shell_imagelists); i++) + { + if (shell_imagelists[i]) + ImageList_Destroy(shell_imagelists[i]); + } + + LeaveCriticalSection(&SHELL32_SicCS); + DeleteCriticalSection(&SHELL32_SicCS); } /***************************************************************************** @@ -621,14 +619,16 @@ static int SIC_LoadOverlayIcon(int icon_idx) * imglist[1|2] [OUT] pointer which receives imagelist handles * */ -BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) +BOOL WINAPI Shell_GetImageLists(HIMAGELIST *large_list, HIMAGELIST *small_list) { - TRACE("(%p,%p)\n",lpBigList,lpSmallList); + TRACE("(%p, %p)\n", large_list, small_list); + InitOnceExecuteOnce( &sic_init_once, SIC_Initialize, NULL, NULL ); - if (lpBigList) *lpBigList = ShellBigIconList; - if (lpSmallList) *lpSmallList = ShellSmallIconList; + if (large_list) *large_list = shell_imagelists[SHIL_LARGE]; + if (small_list) *small_list = shell_imagelists[SHIL_SMALL]; return TRUE; } + /************************************************************************* * PidlToSicIndex [INTERNAL] *

1 0

Nikolay Sivov : comdlg32: Use shell API directly.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 725c02614b9f94d67ad73fcc5f6ab05167bc27dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=725c02614b9f94d67ad73fcc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 08:59:42 2018 +0300 comdlg32: Use shell API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 12 ------- dlls/comdlg32/cdlg32.c | 32 ----------------- dlls/comdlg32/filedlg.c | 79 +++++++++++++++++++++--------------------- dlls/comdlg32/filedlgbrowser.c | 24 ++++++------- 4 files changed, 50 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=725c02614b9f94d67ad7…

1 0

Nikolay Sivov : comdlg32: Add support for Places bar customization.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 8bbb32c99d2aea66183321b601335c748c4bfdcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bbb32c99d2aea66183321b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 08:59:41 2018 +0300 comdlg32: Add support for Places bar customization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 191 +++++++++++++++++++++++++++++++---------- dlls/comdlg32/filedlgbrowser.h | 1 + 2 files changed, 149 insertions(+), 43 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 81f7449..13226e0 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -121,9 +121,11 @@ typedef struct tagLookInInfo /* Undefined windows message sent by CreateViewObject*/ #define WM_GETISHELLBROWSER WM_USER+7 -#define TBPLACES_CMDID_DESKTOP 0xa065 -#define TBPLACES_CMDID_MYDOCS 0xa066 -#define TBPLACES_CMDID_MYCOMPUTER 0xa067 +#define TBPLACES_CMDID_PLACE0 0xa064 +#define TBPLACES_CMDID_PLACE1 0xa065 +#define TBPLACES_CMDID_PLACE2 0xa066 +#define TBPLACES_CMDID_PLACE3 0xa067 +#define TBPLACES_CMDID_PLACE4 0xa068 /* NOTE * Those macros exist in windowsx.h. However, you can't really use them since @@ -214,11 +216,117 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); static BOOL BrowseSelectedFolder(HWND hwnd); +static BOOL get_config_key_as_dword(HKEY hkey, const WCHAR *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (hkey && !RegQueryValueExW(hkey, name, 0, &type, (BYTE *)&data, &size)) + { + *value = data; + return TRUE; + } + + return FALSE; +} + +static BOOL get_config_key_dword(HKEY hkey, const WCHAR *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (hkey && !RegQueryValueExW(hkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + { + *value = data; + return TRUE; + } + + return FALSE; +} + +static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value) +{ + DWORD type, size; + WCHAR *str; + + if (hkey && !RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) + { + if (type != REG_SZ && type != REG_EXPAND_SZ) + return FALSE; + } + + str = heap_alloc(size); + if (RegQueryValueExW(hkey, name, 0, &type, (BYTE *)str, &size)) + { + heap_free(str); + return FALSE; + } + + *value = str; + return TRUE; +} + static BOOL is_places_bar_enabled(const FileOpenDlgInfos *fodInfos) { - return (fodInfos->ofnInfos->lStructSize == sizeof(*fodInfos->ofnInfos) && - !(fodInfos->ofnInfos->FlagsEx & OFN_EX_NOPLACESBAR) && - (fodInfos->ofnInfos->Flags & OFN_EXPLORER)); + static const WCHAR noplacesbarW[] = {'N','o','P','l','a','c','e','s','B','a','r',0}; + DWORD value; + HKEY hkey; + + if (fodInfos->ofnInfos->lStructSize != sizeof(*fodInfos->ofnInfos) || + (fodInfos->ofnInfos->FlagsEx & OFN_EX_NOPLACESBAR) || + !(fodInfos->ofnInfos->Flags & OFN_EXPLORER)) + { + return FALSE; + } + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Comdlg32", &hkey)) + return TRUE; + + value = 0; + get_config_key_as_dword(hkey, noplacesbarW, &value); + RegCloseKey(hkey); + return value == 0; +} + +static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) +{ + static const int default_places[] = + { + CSIDL_DESKTOP, + CSIDL_MYDOCUMENTS, + CSIDL_DRIVES, + }; + unsigned int i; + HKEY hkey; + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Comdlg32\\Placesbar", + &hkey)) + { + for (i = 0; i < ARRAY_SIZE(fodInfos->places); i++) + { + static const WCHAR placeW[] = {'P','l','a','c','e','%','d',0}; + WCHAR nameW[8]; + DWORD value; + WCHAR *str; + + sprintfW(nameW, placeW, i); + if (get_config_key_dword(hkey, nameW, &value)) + SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + else if (get_config_key_string(hkey, nameW, &str)) + { + SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + heap_free(str); + } + } + + /* FIXME: eliminate duplicates. */ + + RegCloseKey(hkey); + return; + } + + for (i = 0; i < ARRAY_SIZE(default_places); i++) + SHGetSpecialFolderLocation(NULL, default_places[i], &fodInfos->places[i]); } /*********************************************************************** @@ -434,6 +542,7 @@ static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) { WCHAR *current_dir = NULL; + unsigned int i; BOOL ret; /* save current directory */ @@ -472,6 +581,10 @@ static BOOL GetFileDialog95(FileOpenDlgInfos *info, UINT dlg_type) heap_free(info->filename); heap_free(info->initdir); + + for (i = 0; i < ARRAY_SIZE(info->places); i++) + ILFree(info->places[i]); + return ret; } @@ -1477,17 +1590,6 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (is_places_bar_enabled(fodInfos)) { - static const struct bar_place_descr - { - int csidl; - int cmdid; - } - default_places[] = - { - { CSIDL_DESKTOP, TBPLACES_CMDID_DESKTOP }, - { CSIDL_MYDOCUMENTS, TBPLACES_CMDID_MYDOCS }, - { CSIDL_DRIVES, TBPLACES_CMDID_MYCOMPUTER }, - }; TBBUTTON tb = { 0 }; HIMAGELIST himl; RECT rect; @@ -1498,26 +1600,28 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) cx = rect.right - rect.left; SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETBUTTONWIDTH, 0, MAKELPARAM(cx, cx)); - himl = ImageList_Create(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), ILC_COLOR32, 4, 1); - for (i = 0; i < sizeof(default_places)/sizeof(default_places[0]); i++) + + filedlg_collect_places_pidls(fodInfos); + for (i = 0; i < ARRAY_SIZE(fodInfos->places); i++) { - ITEMIDLIST *pidl; + int index; + + if (!fodInfos->places[i]) + continue; - SHGetSpecialFolderLocation(NULL, default_places[i].csidl, &pidl); memset(&fileinfo, 0, sizeof(fileinfo)); - SHGetFileInfoW((const WCHAR *)pidl, 0, &fileinfo, sizeof(fileinfo), + SHGetFileInfoW((const WCHAR *)fodInfos->places[i], 0, &fileinfo, sizeof(fileinfo), SHGFI_PIDL | SHGFI_DISPLAYNAME | SHGFI_ICON); - ImageList_AddIcon(himl, fileinfo.hIcon); + index = ImageList_AddIcon(himl, fileinfo.hIcon); - tb.iBitmap = i; + tb.iBitmap = index; tb.iString = (INT_PTR)fileinfo.szDisplayName; tb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP; - tb.idCommand = default_places[i].cmdid; + tb.idCommand = TBPLACES_CMDID_PLACE0 + i; SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_ADDBUTTONSW, 1, (LPARAM)&tb); DestroyIcon(fileinfo.hIcon); - CoTaskMemFree(pidl); } SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, (LPARAM)himl); @@ -1869,20 +1973,15 @@ void FILEDLG95_Clean(HWND hwnd) /*********************************************************************** - * Browse to special folder + * Browse to arbitrary pidl */ -static void filedlg_browse_to_specialfolder(const FileOpenDlgInfos *info, int csidl) +static void filedlg_browse_to_pidl(const FileOpenDlgInfos *info, LPITEMIDLIST pidl) { - LPITEMIDLIST pidl; - - TRACE("%p, %d\n", info->ShellInfos.hwndOwner, csidl); + TRACE("%p, %p\n", info->ShellInfos.hwndOwner, pidl); - SHGetSpecialFolderLocation(0, csidl, &pidl); IShellBrowser_BrowseObject(info->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); if (info->ofnInfos->Flags & OFN_EXPLORER) SendCustomDlgNotificationMessage(info->ShellInfos.hwndOwner, CDN_FOLDERCHANGE); - - COMDLG32_SHFree(pidl); } /*********************************************************************** @@ -1894,9 +1993,9 @@ static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam) { FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwnd); WORD wNotifyCode = HIWORD(wParam); /* notification code */ - WORD wID = LOWORD(wParam); /* item, control, or accelerator identifier */ + WORD id = LOWORD(wParam); /* item, control, or accelerator identifier */ - switch(wID) + switch (id) { /* OK button */ case IDOK: @@ -1935,16 +2034,22 @@ static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam) break; case FCIDM_TB_DESKTOP: - case TBPLACES_CMDID_DESKTOP: - filedlg_browse_to_specialfolder(fodInfos, CSIDL_DESKTOP); - break; + { + LPITEMIDLIST pidl; - case TBPLACES_CMDID_MYDOCS: - filedlg_browse_to_specialfolder(fodInfos, CSIDL_MYDOCUMENTS); + SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &pidl); + filedlg_browse_to_pidl(fodInfos, pidl); + COMDLG32_SHFree(pidl); break; + } - case TBPLACES_CMDID_MYCOMPUTER: - filedlg_browse_to_specialfolder(fodInfos, CSIDL_DRIVES); + /* Places bar */ + case TBPLACES_CMDID_PLACE0: + case TBPLACES_CMDID_PLACE1: + case TBPLACES_CMDID_PLACE2: + case TBPLACES_CMDID_PLACE3: + case TBPLACES_CMDID_PLACE4: + filedlg_browse_to_pidl(fodInfos, fodInfos->places[id - TBPLACES_CMDID_PLACE0]); break; case edt1: diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index 69790e9..21eb3d5 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -93,6 +93,7 @@ typedef struct } HookMsg; BOOL ole_initialized; + LPITEMIDLIST places[5]; } FileOpenDlgInfos; /***********************************************************************

1 0

Nikolay Sivov : comdlg32: Use flat navigation toolbar.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 0092e2ea0f00a33a7e815cba6f74b8eae268c648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0092e2ea0f00a33a7e815cba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 08:59:40 2018 +0300 comdlg32: Use flat navigation toolbar. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a882f80..81f7449 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1443,13 +1443,13 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (fodInfos->unicode) fodInfos->DlgInfos.hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NORESIZE, rectTB.left, rectTB.top, rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL); else fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, - WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NORESIZE, rectTB.left, rectTB.top, rectTB.right - rectTB.left, rectTB.bottom - rectTB.top, hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL);

1 0

Francois Gouget : testbot: DateTimeToString() is not used anymore. Remove it.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: tools Branch: master Commit: ae761bb73e4b9e4208bbbdcda4b27c02f30e6c3f URL: https://source.winehq.org/git/tools.git/?a=commit;h=ae761bb73e4b9e4208bbbdc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 21 05:27:54 2018 +0100 testbot: DateTimeToString() is not used anymore. Remove it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index cc8e2b8..5538ecd 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -121,14 +121,6 @@ sub CreateNewDir($$) } } -sub DateTimeToString($) -{ - my ($Time) = @_; - -# my ($Sec, $Min, $Hour, $MDay, $Mon, $Year, $WDay, $YDay, $IsDst) = localtime($Time); - return strftime("%Y/%m/%d %H:%M:%S", localtime($Time)); -} - sub BuildEMailRecipient($$) { my ($EMailAddress, $Name) = @_;

1 0

Francois Gouget : testbot: Trace the pid of child processes being killed.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: tools Branch: master Commit: 4b51fcfdbb4d702bf572f3be54e5a6cde13576de URL: https://source.winehq.org/git/tools.git/?a=commit;h=4b51fcfdbb4d702bf572f3b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 21 05:27:37 2018 +0100 testbot: Trace the pid of child processes being killed. This helps analysing the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7a35ba7..35bbe2a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -292,7 +292,12 @@ It is up to the caller to save the updated VM object. sub KillChild($) { my ($self) = @_; - kill("TERM", $self->ChildPid) if ($self->ChildPid); + if ($self->ChildPid) + { + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Killing child ". $self->ChildPid ."\n"); + kill("TERM", $self->ChildPid); + } $self->ChildPid(undef); }

1 0

Francois Gouget : testbot/web: Use GET to send the Activity period.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: tools Branch: master Commit: a5485a29a86d9188610ca86f0afc1bddd60a4d20 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a5485a29a86d9188610ca86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 21 05:26:42 2018 +0100 testbot/web: Use GET to send the Activity period. This way when the page refreshes it automatically reuses the same period. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index d5fe6f3..ddea602 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -46,6 +46,7 @@ sub _initialize($$$) } $self->SUPER::_initialize($Request, $RequiredRole); + $self->{Method} = "get"; } sub GeneratePage($)

1 0

Francois Gouget : testbot/web: Let web pages decide whether to POST or GET the parameters.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: tools Branch: master Commit: 77b46bdca8caaaeade17e5e846f31e443843905c URL: https://source.winehq.org/git/tools.git/?a=commit;h=77b46bdca8caaaeade17e5e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 21 05:26:09 2018 +0100 testbot/web: Let web pages decide whether to POST or GET the parameters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7669067..1745ec8 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -44,6 +44,7 @@ sub _initialize($$$$) $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; $self->{ActionPerformed} = !1; + $self->{Method} = "post"; } sub GetPropertyDescriptors($) @@ -136,9 +137,9 @@ sub GenerateBody($) sub GenerateFormStart($) { - #my ($self) = @_; + my ($self) = @_; print "<form action='" . $ENV{"SCRIPT_NAME"} . - "' method='post' enctype='multipart/form-data'>\n"; + "' method='$self->{Method}' enctype='multipart/form-data'>\n"; } sub GenerateFields($)

1 0

Alexandre Julliard : patches: Add pre-push hook that is used to store patch id for commits.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: tools Branch: master Commit: e53ef799a780fa7690676ccf086864d2978951cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=e53ef799a780fa7690676cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 19:11:31 2018 +0100 patches: Add pre-push hook that is used to store patch id for commits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/pre-push-hook | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/patches/pre-push-hook b/patches/pre-push-hook new file mode 100755 index 0000000..fe85aec --- /dev/null +++ b/patches/pre-push-hook @@ -0,0 +1,39 @@ +#!/bin/sh +# +# Pre-push git hook to store commit ids in the patch.commit files +# based on the patch id stored in git notes. +# +# Copyright 2017 Alexandre Julliard +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +urlbase=$(git config remote.$1.patchesurl) || exit 0 +patchdir=$(git config --path patches.dir) || exit 0 + +while read local_ref local_sha remote_ref remote_sha +do + for commit in $(git rev-list "$remote_sha..$local_sha" 2>/dev/null) + do + for patch in $(git notes show $commit 2>/dev/null | grep "^Patch-Id: " | cut -c11-) + do + if test -f $patchdir/$patch + then + echo "$urlbase/commit/$commit" >$patchdir/$patch.commit + fi + done + done +done + +exit 0

1 0

Jacek Caban : mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: cfb67712ce35c05d6b7d27ece84c9192e66290b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb67712ce35c05d6b7d27ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 20 22:39:01 2018 +0100 mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9d6076d..cd18287 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1231,7 +1231,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_OnRedirectVerifyCallback(nsI ERR("AddRequest failed: %08x\n", nsres); } - if(This->bsc->is_doc_channel) { + if(This->bsc->is_doc_channel && This->bsc->bsc.window && This->bsc->bsc.window->base.outer_window) { IUri *uri = nsuri_get_uri(This->nschannel->uri); if(uri) {

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018