January 2020 - Wine-devel - list.winehq.org

[PATCH v3] msvcrt: Fix the btowc() function.
by Chip Davis 27 Jan '20

27 Jan '20

This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix handling of EOF. Add more tests. --- dlls/msvcrt/locale.c | 8 +++-- dlls/msvcrt/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c2166..02b74554e6bc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,11 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa832f..f988e0ccb5f0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,76 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(EOF); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_CTYPE, ".1250"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0x155, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0x155, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4198,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4276,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp(); -- 2.24.0

1 0

[PATCH] rpcrt4: Use a critical section for the context handle lock.
by Zebediah Figura 27 Jan '20

27 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/rpc_assoc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 504f4d66c81..ab865c2de14 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -24,7 +24,6 @@ #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" #include "wine/debug.h" @@ -55,7 +54,7 @@ typedef struct _RpcContextHandle NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + CRITICAL_SECTION lock; unsigned int refs; } RpcContextHandle; @@ -463,12 +462,13 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - RtlInitializeResource(&context_handle->rw_lock); + InitializeCriticalSection(&context_handle->lock); + context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; /* lock here to mirror unmarshall, so we don't need to special-case the * freeing of a non-marshalled context handle */ - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); list_add_tail(&assoc->context_handle_list, &context_handle->entry); @@ -500,7 +500,7 @@ RPC_STATUS RpcServerAssoc_FindContextHandle(RpcAssoc *assoc, const UUID *uuid, { LeaveCriticalSection(&assoc->cs); TRACE("found %p\n", context_handle); - RtlAcquireResourceExclusive(&context_handle->rw_lock, TRUE); + EnterCriticalSection(&context_handle->lock); return RPC_S_OK; } } @@ -555,7 +555,8 @@ static void RpcContextHandle_Destroy(RpcContextHandle *context_handle) context_handle->rundown_routine(context_handle->user_context); } - RtlDeleteResource(&context_handle->rw_lock); + context_handle->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&context_handle->lock); HeapFree(GetProcessHeap(), 0, context_handle); } @@ -566,7 +567,7 @@ unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT S unsigned int refs; if (release_lock) - RtlReleaseResource(&context_handle->rw_lock); + LeaveCriticalSection(&context_handle->lock); EnterCriticalSection(&assoc->cs); refs = --context_handle->refs; -- 2.25.0

1 0

[PATCH 1/2] dsound: Use an SRW lock for buffer_list_lock.
by Zebediah Figura 27 Jan '20

27 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48408 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/buffer.c | 4 ++-- dlls/dsound/dsound.c | 15 +++++++-------- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f6006529141..d585a7605ef 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (x1 || x2) { - RtlAcquireResourceShared(&This->device->buffer_list_lock, TRUE); + AcquireSRWLockShared(&This->device->buffer_list_lock); LIST_FOR_EACH_ENTRY(iter, &This->buffer->buffers, IDirectSoundBufferImpl, entry ) { RtlAcquireResourceShared(&iter->lock, TRUE); @@ -664,7 +664,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, } RtlReleaseResource(&iter->lock); } - RtlReleaseResource(&This->device->buffer_list_lock); + ReleaseSRWLockShared(&This->device->buffer_list_lock); } return hres; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8e2b839fe89..e7ab7922bb7 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -181,7 +181,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) InitializeCriticalSection(&(device->mixlock)); device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); - RtlInitializeResource(&(device->buffer_list_lock)); + InitializeSRWLock(&device->buffer_list_lock); *ppDevice = device; @@ -238,7 +238,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); - RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->mixlock); HeapFree(GetProcessHeap(),0,device); @@ -612,7 +611,7 @@ HRESULT DirectSoundDevice_AddBuffer( TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->buffers) newbuffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(IDirectSoundBufferImpl*)*(device->nrofbuffers+1)); @@ -629,7 +628,7 @@ HRESULT DirectSoundDevice_AddBuffer( hr = DSERR_OUTOFMEMORY; } - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } @@ -644,7 +643,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff TRACE("(%p, %p)\n", device, pDSB); - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); if (device->nrofbuffers == 1) { assert(device->buffers[0] == pDSB); @@ -662,7 +661,7 @@ void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBuff device->nrofbuffers--; TRACE("buffer count is now %d\n", device->nrofbuffers); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); } /******************************************************************************* @@ -869,14 +868,14 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); } - RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&device->mixlock); if ((level == DSSCL_WRITEPRIMARY) != (device->priolevel == DSSCL_WRITEPRIMARY)) hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY); if (SUCCEEDED(hr)) device->priolevel = level; LeaveCriticalSection(&device->mixlock); - RtlReleaseResource(&device->buffer_list_lock); + ReleaseSRWLockExclusive(&device->buffer_list_lock); return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 930c3e92ec8..5605bded905 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -80,7 +80,7 @@ struct DirectSoundDevice DWORD writelead, buflen, ac_frames, frag_frames, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; - RTL_RWLOCK buffer_list_lock; + SRWLOCK buffer_list_lock; CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; DWORD speaker_config; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05ca99b5df4..c1bd3273f58 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -767,9 +767,9 @@ DWORD CALLBACK DSOUND_mixthread(void *p) if (!dev->ref) break; - RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); + AcquireSRWLockShared(&dev->buffer_list_lock); DSOUND_PerformMix(dev); - RtlReleaseResource(&(dev->buffer_list_lock)); + ReleaseSRWLockShared(&dev->buffer_list_lock); } return 0; } diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 852ec51b7ff..8d42fe0ed90 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -472,7 +472,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe } /* **** */ - RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); + AcquireSRWLockExclusive(&device->buffer_list_lock); EnterCriticalSection(&(device->mixlock)); if (device->priolevel == DSSCL_WRITEPRIMARY) { @@ -508,7 +508,7 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe out: LeaveCriticalSection(&(device->mixlock)); - RtlReleaseResource(&(device->buffer_list_lock)); + ReleaseSRWLockExclusive(&device->buffer_list_lock); /* **** */ return err; -- 2.25.0

1 1

[PATCH] find/tests: Add tests for file based search
by Fabian Maurer 27 Jan '20

27 Jan '20

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/find/tests/find.c | 119 ++++++++++++++++++++++++++++++++++--- 1 file changed, 110 insertions(+), 9 deletions(-) diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c index 147b59c8ce..b9a8a12375 100644 --- a/programs/find/tests/find.c +++ b/programs/find/tests/find.c @@ -180,10 +180,44 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp heap_free(child_output); } +static void run_find_file_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +{ + char path_temp_file[MAX_PATH]; + char path_temp_dir[MAX_PATH]; + HANDLE handle_file; + WCHAR commandline_new[MAX_PATH]; + BYTE *out_expected_new; + char header[MAX_PATH]; + int header_len; + + GetTempPathA(ARRAY_SIZE(path_temp_dir), path_temp_dir); + GetTempFileNameA(path_temp_dir, "", 0, path_temp_file); + handle_file = CreateFileA(path_temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + write_to_handle(handle_file, input, input_len); + CloseHandle(handle_file); + + wsprintfW(commandline_new, L"%s %hs", commandline, path_temp_file); + + CharUpperA(path_temp_file); + wsprintfA(header, "\r\n---------- %s\r\n", path_temp_file); + header_len = lstrlenA(header); + out_expected_new = heap_alloc(header_len + out_expected_len); + memcpy(out_expected_new, header, header_len); + memcpy(out_expected_new + header_len, out_expected, out_expected_len); + + run_find_stdin_(commandline_new, (BYTE*)"", 0, out_expected_new, header_len + out_expected_len, exitcode_expected, file, line); + heap_free(out_expected_new); + + DeleteFileA(path_temp_file); +} + #define run_find_stdin_str(commandline, input, out_expected, exitcode_expected) \ - run_find_stdin_str_(commandline, input, out_expected, exitcode_expected, __FILE__, __LINE__) + run_find_str_(commandline, input, out_expected, exitcode_expected, 0, __FILE__, __LINE__) -static void run_find_stdin_str_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, const char *file, int line) +#define run_find_file_str(commandline, input, out_expected, exitcode_expected) \ + run_find_str_(commandline, input, out_expected, exitcode_expected, 1, __FILE__, __LINE__) + +static void run_find_str_(const char *commandline, const char *input, const char *out_expected, int exitcode_expected, BOOL is_file, const char *file, int line) { WCHAR *commandlineW; int len_commandlineW; @@ -193,15 +227,20 @@ static void run_find_stdin_str_(const char *commandline, const char *input, cons commandlineW = heap_alloc(len_commandlineW * sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, commandline, -1, commandlineW, len_commandlineW); - run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); - + if (is_file) + run_find_file_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); + else + run_find_stdin_(commandlineW, (BYTE *)input, lstrlenA(input), (BYTE *)out_expected, lstrlenA(out_expected), exitcode_expected, file, line); heap_free(commandlineW); } #define run_find_stdin_unicode(input, out_expected, exitcode_expected) \ - run_find_stdin_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, __FILE__, __LINE__) + run_find_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, 0, __FILE__, __LINE__) -static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line) +#define run_find_file_unicode(input, out_expected, exitcode_expected) \ + run_find_unicode_(input, sizeof(input), out_expected, sizeof(out_expected), exitcode_expected, 1, __FILE__, __LINE__) + +static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, BOOL is_file, const char *file, int line) { /* Need "test" as char and quoted wchar */ static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 }; @@ -219,7 +258,10 @@ static void run_find_stdin_unicode_(const BYTE *input, int input_len, const BYTE exitcode_expected = 1; } - run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); + if (is_file) + run_find_file_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); + else + run_find_stdin_(wstr_quoted_test, input, input_len, out_expected_mangled, out_expected_mangled_len, exitcode_expected, file, line); } static void test_errors(void) @@ -230,6 +272,7 @@ static void test_errors(void) todo_wine /* Quotes are not properly passed into wine yet */ run_find_stdin_str("\"test", "", "FIND: Parameter format not correct\r\n", 2); run_find_stdin_str("\"test\" /XYZ", "", "FIND: Invalid switch\r\n", 2); + run_find_stdin_str("\"test\" C:\\doesnotexist.dat", "", "File not found - C:\\DOESNOTEXIST.DAT\r\n", 1); } static void test_singleline_without_switches(void) @@ -272,7 +315,7 @@ static const BYTE str_rus_utf8_nobom[] = { 0xD0,0xBF,0xD1,0x static const BYTE str_en_utf8_bom[] = { 0xEF,0xBB,0xBF,'e','n','t','e','s','t','\r','\n' }; static const BYTE str_en_utf8_nobom[] = { 'e','n','t','e','s','t','\r','\n' }; -static void test_unicode_support(void) +static void test_unicode_support_stdin(void) { /* Test unicode support on STDIN * Those depend on the active codepage - e.g. 932 (japanese) behaves different from 1252 (latin) @@ -302,6 +345,62 @@ static void test_unicode_support(void) run_find_stdin_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); } +static void test_file_search(void) +{ + todo_wine + run_find_file_str("\"\"", "test", "", 1); + todo_wine + run_find_file_str("\"test\"", "", "", 1); + todo_wine + run_find_file_str("\"test\"", "test", "test\r\n", 0); + todo_wine + run_find_file_str("\"test\"", "test2", "test2\r\n", 0); + todo_wine + run_find_file_str("\"test\"", "test\r2", "test\r2\r\n", 0); + todo_wine + run_find_file_str("\"test2\"", "test", "", 1); + todo_wine + run_find_file_str("\"test\"", "test\nother\ntest2\ntest3", "test\r\ntest2\r\ntest3\r\n", 0); +} + +static void test_unicode_support_file(void) +{ + /* Test unicode support on files */ + + /* Test UTF-8 BOM */ + todo_wine + run_find_file_unicode(str_en_utf8_nobom, str_en_utf8_nobom, 0); + todo_wine + run_find_file_unicode(str_en_utf8_bom, str_en_utf8_bom, 0); + + /* Test russian characters */ + todo_wine + run_find_file_unicode(str_rus_utf8_bom, str_rus_utf8_bom, 0); + todo_wine + run_find_file_unicode(str_rus_utf8_nobom, str_rus_utf8_nobom, 0); + + /* Test japanese characters */ + todo_wine + run_find_file_unicode(str_jap_utf8_nobom, str_jap_utf8_nobom, 0); + todo_wine + run_find_file_unicode(str_jap_utf8_bom, str_jap_utf8_bom, 0); + todo_wine + run_find_file_unicode(str_jap_shiftjis, str_jap_shiftjis, 0); + + /* Test unsupported encodings */ + todo_wine + run_find_file_unicode(str_jap_utf16le_nobom, str_empty, 1); + todo_wine + run_find_file_unicode(str_jap_utf16be_bom, str_empty, 1); + todo_wine + run_find_file_unicode(str_jap_utf16be_nobom, str_empty, 1); + + /* Test utf16le */ + todo_wine + run_find_file_unicode(str_jap_utf16le_bom, str_jap_utf16le_bom, 0); +} + + START_TEST(find) { if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) @@ -314,5 +413,7 @@ START_TEST(find) } test_singleline_without_switches(); test_multiline(); - test_unicode_support(); + test_unicode_support_stdin(); + test_file_search(); + test_unicode_support_file(); } -- 2.25.0

2 1

[PATCH] scrrun: Add MoveFile implementation.
by Jacek Caban 27 Jan '20

27 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 7 ++-- dlls/scrrun/tests/filesystem.c | 62 ++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-)

2 1

[PATCH] advapi32/tests: Avoid failure when GetServiceKeyName() gets a smart quote.
by Francois Gouget 27 Jan '20

27 Jan '20

For non-English languages the Spooler display name may contain non-ASCII characters, typically a smart quote. On Windows 7 GetServiceKeyName() fails when it gets such characters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/service.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 38726660850..484167656f1 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -720,6 +720,17 @@ static void test_get_displayname(void) CloseServiceHandle(scm_handle); } +static int is_printable_ascii_str(const char *s) +{ + while (*s) + { + if (*s < 32 || *s >= 127) + return 0; + s++; + } + return 1; +} + static void test_get_servicekeyname(void) { SC_HANDLE scm_handle, svc_handle; @@ -861,6 +872,14 @@ static void test_get_servicekeyname(void) servicesize = 0; ret = GetServiceKeyNameA(scm_handle, displayname, NULL, &servicesize); ok(!ret, "Expected failure\n"); + if (!is_printable_ascii_str(displayname) && + GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) + { + win_skip("GetServiceKeyName() does not support non-ASCII display names: %s\n", displayname); /* Windows 7 */ + CloseServiceHandle(scm_handle); + return; /* All the tests that follow will fail too */ + } + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -- 2.20.1

2 1

[PATCH] gdiplus: Use refcounting for GpFontFamily instead of cloning.
by Dmitry Timoshkov 27 Jan '20

27 Jan '20

.Net 4.7+ depends on this behaviour and expects to be able to do pointer equality tests for FontFamily objects. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/font.c | 62 ++++++++++++++-------------------- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/font.c | 57 ++++++++++++++++++++++++++++++- 3 files changed, 83 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index eee272082f..2266e474df 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -115,8 +115,6 @@ typedef struct #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') -static GpStatus clone_font_family(const GpFontFamily *, GpFontFamily **); - static GpFontCollection installedFontCollection = {0}; /******************************************************************************* @@ -183,13 +181,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; (*font)->otm = otm; - - stat = clone_font_family(fontFamily, &(*font)->family); - if (stat != Ok) - { - heap_free(*font); - return stat; - } + (*font)->family = (GpFontFamily *)fontFamily; + InterlockedIncrement(&(*font)->family->ref); TRACE("<-- %p\n", *font); @@ -322,7 +315,10 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) if (!(font && family)) return InvalidParameter; - return GdipCloneFontFamily(font->family, family); + InterlockedIncrement(&font->family->ref); + *family = font->family; + + return Ok; } static REAL get_font_size(const GpFont *font) @@ -518,8 +514,6 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW */ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) { - GpStatus stat; - TRACE("(%p, %p)\n", font, cloneFont); if(!font || !cloneFont) @@ -528,11 +522,10 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) *cloneFont = heap_alloc_zero(sizeof(GpFont)); if(!*cloneFont) return OutOfMemory; + InterlockedIncrement(&font->family->ref); **cloneFont = *font; - stat = GdipCloneFontFamily(font->family, &(*cloneFont)->family); - if (stat != Ok) heap_free(*cloneFont); - return stat; + return Ok; } /******************************************************************************* @@ -769,6 +762,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, ffamily->descent = fm.descent; ffamily->line_spacing = fm.line_spacing; ffamily->dpi = fm.dpi; + ffamily->ref = 1; *FontFamily = ffamily; @@ -777,16 +771,6 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, return Ok; } -static GpStatus clone_font_family(const GpFontFamily *family, GpFontFamily **clone) -{ - *clone = heap_alloc_zero(sizeof(GpFontFamily)); - if (!*clone) return OutOfMemory; - - **clone = *family; - - return Ok; -} - /******************************************************************************* * GdipCloneFontFamily [GDIPLUS.@] * @@ -799,19 +783,19 @@ static GpStatus clone_font_family(const GpFontFamily *family, GpFontFamily **clo * RETURNS * SUCCESS: Ok */ -GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** clonedFontFamily) +GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clone) { - GpStatus status; + if (!family || !clone) return InvalidParameter; - if (!(FontFamily && clonedFontFamily)) return InvalidParameter; + TRACE("%p (%s), %p\n", family, debugstr_w(family->FamilyName), clone); - TRACE("%p (%s), %p\n", FontFamily, - debugstr_w(FontFamily->FamilyName), clonedFontFamily); + *clone = heap_alloc_zero(sizeof(**clone)); + if (!*clone) return OutOfMemory; - status = clone_font_family(FontFamily, clonedFontFamily); - if (status != Ok) return status; + **clone = *family; + (*clone)->ref = 1; - TRACE("<-- %p\n", *clonedFontFamily); + TRACE("<-- %p\n", *clone); return Ok; } @@ -867,11 +851,17 @@ GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, */ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) { - if (!FontFamily) + LONG ref; + + if (!FontFamily || !FontFamily->ref) return InvalidParameter; - TRACE("Deleting %p (%s)\n", FontFamily, debugstr_w(FontFamily->FamilyName)); - heap_free (FontFamily); + ref = InterlockedDecrement(&FontFamily->ref); + if (!ref) + { + TRACE("Deleting %p (%s)\n", FontFamily, debugstr_w(FontFamily->FamilyName)); + heap_free(FontFamily); + } return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8c4fcceded..6b48c360e6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -518,6 +518,7 @@ struct GpFontCollection{ }; struct GpFontFamily{ + LONG ref; WCHAR FamilyName[LF_FACESIZE]; UINT16 em_height, ascent, descent, line_spacing; /* in font units */ int dpi; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 33b75c5bc5..3cada58e39 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -141,7 +141,6 @@ static void test_createfont(void) expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); -todo_wine ok (fontfamily == fontfamily2, "Unexpected family instance.\n"); ok (lstrcmpiW(Tahoma, familyname) == 0, "Expected Tahoma, got %s\n", wine_dbgstr_w(familyname)); @@ -1282,6 +1281,61 @@ static void test_GdipGetFontCollectionFamilyCount(void) ok(status == InvalidParameter, "Unexpected status %d.\n", status); } +static void test_CloneFont(void) +{ + GpStatus status; + GpFont *font, *font2; + GpFontFamily *family, *family2; + REAL height; + Unit unit; + int style; + + status = GdipCreateFontFamilyFromName(Tahoma, NULL, &family); + expect(Ok, status); + + status = GdipCreateFont(family, 30.0f, FontStyleRegular, UnitPixel, &font); + expect(Ok, status); + + status = GdipGetFontUnit(font, &unit); + expect(Ok, status); + ok(unit == UnitPixel, "got %u\n", unit); + + status = GdipGetFontSize(font, &height); + expect(Ok, status); + ok(height == 30.0f, "got %f\n", height); + + status = GdipGetFontStyle(font, &style); + expect(Ok, status); + ok(style == FontStyleRegular, "got %d\n", style); + + status = GdipGetFamily(font, &family2); + expect(Ok, status); + ok(family == family2, "got %p\n", family2); + + status = GdipCloneFont(font, &font2); + expect(Ok, status); + + status = GdipGetFontUnit(font2, &unit); + expect(Ok, status); + ok(unit == UnitPixel, "got %u\n", unit); + + status = GdipGetFontSize(font2, &height); + expect(Ok, status); + ok(height == 30.0f, "got %f\n", height); + + status = GdipGetFontStyle(font2, &style); + expect(Ok, status); + ok(style == FontStyleRegular, "got %d\n", style); + + status = GdipGetFamily(font2, &family2); + expect(Ok, status); + ok(family == family2, "got %p\n", family2); + + GdipDeleteFont(font2); + GdipDeleteFont(font); + GdipDeleteFontFamily(family); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1301,6 +1355,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_CloneFont(); test_long_name(); test_font_transform(); test_font_substitution(); -- 2.20.1

2 3

[PATCH] kernelbase: Implement ReOpenFile().
by Zebediah Figura 27 Jan '20

27 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 99 +++++++++++++++++++++++++++--------- 2 files changed, 177 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5bd168276f9..110082a9c4f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -59,6 +59,7 @@ static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PW static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); +static HANDLE (WINAPI *pReOpenFile)(HANDLE, DWORD, DWORD, DWORD); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); @@ -111,6 +112,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pReOpenFile = (void *) GetProcAddress(hkernel32, "ReOpenFile"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } @@ -4410,6 +4412,104 @@ static void test_SetFileValidData(void) DeleteFileA(filename); } +static void test_ReOpenFile(void) +{ + char path[MAX_PATH], filename[MAX_PATH], buffer[4]; + HANDLE file, new; + unsigned int i; + DWORD size; + BOOL ret; + + static const DWORD invalid_attributes[] = + { + FILE_ATTRIBUTE_ARCHIVE, + FILE_ATTRIBUTE_ENCRYPTED, + FILE_ATTRIBUTE_HIDDEN, + FILE_ATTRIBUTE_NORMAL, + FILE_ATTRIBUTE_OFFLINE, + FILE_ATTRIBUTE_READONLY, + FILE_ATTRIBUTE_SYSTEM, + FILE_ATTRIBUTE_TEMPORARY, + }; + + static const DWORD valid_attributes[] = + { + FILE_FLAG_BACKUP_SEMANTICS, + FILE_FLAG_NO_BUFFERING, + FILE_FLAG_OVERLAPPED, + FILE_FLAG_RANDOM_ACCESS, + FILE_FLAG_SEQUENTIAL_SCAN, + FILE_FLAG_WRITE_THROUGH, + }; + + if (!pReOpenFile) + { + win_skip("ReOpenFile() is not available\n"); + return; + } + + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "tst", 0, filename); + + file = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + ret = WriteFile(file, "foo", 4, &size, NULL); + ok(ret, "failed to write file, error %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(invalid_attributes); ++i) + { + SetLastError(0xdeadbeef); + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, invalid_attributes[i]); + ok(new == INVALID_HANDLE_VALUE, "got %p\n", new); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + } + + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = ReadFile(new, buffer, sizeof(buffer), &size, NULL); + ok(ret, "failed to read file, error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "foo"), "got wrong data\n"); + CloseHandle(new); + + for (i = 0; i < ARRAY_SIZE(valid_attributes); ++i) + { + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, valid_attributes[i]); + ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + CloseHandle(new); + } + + SetLastError(0xdeadbeef); + new = pReOpenFile(file, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(new == INVALID_HANDLE_VALUE, "got %p\n", new); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got error %u\n", GetLastError()); + + CloseHandle(file); + ret = DeleteFileA(filename); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + + file = CreateNamedPipeA("\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, 0, 1, 1000, 1000, 1000, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to create pipe, error %u\n", GetLastError()); + + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + todo_wine ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = WriteFile(file, "foo", 4, &size, NULL); + todo_wine ok(ret, "failed to write file, error %u\n", GetLastError()); + ret = ReadFile(new, buffer, sizeof(buffer), &size, NULL); + todo_wine ok(ret, "failed to read file, error %u\n", GetLastError()); + if (ret) + { + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "foo"), "got wrong data\n"); + } + + CloseHandle(new); + CloseHandle(file); +} + static void test_WriteFileGather(void) { char temp_path[MAX_PATH], filename[MAX_PATH]; @@ -5483,4 +5583,5 @@ START_TEST(file) test_file_readonly_access(); test_find_file_stream(); test_SetFileTime(); + test_ReOpenFile(); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index eb2ef57c7d6..66f0cbfedc4 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -432,6 +432,26 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileA( LPCSTR name, DWORD access, DWORD sh return CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); } +static UINT get_nt_file_options( DWORD attributes ) +{ + UINT options = 0; + + if (attributes & FILE_FLAG_BACKUP_SEMANTICS) + options |= FILE_OPEN_FOR_BACKUP_INTENT; + else + options |= FILE_NON_DIRECTORY_FILE; + if (attributes & FILE_FLAG_DELETE_ON_CLOSE) + options |= FILE_DELETE_ON_CLOSE; + if (attributes & FILE_FLAG_NO_BUFFERING) + options |= FILE_NO_INTERMEDIATE_BUFFERING; + if (!(attributes & FILE_FLAG_OVERLAPPED)) + options |= FILE_SYNCHRONOUS_IO_NONALERT; + if (attributes & FILE_FLAG_RANDOM_ACCESS) + options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_WRITE_THROUGH) + options |= FILE_WRITE_THROUGH; + return options; +} /************************************************************************* * CreateFileW (kernelbase.@) @@ -441,7 +461,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO DWORD attributes, HANDLE template ) { NTSTATUS status; - UINT options; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; IO_STATUS_BLOCK io; @@ -543,25 +562,8 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO /* now call NtCreateFile */ - options = 0; - if (attributes & FILE_FLAG_BACKUP_SEMANTICS) - options |= FILE_OPEN_FOR_BACKUP_INTENT; - else - options |= FILE_NON_DIRECTORY_FILE; if (attributes & FILE_FLAG_DELETE_ON_CLOSE) - { - options |= FILE_DELETE_ON_CLOSE; access |= DELETE; - } - if (attributes & FILE_FLAG_NO_BUFFERING) - options |= FILE_NO_INTERMEDIATE_BUFFERING; - if (!(attributes & FILE_FLAG_OVERLAPPED)) - options |= FILE_SYNCHRONOUS_IO_NONALERT; - if (attributes & FILE_FLAG_RANDOM_ACCESS) - options |= FILE_RANDOM_ACCESS; - if (attributes & FILE_FLAG_WRITE_THROUGH) - options |= FILE_WRITE_THROUGH; - attributes &= FILE_ATTRIBUTE_VALID_FLAGS; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -582,8 +584,9 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; status = NtCreateFile( &ret, access | SYNCHRONIZE | FILE_READ_ATTRIBUTES, &attr, &io, - NULL, attributes, sharing, nt_disposition[creation - CREATE_NEW], - options, NULL, 0 ); + NULL, attributes & FILE_ATTRIBUTE_VALID_FLAGS, sharing, + nt_disposition[creation - CREATE_NEW], + get_nt_file_options( attributes ), NULL, 0 ); if (status) { if (vxd_name && vxd_name[0]) @@ -2550,10 +2553,60 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO /*********************************************************************** * ReOpenFile (kernelbase.@) */ -HANDLE WINAPI /* DECLSPEC_HOTPATCH */ ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags ) +HANDLE WINAPI DECLSPEC_HOTPATCH ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD attributes ) { - FIXME( "(%p, %d, %d, %d): stub\n", handle, access, sharing, flags ); - return INVALID_HANDLE_VALUE; + SECURITY_QUALITY_OF_SERVICE qos; + OBJECT_NAME_INFORMATION *name; + OBJECT_ATTRIBUTES attr = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + DWORD size; + + TRACE("handle %p, access %#x, sharing %#x, attributes %#x.\n", handle, access, sharing, attributes); + + if (attributes & 0x7ffff) /* FILE_ATTRIBUTE_* flags are invalid */ + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + status = NtQueryObject( handle, ObjectNameInformation, NULL, 0, &size ); + if (status != STATUS_INFO_LENGTH_MISMATCH && !set_ntstatus( status )) + return INVALID_HANDLE_VALUE; + + if (!(name = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return INVALID_HANDLE_VALUE; + } + + status = NtQueryObject( handle, ObjectNameInformation, name, size, NULL ); + if (!set_ntstatus( status )) + return INVALID_HANDLE_VALUE; + + if (attributes & FILE_FLAG_DELETE_ON_CLOSE) + access |= DELETE; + + attr.Length = sizeof(attr); + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &name->Name; + if (attributes & SECURITY_SQOS_PRESENT) + { + qos.Length = sizeof(qos); + qos.ImpersonationLevel = (attributes >> 16) & 0x3; + qos.ContextTrackingMode = attributes & SECURITY_CONTEXT_TRACKING ? SECURITY_DYNAMIC_TRACKING : SECURITY_STATIC_TRACKING; + qos.EffectiveOnly = (attributes & SECURITY_EFFECTIVE_ONLY) != 0; + attr.SecurityQualityOfService = &qos; + } + else + attr.SecurityQualityOfService = NULL; + + status = NtCreateFile( &file, access | SYNCHRONIZE | FILE_READ_ATTRIBUTES, &attr, &io, NULL, + 0, sharing, FILE_OPEN, get_nt_file_options( attributes ), NULL, 0 ); + if (!set_ntstatus( status )) + return INVALID_HANDLE_VALUE; + return file; } -- 2.25.0

2 2

[PATCH v2] kernelbase: Implement ReOpenFile().
by Zebediah Figura 27 Jan '20

27 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 85 ++++++++++++++++++++++--------- 2 files changed, 163 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5bd168276f9..110082a9c4f 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -59,6 +59,7 @@ static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PW static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); +static HANDLE (WINAPI *pReOpenFile)(HANDLE, DWORD, DWORD, DWORD); static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); @@ -111,6 +112,7 @@ static void InitFunctionPointers(void) pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); + pReOpenFile = (void *) GetProcAddress(hkernel32, "ReOpenFile"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } @@ -4410,6 +4412,104 @@ static void test_SetFileValidData(void) DeleteFileA(filename); } +static void test_ReOpenFile(void) +{ + char path[MAX_PATH], filename[MAX_PATH], buffer[4]; + HANDLE file, new; + unsigned int i; + DWORD size; + BOOL ret; + + static const DWORD invalid_attributes[] = + { + FILE_ATTRIBUTE_ARCHIVE, + FILE_ATTRIBUTE_ENCRYPTED, + FILE_ATTRIBUTE_HIDDEN, + FILE_ATTRIBUTE_NORMAL, + FILE_ATTRIBUTE_OFFLINE, + FILE_ATTRIBUTE_READONLY, + FILE_ATTRIBUTE_SYSTEM, + FILE_ATTRIBUTE_TEMPORARY, + }; + + static const DWORD valid_attributes[] = + { + FILE_FLAG_BACKUP_SEMANTICS, + FILE_FLAG_NO_BUFFERING, + FILE_FLAG_OVERLAPPED, + FILE_FLAG_RANDOM_ACCESS, + FILE_FLAG_SEQUENTIAL_SCAN, + FILE_FLAG_WRITE_THROUGH, + }; + + if (!pReOpenFile) + { + win_skip("ReOpenFile() is not available\n"); + return; + } + + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "tst", 0, filename); + + file = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + ok(file != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + ret = WriteFile(file, "foo", 4, &size, NULL); + ok(ret, "failed to write file, error %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(invalid_attributes); ++i) + { + SetLastError(0xdeadbeef); + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, invalid_attributes[i]); + ok(new == INVALID_HANDLE_VALUE, "got %p\n", new); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + } + + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = ReadFile(new, buffer, sizeof(buffer), &size, NULL); + ok(ret, "failed to read file, error %u\n", GetLastError()); + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "foo"), "got wrong data\n"); + CloseHandle(new); + + for (i = 0; i < ARRAY_SIZE(valid_attributes); ++i) + { + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, valid_attributes[i]); + ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + CloseHandle(new); + } + + SetLastError(0xdeadbeef); + new = pReOpenFile(file, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(new == INVALID_HANDLE_VALUE, "got %p\n", new); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got error %u\n", GetLastError()); + + CloseHandle(file); + ret = DeleteFileA(filename); + ok(ret, "failed to delete file, error %u\n", GetLastError()); + + file = CreateNamedPipeA("\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, 0, 1, 1000, 1000, 1000, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to create pipe, error %u\n", GetLastError()); + + new = pReOpenFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + todo_wine ok(new != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); + + ret = WriteFile(file, "foo", 4, &size, NULL); + todo_wine ok(ret, "failed to write file, error %u\n", GetLastError()); + ret = ReadFile(new, buffer, sizeof(buffer), &size, NULL); + todo_wine ok(ret, "failed to read file, error %u\n", GetLastError()); + if (ret) + { + ok(size == 4, "got size %u\n", size); + ok(!strcmp(buffer, "foo"), "got wrong data\n"); + } + + CloseHandle(new); + CloseHandle(file); +} + static void test_WriteFileGather(void) { char temp_path[MAX_PATH], filename[MAX_PATH]; @@ -5483,4 +5583,5 @@ START_TEST(file) test_file_readonly_access(); test_find_file_stream(); test_SetFileTime(); + test_ReOpenFile(); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index eb2ef57c7d6..8734adf4b76 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -432,6 +432,26 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileA( LPCSTR name, DWORD access, DWORD sh return CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); } +static UINT get_nt_file_options( DWORD attributes ) +{ + UINT options = 0; + + if (attributes & FILE_FLAG_BACKUP_SEMANTICS) + options |= FILE_OPEN_FOR_BACKUP_INTENT; + else + options |= FILE_NON_DIRECTORY_FILE; + if (attributes & FILE_FLAG_DELETE_ON_CLOSE) + options |= FILE_DELETE_ON_CLOSE; + if (attributes & FILE_FLAG_NO_BUFFERING) + options |= FILE_NO_INTERMEDIATE_BUFFERING; + if (!(attributes & FILE_FLAG_OVERLAPPED)) + options |= FILE_SYNCHRONOUS_IO_NONALERT; + if (attributes & FILE_FLAG_RANDOM_ACCESS) + options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_WRITE_THROUGH) + options |= FILE_WRITE_THROUGH; + return options; +} /************************************************************************* * CreateFileW (kernelbase.@) @@ -441,7 +461,6 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO DWORD attributes, HANDLE template ) { NTSTATUS status; - UINT options; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; IO_STATUS_BLOCK io; @@ -543,25 +562,8 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO /* now call NtCreateFile */ - options = 0; - if (attributes & FILE_FLAG_BACKUP_SEMANTICS) - options |= FILE_OPEN_FOR_BACKUP_INTENT; - else - options |= FILE_NON_DIRECTORY_FILE; if (attributes & FILE_FLAG_DELETE_ON_CLOSE) - { - options |= FILE_DELETE_ON_CLOSE; access |= DELETE; - } - if (attributes & FILE_FLAG_NO_BUFFERING) - options |= FILE_NO_INTERMEDIATE_BUFFERING; - if (!(attributes & FILE_FLAG_OVERLAPPED)) - options |= FILE_SYNCHRONOUS_IO_NONALERT; - if (attributes & FILE_FLAG_RANDOM_ACCESS) - options |= FILE_RANDOM_ACCESS; - if (attributes & FILE_FLAG_WRITE_THROUGH) - options |= FILE_WRITE_THROUGH; - attributes &= FILE_ATTRIBUTE_VALID_FLAGS; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -582,8 +584,9 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileW( LPCWSTR filename, DWORD access, DWO if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; status = NtCreateFile( &ret, access | SYNCHRONIZE | FILE_READ_ATTRIBUTES, &attr, &io, - NULL, attributes, sharing, nt_disposition[creation - CREATE_NEW], - options, NULL, 0 ); + NULL, attributes & FILE_ATTRIBUTE_VALID_FLAGS, sharing, + nt_disposition[creation - CREATE_NEW], + get_nt_file_options( attributes ), NULL, 0 ); if (status) { if (vxd_name && vxd_name[0]) @@ -2550,10 +2553,46 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO /*********************************************************************** * ReOpenFile (kernelbase.@) */ -HANDLE WINAPI /* DECLSPEC_HOTPATCH */ ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD flags ) +HANDLE WINAPI DECLSPEC_HOTPATCH ReOpenFile( HANDLE handle, DWORD access, DWORD sharing, DWORD attributes ) { - FIXME( "(%p, %d, %d, %d): stub\n", handle, access, sharing, flags ); - return INVALID_HANDLE_VALUE; + SECURITY_QUALITY_OF_SERVICE qos; + OBJECT_ATTRIBUTES attr = {}; + UNICODE_STRING empty = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + TRACE("handle %p, access %#x, sharing %#x, attributes %#x.\n", handle, access, sharing, attributes); + + if (attributes & 0x7ffff) /* FILE_ATTRIBUTE_* flags are invalid */ + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + if (attributes & FILE_FLAG_DELETE_ON_CLOSE) + access |= DELETE; + + attr.Length = sizeof(attr); + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.RootDirectory = handle; + attr.ObjectName = ∅ + if (attributes & SECURITY_SQOS_PRESENT) + { + qos.Length = sizeof(qos); + qos.ImpersonationLevel = (attributes >> 16) & 0x3; + qos.ContextTrackingMode = attributes & SECURITY_CONTEXT_TRACKING ? SECURITY_DYNAMIC_TRACKING : SECURITY_STATIC_TRACKING; + qos.EffectiveOnly = (attributes & SECURITY_EFFECTIVE_ONLY) != 0; + attr.SecurityQualityOfService = &qos; + } + else + attr.SecurityQualityOfService = NULL; + + status = NtCreateFile( &file, access | SYNCHRONIZE | FILE_READ_ATTRIBUTES, &attr, &io, NULL, + 0, sharing, FILE_OPEN, get_nt_file_options( attributes ), NULL, 0 ); + if (!set_ntstatus( status )) + return INVALID_HANDLE_VALUE; + return file; } -- 2.25.0

1 0

[PATCH] httpapi: Stub HttpSetRequestQueueProperty().
by Zebediah Figura 27 Jan '20

27 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48514 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 11 +++++++++++ include/http.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index c27d0c96b0..e1a16c39ab 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -51,6 +51,7 @@ @ stub HttpSetAppPoolInformation @ stub HttpSetConfigGroupInformation @ stub HttpSetControlChannelInformation +@ stdcall HttpSetRequestQueueProperty(ptr long ptr long long ptr) @ stub HttpSetServerContextInformation @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) @ stdcall HttpSetUrlGroupProperty(int64 long ptr long) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 8adbd38be5..c24cadfaeb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -760,3 +760,14 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) return GetLastError(); return ERROR_SUCCESS; } + +/*********************************************************************** + * HttpSetRequestQueueProperty (HTTPAPI.@) + */ +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, + void *value, ULONG length, ULONG reserved1, void *reserved2) +{ + FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + queue, property, value, length, reserved1, reserved2); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index 394167fd68..f569c1ecb5 100644 --- a/include/http.h +++ b/include/http.h @@ -447,6 +447,7 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, ULONG flags); ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); +ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length); -- 2.25.0

1 0