wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Alexandre Julliard : kernel32/tests: Fix mapping protection tests to succeed on recent Windows versions.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 1caf95d1ad24ac290e2ea20643e77b4b21246ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1caf95d1ad24ac290e2ea2064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 11:33:18 2017 +0200 kernel32/tests: Fix mapping protection tests to succeed on recent Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 126 ++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 65 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4d9335e..054d335 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3674,51 +3674,35 @@ static void test_CreateFileMapping_protection(void) #define ACCESS_READ 0x01 #define ACCESS_WRITE 0x02 #define ACCESS_EXECUTE 0x04 -#define ACCESS_WRITECOPY 0x08 static DWORD page_prot_to_access(DWORD prot) { switch (prot) { + case PAGE_READONLY: + case PAGE_WRITECOPY: + return ACCESS_READ; case PAGE_READWRITE: return ACCESS_READ | ACCESS_WRITE; - case PAGE_EXECUTE: case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: return ACCESS_READ | ACCESS_EXECUTE; - case PAGE_EXECUTE_READWRITE: - return ACCESS_READ | ACCESS_WRITE | ACCESS_WRITECOPY | ACCESS_EXECUTE; - - case PAGE_EXECUTE_WRITECOPY: - return ACCESS_READ | ACCESS_WRITECOPY | ACCESS_EXECUTE; - - case PAGE_READONLY: - return ACCESS_READ; - - case PAGE_WRITECOPY: - return ACCESS_READ; - + return ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE; default: return 0; } } -static BOOL is_compatible_protection(DWORD map_prot, DWORD view_prot, DWORD prot) +static BOOL is_compatible_protection(DWORD view_prot, DWORD prot) { - DWORD map_access, view_access, prot_access; + DWORD view_access, prot_access; - map_access = page_prot_to_access(map_prot); view_access = page_prot_to_access(view_prot); prot_access = page_prot_to_access(prot); - if (view_access == prot_access) return TRUE; - if (!view_access) return FALSE; - - if ((view_access & prot_access) != prot_access) return FALSE; - if ((map_access & prot_access) == prot_access) return TRUE; - - return FALSE; + return ((view_access & prot_access) == prot_access); } static DWORD map_prot_to_access(DWORD prot) @@ -3726,10 +3710,12 @@ static DWORD map_prot_to_access(DWORD prot) switch (prot) { case PAGE_READWRITE: + return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_QUERY; case PAGE_EXECUTE_READWRITE: return SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT | SECTION_QUERY; case PAGE_READONLY: case PAGE_WRITECOPY: + return SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_QUERY; case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: @@ -3739,11 +3725,23 @@ static DWORD map_prot_to_access(DWORD prot) } } +static DWORD file_access_to_prot( DWORD access ) +{ + BOOL exec = access & FILE_MAP_EXECUTE; + access &= ~FILE_MAP_EXECUTE; + + if (access == FILE_MAP_COPY) return exec ? PAGE_EXECUTE_WRITECOPY : PAGE_WRITECOPY; + if (access & FILE_MAP_WRITE) return exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; + if (access & FILE_MAP_READ) return exec ? PAGE_EXECUTE_READ : PAGE_READONLY; + return PAGE_NOACCESS; +} + static BOOL is_compatible_access(DWORD map_prot, DWORD view_prot) { DWORD access = map_prot_to_access(map_prot); - if (!view_prot) view_prot = SECTION_MAP_READ; - return (view_prot & access) == view_prot; + DWORD view_access = map_prot_to_access( file_access_to_prot( view_prot )); + if (!view_access) view_access = SECTION_MAP_READ; + return (view_access & access) == view_access; } static void *map_view_of_file(HANDLE handle, DWORD access) @@ -3752,7 +3750,6 @@ static void *map_view_of_file(HANDLE handle, DWORD access) LARGE_INTEGER offset; SIZE_T count; ULONG protect; - BOOL exec; void *addr; if (!pNtMapViewOfSection) return NULL; @@ -3761,32 +3758,7 @@ static void *map_view_of_file(HANDLE handle, DWORD access) offset.u.LowPart = 0; offset.u.HighPart = 0; - exec = access & FILE_MAP_EXECUTE; - access &= ~FILE_MAP_EXECUTE; - - if (access == FILE_MAP_COPY) - { - if (exec) - protect = PAGE_EXECUTE_WRITECOPY; - else - protect = PAGE_WRITECOPY; - } - else if (access & FILE_MAP_WRITE) - { - if (exec) - protect = PAGE_EXECUTE_READWRITE; - else - protect = PAGE_READWRITE; - } - else if (access & FILE_MAP_READ) - { - if (exec) - protect = PAGE_EXECUTE_READ; - else - protect = PAGE_READONLY; - } - else protect = PAGE_NOACCESS; - + protect = file_access_to_prot( access ); addr = NULL; status = pNtMapViewOfSection(handle, GetCurrentProcess(), &addr, 0, 0, &offset, &count, 1 /* ViewShare */, 0, protect); @@ -3804,7 +3776,7 @@ static void test_mapping(void) static const DWORD page_prot[] = { PAGE_NOACCESS, PAGE_READONLY, PAGE_READWRITE, PAGE_WRITECOPY, - PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY + PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_EXECUTE_WRITECOPY }; static const struct { @@ -3882,6 +3854,13 @@ static void test_mapping(void) CloseHandle(hmap); hmap = hmap2; } + if (page_prot[i] == PAGE_EXECUTE) + { + ok(!hmap, "CreateFileMapping(PAGE_NOACCESS) should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + continue; + } if (!hmap) { @@ -3924,8 +3903,25 @@ static void test_mapping(void) if (!is_compatible_access(page_prot[i], view[j].access)) { - ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", j, page_prot[i], view[j].access); - ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); + /* FILE_MAP_EXECUTE | FILE_MAP_COPY broken on XP */ + if (base != NULL && view[j].access == (FILE_MAP_EXECUTE | FILE_MAP_COPY)) + { + todo_wine + ok( broken(base != NULL), "%d: MapViewOfFile(%04x/%04x) should fail\n", + j, page_prot[i], view[j].access); + UnmapViewOfFile( base ); + } + else todo_wine_if ((page_prot[i] == PAGE_READONLY && + is_compatible_access( PAGE_EXECUTE_READ, view[j].access )) || + (page_prot[i] == PAGE_READWRITE && + is_compatible_access( PAGE_EXECUTE_READWRITE, view[j].access )) || + (page_prot[i] == PAGE_WRITECOPY && + is_compatible_access( PAGE_EXECUTE_WRITECOPY, view[j].access ))) + { + ok(!base, "%d: MapViewOfFile(%04x/%04x) should fail\n", + j, page_prot[i], view[j].access); + ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %d\n", GetLastError()); + } continue; } @@ -3974,11 +3970,12 @@ static void test_mapping(void) SetLastError(0xdeadbeef); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, page_prot[k], &old_prot); - if (is_compatible_protection(page_prot[i], view[j].prot, page_prot[k])) + if (is_compatible_protection(view[j].prot, page_prot[k])) { /* win2k and XP don't support EXEC on file mappings */ if (!ret && page_prot[k] == PAGE_EXECUTE) { + todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); continue; } @@ -3991,6 +3988,7 @@ static void test_mapping(void) /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ if (!ret && page_prot[k] == PAGE_EXECUTE_WRITECOPY) { + todo_wine ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n"); continue; } @@ -4004,17 +4002,15 @@ static void test_mapping(void) ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); prev_prot = page_prot[k]; + + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + ok(info.Protect == page_prot[k], + "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", + page_prot[i], view[j].prot, page_prot[k], info.Protect ); } else { - /* NT4 doesn't fail on incompatible map and view */ - if (ret) - { - ok(broken(ret), "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); - skip("Incompatible map and view are not properly handled on this platform\n"); - break; /* NT4 won't pass remaining tests */ - } - ok(!ret, "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); }

1 0

Alexandre Julliard : kernel32/tests: Retrieve the page size only once.
by Alexandre Julliard 11 Sep '17

11 Sep '17

Module: wine Branch: master Commit: 9b85cebf051762e25089c2ebf4cb0d889c4b1dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b85cebf051762e25089c2ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 11:18:48 2017 +0200 kernel32/tests: Retrieve the page size only once. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 9b99464..4d9335e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -36,6 +36,7 @@ #define MAPPING_SIZE 0x100000 static HINSTANCE hkernel32, hntdll; +static SYSTEM_INFO si; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); @@ -3184,14 +3185,10 @@ static void test_VirtualProtect(void) char *base, *ptr; DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; - SYSTEM_INFO si; void *addr; SIZE_T size; NTSTATUS status; - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); - SetLastError(0xdeadbeef); base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); ok(base != NULL, "VirtualAlloc failed %d\n", GetLastError()); @@ -3381,10 +3378,6 @@ static void test_VirtualAlloc_protection(void) char *base, *ptr; DWORD ret, i; MEMORY_BASIC_INFORMATION info; - SYSTEM_INFO si; - - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { @@ -3475,15 +3468,11 @@ static void test_CreateFileMapping_protection(void) char *base, *ptr; DWORD ret, i, alloc_prot, prot, old_prot; MEMORY_BASIC_INFORMATION info; - SYSTEM_INFO si; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; HANDLE hfile, hmap; BOOL page_exec_supported = TRUE; - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); - GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "map", 0, file_name); @@ -3857,15 +3846,11 @@ static void test_mapping(void) }; void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; - SYSTEM_INFO si; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; HANDLE hfile, hmap; MEMORY_BASIC_INFORMATION info, nt_info; - GetSystemInfo(&si); - trace("system page size %#x\n", si.dwPageSize); - GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "map", 0, file_name); @@ -4201,6 +4186,9 @@ START_TEST(virtual) pNtAllocateVirtualMemory = (void *)GetProcAddress( hntdll, "NtAllocateVirtualMemory" ); pNtFreeVirtualMemory = (void *)GetProcAddress( hntdll, "NtFreeVirtualMemory" ); + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + test_shared_memory(FALSE); test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); test_shared_memory_ro(FALSE, FILE_MAP_COPY);

1 0

Rosanne DiMesio : Order screenshot queue by submitTime
by Jeremy Newman 11 Sep '17

11 Sep '17

Module: appdb Branch: master Commit: c807880551bee62d5465071795181065871af7af URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c807880551bee62d54650717… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 12:54:25 2017 -0500 Order screenshot queue by submitTime Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/appData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/appData.php b/include/appData.php index 87f751d..52ba8b0 100644 --- a/include/appData.php +++ b/include/appData.php @@ -517,7 +517,7 @@ class appData AND appData.state = '?' AND - appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appFamily.appName $sLimit + appData.type = '?' $sVersionWhereFilter$sWhereFilter ORDER BY appData.submitTime, appFamily.appName $sLimit )"; if(!$iRows && !$iStart) {

1 0

Rosanne DiMesio : Adjust test results table ratings colors
by Jeremy Newman 11 Sep '17

11 Sep '17

Module: appdb Branch: master Commit: 2c2c8996408ab41ef29fddc342dc905cab3f8a56 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2c2c8996408ab41ef29fddc3… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 10:42:03 2017 -0500 Adjust test results table ratings colors Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- css/styles.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css/styles.css b/css/styles.css index be5eef0..f09174d 100644 --- a/css/styles.css +++ b/css/styles.css @@ -746,20 +746,20 @@ table tr.rowtitle td:last-child { .color4 { background-color: #999999 } /* table row colors for ratings (alternating colors for rows) */ -tr:nth-child(odd) td.Platinum { background-color: #333333 !important; color: #ffffff !important; } -tr:nth-child(even) td.Platinum { background-color: #666666 !important; color: #ffffff !important; } +tr:nth-child(odd) td.Platinum { background-color: #E5E4E2 !important; } +tr:nth-child(even) td.Platinum { background-color: #F5F5F5 !important; } tr:nth-child(odd) td.Gold { background-color: #FFF600 !important; } tr:nth-child(even) td.Gold { background-color: #fffcb3 !important; } -tr:nth-child(odd) td.Silver { background-color: #C0C0C0 !important; } -tr:nth-child(even) td.Silver { background-color: #e6e6e6 !important; } +tr:nth-child(odd) td.Silver { background-color: #A9A9A9 !important; } +tr:nth-child(even) td.Silver { background-color: #D3D3D3 !important; } -tr:nth-child(odd) td.Bronze { background-color: #FCBA0A !important; } +tr:nth-child(odd) td.Bronze { background-color: #DAA520 !important; } tr:nth-child(even) td.Bronze { background-color: #FCBA0A !important; } tr:nth-child(odd) td.Garbage { background-color: #999966 !important; } -tr:nth-child(even) td.Garbage { background-color: #ebebe0 !important; } +tr:nth-child(even) td.Garbage { background-color: #BDB76B !important; } /* labels */ TD.label { font-weight: bold }

1 0

Rosanne DiMesio : Change extra comments to match other textareas
by Jeremy Newman 11 Sep '17

11 Sep '17

Module: appdb Branch: master Commit: 0c964b6dfefedcf2f028eb46dbbcf727da61261b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0c964b6dfefedcf2f028eb46… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Sep 11 10:09:52 2017 -0500 Change extra comments to match other textareas Makes the input field on the test report form wysiwyg and removes the pre-formatted text styling from the test results display so that it matches the other textareas in the test report. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/testData.php b/include/testData.php index 7f05db2..86771d2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -584,7 +584,7 @@ class testData{ "Workarounds\n{$this->shWorkarounds}\n". "What was not tested\n{$this->shWhatNotTested}\n". "Hardware tested\nGraphics: </ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". - "Additional Comments\n<pre style='white-space: pre-wrap;'>{$this->sComments}</pre>\n"; + "Additional Comments\n{$this->sComments}\n"; } function CreateTestTable() @@ -907,7 +907,7 @@ class testData{ echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td>Extra comments</td>',"\n"; - echo '<td><textarea name="sComments" id="extra_comments" rows=10 cols=65>'; + echo '<td><textarea name="sComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; echo $this->sComments.'</textarea></td></tr>',"\n"; /* Graphics hardware/driver

1 0

Vincent Povirk : winemenubuilder: Set StartupWMClass for shortcuts to exe files.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 917e86dd7a4cca1da47262caaded2bef9e022f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917e86dd7a4cca1da47262caa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 8 10:54:30 2017 -0500 winemenubuilder: Set StartupWMClass for shortcuts to exe files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 44 ++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 154b575..0013b04 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1446,13 +1446,14 @@ static DWORD register_menus_entry(const char *unix_file, const char *windows_fil static BOOL write_desktop_entry(const char *unix_link, const char *location, const char *linkname, const char *path, const char *args, const char *descr, - const char *workdir, const char *icon) + const char *workdir, const char *icon, const char *wmclass) { FILE *file; - WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), + WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), wine_dbgstr_a(linkname), wine_dbgstr_a(path), wine_dbgstr_a(args), - wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + wine_dbgstr_a(descr), wine_dbgstr_a(workdir), wine_dbgstr_a(icon), + wine_dbgstr_a(wmclass)); file = fopen(location, "w"); if (file == NULL) @@ -1470,6 +1471,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con fprintf(file, "Path=%s\n", workdir); if (icon && lstrlenA(icon)) fprintf(file, "Icon=%s\n", icon); + if (wmclass && lstrlenA(wmclass)) + fprintf(file, "StartupWMClass=%s\n", wmclass); fclose(file); @@ -1615,7 +1618,7 @@ end: } static BOOL write_menu_entry(const char *unix_link, const char *link, const char *path, const char *args, - const char *descr, const char *workdir, const char *icon) + const char *descr, const char *workdir, const char *icon, const char *wmclass) { const char *linkname; char *desktopPath = NULL; @@ -1623,9 +1626,9 @@ static BOOL write_menu_entry(const char *unix_link, const char *link, const char char *filename = NULL; BOOL ret = TRUE; - WINE_TRACE("(%s, %s, %s, %s, %s, %s, %s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(link), + WINE_TRACE("(%s, %s, %s, %s, %s, %s, %s, %s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(link), wine_dbgstr_a(path), wine_dbgstr_a(args), wine_dbgstr_a(descr), - wine_dbgstr_a(workdir), wine_dbgstr_a(icon)); + wine_dbgstr_a(workdir), wine_dbgstr_a(icon), wine_dbgstr_a(wmclass)); linkname = strrchr(link, '/'); if (linkname == NULL) @@ -1649,7 +1652,7 @@ static BOOL write_menu_entry(const char *unix_link, const char *link, const char goto end; } *desktopDir = '/'; - if (!write_desktop_entry(unix_link, desktopPath, linkname, path, args, descr, workdir, icon)) + if (!write_desktop_entry(unix_link, desktopPath, linkname, path, args, descr, workdir, icon, wmclass)) { WINE_WARN("couldn't make desktop entry %s\n", wine_dbgstr_a(desktopPath)); ret = FALSE; @@ -2771,9 +2774,10 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; + char *wmclass = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; - WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH]; + WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH], szWMClass[MAX_PATH]; int iIconId = 0, r = -1; DWORD csidl = -1; HANDLE hsem = NULL; @@ -2818,6 +2822,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ExpandEnvironmentStringsW(szTmp, szIconPath, MAX_PATH); WINE_TRACE("icon file : %s\n", wine_dbgstr_w(szIconPath) ); + szWMClass[0] = 0; + if( !szPath[0] ) { LPITEMIDLIST pidl = NULL; @@ -2880,6 +2886,14 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) GetWindowsDirectoryW(szPath, MAX_PATH); lstrcatW(szPath, startW); } + else + { + /* FIXME: Use AppUserModelID if present. */ + WCHAR *p = PathFindFileNameW(szPath); + + lstrcpyW(szWMClass, p); + CharLowerW(szWMClass); + } /* convert app working dir */ if (szWorkDir[0]) @@ -2897,7 +2911,8 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) escaped_path = escape(szPath); escaped_args = escape(szArgs); description = wchars_to_utf8_chars(szDescription); - if (escaped_path == NULL || escaped_args == NULL || description == NULL) + wmclass = wchars_to_utf8_chars(szWMClass); + if (escaped_path == NULL || escaped_args == NULL || description == NULL || wmclass == NULL) { WINE_ERR("out of memory allocating/escaping parameters\n"); goto cleanup; @@ -2936,12 +2951,12 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (link_arg) { r = !write_desktop_entry(unix_link, location, lastEntry, - start_path, link_arg, description, work_dir, icon_name); + start_path, link_arg, description, work_dir, icon_name, wmclass); HeapFree(GetProcessHeap(), 0, link_arg); } } else - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name, wmclass); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); @@ -2952,7 +2967,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) char *link_arg = escape_unix_link_arg(unix_link); if (link_arg) { - r = !write_menu_entry(unix_link, link_name, start_path, link_arg, description, work_dir, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, link_arg, description, work_dir, icon_name, wmclass); HeapFree(GetProcessHeap(), 0, link_arg); } } @@ -2967,6 +2982,7 @@ cleanup: HeapFree( GetProcessHeap(), 0, escaped_args ); HeapFree( GetProcessHeap(), 0, escaped_path ); HeapFree( GetProcessHeap(), 0, description ); + HeapFree( GetProcessHeap(), 0, wmclass ); HeapFree( GetProcessHeap(), 0, unix_link ); HeapFree( GetProcessHeap(), 0, start_path ); @@ -3102,14 +3118,14 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, start_path, escaped_urlPath, NULL, NULL, icon_name, NULL); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } else - r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name, NULL); ret = (r == 0); ReleaseSemaphore(hSem, 1, NULL);

1 0

Vincent Povirk : winex11: Convert process name to lowercase for WM name hint.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 50b033691494186421f04d518a9eb249d8a348cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b033691494186421f04d518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 8 10:54:29 2017 -0500 winex11: Convert process name to lowercase for WM name hint. The startup-notification spec is vague on this point, but it seems that StartupWMClass is case-sensitive. We should convert to a standard case so we can use that field. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 65ef59b..a2ec18b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -343,6 +343,7 @@ static void setup_options(void) WCHAR *p, *appname = bufferW; if ((p = strrchrW( appname, '/' ))) appname = p + 1; if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + CharLowerW(appname); len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); if ((process_name = HeapAlloc( GetProcessHeap(), 0, len ))) WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL );

1 0

Nikolay Sivov : msxml3/httpreq: Support HEAD request.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 79f11f228216f6b6fa6aaf02704a86592b44aba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f11f228216f6b6fa6aaf027… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 8 17:47:27 2017 +0300 msxml3/httpreq: Support HEAD request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 ++ dlls/msxml3/tests/httpreq.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 55339e1..d9f3f98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -880,6 +880,7 @@ static HRESULT verify_uri(httprequest *This, IUri *uri) static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { + static const WCHAR MethodHeadW[] = {'H','E','A','D',0}; static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; @@ -915,6 +916,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, This->verb = BINDVERB_POST; } else if (!strcmpiW(method, MethodDeleteW) || + !strcmpiW(method, MethodHeadW) || !strcmpiW(method, MethodPropFindW)) { This->verb = BINDVERB_CUSTOM; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 55ea8b6..a744b95 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1731,6 +1731,28 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); IObjectWithSite_Release(obj_site); + + /* HEAD request */ + hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); + ok(hr == S_OK, "Failed to reset state change handler, hr %#x.\n", hr); + + test_open(xhr, "HEAD", xmltestA, S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "Failed to send HEAD request, hr %#x.\n", hr); + + str = NULL; + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "Failed to get response text, hr %#x.\n", hr); + ok(!*str, "Unexpected text %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); + ok(hr == S_OK, "Failed to get response headers, hr %#x.\n", hr); + ok(str && *str, "Expected response headers.\n"); + SysFreeString(str); + IXMLHttpRequest_Release(xhr); free_bstrs(); }

1 0

Francois Gouget : gdiplus: Add a trailing linefeed to an ERR() message.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: cbacc556ec1cd0cffe42ae43cd1db1bd4d22e149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbacc556ec1cd0cffe42ae43c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:13:17 2017 +0200 gdiplus: Add a trailing linefeed to an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ea02c6b..9ca1d4e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6668,7 +6668,7 @@ GpStatus gdi_transform_release(GpGraphics *graphics) { if (graphics->gdi_transform_acquire_count <= 0) { - ERR("called without matching gdi_transform_acquire"); + ERR("called without matching gdi_transform_acquire\n"); return GenericError; } if (graphics->gdi_transform_acquire_count == 1 && graphics->hdc)

1 0

Daniel Lehman : wininet: Fix proxy bypass with wildcard if domain length matches with server.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 1b25de7d57e81e5307a18c8889d4727c857dadca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b25de7d57e81e5307a18c888… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 30 09:44:16 2017 -0700 wininet: Fix proxy bypass with wildcard if domain length matches with server. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dc106d8..9191188 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1732,7 +1732,7 @@ static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain) return FALSE; len = strlenW(dot + 1); - if(len <= domain.len - 2) + if(len < domain.len - 2) return FALSE; /* The server's domain is longer than the wildcard, so it

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
45
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 September 2017