July 2017 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : mfreadwrite.idl: Add enum MF_SOURCE_READER_FLAG and EXTERN_GUID defines.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: 06b90fe09d453081665c888b505a076cc383bc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b90fe09d453081665c888b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 8 04:14:53 2017 +0000 mfreadwrite.idl: Add enum MF_SOURCE_READER_FLAG and EXTERN_GUID defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index dd8c124..5cb3501 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -31,6 +31,17 @@ enum MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff }; +typedef enum MF_SOURCE_READER_FLAG +{ + MF_SOURCE_READERF_ERROR = 0x001, + MF_SOURCE_READERF_ENDOFSTREAM = 0x002, + MF_SOURCE_READERF_NEWSTREAM = 0x004, + MF_SOURCE_READERF_NATIVEMEDIATYPECHANGED = 0x010, + MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED = 0x020, + MF_SOURCE_READERF_STREAMTICK = 0x100, + MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x200 +} MF_SOURCE_READER_FLAG; + typedef struct _MF_SINK_WRITER_STATISTICS { DWORD cb; @@ -51,6 +62,23 @@ typedef struct _MF_SINK_WRITER_STATISTICS DWORD dwAverageSampleRateProcessed; } MF_SINK_WRITER_STATISTICS; +cpp_quote("EXTERN_GUID(CLSID_MFReadWriteClassFactory, 0x48e2ed0f, 0x98c2, 0x4a37, 0xbe, 0xd5, 0x16, 0x63, 0x12, 0xdd, 0xd8, 0x3f);") +cpp_quote("EXTERN_GUID(CLSID_MFSourceReader, 0x1777133c, 0x0881, 0x411b, 0xa5, 0x77, 0xad, 0x54, 0x5f, 0x07, 0x14, 0xc4);") +cpp_quote("EXTERN_GUID(CLSID_MFSinkWriter, 0xa3bbfb17, 0x8273, 0x4e52, 0x9e, 0x0e, 0x97, 0x39, 0xdc, 0x88, 0x79, 0x90);") + +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_ASYNC_CALLBACK, 0x48cb183e, 0x7b0b, 0x46f4, 0x82, 0x2e, 0x5e, 0x1d, 0x2d, 0xda, 0x43, 0x54);") +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_DISABLE_THROTTLING, 0x08b845d8, 0x2b74, 0x4afe, 0x9d, 0x53, 0xbe, 0x16, 0xd2, 0xd5, 0xae, 0x4f);") +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_D3D_MANAGER, 0xec822da2, 0xe1e9, 0x4b29, 0xa0, 0xd8, 0x56, 0x3c, 0x71, 0x9f, 0x52, 0x69);") +cpp_quote("EXTERN_GUID(MF_SINK_WRITER_ENCODER_CONFIG, 0xad91cd04, 0xa7cc, 0x4ac7, 0x99, 0xb6, 0xa5, 0x7b, 0x9a, 0x4a, 0x7c, 0x70);") + +cpp_quote("EXTERN_GUID(MF_READWRITE_DISABLE_CONVERTERS, 0x98d5b065, 0x1374, 0x4847, 0x8d, 0x5d, 0x31, 0x52, 0x0f, 0xee, 0x71, 0x56);") +cpp_quote("EXTERN_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS, 0x39384300, 0xd0eb, 0x40b1, 0x87, 0xa0, 0x33, 0x18, 0x87, 0x1b, 0x5a, 0x53);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY, 0x43ad19ce, 0xf33f, 0x4ba9, 0xa5, 0x80, 0xe4, 0xcd, 0x12, 0xf2, 0xd1, 0x44);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x0890, 0x4b0e, 0x93, 0x8c, 0x05, 0x43, 0x32, 0xc5, 0x47, 0xe1);") +cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") +cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") + interface IMFMediaSource; [

1 0

Nikolay Sivov : advapi32/tests: Statically link to ConvertSidToStringSidA( ).
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: df522c5a0613bf339e21bf9a59e90ec4407b0174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df522c5a0613bf339e21bf9a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 12:01:41 2017 +0300 advapi32/tests: Statically link to ConvertSidToStringSidA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f71d45f..fe84dbe 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -81,7 +81,6 @@ static VOID (WINAPI *pBuildTrusteeWithObjectsAndSidA)( PTRUSTEEA pTrustee, PSID pSid ); static LPSTR (WINAPI *pGetTrusteeNameA)( PTRUSTEEA pTrustee ); static BOOL (WINAPI *pMakeSelfRelativeSD)( PSECURITY_DESCRIPTOR, PSECURITY_DESCRIPTOR, LPDWORD ); -static BOOL (WINAPI *pConvertSidToStringSidA)( PSID pSid, LPSTR *str ); static BOOL (WINAPI *pConvertStringSidToSidA)( LPCSTR str, PSID pSid ); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE, PSID, PBOOL); static BOOL (WINAPI *pConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR, DWORD, @@ -156,9 +155,8 @@ static const char* debugstr_sid(PSID sid) DWORD le = GetLastError(); char* res = debugsid_str[debugsid_index]; debugsid_index = (debugsid_index + 1) % SID_SLOTS; - if (!pConvertSidToStringSidA) - strcpy(res, "missing ConvertSidToStringSidA"); - else if (!pConvertSidToStringSidA(sid, &sidstr)) + + if (!ConvertSidToStringSidA(sid, &sidstr)) sprintf(res, "ConvertSidToStringSidA failed le=%u", GetLastError()); else if (strlen(sidstr) > sizeof(*debugsid_str) - 1) { @@ -223,7 +221,6 @@ static void init(void) pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); pSetSecurityInfo = (void *)GetProcAddress(hmod, "SetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); - pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); pGetAce = (void *)GetProcAddress(hmod, "GetAce"); @@ -327,7 +324,7 @@ static void test_sid(void) BOOL r; LPSTR str = NULL; - if( !pConvertSidToStringSidA || !pConvertStringSidToSidA ) + if( !pConvertStringSidToSidA ) { win_skip("ConvertSidToStringSidA or ConvertStringSidToSidA not available\n"); return; @@ -371,7 +368,7 @@ static void test_sid(void) r = AllocateAndInitializeSid( &refs[i].auth, 1,1,0,0,0,0,0,0,0, &psid ); ok( r, "failed to allocate sid\n" ); - r = pConvertSidToStringSidA( psid, &str ); + r = ConvertSidToStringSidA( psid, &str ); ok( r, "failed to convert sid\n" ); if (r) { @@ -427,7 +424,7 @@ static void test_sid(void) if (r) { - if ((winetest_debug > 1) && (pConvertSidToStringSidA(psid, &temp))) + if ((winetest_debug > 1) && (ConvertSidToStringSidA(psid, &temp))) { trace(" %s: %s\n", strsid_table[i].str, temp); LocalFree(temp); @@ -1766,12 +1763,6 @@ static void test_token_attr(void) CloseHandle(Token); } - if(!pConvertSidToStringSidA) - { - win_skip("ConvertSidToStringSidA is not available\n"); - return; - } - SetLastError(0xdeadbeef); ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &Token); ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); @@ -1822,7 +1813,7 @@ static void test_token_attr(void) ret = LookupAccountSidA(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); if (ret) { - pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); + ConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); trace("%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); LocalFree(SidString); } @@ -1839,7 +1830,7 @@ static void test_token_attr(void) ok(ret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); - pConvertSidToStringSidA(User->User.Sid, &SidString); + ConvertSidToStringSidA(User->User.Sid, &SidString); trace("TokenUser: %s attr: 0x%08x\n", SidString, User->User.Attributes); LocalFree(SidString); HeapFree(GetProcessHeap(), 0, User); @@ -1954,7 +1945,7 @@ typedef union _MAX_SID static void test_sid_str(PSID * sid) { char *str_sid; - BOOL ret = pConvertSidToStringSidA(sid, &str_sid); + BOOL ret = ConvertSidToStringSidA(sid, &str_sid); ok(ret, "ConvertSidToStringSidA() failed: %d\n", GetLastError()); if (ret) { @@ -2071,7 +2062,7 @@ static void test_CreateWellKnownSid(void) ok(pCreateWellKnownSid(i, value->without_domain ? NULL : domainsid, sid_buffer, &cb), "Couldn't create well known sid %u\n", i); expect_eq(GetSidLengthRequired(*GetSidSubAuthorityCount(sid_buffer)), cb, DWORD, "%d"); ok(IsValidSid(sid_buffer), "The sid is not valid\n"); - ok(pConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); + ok(ConvertSidToStringSidA(sid_buffer, &str), "Couldn't convert SID to string\n"); ok(strcmp(str, value->sid_string) == 0, "%d: SID mismatch - expected %s, got %s\n", i, value->sid_string, str); LocalFree(str); @@ -2294,7 +2285,7 @@ static void test_LookupAccountSid(void) } HeapFree(GetProcessHeap(), 0, ptiUser); - if (pCreateWellKnownSid && pConvertSidToStringSidA) + if (pCreateWellKnownSid) { trace("Well Known SIDs:\n"); for (i = 0; i <= 60; i++) @@ -2302,7 +2293,7 @@ static void test_LookupAccountSid(void) size = SECURITY_MAX_SID_SIZE; if (pCreateWellKnownSid(i, NULL, &max_sid.sid, &size)) { - if (pConvertSidToStringSidA(&max_sid.sid, &str_sidA)) + if (ConvertSidToStringSidA(&max_sid.sid, &str_sidA)) { acc_sizeA = MAX_PATH; dom_sizeA = MAX_PATH; @@ -6784,7 +6775,7 @@ static void test_token_label(void) ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); sid = (SID *)&ace->SidStart; - pConvertSidToStringSidA(sid, &str); + ConvertSidToStringSidA(sid, &str); ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); }

1 0

Stefan Dösinger : msvcp140: Implement _File_size.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: dc736dae6356f540a7828b75455c71ecd66abfb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc736dae6356f540a7828b754… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 11 12:30:15 2017 +0200 msvcp140: Implement _File_size. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 56 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 12 +++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 0216450..2d51168 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3648,7 +3648,7 @@ @ extern _FNan _FNan @ stub _FSinh @ extern _FSnan _FSnan -@ stub _File_size +@ cdecl _File_size(wstr) @ cdecl -ret64 _Getcoll() _Getcoll @ cdecl _Getctype(ptr) _Getctype @ cdecl _Getcvt(ptr) _Getcvt diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 7cb75f5..f555980 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -152,6 +152,7 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -216,6 +217,7 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_File_size, "_File_size"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -563,6 +565,59 @@ static void test_to_wide(void) } } +static void test_File_size(void) +{ + ULONGLONG val; + HANDLE file; + LARGE_INTEGER file_size; + WCHAR test_f1_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + WCHAR test_f2_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; + WCHAR test_dir_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + WCHAR test_ne_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','n','e',0}; + WCHAR temp_path[MAX_PATH], origin_path[MAX_PATH]; + + memset(origin_path, 0, sizeof(origin_path)); + memset(origin_path, 0, sizeof(temp_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(test_dir_W, NULL); + + file = CreateFileW(test_f1_W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + val = p_File_size(test_f1_W); + ok(val == 7, "file_size is %s\n", wine_dbgstr_longlong(val)); + + file = CreateFileW(test_f2_W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + val = p_File_size(test_f2_W); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); + + val = p_File_size(test_dir_W); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); + + errno = 0xdeadbeef; + val = p_File_size(test_ne_W); + ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + val = p_File_size(NULL); + ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(DeleteFileW(test_f1_W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f2_W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dir_W), "expect wine_test_dir to exist\n"); + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -574,5 +629,6 @@ START_TEST(msvcp140) test_chore(); test_to_byte(); test_to_wide(); + test_File_size(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8e3376c..e3ba648 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15471,6 +15471,18 @@ ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +/* _File_size, msvcp140 version. Different error handling. */ +ULONGLONG __cdecl _File_size(WCHAR const* path) +{ + WIN32_FILE_ATTRIBUTE_DATA fad; + + TRACE("(%s)\n", debugstr_w(path)); + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) + return ~(ULONGLONG)0; + + return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; +} + /* ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ /* ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2)

1 0

Piotr Caban : gdiplus: Support GdipSetPixelOffsetMode in metafiles.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: f7160291dfbf8b61349526f44a0c72bb4bd28131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7160291dfbf8b61349526f44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 11 10:59:03 2017 +0200 gdiplus: Support GdipSetPixelOffsetMode in metafiles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7a6fcb1..f20178a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5913,6 +5913,19 @@ GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode if(graphics->busy) return ObjectBusy; + if(graphics->pixeloffset == mode) + return Ok; + + if(graphics->image && graphics->image->type == ImageTypeMetafile) + { + GpStatus stat; + + stat = METAFILE_AddSimpleProperty((GpMetafile*)graphics->image, + EmfPlusRecordTypeSetPixelOffsetMode, mode); + if(stat != Ok) + return stat; + } + graphics->pixeloffset = mode; return Ok;

1 0

Nikolay Sivov : advapi32/tests: Fix a sid string leak (Valgrind).
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: a0ac14456b5f31ef97698a1d711f10e99378f49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ac14456b5f31ef97698a1d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 12:01:42 2017 +0300 advapi32/tests: Fix a sid string leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fe84dbe..4121908 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6777,6 +6777,7 @@ static void test_token_label(void) sid = (SID *)&ace->SidStart; ConvertSidToStringSidA(sid, &str); ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); + LocalFree(str); } ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted);

1 0

Alexandre Julliard : user32: Match cursor size in priority over color depth.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: 55d247ef13656eb703dfb943f309adb8c5b37f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d247ef13656eb703dfb943f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 11 21:22:54 2017 +0200 user32: Match cursor size in priority over color depth. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4b2d6bd..f408c22 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -580,11 +580,14 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ { if (cx > width || cy > height) continue; if (cx < maxwidth || cy < maxheight) continue; - if (loadflags & LR_MONOCHROME) + if (cx == maxwidth && cy == maxheight) { - if (maxbits && bits >= maxbits) continue; + if (loadflags & LR_MONOCHROME) + { + if (maxbits && bits >= maxbits) continue; + } + else if (bits <= maxbits) continue; } - else if (bits <= maxbits) continue; bestEntry = i; maxwidth = cx; maxheight = cy; @@ -598,11 +601,14 @@ static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_ for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if (cx > maxwidth || cy > maxheight) continue; - if (loadflags & LR_MONOCHROME) + if (cx == maxwidth && cy == maxheight) { - if (maxbits && bits >= maxbits) continue; + if (loadflags & LR_MONOCHROME) + { + if (maxbits && bits >= maxbits) continue; + } + else if (bits <= maxbits) continue; } - else if (bits <= maxbits) continue; bestEntry = i; maxwidth = cx; maxheight = cy;

1 0

Stefan Dösinger : msvcp140: Export _Current_set.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: 8810c88abff72df3c6f51c07b11d2efe55a220dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8810c88abff72df3c6f51c07b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 11 12:30:17 2017 +0200 msvcp140: Export _Current_set. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 10bad33..22871bc 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3635,7 +3635,7 @@ @ stub _Copy_file @ stub _Cosh @ cdecl _Current_get(ptr) -@ stub _Current_set +@ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest @ stub _Equivalent diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 7f1aae3..7ab1ba5 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -153,6 +153,7 @@ static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); +static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -219,6 +220,7 @@ static BOOL init(void) } SET(p_Current_get, "_Current_get"); + SET(p_Current_set, "_Current_set"); SET(p_File_size, "_File_size"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -645,6 +647,50 @@ static void test_Current_get(void) wine_dbgstr_w(origin_path), wine_dbgstr_w(current_path)); } +static void test_Current_set(void) +{ + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; + MSVCP_bool ret; + WCHAR testW[] = {'.','/',0}; + WCHAR not_exit_dirW[] = {'n', 'o', 't', '_', 'e', 'x', 'i', 's', 't', '_', 'd', 'i', 'r', 0}; + WCHAR invalid_nameW[] = {'?', '?', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'n', 'a', 'm', 'e', '>', '>', 0}; + memset(temp_path, 0, sizeof(temp_path)); + GetTempPathW(MAX_PATH, temp_path); + memset(origin_path, 0, sizeof(origin_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + + ok(p_Current_set(temp_path), "p_Current_set to temp_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + current_path[wcslen(current_path)] = '\\'; + ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); + + ok(p_Current_set(testW), "p_Current_set to temp_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + current_path[wcslen(current_path)] = '\\'; + ok(!wcscmp(temp_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(temp_path), wine_dbgstr_w(current_path)); + + errno = 0xdeadbeef; + ok(!p_Current_set(not_exit_dirW), "p_Current_set to not_exist_dir succeed\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ok(!p_Current_set(invalid_nameW), "p_Current_set to ??invalid_name>> succeed\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(p_Current_set(origin_path), "p_Current_set to origin_path failed\n"); + memset(current_path, 0, sizeof(current_path)); + ret = p_Current_get(current_path); + ok(ret == TRUE, "p_Current_get returned %u\n", ret); + ok(!wcscmp(origin_path, current_path), "p_Current_get(): expect: %s, got %s\n", + wine_dbgstr_w(origin_path), wine_dbgstr_w(current_path)); +} + START_TEST(msvcp140) { if(!init()) return; @@ -658,5 +704,6 @@ START_TEST(msvcp140) test_to_wide(); test_File_size(); test_Current_get(); + test_Current_set(); FreeLibrary(msvcp); }

1 0

Nikolay Sivov : d2d1/tests: Fix stroke style object leak (Valgrind).
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: d6e2a6f370b50df06ec5957226f637e40d049527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2a6f370b50df06ec595722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 11:36:02 2017 +0300 d2d1/tests: Fix stroke style object leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e0318ce..e9e73d8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4440,6 +4440,8 @@ static void test_stroke_style(void) desc.dashStyle = D2D1_DASH_STYLE_CUSTOM; desc.dashOffset = 0.0f; + ID2D1StrokeStyle_Release(style); + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); ok(hr == E_INVALIDARG, "Unexpected return value, %#x.\n", hr);

1 0

Nikolay Sivov : d2d1: Added a helper to trace D2D1_RECT_F arguments.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: 9fe40c24f8cb6d7bafe3b41ad57a01b9aa14f225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe40c24f8cb6d7bafe3b41ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 10 19:02:18 2017 +0300 d2d1: Added a helper to trace D2D1_RECT_F arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 20 ++++++++++---------- dlls/d2d1/d2d1_private.h | 6 ++++++ dlls/d2d1/dc_render_target.c | 20 ++++++++++---------- dlls/d2d1/factory.c | 2 +- dlls/d2d1/hwnd_render_target.c | 20 ++++++++++---------- dlls/d2d1/render_target.c | 20 ++++++++++---------- dlls/d2d1/wic_render_target.c | 20 ++++++++++---------- 7 files changed, 57 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fe40c24f8cb6d7bafe3b…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 11, 2017

July 11, 2017

Module: wine Branch: master Commit: 26c2745266fb8e81368b411e4f06f06869d5c53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c2745266fb8e81368b411e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 11 13:18:51 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/po/ru.po b/po/ru.po index a5bcfae..eefee95 100644 --- a/po/ru.po +++ b/po/ru.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: 2017-06-30 10:35+0300\n" +"PO-Revision-Date: 2017-07-11 13:16+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -1171,7 +1171,7 @@ msgstr "Документов в очереди: %d" #: comdlg32.rc:79 msgid "Margins [inches]" -msgstr "Границы [дюймы)" +msgstr "Границы [дюймы]" #: comdlg32.rc:80 msgid "Margins [mm]" @@ -6895,27 +6895,23 @@ msgstr "выберите каталог, содержащий %s" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Критическая ошибка: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Ошибка [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Предупреждение [1]." #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " msgid "Info [1]." -msgstr "Инфо [1]. " +msgstr "Инфо [1]." #: msi.rc:75 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Диск полностью заполнен.\n" +msgstr "{{Диск полон: }}" #: msi.rc:76 msgid "Action %s: [1]. [2]" @@ -6943,6 +6939,8 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Произошла непредвиденная ошибка при установке пакета. Возможно проблема в " +"самом пакете. Код ошибки [1]. {{Аргументы: [2], [3], [4]}}" #: msi.rc:92 msgid "Allocating registry space" @@ -7010,11 +7008,11 @@ msgstr "Проверка установки" #: msi.rc:110 msgid "Evaluating launch conditions" -msgstr "вычисление условий запуска" +msgstr "Вычисление условий запуска" #: msi.rc:111 msgid "Migrating feature states from related applications" -msgstr "Миграция состояний компонентов " +msgstr "Миграция состояний компонентов" #: msi.rc:112 msgid "Moving files" @@ -12991,7 +12989,7 @@ msgstr "Загрузка ЦП" #: taskmgr.rc:373 msgid "Mem usage" -msgstr "использование памяти" +msgstr "Использование памяти" #: taskmgr.rc:374 msgid "Totals" @@ -13550,7 +13548,7 @@ msgstr "Выгр. пул" #: taskmgr.rc:288 msgid "NP Pool" -msgstr "Невыгр. пул." +msgstr "Невыгр. пул" #: taskmgr.rc:289 msgid "Base Pri"

1 0