February 2016 - Wine-Commits

Andrew Eikum : ntdll: Initialize variable (Coverity).
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 0df38064c2940275c110274c9880ec4e7b0e8e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df38064c2940275c110274c9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:53:42 2016 -0600 ntdll: Initialize variable (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5c8b7fd..a18dfae 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2340,7 +2340,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInformationClass, void *Query, ULONG QueryLength, void *SystemInformation, ULONG Length, ULONG *ResultLength) { - ULONG len; + ULONG len = 0; NTSTATUS ret = STATUS_NOT_IMPLEMENTED; TRACE("(0x%08x,%p,%u,%p,%u,%p) stub\n", SystemInformationClass, Query, QueryLength, SystemInformation,

1 0

Sebastian Lackner : msvcrt/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 340f1615bd01645c2f8747c6bcaa5f3e3409bd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=340f1615bd01645c2f8747c6b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:07 2016 +0100 msvcrt/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e67e344..e3f7f99 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -146,7 +146,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else

1 0

Sebastian Lackner : msvcp100/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 5fd226ac06332990a1e4c93653384e60e88959ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd226ac06332990a1e4c9365… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:16:53 2016 +0100 msvcp100/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/tests/misc.c | 2 +- dlls/msvcp100/tests/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 4740951..e85bf10 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -83,7 +83,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index eb02bc5..c963169 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -67,7 +67,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: af41733890b09d61bc49fcf8f2e5af3c0dc573fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=af41733890b09d61bc49fcf8f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 11 08:11:22 2016 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 730d45e..e4a3f46 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-09 21:07+0300\n" +"PO-Revision-Date: 2016-02-11 08:10+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11623,22 +11623,16 @@ msgid "(Default)" msgstr "(numatytoji)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Ar tikrai norite pašalinti šias reikšmes?" +msgstr "Ar tikrai norite pašalinti registro reikšmę „%1“?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Ar tikrai norite pašalinti reikšmę „%s“?" +msgstr "Ar tikrai norite pašalinti visas registro „%1“ reikšmes?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Ar tikrai norite pašalinti „%1“?" +msgstr "Ar tikrai norite pašalinti registro raktą „%1“?" #: regedit.rc:34 msgid "&Registry"

1 0

Sebastian Lackner : avifil32/tests: Remove a couple of unnecessary tests.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: ec010ce3615d38be79d8f20cbca9a649c5ae2a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec010ce3615d38be79d8f20cb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 07:12:01 2016 +0100 avifil32/tests: Remove a couple of unnecessary tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/tests/api.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 552a356..137062ad8 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -371,11 +371,6 @@ static void test_default_data(void) create_avi_file(&cah, filename); res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); - ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); - ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); - ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); - ok(res != AVIERR_FILEOPEN, "Unable to open file: error4=%u\n", AVIERR_FILEOPEN); - ok(res != REGDB_E_CLASSNOTREG, "Unable to open file: error5=%u\n", REGDB_E_CLASSNOTREG); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream0, 0, 0);

1 0

Michael Müller : server: Add support for Win8 pseudo handles.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 18a8636ebee7c02d1a777eaf2ce287d92607a145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a8636ebee7c02d1a777eaf2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:45 2016 +0100 server: Add support for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/handle.c b/server/handle.c index 15e5670..3b0d033 100644 --- a/server/handle.c +++ b/server/handle.c @@ -405,6 +405,12 @@ static inline struct object *get_magic_handle( obj_handle_t handle ) { switch(handle) { + case 0xfffffffa: /* current thread impersonation token pseudo-handle */ + return (struct object *)thread_get_impersonation_token( current ); + case 0xfffffffb: /* current thread token pseudo-handle */ + return (struct object *)current->token; + case 0xfffffffc: /* current process token pseudo-handle */ + return (struct object *)current->process->token; case 0xfffffffe: /* current thread pseudo-handle */ return &current->obj; case 0x7fffffff: /* current process pseudo-handle */

1 0

Michael Müller : advapi32/tests: Add tests for Win8 pseudo handles.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: c937cf6ad272ce0e7d95ac8a2cd2fbd875f0d4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c937cf6ad272ce0e7d95ac8a2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:23:16 2016 +0100 advapi32/tests: Add tests for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 498d19a..8dafb08 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6103,6 +6103,57 @@ static void test_GetSidIdentifierAuthority(void) ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); } +static void test_pseudo_tokens(void) +{ + TOKEN_STATISTICS statistics1, statistics2; + HANDLE token; + DWORD retlen; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + memset(&statistics1, 0x11, sizeof(statistics1)); + ret = GetTokenInformation(token, TokenStatistics, &statistics1, sizeof(statistics1), &retlen); + ok(ret, "GetTokenInformation failed with %u\n", GetLastError()); + CloseHandle(token); + + /* test GetCurrentProcessToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentProcessToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentProcessToken not supported, skipping test\n"); + + /* test GetCurrentThreadEffectiveToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentThreadEffectiveToken not supported, skipping test\n"); + + SetLastError(0xdeadbeef); + ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); + ok(!ret, "OpenThreadToken should have failed\n"); + ok(GetLastError() == ERROR_NO_TOKEN, "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); + + /* test GetCurrentThreadToken() */ + SetLastError(0xdeadbeef); + ret = GetTokenInformation(GetCurrentThreadToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + todo_wine ok(GetLastError() == ERROR_NO_TOKEN || broken(GetLastError() == ERROR_INVALID_HANDLE), + "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -6148,4 +6199,5 @@ START_TEST(security) test_AddAce(); test_system_security_access(); test_GetSidIdentifierAuthority(); + test_pseudo_tokens(); }

1 0

Michael Müller : include: Add definitions for Win8 pseudo handles.
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: e7bbca8fcc5f460c5b7dc43cfaca661bc802f413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bbca8fcc5f460c5b7dc43cf… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:30 2016 +0100 include: Add definitions for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index f35391d..89f27c9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2973,6 +2973,10 @@ WINBASEAPI VOID WINAPI SetLastError(DWORD); #define GetCurrentThread() ((HANDLE)~(ULONG_PTR)1) #endif +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) +#define GetCurrentThreadToken() ((HANDLE)~(ULONG_PTR)4) +#define GetCurrentThreadEffectiveToken() ((HANDLE)~(ULONG_PTR)5) + /* WinMain(entry point) must be declared in winbase.h. */ /* If this is not declared, we cannot compile many sources written with C++. */ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR,int);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: 4155c22e25464f4aa6fa121a786b34d748664bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4155c22e25464f4aa6fa121a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:30:00 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in wined3d_surface_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 95ee255..45cefca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2414,10 +2414,15 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { map_desc->row_pitch = surface->resource.width * format->byte_count; + map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; + } else - map_desc->row_pitch = wined3d_surface_get_pitch(surface); - map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; + { + wined3d_texture_get_pitch(surface->container, surface->texture_level, + &map_desc->row_pitch, &map_desc->slice_pitch); + } if (!box) {

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_pitch() in surface_download_data().
by Alexandre Julliard Feb. 11, 2016

Feb. 11, 2016

Module: wine Branch: master Commit: ef040d71db045a13df0b3209f542ba4a50787a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef040d71db045a13df0b3209f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 19:29:58 2016 +0100 wined3d: Use wined3d_texture_get_pitch() in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b31e2ea..820fbfa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1330,14 +1330,15 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - unsigned int src_row_pitch, src_slice_pitch, dst_pitch = 0; + unsigned int dst_row_pitch, dst_slice_pitch; + unsigned int src_row_pitch, src_slice_pitch; GLenum gl_format = format->glFormat; GLenum gl_type = format->glType; void *mem; if (surface->flags & SFLAG_NONPOW2) { - dst_pitch = wined3d_surface_get_pitch(surface); + wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); @@ -1425,12 +1426,12 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; - TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_pitch); + TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); for (y = 0; y < surface->resource.height; ++y) { - memcpy(dst_data, src_data, dst_pitch); + memcpy(dst_data, src_data, dst_row_pitch); src_data += src_row_pitch; - dst_data += dst_pitch; + dst_data += dst_row_pitch; } HeapFree(GetProcessHeap(), 0, mem);

1 0