May 2015 - Wine-commits - list.winehq.org

Alex Henrie : winmm: Make mixer UI translatable.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: e4fce5058d7f35b7188a17b3aadfc5fa1d62ec1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fce5058d7f35b7188a17b3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 18 23:44:25 2015 -0600 winmm: Make mixer UI translatable. --- dlls/winmm/resource.h | 22 ++++++ dlls/winmm/waveform.c | 35 +++------ dlls/winmm/winmm.rc | 7 ++ po/ar.po | 206 +++++++++++++++++++++++++++----------------------- po/bg.po | 203 ++++++++++++++++++++++++++----------------------- po/ca.po | 206 +++++++++++++++++++++++++++----------------------- po/cs.po | 206 +++++++++++++++++++++++++++----------------------- po/da.po | 206 +++++++++++++++++++++++++++----------------------- po/de.po | 206 +++++++++++++++++++++++++++----------------------- po/el.po | 202 ++++++++++++++++++++++++++----------------------- po/en.po | 202 ++++++++++++++++++++++++++----------------------- po/en_US.po | 202 ++++++++++++++++++++++++++----------------------- po/eo.po | 206 +++++++++++++++++++++++++++----------------------- po/es.po | 206 +++++++++++++++++++++++++++----------------------- po/fa.po | 202 ++++++++++++++++++++++++++----------------------- po/fi.po | 206 +++++++++++++++++++++++++++----------------------- po/fr.po | 206 +++++++++++++++++++++++++++----------------------- po/he.po | 206 +++++++++++++++++++++++++++----------------------- po/hi.po | 202 ++++++++++++++++++++++++++----------------------- po/hr.po | 206 +++++++++++++++++++++++++++----------------------- po/hu.po | 206 +++++++++++++++++++++++++++----------------------- po/it.po | 206 +++++++++++++++++++++++++++----------------------- po/ja.po | 206 +++++++++++++++++++++++++++----------------------- po/ko.po | 206 +++++++++++++++++++++++++++----------------------- po/lt.po | 206 +++++++++++++++++++++++++++----------------------- po/ml.po | 202 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 206 +++++++++++++++++++++++++++----------------------- po/nl.po | 206 +++++++++++++++++++++++++++----------------------- po/or.po | 202 ++++++++++++++++++++++++++----------------------- po/pa.po | 202 ++++++++++++++++++++++++++----------------------- po/pl.po | 206 +++++++++++++++++++++++++++----------------------- po/pt_BR.po | 206 +++++++++++++++++++++++++++----------------------- po/pt_PT.po | 206 +++++++++++++++++++++++++++----------------------- po/rm.po | 202 ++++++++++++++++++++++++++----------------------- po/ro.po | 206 +++++++++++++++++++++++++++----------------------- po/ru.po | 206 +++++++++++++++++++++++++++----------------------- po/sk.po | 206 +++++++++++++++++++++++++++----------------------- po/sl.po | 206 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 206 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 206 +++++++++++++++++++++++++++----------------------- po/sv.po | 206 +++++++++++++++++++++++++++----------------------- po/te.po | 202 ++++++++++++++++++++++++++----------------------- po/th.po | 202 ++++++++++++++++++++++++++----------------------- po/tr.po | 206 +++++++++++++++++++++++++++----------------------- po/uk.po | 206 +++++++++++++++++++++++++++----------------------- po/wa.po | 202 ++++++++++++++++++++++++++----------------------- po/wine.pot | 202 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 206 +++++++++++++++++++++++++++----------------------- po/zh_TW.po | 206 +++++++++++++++++++++++++++----------------------- 49 files changed, 5183 insertions(+), 4302 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4fce5058d7f35b7188a1…

1 0

André Hentschel : include: Add more defines related to ARM64.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: cc95ba7ed25a2a9796b605ac398a3a2535963f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc95ba7ed25a2a9796b605ac3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 20 14:31:43 2015 +0200 include: Add more defines related to ARM64. --- include/winnt.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 9b08544..b25c25b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -652,6 +652,7 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_NEUTRAL 11 +#define PROCESSOR_ARCHITECTURE_ARM64 12 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */ @@ -873,6 +874,10 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 #define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 #define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 +#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 +#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 +#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 +#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 /* Execution state flags */ @@ -2097,6 +2102,8 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define PRODUCT_SB_SOLUTION_SERVER_EM 0x00000036 #define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM 0x00000037 #define PRODUCT_SOLUTION_EMBEDDEDSERVER 0x00000038 +#define PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE 0x00000039 +#define PRODUCT_PROFESSIONAL_EMBEDDED 0x0000003A #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x0000003B #define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL 0x0000003C #define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC 0x0000003D @@ -2116,14 +2123,50 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); #define PRODUCT_STANDARD_EVALUATION_SERVER 0x0000004F #define PRODUCT_DATACENTER_EVALUATION_SERVER 0x00000050 #define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054 +#define PRODUCT_EMBEDDED_AUTOMOTIVE 0x00000055 +#define PRODUCT_EMBEDDED_INDUSTRY_A 0x00000056 +#define PRODUCT_THINPC 0x00000057 +#define PRODUCT_EMBEDDED_A 0x00000058 +#define PRODUCT_EMBEDDED_INDUSTRY 0x00000059 +#define PRODUCT_EMBEDDED_E 0x0000005A +#define PRODUCT_EMBEDDED_INDUSTRY_E 0x0000005B +#define PRODUCT_EMBEDDED_INDUSTRY_A_E 0x0000005C #define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x0000005F #define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x00000060 #define PRODUCT_CORE_ARM 0x00000061 #define PRODUCT_CORE_N 0x00000062 #define PRODUCT_CORE_COUNTRYSPECIFIC 0x00000063 +#define PRODUCT_CORE_SINGLELANGUAGE 0x00000064 #define PRODUCT_CORE_LANGUAGESPECIFIC 0x00000064 #define PRODUCT_CORE 0x00000065 #define PRODUCT_PROFESSIONAL_WMC 0x00000067 +#define PRODUCT_MOBILE_CORE 0x00000068 +#define PRODUCT_EMBEDDED_INDUSTRY_EVAL 0x00000069 +#define PRODUCT_EMBEDDED_INDUSTRY_E_EVAL 0x0000006A +#define PRODUCT_EMBEDDED_EVAL 0x0000006B +#define PRODUCT_EMBEDDED_E_EVAL 0x0000006C +#define PRODUCT_NANO_SERVER 0x0000006D +#define PRODUCT_CLOUD_STORAGE_SERVER 0x0000006E +#define PRODUCT_CORE_CONNECTED 0x0000006F +#define PRODUCT_PROFESSIONAL_STUDENT 0x00000070 +#define PRODUCT_CORE_CONNECTED_N 0x00000071 +#define PRODUCT_PROFESSIONAL_STUDENT_N 0x00000072 +#define PRODUCT_CORE_CONNECTED_SINGLELANGUAGE 0x00000073 +#define PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC 0x00000074 +#define PRODUCT_CONNECTED_CAR 0x00000075 +#define PRODUCT_INDUSTRY_HANDHELD 0x00000076 +#define PRODUCT_PPI_PRO 0x00000077 +#define PRODUCT_ARM64_SERVER 0x00000078 +#define PRODUCT_EDUCATION 0x00000079 +#define PRODUCT_EDUCATION_N 0x0000007A +#define PRODUCT_IOTUAP 0x0000007B +#define PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER 0x0000007C +#define PRODUCT_ENTERPRISE_S 0x0000007D +#define PRODUCT_ENTERPRISE_S_N 0x0000007E +#define PRODUCT_PROFESSIONAL_S 0x0000007F +#define PRODUCT_PROFESSIONAL_S_N 0x00000080 +#define PRODUCT_ENTERPRISE_S_EVALUATION 0x00000081 +#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082 #define PRODUCT_UNLICENSED 0xABCDABCD @@ -3230,6 +3273,23 @@ typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; #define IMAGE_REL_ARM_BRANCH24T 0x0014 #define IMAGE_REL_ARM_BLX23T 0x0015 +/* ARM64 relocation types */ +#define IMAGE_REL_ARM64_ABSOLUTE 0x0000 +#define IMAGE_REL_ARM64_ADDR32 0x0001 +#define IMAGE_REL_ARM64_ADDR32NB 0x0002 +#define IMAGE_REL_ARM64_BRANCH26 0x0003 +#define IMAGE_REL_ARM64_PAGEBASE_REL21 0x0004 +#define IMAGE_REL_ARM64_REL21 0x0005 +#define IMAGE_REL_ARM64_PAGEOFFSET_12A 0x0006 +#define IMAGE_REL_ARM64_PAGEOFFSET_12L 0x0007 +#define IMAGE_REL_ARM64_SECREL 0x0008 +#define IMAGE_REL_ARM64_SECREL_LOW12A 0x0009 +#define IMAGE_REL_ARM64_SECREL_HIGH12A 0x000A +#define IMAGE_REL_ARM64_SECREL_LOW12L 0x000B +#define IMAGE_REL_ARM64_TOKEN 0x000C +#define IMAGE_REL_ARM64_SECTION 0x000D +#define IMAGE_REL_ARM64_ADDR64 0x000E + /* IA64 relocation types */ #define IMAGE_REL_IA64_ABSOLUTE 0x0000 #define IMAGE_REL_IA64_IMM14 0x0001

1 0

André Hentschel : ntdll: Use the correct arch value for ARM64.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 74ef3af73dc5d7b4887ed4504bd61ad69d464135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ef3af73dc5d7b4887ed4504… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 20 14:43:09 2015 +0200 ntdll: Use the correct arch value for ARM64. --- 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 3601c0f..550a91a 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1147,7 +1147,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { info->Level = 8; - info->Architecture = PROCESSOR_ARCHITECTURE_ARM; + info->Architecture = PROCESSOR_ARCHITECTURE_ARM64; } #endif /* End architecture specific feature detection for CPUs */

1 0

Martin Storsjo : kernel32: Implement a few more classes in GetFileInformationByHandleEx.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 68b654ad2fe18aad6b9b0d0128656753f6639442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b654ad2fe18aad6b9b0d012… Author: Martin Storsjo <martin(a)martin.st> Date: Wed May 20 20:44:56 2015 +0300 kernel32: Implement a few more classes in GetFileInformationByHandleEx. --- dlls/kernel32/file.c | 31 +++++++++++--------- dlls/kernel32/tests/file.c | 72 ++++++++++++++++++++++++++++++++++++++++++++-- include/winbase.h | 21 ++++++++++++++ 3 files changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 006db1c..a680ab2 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -897,8 +897,6 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA switch (class) { - case FileBasicInfo: - case FileStandardInfo: case FileRenameInfo: case FileDispositionInfo: case FileAllocationInfo: @@ -919,31 +917,36 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileBasicInfo: + status = NtQueryInformationFile( handle, &io, info, size, FileBasicInformation ); + break; + + case FileStandardInfo: + status = NtQueryInformationFile( handle, &io, info, size, FileStandardInformation ); + break; + case FileNameInfo: status = NtQueryInformationFile( handle, &io, info, size, FileNameInformation ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; + break; case FileIdBothDirectoryRestartInfo: case FileIdBothDirectoryInfo: status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size, FileIdBothDirectoryInformation, FALSE, NULL, (class == FileIdBothDirectoryRestartInfo) ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; + break; default: SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; } diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 64b0b8b..bd85e01 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3821,11 +3821,15 @@ else static void test_GetFileInformationByHandleEx(void) { int i; - char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024]; + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024], *strPtr; BOOL ret; - DWORD ret2; - HANDLE directory; + DWORD ret2, written; + HANDLE directory, file; FILE_ID_BOTH_DIR_INFO *bothDirInfo; + FILE_BASIC_INFO *basicInfo; + FILE_STANDARD_INFO *standardInfo; + FILE_NAME_INFO *nameInfo; + LARGE_INTEGER prevWrite; struct { FILE_INFO_BY_HANDLE_CLASS handleClass; void *ptr; @@ -3888,6 +3892,68 @@ static void test_GetFileInformationByHandleEx(void) } CloseHandle(directory); + + file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "GetFileInformationByHandleEx: failed to open the temp file, " + "got error %u.\n", GetLastError()); + + /* Test FileBasicInfo; make sure the write time changes when a file is updated */ + memset(buffer, 0xff, sizeof(buffer)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, buffer, sizeof(buffer)); + ok(ret, "GetFileInformationByHandleEx: failed to get FileBasicInfo, %u\n", GetLastError()); + basicInfo = (FILE_BASIC_INFO *)buffer; + prevWrite = basicInfo->LastWriteTime; + CloseHandle(file); + + Sleep(30); /* Make sure a new write time is different from the previous */ + + /* Write something to the file, to make sure the write time has changed */ + file = CreateFileA(tempFileName, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "GetFileInformationByHandleEx: failed to open the temp file, " + "got error %u.\n", GetLastError()); + ret = WriteFile(file, tempFileName, strlen(tempFileName), &written, NULL); + ok(ret, "GetFileInformationByHandleEx: Write failed\n"); + CloseHandle(file); + + file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "GetFileInformationByHandleEx: failed to open the temp file, " + "got error %u.\n", GetLastError()); + + memset(buffer, 0xff, sizeof(buffer)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, buffer, sizeof(buffer)); + ok(ret, "GetFileInformationByHandleEx: failed to get FileBasicInfo, %u\n", GetLastError()); + basicInfo = (FILE_BASIC_INFO *)buffer; + /* Could also check that the creation time didn't change - on windows + * it doesn't, but on wine, it does change even if it shouldn't. */ + ok(basicInfo->LastWriteTime.QuadPart != prevWrite.QuadPart, + "GetFileInformationByHandleEx: last write time didn't change\n"); + + /* Test FileStandardInfo, check some basic parameters */ + memset(buffer, 0xff, sizeof(buffer)); + ret = pGetFileInformationByHandleEx(file, FileStandardInfo, buffer, sizeof(buffer)); + ok(ret, "GetFileInformationByHandleEx: failed to get FileStandardInfo, %u\n", GetLastError()); + standardInfo = (FILE_STANDARD_INFO *)buffer; + ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpcted number of links\n"); + ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpcted pending delete\n"); + ok(standardInfo->Directory == FALSE, "GetFileInformationByHandleEx: Incorrect directory flag\n"); + + /* Test FileNameInfo */ + memset(buffer, 0xff, sizeof(buffer)); + ret = pGetFileInformationByHandleEx(file, FileNameInfo, buffer, sizeof(buffer)); + ok(ret, "GetFileInformationByHandleEx: failed to get FileNameInfo, %u\n", GetLastError()); + nameInfo = (FILE_NAME_INFO *)buffer; + strPtr = strchr(tempFileName, '\\'); + ok(strPtr != NULL, "GetFileInformationByHandleEx: Temp filename didn't contain backslash\n"); + ok(nameInfo->FileNameLength == strlen(strPtr) * 2, + "GetFileInformationByHandleEx: Incorrect file name length\n"); + for (i = 0; i < nameInfo->FileNameLength/2; i++) + ok(strPtr[i] == nameInfo->FileName[i], "Incorrect filename char %d: %c vs %c\n", + i, strPtr[i], nameInfo->FileName[i]); + CloseHandle(file); + DeleteFileA(tempFileName); } diff --git a/include/winbase.h b/include/winbase.h index 7540e6d..3601051 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -823,6 +823,27 @@ typedef struct _FILE_ID_BOTH_DIR_INFO { WCHAR FileName[1]; } FILE_ID_BOTH_DIR_INFO, *PFILE_ID_BOTH_DIR_INFO; +typedef struct _FILE_BASIC_INFO { + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + DWORD FileAttributes; +} FILE_BASIC_INFO, *PFILE_BASIC_INFO; + +typedef struct _FILE_STANDARD_INFO { + LARGE_INTEGER AllocationSize; + LARGE_INTEGER EndOfFile; + DWORD NumberOfLinks; + BOOLEAN DeletePending; + BOOLEAN Directory; +} FILE_STANDARD_INFO, *PFILE_STANDARD_INFO; + +typedef struct _FILE_NAME_INFO { + DWORD FileNameLength; + WCHAR FileName[1]; +} FILE_NAME_INFO, *PFILE_NAME_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0

Nikolay Sivov : include: Fix oleacc.idl size_is attributes for void** arrays.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 3e64491a4afa88a889d75d8c24e24f1dd4f2af72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e64491a4afa88a889d75d8c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 08:16:23 2015 +0300 include: Fix oleacc.idl size_is attributes for void** arrays. --- include/oleacc.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 9edfdda..3328548 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -230,7 +230,7 @@ interface IAccessibleHandler : IUnknown interface IAccIdentity : IUnknown { HRESULT GetIdentityString([in] DWORD idchild, - [out, size_is(*string_len)] BYTE **str, + [out, size_is(,*string_len)] BYTE **str, [out] DWORD *string_len); } @@ -295,7 +295,7 @@ interface IAccPropServices : IUnknown HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [out, size_is(*string_len)] BYTE **str, + [out, size_is(,*string_len)] BYTE **str, [out] DWORD *string_len); HRESULT DecomposeHwndIdentityString([in, size_is(string_len)] const BYTE *str, @@ -322,7 +322,7 @@ interface IAccPropServices : IUnknown HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, - [out, size_is(*string_len)] BYTE **str, + [out, size_is(,*string_len)] BYTE **str, [out] DWORD *string_len); HRESULT DecomposeHmenuIdentityString([in, size_is(string_len)] const BYTE *str,

1 0

Nikolay Sivov : include: Fix missing attributes in urlmon.idl.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: b191519a4b8b6aa024a12c7e2306831f54e23902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b191519a4b8b6aa024a12c7e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 09:28:13 2015 +0300 include: Fix missing attributes in urlmon.idl. --- include/urlmon.idl | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index a9b665c..4be8d4b 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -292,7 +292,7 @@ interface IBindStatusCallback : IUnknown [in] ULONG ulProgress, [in] ULONG ulProgressMax, [in] ULONG ulStatusCode, - [in] LPCWSTR szStatusText); + [in, unique] LPCWSTR szStatusText); HRESULT OnStopBinding( [in] HRESULT hresult, @@ -593,6 +593,7 @@ interface ICodeInstall : IWindowForBindingUI * IHttpSecurity interface */ [ + local, object, uuid(79eac9d7-bafa-11ce-8c82-00aa004ba90b), pointer_default(unique) @@ -1092,7 +1093,7 @@ cpp_quote("#define MAX_SIZE_SECURITY_ID 512") [in] DWORD dwAction, [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, - [in] BYTE *pContext, + [in, unique] BYTE *pContext, [in] DWORD cbContext, [in] DWORD dwFlags, [in] DWORD dwReserved); @@ -1137,7 +1138,7 @@ interface IInternetSecurityManagerEx : IInternetSecurityManager HRESULT ProcessUrlActionEx( [in] LPCWSTR pwszUrl, [in] DWORD dwAction, - [out] BYTE *pPolicy, + [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, [in] BYTE *pContext, [in] DWORD cbContext, @@ -1168,9 +1169,9 @@ interface IInternetSecurityManagerEx2 : IInternetSecurityManagerEx HRESULT ProcessUrlActionEx2( [in] IUri *pUri, [in] DWORD dwAction, - [out] BYTE *pPolicy, + [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, - [in] BYTE *pContext, + [in, unique] BYTE *pContext, [in] DWORD cbContext, [in] DWORD dwFlags, [in] DWORD_PTR dwReserved, @@ -1178,14 +1179,14 @@ interface IInternetSecurityManagerEx2 : IInternetSecurityManagerEx HRESULT GetSecurityIdEx2( [in] IUri *pUri, - [out] BYTE *pbSecurityId, + [out, size_is(*pcbSecurityId)] BYTE *pbSecurityId, [in, out] DWORD *pcbSecurityId, [in] DWORD_PTR dwReserved); HRESULT QueryCustomPolicyEx2( [in] IUri *pUri, [in] REFGUID guidKey, - [out] BYTE **ppPolicy, + [out, size_is(,*pcbPolicy)] BYTE **ppPolicy, [out] DWORD *pcbPolicy, [in] BYTE *pContext, [in] DWORD cbContext, @@ -1441,28 +1442,28 @@ interface IInternetZoneManager : IUnknown HRESULT GetZoneCustomPolicy( [in] DWORD dwZone, [in] REFGUID guidKey, - [out] BYTE **ppPolicy, + [out, size_is(,*pcbPolicy)] BYTE **ppPolicy, [out] DWORD* pcbPolicy, [in] URLZONEREG ulrZoneReg); HRESULT SetZoneCustomPolicy( [in] DWORD dwZone, [in] REFGUID guidKey, - [in] BYTE *ppPolicy, + [in, size_is(pcbPolicy)] BYTE *ppPolicy, [in] DWORD pcbPolicy, [in] URLZONEREG ulrZoneReg); HRESULT GetZoneActionPolicy( [in] DWORD dwZone, [in] DWORD dwAction, - [out] BYTE* pPolicy, + [out, size_is(cbPolicy)] BYTE* pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg); HRESULT SetZoneActionPolicy( [in] DWORD dwZone, [in] DWORD dwAction, - [in] BYTE* pPolicy, + [in, size_is(cbPolicy)] BYTE* pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg); @@ -1512,7 +1513,7 @@ interface IInternetZoneManagerEx : IInternetZoneManager HRESULT GetZoneActionPolicyEx( [in] DWORD dwZone, [in] DWORD dwAction, - [out] BYTE* pPolicy, + [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg, [in] DWORD dwFlags); @@ -1520,7 +1521,7 @@ interface IInternetZoneManagerEx : IInternetZoneManager HRESULT SetZoneActionPolicyEx( [in] DWORD dwZone, [in] DWORD dwAction, - [in] BYTE* pPolicy, + [in, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg, [in] DWORD dwFlags);

1 0

Alexandre Julliard : server: Allow a device file to be mapped directly to a Unix device.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: b414b93d5acc5629559f1e192de9034a833dda52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b414b93d5acc5629559f1e192… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:18:08 2015 +0900 server: Allow a device file to be mapped directly to a Unix device. --- server/device.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 6afa004..de11a9a 100644 --- a/server/device.c +++ b/server/device.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -120,6 +124,7 @@ struct device { struct object obj; /* object header */ struct device_manager *manager; /* manager for this device (or NULL if deleted) */ + char *unix_path; /* path to unix device if any */ client_ptr_t user_ptr; /* opaque ptr for client side */ struct list entry; /* entry in device manager list */ struct list files; /* list of open files */ @@ -326,6 +331,7 @@ static void device_destroy( struct object *obj ) assert( list_empty( &device->files )); + free( device->unix_path ); if (device->manager) list_remove( &device->entry ); } @@ -340,7 +346,17 @@ static struct object *device_open_file( struct object *obj, unsigned int access, file->device = (struct device *)grab_object( device ); list_init( &file->requests ); list_add_tail( &device->files, &file->entry ); - if (!(file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 ))) + if (device->unix_path) + { + mode_t mode = 0666; + access = file->obj.ops->map_access( &file->obj, access ); + file->fd = open_fd( NULL, device->unix_path, O_NONBLOCK | O_LARGEFILE, + &mode, access, sharing, options ); + if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); + } + else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, 0 ); + + if (!file->fd) { release_object( file ); file = NULL; @@ -509,6 +525,7 @@ static struct device *create_device( struct directory *root, const struct unicod if (get_error() != STATUS_OBJECT_NAME_EXISTS) { /* initialize it if it didn't already exist */ + device->unix_path = NULL; device->manager = manager; list_add_tail( &manager->devices, &device->entry ); list_init( &device->files );

1 0

Ken Thomases : configure: Add a check for sys/vnode.h.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 4655924568291481ebbf18a177f3fa852d5448e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4655924568291481ebbf18a17… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 20 14:59:23 2015 -0500 configure: Add a check for sys/vnode.h. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+) diff --git a/configure b/configure index fff8e9b..ec6bd6f 100755 --- a/configure +++ b/configure @@ -6706,6 +6706,7 @@ for ac_header in \ sys/user.h \ sys/utsname.h \ sys/vm86.h \ + sys/vnode.h \ sys/wait.h \ syscall.h \ termios.h \ diff --git a/configure.ac b/configure.ac index fcf825e..1133499 100644 --- a/configure.ac +++ b/configure.ac @@ -506,6 +506,7 @@ AC_CHECK_HEADERS(\ sys/user.h \ sys/utsname.h \ sys/vm86.h \ + sys/vnode.h \ sys/wait.h \ syscall.h \ termios.h \ diff --git a/include/config.h.in b/include/config.h.in index 4d7c7ac..bcc6eb9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1122,6 +1122,9 @@ /* Define to 1 if you have the <sys/vm86.h> header file. */ #undef HAVE_SYS_VM86_H +/* Define to 1 if you have the <sys/vnode.h> header file. */ +#undef HAVE_SYS_VNODE_H + /* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H

1 0

Ken Thomases : ntdll: Fix read_directory_getattrlist() to get the name of a symlink rather than its target, but still detect if the symlink is broken.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: bb89f10e5ed690abd191941a6ba5ecadb7d70c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb89f10e5ed690abd191941a6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 20 14:59:39 2015 -0500 ntdll: Fix read_directory_getattrlist() to get the name of a symlink rather than its target, but still detect if the symlink is broken. --- dlls/ntdll/directory.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 267f019..1a8d9cc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -47,6 +47,9 @@ #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif +#ifdef HAVE_SYS_VNODE_H +#include <sys/vnode.h> +#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -2140,12 +2143,15 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer int unix_len, ret, used_default; char *unix_name; struct attrlist attrlist; +#include "pshpack4.h" struct { u_int32_t length; struct attrreference name_reference; + fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; +#include "poppack.h" TRACE("looking up file %s\n", debugstr_us( mask )); @@ -2173,8 +2179,16 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME; - ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), 0 ); + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; + ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); + /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. + Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ + if (!ret && attrlist_buffer.type == VLNK) + { + u_int32_t dummy; + attrlist.commonattr = 0; + ret = getattrlist( unix_name, &attrlist, &dummy, sizeof(dummy), 0 ); + } if (!ret) { union file_directory_info *info = append_entry( buffer, io, length, attrlist_buffer.name, NULL, NULL, class );

1 0

Nikolay Sivov : msctfp: Added proxy/stub dll for msctf.idl interfaces.
by Alexandre Julliard 21 May '15

21 May '15

Module: wine Branch: master Commit: 5d0806d29dbb8505868cb25a3813c96d8092507b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0806d29dbb8505868cb25a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 12:51:47 2015 +0300 msctfp: Added proxy/stub dll for msctf.idl interfaces. --- configure | 2 ++ configure.ac | 1 + dlls/msctfp/Makefile.in | 6 ++++++ dlls/msctfp/msctfp.idl | 27 +++++++++++++++++++++++++++ dlls/msctfp/msctfp.spec | 5 +++++ 5 files changed, 41 insertions(+) diff --git a/configure b/configure index ec6bd6f..de5f942 100755 --- a/configure +++ b/configure @@ -1130,6 +1130,7 @@ enable_mscat32 enable_mscms enable_mscoree enable_msctf +enable_msctfp enable_msdaps enable_msdmo enable_msftedit @@ -17378,6 +17379,7 @@ wine_fn_config_dll mscoree enable_mscoree clean wine_fn_config_test dlls/mscoree/tests mscoree_test wine_fn_config_dll msctf enable_msctf clean wine_fn_config_test dlls/msctf/tests msctf_test +wine_fn_config_dll msctfp enable_msctfp clean wine_fn_config_dll msdaps enable_msdaps clean wine_fn_config_dll msdmo enable_msdmo implib wine_fn_config_test dlls/msdmo/tests msdmo_test diff --git a/configure.ac b/configure.ac index 1133499..7a48000 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(mscoree,,[clean]) WINE_CONFIG_TEST(dlls/mscoree/tests) WINE_CONFIG_DLL(msctf,,[clean]) WINE_CONFIG_TEST(dlls/msctf/tests) +WINE_CONFIG_DLL(msctfp,,[clean]) WINE_CONFIG_DLL(msdaps,,[clean]) WINE_CONFIG_DLL(msdmo,,[implib]) WINE_CONFIG_TEST(dlls/msdmo/tests) diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in new file mode 100644 index 0000000..9ff3c3d --- /dev/null +++ b/dlls/msctfp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = msctfp.dll +IMPORTS = rpcrt4 ole32 oleaut32 + +IDL_SRCS = msctfp.idl + +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL diff --git a/dlls/msctfp/msctfp.idl b/dlls/msctfp/msctfp.idl new file mode 100644 index 0000000..c1d7ec0 --- /dev/null +++ b/dlls/msctfp/msctfp.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Nikolay Sivov for CodeWeavers + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep ident proxy register + +#include "msctf.idl" + +[ + threading(both), + uuid(b5f8fb3b-393f-4f7c-84cb-504924c2705a) /* ITfMSAAControl */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/msctfp/msctfp.spec b/dlls/msctfp/msctfp.spec new file mode 100644 index 0000000..7c7a65b --- /dev/null +++ b/dlls/msctfp/msctfp.spec @@ -0,0 +1,5 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall -private GetProxyDllInfo(ptr ptr)

1 0