March 2018 - Wine-commits - list.winehq.org

Michael Müller : bcrypt: Implement BCryptEncrypt for AES GCM mode.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 7c9291ce0799ebf6eadc266ee13a74cbc0b7ff50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9291ce0799ebf6eadc266e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:06 2018 +0000 bcrypt: Implement BCryptEncrypt for AES GCM mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 59 +++++++++++++++++++++++++++++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 18 +++++++------- 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index fa80318..9669553 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -63,6 +63,12 @@ MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); #undef MAKE_FUNCPTR +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -848,6 +854,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; gnutls_cipher_hd_t handle; UCHAR *secret; @@ -858,6 +865,7 @@ struct key { struct object hdr; enum alg_id alg_id; + enum mode_id mode; ULONG block_size; CCCryptorRef ref_encrypt; CCCryptorRef ref_decrypt; @@ -868,6 +876,7 @@ struct key struct key { struct object hdr; + enum mode_id mode; ULONG block_size; }; #endif @@ -923,6 +932,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->handle = 0; /* initialized on first use */ key->secret = buffer; key->secret_len = secret_len; @@ -935,9 +945,13 @@ static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) switch (key->alg_id) { case ALG_ID_AES: - FIXME( "handle block size and chaining mode\n" ); - return GNUTLS_CIPHER_AES_128_CBC; - + WARN( "handle block size\n" ); + switch (key->mode) + { + case MODE_ID_GCM: return GNUTLS_CIPHER_AES_128_GCM; + case MODE_ID_CBC: + default: return GNUTLS_CIPHER_AES_128_CBC; + } default: FIXME( "algorithm %u not supported\n", key->alg_id ); return GNUTLS_CIPHER_UNKNOWN; @@ -1019,6 +1033,14 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s switch (alg->id) { case ALG_ID_AES: + switch (alg->mode) + { + case MODE_ID_CBC: + break; + default: + FIXME( "mode %u not supported\n", alg->mode ); + return STATUS_NOT_SUPPORTED; + } break; default: @@ -1031,6 +1053,7 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s memcpy( buffer, secret, secret_len ); key->alg_id = alg->id; + key->mode = alg->mode; key->ref_encrypt = NULL; /* initialized on first use */ key->ref_decrypt = NULL; key->secret = buffer; @@ -1260,17 +1283,37 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + if (auth_info->dwFlags & BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG) + FIXME( "call chaining not implemented\n" ); + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_encrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ba2011f..1875fb3 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -751,12 +751,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); @@ -766,12 +766,12 @@ static void test_BCryptEncrypt(void) memset(ciphertext, 0xff, sizeof(ciphertext)); memset(tag, 0xff, sizeof(tag)); ret = pBCryptEncrypt(key, data2, 24, &auth_info, ivbuf, 16, ciphertext, 24, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 24, "got %u\n", size); - todo_wine ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 24, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) - todo_wine ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); @@ -784,7 +784,7 @@ static void test_BCryptEncrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(ciphertext, 0, sizeof(ciphertext)); ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Michael Müller : bcrypt: Implement BCryptDecrypt for AES GCM mode.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 8d2b1d276df5727499a5a9f7a3dd12e0634032c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2b1d276df5727499a5a9f7… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:08 2018 +0000 bcrypt: Implement BCryptDecrypt for AES GCM mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++----- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9669553..573cd37 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1361,17 +1361,35 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_decrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1875fb3..e3cbc87 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -969,16 +969,16 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); + ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

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

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

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

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

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: 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: 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

Piotr Caban : ucrtbase: Add __current_exception_context() implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: f82af4d2bbf9672580c70d904c7e67212839620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82af4d2bbf9672580c70d90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:43 2018 +0100 ucrtbase: Add __current_exception_context() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 25 ++++++++++++++++------ dlls/msvcrt/except_i386.c | 10 ++++++--- dlls/msvcrt/except_x86_64.c | 20 ++++++++++------- dlls/msvcrt/msvcrt.h | 5 +++-- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 43 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f82af4d2bbf9672580c7…

1 0