April 2019 - Wine-Devel - list.winehq.org

[v2 PATCH] ntdll: Initialize critical section debug info with correct pointer value.
by Nikolay Sivov April 30, 2019

April 30, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed todo_wine from ntdll tests. dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/sync.c | 14 +++++++++++- dlls/ntdll/critsection.c | 44 ++++++++++++++++++++++---------------- dlls/ntdll/tests/rtl.c | 1 - 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6d47d7004c..9f5b614508 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -402,7 +402,8 @@ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + if (crit->DebugInfo != (void *)(ULONG_PTR)-1) + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 188689a9f4..97566f1d84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2648,6 +2648,7 @@ static void test_crit_section(void) InitializeCriticalSection(&cs); ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); if (!pInitializeCriticalSectionEx) { @@ -2658,9 +2659,20 @@ static void test_crit_section(void) memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); -todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + + cs.DebugInfo = NULL; + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } START_TEST(sync) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 42e432c8f6..e8ffc1ceed 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -59,6 +59,13 @@ static inline void small_pause(void) #endif } +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ @@ -226,7 +233,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; @@ -321,20 +328,21 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). */ if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = NULL; + crit->DebugInfo = no_debug_info_marker; else - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - if (crit->DebugInfo) { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } } crit->LockCount = -1; crit->RecursionCount = 0; @@ -396,7 +404,7 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->DebugInfo) + if (crit_section_has_debuginfo( crit )) { /* only free the ones we made in here */ if (!crit->DebugInfo->Spare[0]) @@ -454,7 +462,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[0]; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); @@ -472,7 +480,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (status == STATUS_WAIT_0) break; /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; /* only throw deadlock exception if configured timeout is reached */ if (timeout > 0) continue; @@ -485,7 +493,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) rec.ExceptionInformation[0] = (ULONG_PTR)crit; RtlRaiseException( &rec ); } - if (crit->DebugInfo) crit->DebugInfo->ContentionCount++; + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS; } @@ -518,7 +526,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 5fe72ec38b..62662cb438 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3152,7 +3152,6 @@ static void test_RtlInitializeCriticalSectionEx(void) memset(&cs, 0x11, sizeof(cs)); pRtlInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO); - todo_wine ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); -- 2.20.1

2 1

[PATCH] mfreadwrite: Wake waiting threads on stream states changes.
by Nikolay Sivov April 30, 2019

April 30, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index aeb86db3e3..5ec5c9171d 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -418,6 +418,9 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re } LeaveCriticalSection(&reader->streams[i].cs); + + WakeAllConditionVariable(&reader->streams[i].sample_event); + break; } } -- 2.20.1

1 0

[PATCH] ntdll: Initialize critical section debug info with correct pointer value.
by Nikolay Sivov April 30, 2019

April 30, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39614 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/sync.c | 3 ++- dlls/kernel32/tests/sync.c | 14 +++++++++++- dlls/ntdll/critsection.c | 44 ++++++++++++++++++++++---------------- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 6d47d7004c..9f5b614508 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -402,7 +402,8 @@ void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit ) HANDLE sem = crit->LockSemaphore; if (!sem) NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 ); crit->LockSemaphore = ConvertToGlobalHandle( sem ); - RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); + if (crit->DebugInfo != (void *)(ULONG_PTR)-1) + RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 188689a9f4..97566f1d84 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2648,6 +2648,7 @@ static void test_crit_section(void) InitializeCriticalSection(&cs); ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); if (!pInitializeCriticalSectionEx) { @@ -2658,9 +2659,20 @@ static void test_crit_section(void) memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); -todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + + cs.DebugInfo = NULL; + + ret = TryEnterCriticalSection(&cs); + ok(ret, "Failed to enter critical section.\n"); + LeaveCriticalSection(&cs); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); } START_TEST(sync) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 42e432c8f6..e8ffc1ceed 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -59,6 +59,13 @@ static inline void small_pause(void) #endif } +static void *no_debug_info_marker = (void *)(ULONG_PTR)-1; + +static BOOL crit_section_has_debuginfo(const RTL_CRITICAL_SECTION *crit) +{ + return crit->DebugInfo != NULL && crit->DebugInfo != no_debug_info_marker; +} + #ifdef __linux__ static int wait_op = 128; /*FUTEX_WAIT|FUTEX_PRIVATE_FLAG*/ @@ -226,7 +233,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wait( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; @@ -321,20 +328,21 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON * so (e.g.) MakeCriticalSectionGlobal() doesn't free it using HeapFree(). */ if (flags & RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO) - crit->DebugInfo = NULL; + crit->DebugInfo = no_debug_info_marker; else - crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); - - if (crit->DebugInfo) { - crit->DebugInfo->Type = 0; - crit->DebugInfo->CreatorBackTraceIndex = 0; - crit->DebugInfo->CriticalSection = crit; - crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); - crit->DebugInfo->EntryCount = 0; - crit->DebugInfo->ContentionCount = 0; - memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + crit->DebugInfo = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + if (crit->DebugInfo) + { + crit->DebugInfo->Type = 0; + crit->DebugInfo->CreatorBackTraceIndex = 0; + crit->DebugInfo->CriticalSection = crit; + crit->DebugInfo->ProcessLocksList.Blink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->ProcessLocksList.Flink = &(crit->DebugInfo->ProcessLocksList); + crit->DebugInfo->EntryCount = 0; + crit->DebugInfo->ContentionCount = 0; + memset( crit->DebugInfo->Spare, 0, sizeof(crit->DebugInfo->Spare) ); + } } crit->LockCount = -1; crit->RecursionCount = 0; @@ -396,7 +404,7 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) crit->LockCount = -1; crit->RecursionCount = 0; crit->OwningThread = 0; - if (crit->DebugInfo) + if (crit_section_has_debuginfo( crit )) { /* only free the ones we made in here */ if (!crit->DebugInfo->Spare[0]) @@ -454,7 +462,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if ( status == STATUS_TIMEOUT ) { const char *name = NULL; - if (crit->DebugInfo) name = (char *)crit->DebugInfo->Spare[0]; + if (crit_section_has_debuginfo( crit )) name = (char *)crit->DebugInfo->Spare[0]; if (!name) name = "?"; ERR( "section %p %s wait timed out in thread %04x, blocked by %04x, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); @@ -472,7 +480,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) if (status == STATUS_WAIT_0) break; /* Throw exception only for Wine internal locks */ - if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; + if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; /* only throw deadlock exception if configured timeout is reached */ if (timeout > 0) continue; @@ -485,7 +493,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) rec.ExceptionInformation[0] = (ULONG_PTR)crit; RtlRaiseException( &rec ); } - if (crit->DebugInfo) crit->DebugInfo->ContentionCount++; + if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS; } @@ -518,7 +526,7 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit->DebugInfo || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit ) || ((ret = fast_wake( crit )) == STATUS_NOT_IMPLEMENTED)) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); -- 2.20.1

2 1

[PATCH] crypt32: CryptMsgUpdate should skip broken certificates.
by Dmitry Timoshkov April 30, 2019

April 30, 2019

CertOpenStore() already verifies the certificate before adding it to the memory store from the file, this patch makes CryptMsgUpdate() behave in a similar way. This patch fixes signature verification reported in the bug 45757. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/decode.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ce068f3c47..aa697e3bfa 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -683,6 +683,13 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, &itemDecoded); if (ret) { + /* Ignore an item that failed to decode but the decoder doesn't want to fail the whole process */ + if (!size) + { + ptr += itemEncoded; + continue; + } + cItems++; if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, @@ -5628,6 +5635,25 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL verify_and_copy_certificate(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + PCCERT_CONTEXT cert; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, pbEncoded, cbEncoded); + if (!cert) + { + WARN("CertCreateCertificateContext error %#x\n", GetLastError()); + *pcbStructInfo = 0; + *pcbDecoded = 0; + return TRUE; + } + + CertFreeCertificateContext(cert); + + return CRYPT_AsnDecodeCopyBytes(pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); +} + static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5637,7 +5663,7 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, offsetof(CRYPT_SIGNED_INFO, cCertEncoded), offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), - CRYPT_AsnDecodeCopyBytes, + verify_and_copy_certificate, sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, -- 2.20.1

1 0

[PATCH] ntdll: Account for null terminating char in unload traces (Coverity).
by Nikolay Sivov April 30, 2019

April 30, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 994ff6f215..034b98cfee 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -177,7 +177,7 @@ static unsigned int unload_trace_seq; static void module_push_unload_trace( const LDR_MODULE *ldr ) { RTL_UNLOAD_EVENT_TRACE *ptr = &unload_traces[unload_trace_seq]; - unsigned int len = min(sizeof(ptr->ImageName), ldr->BaseDllName.Length); + unsigned int len = min(sizeof(ptr->ImageName) - sizeof(WCHAR), ldr->BaseDllName.Length); ptr->BaseAddress = ldr->BaseAddress; ptr->SizeOfImage = ldr->SizeOfImage; -- 2.20.1

1 0

[PATCH 2/2] kernel32: Split A/W implementation of {Get,Write}PrivateProfileString().
by Jactry Zeng April 30, 2019

April 30, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/profile.c | 126 +++++++++++++++++++--------------- dlls/kernel32/tests/profile.c | 109 ++++++++++++++++++++++++++--- 2 files changed, 169 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 462d64e5f0..3defaf6bef 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -68,6 +68,7 @@ typedef struct WCHAR *filename; FILETIME LastWriteTime; ENCODING encoding; + BOOL is_unicode; } PROFILE; @@ -149,7 +150,7 @@ static inline void PROFILE_WriteMarker(HANDLE hFile, ENCODING encoding) } } -static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING encoding) +static void PROFILE_WriteLine(HANDLE hFile, WCHAR *szLine, int len, ENCODING encoding, BOOL is_unicode) { char * write_buffer; int write_buffer_len; @@ -160,10 +161,10 @@ static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING e switch (encoding) { case ENCODING_ANSI: - write_buffer_len = WideCharToMultiByte(CP_ACP, 0, szLine, len, NULL, 0, NULL, NULL); + write_buffer_len = WideCharToMultiByte(is_unicode ? CP_ACP : 1252, 0, szLine, len, NULL, 0, NULL, NULL); write_buffer = HeapAlloc(GetProcessHeap(), 0, write_buffer_len); if (!write_buffer) return; - len = WideCharToMultiByte(CP_ACP, 0, szLine, len, write_buffer, write_buffer_len, NULL, NULL); + len = WideCharToMultiByte(is_unicode ? CP_ACP : 1252, 0, szLine, len, write_buffer, write_buffer_len, NULL, NULL); WriteFile(hFile, write_buffer, len, &dwBytesWritten, NULL); HeapFree(GetProcessHeap(), 0, write_buffer); break; @@ -192,7 +193,7 @@ static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING e * * Save a profile tree to a file. */ -static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING encoding ) +static void PROFILE_Save(HANDLE hFile, const PROFILESECTION *section, ENCODING encoding, BOOL is_unicode) { PROFILEKEY *key; WCHAR *buffer, *p; @@ -238,7 +239,7 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING *p++ = '\r'; *p++ = '\n'; } - PROFILE_WriteLine( hFile, buffer, len, encoding ); + PROFILE_WriteLine(hFile, buffer, len, encoding, is_unicode); HeapFree(GetProcessHeap(), 0, buffer); } } @@ -305,7 +306,7 @@ static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len * * Load a profile tree from a file. */ -static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) +static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING *pEncoding, BOOL is_unicode) { void *buffer_base, *pBuffer; WCHAR * szFile; @@ -343,14 +344,14 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) case ENCODING_ANSI: TRACE("ANSI encoding\n"); - len = MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, NULL, 0); + len = MultiByteToWideChar(is_unicode ? CP_ACP : 1252, 0, pBuffer, dwFileSize, NULL, 0); szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } - MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, szFile, len); + MultiByteToWideChar(is_unicode ? CP_ACP : 1252, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; case ENCODING_UTF8: @@ -678,7 +679,7 @@ static BOOL PROFILE_FlushFile(void) } TRACE("Saving %s\n", debugstr_w(CurProfile->filename)); - PROFILE_Save( hFile, CurProfile->section, CurProfile->encoding ); + PROFILE_Save(hFile, CurProfile->section, CurProfile->encoding, CurProfile->is_unicode); if(GetFileTime(hFile, NULL, NULL, &LastWriteTime)) CurProfile->LastWriteTime=LastWriteTime; CloseHandle( hFile ); @@ -729,7 +730,7 @@ static BOOL is_not_current(FILETIME * ft) * * Open a profile file, checking the cached file first. */ -static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) +static BOOL PROFILE_Open(LPCWSTR filename, BOOL write_access, BOOL is_unicode) { WCHAR buffer[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; @@ -750,6 +751,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) MRUProfile[i]->section=NULL; MRUProfile[i]->filename=NULL; MRUProfile[i]->encoding=ENCODING_ANSI; + MRUProfile[i]->is_unicode = is_unicode; ZeroMemory(&MRUProfile[i]->LastWriteTime, sizeof(FILETIME)); } @@ -786,7 +788,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) for(i=0;i<N_CACHED_PROFILES;i++) { - if ((MRUProfile[i]->filename && !strcmpiW( buffer, MRUProfile[i]->filename ))) + if ((MRUProfile[i]->filename && !strcmpiW(buffer, MRUProfile[i]->filename) && + (MRUProfile[i]->is_unicode == is_unicode))) { TRACE("MRU Filename: %s, new filename: %s\n", debugstr_w(MRUProfile[i]->filename), debugstr_w(buffer)); if(i) @@ -810,7 +813,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) TRACE("(%s): already opened, needs refreshing (mru=%d)\n", debugstr_w(buffer), i); PROFILE_Free(CurProfile->section); - CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding, CurProfile->is_unicode); CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); @@ -840,7 +843,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) if (hFile != INVALID_HANDLE_VALUE) { - CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->is_unicode = is_unicode; + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding, CurProfile->is_unicode); GetFileTime(hFile, NULL, NULL, &CurProfile->LastWriteTime); CloseHandle(hFile); } @@ -1062,6 +1066,19 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, return TRUE; } +static LPWSTR c2w(LPCSTR string) +{ + INT lenW; + LPWSTR stringW = NULL; + + if (!string) + return stringW; + + lenW = MultiByteToWideChar(1252, 0, string, -1, NULL, 0); + if ((stringW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)))) + MultiByteToWideChar(1252, 0, string, -1, stringW, lenW); + return stringW; +} /********************* API functions **********************************/ @@ -1083,13 +1100,13 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) } static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, - LPWSTR buffer, UINT len, LPCWSTR filename) + LPWSTR buffer, UINT len, LPCWSTR filename, BOOL is_unicode) { int ret; LPWSTR defval_tmp = NULL; - TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_w(section), debugstr_w(entry), - debugstr_w(def_val), buffer, len, debugstr_w(filename)); + TRACE("(%s, %s, %s, %p, %u, %s, %d)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(def_val), buffer, len, debugstr_w(filename), is_unicode); /* strip any trailing ' ' of def_val. */ if (def_val) @@ -1112,7 +1129,7 @@ static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR de RtlEnterCriticalSection(&PROFILE_CritSect); - if (PROFILE_Open(filename, FALSE)) + if (PROFILE_Open(filename, FALSE, is_unicode)) { if (section == NULL) ret = PROFILE_GetSectionNames(buffer, len); @@ -1145,7 +1162,7 @@ INT WINAPI GetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, UINT len, LPCWSTR filename) { return get_private_profile_string(section, entry, def_val, buffer, - len, filename); + len, filename, TRUE); } /*********************************************************************** @@ -1155,39 +1172,35 @@ INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, UINT len, LPCSTR filename) { - UNICODE_STRING sectionW, entryW, def_valW, filenameW; - LPWSTR bufferW; + UNICODE_STRING filenameW; + LPWSTR bufferW, sectionW, entryW, def_valW; INT retW, ret = 0; bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; - if (entry) RtlCreateUnicodeStringFromAsciiz(&entryW, entry); - else entryW.Buffer = NULL; - if (def_val) RtlCreateUnicodeStringFromAsciiz(&def_valW, def_val); - else def_valW.Buffer = NULL; + sectionW = c2w(section); + entryW = c2w(entry); + def_valW = c2w(def_val); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = get_private_profile_string(sectionW.Buffer, entryW.Buffer, - def_valW.Buffer, bufferW, len, - filenameW.Buffer); + retW = get_private_profile_string(sectionW, entryW, def_valW, bufferW, len, + filenameW.Buffer, FALSE); if (len && buffer) { if (retW) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, len - 1, NULL, NULL); + ret = WideCharToMultiByte(1252, 0, bufferW, retW, buffer, len - 1, NULL, NULL); if (!ret) ret = len - 1; } buffer[ret] = 0; } - RtlFreeUnicodeString(&sectionW); - RtlFreeUnicodeString(&entryW); - RtlFreeUnicodeString(&def_valW); RtlFreeUnicodeString(&filenameW); HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, sectionW); + HeapFree(GetProcessHeap(), 0, entryW); + HeapFree(GetProcessHeap(), 0, def_valW); return ret; } @@ -1298,7 +1311,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) + if (PROFILE_Open(filename, FALSE, TRUE)) ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1369,23 +1382,23 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) } static BOOL write_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR string, - LPCWSTR filename) + LPCWSTR filename, BOOL is_unicode) { BOOL ret = FALSE; - TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), - debugstr_w(string), debugstr_w(filename)); + TRACE("(%s, %s, %s, %s, %d)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(string), debugstr_w(filename), is_unicode); RtlEnterCriticalSection(&PROFILE_CritSect); if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open(filename, TRUE)) + if (!filename || PROFILE_Open(filename, TRUE, is_unicode)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open(filename, TRUE)) + else if (PROFILE_Open(filename, TRUE, is_unicode)) { if (!section) { SetLastError(ERROR_FILE_NOT_FOUND); @@ -1406,7 +1419,7 @@ BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, LPCWSTR string, LPCWSTR filename) { return write_private_profile_string(section, entry, string, - filename); + filename, TRUE); } /*********************************************************************** @@ -1415,23 +1428,22 @@ BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR string, LPCSTR filename ) { - UNICODE_STRING sectionW, entryW, stringW, filenameW; + UNICODE_STRING filenameW; + LPWSTR sectionW, entryW, stringW; BOOL ret; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; - if (entry) RtlCreateUnicodeStringFromAsciiz(&entryW, entry); - else entryW.Buffer = NULL; - if (string) RtlCreateUnicodeStringFromAsciiz(&stringW, string); - else stringW.Buffer = NULL; + sectionW = c2w(section); + entryW = c2w(entry); + stringW = c2w(string); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - ret = write_private_profile_string(sectionW.Buffer, entryW.Buffer, - stringW.Buffer, filenameW.Buffer); - RtlFreeUnicodeString(&sectionW); - RtlFreeUnicodeString(&entryW); - RtlFreeUnicodeString(&stringW); + ret = write_private_profile_string(sectionW, entryW, stringW, + filenameW.Buffer, FALSE); + + HeapFree(GetProcessHeap(), 0, sectionW); + HeapFree(GetProcessHeap(), 0, entryW); + HeapFree(GetProcessHeap(), 0, stringW); RtlFreeUnicodeString(&filenameW); return ret; } @@ -1449,12 +1461,12 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, if (!section && !string) { - if (!filename || PROFILE_Open( filename, TRUE )) + if (!filename || PROFILE_Open(filename, TRUE, TRUE)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename, TRUE )) { + else if (PROFILE_Open(filename, TRUE, TRUE)) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); } else { @@ -1576,7 +1588,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) + if (PROFILE_Open(filename, FALSE, TRUE)) ret = PROFILE_GetSectionNames(buffer, size); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1631,7 +1643,7 @@ BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) { + if (PROFILE_Open(filename, FALSE, TRUE)) { PROFILEKEY *k = PROFILE_Find ( &CurProfile->section, section, key, FALSE, FALSE); if (k) { TRACE("value (at %p): %s\n", k->value, debugstr_w(k->value)); @@ -1751,7 +1763,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, TRUE )) { + if (PROFILE_Open(filename, TRUE, TRUE)) { ret = PROFILE_SetString( section, key, outstring, FALSE); if (ret) ret = PROFILE_FlushFile(); } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 8a0089bb1b..761817cb9c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -592,7 +592,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri empty string and check for modification */ CHAR emptystr[MAX_PATH] = ""; LPSTR tempfile; - + WCHAR bufW[MAX_PATH], expected_valW[MAX_PATH]; + static const WCHAR section_schineseW[] = {0xe6,0xae,0xb5,0x31,0}; + static const WCHAR name5W[] = {'n','a','m','e','5',0}; + static const WCHAR filenameW[] = {'.','\\','w','i','n','e','t','e','s','t','.','i','n','i',0}; + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + static const WCHAR expected_val_enW[] = {0x00e9,0x2026,0x2019,'.',0}; static const char filename[] = ".\\winetest.ini"; trace("test_GetPrivateProfileStringA: %s\n", descript); @@ -620,12 +625,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, MAX_PATH, filename); - ok(ret == 18 || - broken(ret == 19), /* Win9x and WinME */ - "Expected 18, got %d\n", ret); - len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); - ok(!memcmp(buf, "section1\0section2\0\0", len), - "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); + ok(ret == 23 || + broken(ret == 24), /* Win9x and WinME */ + "Expected 23, got %d\n", ret); + len = lstrlenA("section1") + lstrlenA("section2") + lstrlenA("\xe6\xae\xb5\x31") + 4 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0section2\0\xe6\xae\xb5\x31\0\0", len), + "Expected \"section1\\0section2\\0\xe6\xae\xb5\x31\\0\\0\", got \"%s\"\n", buf); /* lpAppName is empty */ memset(buf, 0xc, sizeof(buf)); @@ -827,6 +832,59 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 0, "Expected 0, got %d\n", ret); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + memset(buf, 0xc, sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "name5", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "\xe9\x85\x92\x2e"), + "Expected \"\xe9\x85\x92\x2e\", got \"%s\"\n", buf); + + memset(buf, 0xc,sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "\xe5\xa7\x93", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "\xe6\x9b\xbe\x2e"), + "Expected \"\xe6\x9b\xbe\x2e\", got \"%s\"\n", buf); + + memset(buf, 0xc, sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "name6", "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "\xd7\x99\xd7\x99\xd7\x9f\x2e"), + "Expected \"\xd7\x99\xd7\x99\xd7\x9f\x2e\", got \"%s\"\n", buf); + + + memset(bufW, 0xc, sizeof(bufW)); + ret = GetPrivateProfileStringW(section_schineseW, name5W, defaultW, + bufW, MAX_PATH, filenameW); + switch (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale()))) + { + case LANG_CHINESE: + case LANG_HEBREW: + case LANG_JAPANESE: + trace("on Chinese, Hebrew or Japanese system.\n"); + lstrcpyW(expected_valW, defaultW); + len = lstrlenW(expected_valW); + ok(ret == len, "Expected %d, got %d\n", len, ret); + ok(!lstrcmpW(bufW, expected_valW), "Expected \"%s\", got \"%s\"\n", + wine_dbgstr_w(expected_valW), wine_dbgstr_w(bufW)); + break; + case LANG_ENGLISH: + case LANG_FRENCH: + trace("on English or French system.\n"); + lstrcpyW(expected_valW, expected_val_enW); + len = lstrlenW(expected_valW); + ok(ret == len, "Expected %d, got %d\n", len, ret); + ok(!lstrcmpW(bufW, expected_valW), "Expected \"%s\", got \"%s\"\n", + wine_dbgstr_w(expected_valW), wine_dbgstr_w(bufW)); + break; + default: + skip("Unknown system language.\n"); + } + /* lpAppName is NULL, not enough room for final section name */ memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); @@ -1171,6 +1229,31 @@ static void test_WritePrivateProfileString(void) "key1=string1" /* 14 bytes */ , 59)), "File doesn't match\n"); DeleteFileA(path); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n"; + GetTempFileNameA(temp, "wine", 0, path); + ret = WritePrivateProfileStringA("section1", "name", "\xe9\x85\x92\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n" + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n"; + ret = WritePrivateProfileStringA("section1", "\xe5\xa7\x93", "\xe6\x9b\xbe\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n" + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n" + "[\xe6\xae\xb5\x31]\r\n" + "name2=\xe6\x9b\xbe\x2e\r\n"; + ret = WritePrivateProfileStringA("\xe6\xae\xb5\x31", "name2", "\xe6\x9b\xbe\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + DeleteFileA(path); } START_TEST(profile) @@ -1189,7 +1272,11 @@ START_TEST(profile) "name2=\"val2\"\r\n" "name3\r\n" "name4=a\r\n" - "[section2]\r\n", + "[section2]\r\n" + "[\xe6\xae\xb5\x31]\r\n" /* Simplified Chinese in UTF-8 */ + "name5=\xe9\x85\x92\x2e\r\n" /* Simplified Chinese in UTF-8 */ + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n" /* Simplified Chinese in UTF-8 */ + "name6=\xd7\x99\xd7\x99\xd7\x9f\x2e\r\n", /* Hebrew in UTF-8 */ "CR+LF"); test_GetPrivateProfileString( "[section1]\r" @@ -1197,7 +1284,11 @@ START_TEST(profile) "name2=\"val2\"\r" "name3\r" "name4=a\r" - "[section2]\r", + "[section2]\r" + "[\xe6\xae\xb5\x31]\r" /* Simplified Chinese in UTF-8 */ + "name5=\xe9\x85\x92\x2e\r" /* Simplified Chinese in UTF-8 */ + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r" /* Simplified Chinese in UTF-8 */ + "name6=\xd7\x99\xd7\x99\xd7\x9f\x2e\r", /* Hebrew in UTF-8 */ "CR only"); test_WritePrivateProfileString(); } -- 2.20.1

2 3

[PATCH 1/2] kernel32: Move implementation of {Get,Write}PrivateProfileStringW() to helper.
by Jactry Zeng April 30, 2019

April 30, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/profile.c | 97 ++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 027693e5da..462d64e5f0 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1082,17 +1082,13 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) return GetPrivateProfileIntW( section, entry, def_val, wininiW ); } -/*********************************************************************** - * GetPrivateProfileStringW (KERNEL32.@) - */ -INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, - LPCWSTR def_val, LPWSTR buffer, - UINT len, LPCWSTR filename ) +static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, + LPWSTR buffer, UINT len, LPCWSTR filename) { - int ret; - LPWSTR defval_tmp = NULL; + int ret; + LPWSTR defval_tmp = NULL; - TRACE("%s,%s,%s,%p,%u,%s\n", debugstr_w(section), debugstr_w(entry), + TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_w(section), debugstr_w(entry), debugstr_w(def_val), buffer, len, debugstr_w(filename)); /* strip any trailing ' ' of def_val. */ @@ -1114,22 +1110,25 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } } - RtlEnterCriticalSection( &PROFILE_CritSect ); + RtlEnterCriticalSection(&PROFILE_CritSect); - if (PROFILE_Open( filename, FALSE )) { - if (section == NULL) + if (PROFILE_Open(filename, FALSE)) + { + if (section == NULL) ret = PROFILE_GetSectionNames(buffer, len); - else - /* PROFILE_GetString can handle the 'entry == NULL' case */ - ret = PROFILE_GetString( section, entry, def_val, buffer, len ); - } else if (buffer && def_val) { - lstrcpynW( buffer, def_val, len ); - ret = strlenW( buffer ); + else + /* PROFILE_GetString can handle the 'entry == NULL' case */ + ret = PROFILE_GetString(section, entry, def_val, buffer, len); + } + else if (buffer && def_val) + { + lstrcpynW(buffer, def_val, len); + ret = strlenW(buffer); } else - ret = 0; + ret = 0; - RtlLeaveCriticalSection( &PROFILE_CritSect ); + RtlLeaveCriticalSection(&PROFILE_CritSect); HeapFree(GetProcessHeap(), 0, defval_tmp); @@ -1138,12 +1137,23 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, return ret; } +/*********************************************************************** + * GetPrivateProfileStringW (KERNEL32.@) + */ +INT WINAPI GetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR def_val, LPWSTR buffer, + UINT len, LPCWSTR filename) +{ + return get_private_profile_string(section, entry, def_val, buffer, + len, filename); +} + /*********************************************************************** * GetPrivateProfileStringA (KERNEL32.@) */ -INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, - LPCSTR def_val, LPSTR buffer, - UINT len, LPCSTR filename ) +INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry, + LPCSTR def_val, LPSTR buffer, + UINT len, LPCSTR filename) { UNICODE_STRING sectionW, entryW, def_valW, filenameW; LPWSTR bufferW; @@ -1159,9 +1169,9 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = GetPrivateProfileStringW( sectionW.Buffer, entryW.Buffer, - def_valW.Buffer, bufferW, len, - filenameW.Buffer); + retW = get_private_profile_string(sectionW.Buffer, entryW.Buffer, + def_valW.Buffer, bufferW, len, + filenameW.Buffer); if (len && buffer) { if (retW) @@ -1358,38 +1368,47 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) return GetPrivateProfileSectionW( section, buffer, len, wininiW ); } - -/*********************************************************************** - * WritePrivateProfileStringW (KERNEL32.@) - */ -BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, - LPCWSTR string, LPCWSTR filename ) +static BOOL write_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR string, + LPCWSTR filename) { BOOL ret = FALSE; - RtlEnterCriticalSection( &PROFILE_CritSect ); + TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(string), debugstr_w(filename)); + + RtlEnterCriticalSection(&PROFILE_CritSect); if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open( filename, TRUE )) + if (!filename || PROFILE_Open(filename, TRUE)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename, TRUE )) + else if (PROFILE_Open(filename, TRUE)) { if (!section) { SetLastError(ERROR_FILE_NOT_FOUND); } else { - ret = PROFILE_SetString( section, entry, string, FALSE); + ret = PROFILE_SetString(section, entry, string, FALSE); if (ret) ret = PROFILE_FlushFile(); } } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + RtlLeaveCriticalSection(&PROFILE_CritSect); return ret; } +/*********************************************************************** + * WritePrivateProfileStringW (KERNEL32.@) + */ +BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR string, LPCWSTR filename) +{ + return write_private_profile_string(section, entry, string, + filename); +} + /*********************************************************************** * WritePrivateProfileStringA (KERNEL32.@) */ @@ -1408,8 +1427,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - ret = WritePrivateProfileStringW(sectionW.Buffer, entryW.Buffer, - stringW.Buffer, filenameW.Buffer); + ret = write_private_profile_string(sectionW.Buffer, entryW.Buffer, + stringW.Buffer, filenameW.Buffer); RtlFreeUnicodeString(&sectionW); RtlFreeUnicodeString(&entryW); RtlFreeUnicodeString(&stringW); -- 2.20.1

2 1

[PATCH v2] server: Add __pad member to pe_image_info_t and zero struct.
by Jefferson Carpenter April 29, 2019

April 29, 2019

1 0

[PATCH] makefiles: Build with -fno-PIC on i386.
by Zebediah Figura April 29, 2019

April 29, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37540 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47027 Many applications attempt to hook or copy native API calls, using methods sophisticated enough to recognize any sequence of x86 instructions, but not enough to recognize and account for a GOT register load. Most such cases only care to insert a JMP instruction in the first five bytes, and so are satisfied by adding the hot-patch prefix. However, the madCodeHook 3.x engine attempts to copy the first 15 bytes, and some copy-protection schemes will try to copy the whole function. Building with -fno-PIC on i386, as is the default behaviour for Visual Studio compiled applications, and likely for Windows libraries as well, fixes those applications, and also stops us once and for all wasting time debugging and individually applying DECLSPEC_HOTPATCH. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 8de9d3723e..a200e73a2f 100644 --- a/configure.ac +++ b/configure.ac @@ -924,31 +924,36 @@ case $host_os in ;; *) - DLLFLAGS="$DLLFLAGS -fPIC" + case $host_cpu in + *i[[3456789]]86*) + DLLFLAGS="$DLLFLAGS -fno-PIC" ;; + *) + DLLFLAGS="$DLLFLAGS -fPIC" ;; + esac AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf, - [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic], + [WINE_TRY_SHLIB_FLAGS([$DLLFLAGS -shared -Wl,-Bsymbolic], ac_cv_c_dll_gnuelf="yes",ac_cv_c_dll_gnuelf="no")]) if test "$ac_cv_c_dll_gnuelf" = "yes" then LIBWINE_LDFLAGS="-shared" - WINE_TRY_CFLAGS([-fPIC -shared -Wl,-soname,confest.so.1], + WINE_TRY_CFLAGS([$DLLFLAGS -shared -Wl,-soname,confest.so.1], [LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"], - [WINE_TRY_CFLAGS([-fPIC -shared -Wl,-h,confest.so.1], + [WINE_TRY_CFLAGS([$DLLFLAGS -shared -Wl,-h,confest.so.1], [LIBWINE_LDFLAGS="-shared -Wl,-h,libwine.so.$libwine_soversion"])]) echo '{ global: *; };' >conftest.map - WINE_TRY_CFLAGS([-fPIC -shared -Wl,--version-script=conftest.map], + WINE_TRY_CFLAGS([$DLLFLAGS -shared -Wl,--version-script=conftest.map], [LIBWINE_LDFLAGS="$LIBWINE_LDFLAGS -Wl,--version-script=\$(srcdir)/wine.map"]) rm -f conftest.map - WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], + WINE_TRY_CFLAGS([$DLLFLAGS -Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" - WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], + WINE_TRY_CFLAGS([$DLLFLAGS -Wl,--rpath,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], - [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib], + [WINE_TRY_CFLAGS([$DLLFLAGS -Wl,-R,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) -- 2.21.0

1 0

[PATCH V2 1/7] ntdll: Implement retrieving DOS attributes in NtQueryInformationFile
by Vijay Kiran Kamuju April 29, 2019

April 29, 2019

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> v2: merge macos support From: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- configure.ac | 8 ++++++++ dlls/ntdll/file.c | 22 +++++++++++++++++++++- include/wine/port.h | 8 ++++++++ libs/port/Makefile.in | 3 ++- libs/port/xattr.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 libs/port/xattr.c diff --git a/configure.ac b/configure.ac index d1502bacf7..5782df2a3f 100644 --- a/configure.ac +++ b/configure.ac @@ -702,6 +702,14 @@ AC_CHECK_HEADERS([libprocstat.h],,, #include <sys/socket.h> #endif]) +AC_CHECK_HEADERS([attr/xattr.h sys/xattr.h]) +if test "$ac_cv_header_sys_xattr_h" = "yes" +then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]], [[getxattr("", "", "", 0, 0, 0);]])] + [AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, + [Define if xattr functions take additional arguments (Mac OS X)])]) +fi + dnl **** Check for working dll **** AC_SUBST(DLLFLAGS,"-D_REENTRANT") diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3dafdcfb44..d62126df6e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -122,6 +122,22 @@ mode_t FILE_umask = 0; static const WCHAR ntfsW[] = {'N','T','F','S'}; +/* Match the Samba conventions for storing DOS file attributes */ +#define SAMBA_XATTR_DOS_ATTRIB XATTR_USER_PREFIX "DOSATTRIB" +/* We are only interested in some attributes, the others have corresponding Unix attributes */ +#define XATTR_ATTRIBS_MASK (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM) + +/* decode the xattr-stored DOS attributes */ +static inline int get_file_xattr( char *hexattr, int attrlen ) +{ + if (attrlen > 2 && hexattr[0] == '0' && hexattr[1] == 'x') + { + hexattr[attrlen] = 0; + return strtol( hexattr+2, NULL, 16 ) & XATTR_ATTRIBS_MASK; + } + return 0; +} + /* fetch the attributes of a file */ static inline ULONG get_file_attributes( const struct stat *st ) { @@ -139,12 +155,16 @@ static inline ULONG get_file_attributes( const struct stat *st ) /* get the stat info and file attributes for a file (by file descriptor) */ int fd_get_file_info( int fd, struct stat *st, ULONG *attr ) { - int ret; + char hexattr[11]; + int len, ret; *attr = 0; ret = fstat( fd, st ); if (ret == -1) return ret; *attr |= get_file_attributes( st ); + len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 ); + if (len == -1) return ret; + *attr |= get_file_xattr( hexattr, len ); return ret; } diff --git a/include/wine/port.h b/include/wine/port.h index d23e2b033f..2be2afe421 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -335,6 +335,14 @@ int usleep (unsigned int useconds); extern int mkstemps(char *template, int suffix_len); +/* Extended attribute functions */ + +#ifndef XATTR_USER_PREFIX +# define XATTR_USER_PREFIX "user." +#endif + +extern int xattr_fget( int filedes, const char *name, void *value, size_t size ); + /* Interlocked functions */ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index a2e96d1500..dcc1ea1769 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -108,4 +108,5 @@ C_SRCS = \ usleep.c \ utf8.c \ wctomb.c \ - wctype.c + wctype.c \ + xattr.c diff --git a/libs/port/xattr.c b/libs/port/xattr.c new file mode 100644 index 0000000000..1c06b89a86 --- /dev/null +++ b/libs/port/xattr.c @@ -0,0 +1,44 @@ +/* + * extended attributes functions + * + * Copyright 2014 Erich E. Hoover + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#if defined(HAVE_ATTR_XATTR_H) +# undef XATTR_ADDITIONAL_OPTIONS +# include <attr/xattr.h> +#elif defined(HAVE_SYS_XATTR_H) +# include <sys/xattr.h> +#endif + +#include <ctype.h> +#include <errno.h> + +int xattr_fget( int filedes, const char *name, void *value, size_t size ) +{ +#if defined(XATTR_ADDITIONAL_OPTIONS) + return fgetxattr( filedes, name, value, size, 0, 0 ); +#elif defined(HAVE_ATTR_XATTR_H) || defined(HAVE_SYS_XATTR_H) + return fgetxattr( filedes, name, value, size ); +#else + errno = ENOSYS; + return -1; +#endif +} -- 2.21.0

1 6