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

Matteo Bruni : ntdll/tests: Add a test for filename casing with NtQueryDirectoryFile().
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: cb5c92f33c56d469e5e061e8ac2f090e88358c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5c92f33c56d469e5e061e8a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:35 2015 +0200 ntdll/tests: Add a test for filename casing with NtQueryDirectoryFile(). --- dlls/ntdll/tests/directory.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index ec8cd5a..21aa31f 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -276,6 +276,101 @@ done: pRtlFreeUnicodeString(&ntdirname); } +static void set_up_case_test(const char *testdir) +{ + BOOL ret; + char buf[MAX_PATH]; + HANDLE h; + + ret = CreateDirectoryA(testdir, NULL); + ok(ret, "couldn't create dir '%s', error %d\n", testdir, GetLastError()); + + sprintf(buf, "%s\\%s", testdir, "TesT"); + h = CreateFileA(buf, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, 0); + ok(h != INVALID_HANDLE_VALUE, "failed to create temp file '%s'\n", buf); + CloseHandle(h); +} + +static void tear_down_case_test(const char *testdir) +{ + int ret; + char buf[MAX_PATH]; + + sprintf(buf, "%s\\%s", testdir, "TesT"); + ret = DeleteFileA(buf); + ok(ret || (GetLastError() == ERROR_PATH_NOT_FOUND), + "Failed to rm %s, error %d\n", buf, GetLastError()); + RemoveDirectoryA(testdir); +} + +static void test_NtQueryDirectoryFile_case(void) +{ + static const char testfile[] = "TesT"; + static const WCHAR testfile_w[] = {'T','e','s','T'}; + static int testfile_len = sizeof(testfile) - 1; + static WCHAR testmask[] = {'t','e','s','t'}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ntdirname; + char testdir[MAX_PATH]; + WCHAR testdir_w[MAX_PATH]; + HANDLE dirh; + UNICODE_STRING mask; + IO_STATUS_BLOCK io; + UINT data_size, data_len; + BYTE data[8192]; + FILE_BOTH_DIRECTORY_INFORMATION *dir_info = (FILE_BOTH_DIRECTORY_INFORMATION *)data; + DWORD status; + WCHAR *name; + ULONG name_len; + + /* Clean up from prior aborted run, if any, then set up test files */ + ok(GetTempPathA(MAX_PATH, testdir), "couldn't get temp dir\n"); + strcat(testdir, "case.tmp"); + tear_down_case_test(testdir); + set_up_case_test(testdir); + + pRtlMultiByteToUnicodeN(testdir_w, sizeof(testdir_w), NULL, testdir, strlen(testdir) + 1); + if (!pRtlDosPathNameToNtPathName_U(testdir_w, &ntdirname, NULL, NULL)) + { + ok(0, "RtlDosPathNametoNtPathName_U failed\n"); + goto done; + } + InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); + + data_size = offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[256]); + + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); + ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdir, status, GetLastError()); + if (status != STATUS_SUCCESS) + { + skip("can't test if we can't open the directory\n"); + return; + } + + mask.Buffer = testmask; + mask.Length = mask.MaximumLength = lstrlenW(testmask) * sizeof(WCHAR); + pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, FALSE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + data_len = io.Information; + ok(data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); + + name = dir_info->FileName; + name_len = dir_info->FileNameLength / sizeof(WCHAR); + + ok(name_len == testfile_len, "unexpected filename length %u\n", name_len); + ok(!memcmp(name, testfile_w, testfile_len * sizeof(WCHAR)), "unexpected filename %s\n", + wine_dbgstr_wn(name, name_len)); + + pNtClose(dirh); + +done: + tear_down_case_test(testdir); + pRtlFreeUnicodeString(&ntdirname); +} + static void test_redirection(void) { ULONG old, cur; @@ -345,5 +440,6 @@ START_TEST(directory) pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirectionEx"); test_NtQueryDirectoryFile(); + test_NtQueryDirectoryFile_case(); test_redirection(); }

1 0

Nikolay Sivov : riched20: Implement GetUnderline().
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: d7a1700a29a52c8548847888faddaeb1c7660f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a1700a29a52c8548847888f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 10:30:06 2015 +0300 riched20: Implement GetUnderline(). --- dlls/riched20/richole.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 95a92fe..8fecc8c 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -220,6 +220,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te { case FONT_BOLD: case FONT_ITALIC: + case FONT_UNDERLINE: return left->l == right->l; case FONT_SIZE: return left->f == right->f; @@ -235,6 +236,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo { case FONT_BOLD: case FONT_ITALIC: + case FONT_UNDERLINE: v->l = tomUndefined; return; case FONT_SIZE: @@ -273,6 +275,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_SIZE: value->f = fmt.yHeight; break; + case FONT_UNDERLINE: + value->l = fmt.dwEffects & CFE_UNDERLINE ? tomTrue : tomFalse; + break; default: FIXME("unhandled font property %d\n", propid); return E_FAIL; @@ -2101,8 +2106,8 @@ static HRESULT WINAPI TextFont_SetSuperscript(ITextFont *iface, LONG value) static HRESULT WINAPI TextFont_GetUnderline(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_UNDERLINE, value); } static HRESULT WINAPI TextFont_SetUnderline(ITextFont *iface, LONG value)

1 0

André Hentschel : dbghelp: Fix typo in trace output.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 0d68edf03e2d1e09b18cfe2b465c7759b08257e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d68edf03e2d1e09b18cfe2b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 20 14:31:46 2015 +0200 dbghelp: Fix typo in trace output. --- dlls/dbghelp/cpu_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index d80e608..403cde7 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -134,7 +134,7 @@ static BOOL arm64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, C wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), - curr_mode == stm_start ? "start" : "ARM", + curr_mode == stm_start ? "start" : "ARM64", wine_dbgstr_longlong(curr_count), frame->FuncTableEntry);

1 0

Nikolay Sivov : riched20: Implement GetLanguageID().
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 72ef367992e4c9c39bdd9b13fb019a2ad9ec544c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ef367992e4c9c39bdd9b13f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 11:18:52 2015 +0300 riched20: Implement GetLanguageID(). --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index e4136b0..1fbbc0a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -221,6 +221,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_BOLD: case FONT_FORECOLOR: case FONT_ITALIC: + case FONT_LANGID: case FONT_STRIKETHROUGH: case FONT_SUBSCRIPT: case FONT_SUPERSCRIPT: @@ -241,6 +242,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo case FONT_BOLD: case FONT_FORECOLOR: case FONT_ITALIC: + case FONT_LANGID: case FONT_STRIKETHROUGH: case FONT_SUBSCRIPT: case FONT_SUPERSCRIPT: @@ -283,6 +285,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos, case FONT_ITALIC: value->l = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse; break; + case FONT_LANGID: + value->l = fmt.lcid; + break; case FONT_SIZE: value->f = fmt.yHeight; break; @@ -1958,8 +1963,8 @@ static HRESULT WINAPI TextFont_SetKerning(ITextFont *iface, FLOAT value) static HRESULT WINAPI TextFont_GetLanguageID(ITextFont *iface, LONG *value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, value); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, value); + return get_textfont_propl(This->range, FONT_LANGID, value); } static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index a85f485..6ff2fe3 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1272,6 +1272,13 @@ static void test_GetFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(size > 0.0, "size %.2f\n", size); + value = 0; + hr = ITextFont_GetLanguageID(font, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(value == GetUserDefaultLCID(), "got lcid %x, user lcid %x\n", value, + GetUserDefaultLCID()); + /* range is non-italic */ value = tomTrue; hr = ITextFont_GetItalic(font, &value);

1 0

Nikolay Sivov : oleaut32: Added missing IPersistMemory proxy/stub methods.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 1d91c844dacd78157f43f88933f1b1236dd5d27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d91c844dacd78157f43f8893… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 20 09:13:37 2015 +0300 oleaut32: Added missing IPersistMemory proxy/stub methods. --- dlls/oleaut32/usrmarshal.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 32c089c..e86b577 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2268,8 +2268,12 @@ HRESULT CALLBACK IPersistMemory_Load_Proxy( LPVOID pMem, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %u)\n", pMem, cbSize); + + if (!pMem) + return E_POINTER; + + return IPersistMemory_RemoteLoad_Proxy(This, pMem, cbSize); } HRESULT __RPC_STUB IPersistMemory_Load_Stub( @@ -2277,8 +2281,8 @@ HRESULT __RPC_STUB IPersistMemory_Load_Stub( BYTE *pMem, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %u)\n", pMem, cbSize); + return IPersistMemory_Load(This, pMem, cbSize); } HRESULT CALLBACK IPersistMemory_Save_Proxy( @@ -2287,8 +2291,12 @@ HRESULT CALLBACK IPersistMemory_Save_Proxy( BOOL fClearDirty, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + + if (!pMem) + return E_POINTER; + + return IPersistMemory_RemoteSave_Proxy(This, pMem, fClearDirty, cbSize); } HRESULT __RPC_STUB IPersistMemory_Save_Stub( @@ -2297,8 +2305,8 @@ HRESULT __RPC_STUB IPersistMemory_Save_Stub( BOOL fClearDirty, ULONG cbSize) { - FIXME("not implemented\n"); - return E_NOTIMPL; + TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + return IPersistMemory_Save(This, pMem, fClearDirty, cbSize); } void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy(

1 0

Matteo Bruni : wined3d: Dirtify vertex shader on transformed <-> untransformed transitions.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 409cda0ac26177a8edd7b1afccb951571ca55695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409cda0ac26177a8edd7b1afc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:31 2015 +0200 wined3d: Dirtify vertex shader on transformed <-> untransformed transitions. --- dlls/wined3d/glsl_shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0a130e1..c85508c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7682,6 +7682,12 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, context->last_was_rhw = transformed; + /* If the vertex declaration contains a transformed position attribute, + * the draw uses the fixed function vertex pipeline regardless of any + * vertex shader set by the application. */ + if (transformed != wasrhw) + context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; + if (!use_vs(state)) { if (context->last_was_vshader)

1 0

Thomas Faber : advapi32: Do not fail in RegQueryInfoKey if *class_len is 0.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 87b6d42c127f8c8b7b1dc2900c2bd18c969aa2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b6d42c127f8c8b7b1dc2900… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue May 19 10:03:41 2015 -0400 advapi32: Do not fail in RegQueryInfoKey if *class_len is 0. --- dlls/advapi32/registry.c | 5 +++-- dlls/advapi32/tests/registry.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 633c0c4..0697c9c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -849,7 +849,7 @@ LSTATUS WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPD status = NtQueryKey( hkey, KeyFullInformation, buffer, sizeof(buffer), &total_size ); if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - if (class) + if (class && class_len && *class_len) { /* retry with a dynamically allocated buffer */ while (status == STATUS_BUFFER_OVERFLOW) @@ -1052,7 +1052,8 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->ClassOffset), info->ClassLength); if (class_len) { - if (len + 1 > *class_len) status = STATUS_BUFFER_OVERFLOW; + if (*class_len == 0) class = NULL; + if (class && len + 1 > *class_len) status = STATUS_BUFFER_OVERFLOW; *class_len = len; } if (class && !status) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c862b46..2aca837 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1747,7 +1747,7 @@ static void test_reg_query_info(void) /* with subkey & default value */ ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); - todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); ok(subkeys == 1, "subkeys = %u\n", subkeys); ok(maxsubkeylen == strlen("subsubkey"), "maxsubkeylen = %u\n", maxsubkeylen); @@ -1780,7 +1780,7 @@ static void test_reg_query_info(void) /* with named value */ ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); - todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(values == 3, "values = %u\n", values); ok(maxvaluenamelen == strlen("value one"), "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == sizeof("second value data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); @@ -1795,7 +1795,7 @@ static void test_reg_query_info(void) memset(classbuffer, 0x55, sizeof(classbuffer)); classlen = 0; ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class) /* win2k */ || classlen == 0, "classlen = %u\n", classlen); memset(expectbuffer, 0x55, sizeof(expectbuffer)); @@ -1804,7 +1804,7 @@ static void test_reg_query_info(void) memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 0; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class) /* win2k */ || classlen == 0, "classlen = %u\n", classlen); memset(expectbufferW, 0x55, sizeof(expectbufferW));

1 0

Thomas Faber : advapi32: Use STATUS_BUFFER_TOO_SMALL for buffer overflows in RegQueryInfoKeyW.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: b6c31bea3df9a6b0da381e48a85a74580619399a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c31bea3df9a6b0da381e48a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue May 19 09:59:09 2015 -0400 advapi32: Use STATUS_BUFFER_TOO_SMALL for buffer overflows in RegQueryInfoKeyW. --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 06833d6..633c0c4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -865,7 +865,7 @@ LSTATUS WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPD if (class_len && (info->ClassLength/sizeof(WCHAR) + 1 > *class_len)) { - status = STATUS_BUFFER_OVERFLOW; + status = STATUS_BUFFER_TOO_SMALL; } else { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 20b9bd8..c862b46 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1823,7 +1823,7 @@ static void test_reg_query_info(void) memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 1; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); ok(classlen == 0 /* win8 */ || classlen == strlen(subkey_class), "classlen = %u\n", classlen); memset(expectbufferW, 0x55, sizeof(expectbufferW)); @@ -1846,7 +1846,7 @@ static void test_reg_query_info(void) memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class) - 1; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); ok(classlen == sizeof(subkey_class) - 2 /* win8 */ || classlen == strlen(subkey_class), "classlen = %u\n", classlen); memset(expectbufferW, 0x55, sizeof(expectbufferW));

1 0

Matteo Bruni : ntdll: Implement a read_directory_getattrlist() function.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 5d65b9d0c2af38e11b59719f3888944ad29b41b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d65b9d0c2af38e11b59719f3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:59:06 2015 +0200 ntdll: Implement a read_directory_getattrlist() function. When searching for a specific filename on a case-insensitive filesystem we first try with stat(). If stat() does find the file we currently return the requested filename back. That presents an issue when the application cares about the casing of the actual file stored on-disk. Specifically, NtQueryDirectoryFile is supposed to return the actual filename with correct casing. One possible solution to the issue, without having to resort to manually scanning the directory entries, is to make use of the OS X getattrlist() function, since it can return the filename stored on the filesystem. --- dlls/ntdll/directory.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cbfc022..81b5c2e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2112,6 +2112,77 @@ done: return ret; } +#ifdef HAVE_GETATTRLIST +/*********************************************************************** + * read_directory_getattrlist + * + * Read a single file from a directory by determining whether the file + * identified by mask exists using getattrlist. + */ +static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG length, + BOOLEAN single_entry, const UNICODE_STRING *mask, + BOOLEAN restart_scan, FILE_INFORMATION_CLASS class ) +{ + int unix_len, ret, used_default; + char *unix_name; + struct attrlist attrlist; + struct + { + u_int32_t length; + struct attrreference name_reference; + char name[NAME_MAX + 1]; + } attrlist_buffer; + + TRACE("looking up file %s\n", debugstr_us( mask )); + + unix_len = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len + 1))) + { + io->u.Status = STATUS_NO_MEMORY; + return 0; + } + ret = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), unix_name, unix_len, + NULL, &used_default ); + if (ret > 0 && !used_default) + { + unix_name[ret] = 0; + if (restart_scan) + { + lseek( fd, 0, SEEK_SET ); + } + else if (lseek( fd, 0, SEEK_CUR ) != 0) + { + io->u.Status = STATUS_NO_MORE_FILES; + ret = 0; + goto done; + } + + memset( &attrlist, 0, sizeof(attrlist) ); + attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; + attrlist.commonattr = ATTR_CMN_NAME; + ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), 0 ); + if (!ret) + { + union file_directory_info *info = append_entry( buffer, io, length, attrlist_buffer.name, NULL, NULL, class ); + if (info) + { + info->next = 0; + if (io->u.Status != STATUS_BUFFER_OVERFLOW) lseek( fd, 1, SEEK_CUR ); + } + else io->u.Status = STATUS_NO_MORE_FILES; + } + } + else ret = -1; + +done: + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + + TRACE("returning %d\n", ret); + + return ret; +} +#endif + /****************************************************************************** * NtQueryDirectoryFile [NTDLL.@] @@ -2173,9 +2244,15 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done; #endif - if (!has_wildcard( mask ) && - read_directory_stat( fd, io, buffer, length, single_entry, + if (!has_wildcard( mask )) + { +#ifdef HAVE_GETATTRLIST + if (read_directory_getattrlist( fd, io, buffer, length, single_entry, mask, restart_scan, info_class ) != -1) goto done; +#endif + if (read_directory_stat( fd, io, buffer, length, single_entry, + mask, restart_scan, info_class ) != -1) goto done; + } #ifdef USE_GETDENTS if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done;

1 0

Matteo Bruni : wined3d: Fix fragment shaders sampling directly into oC[n] in the ARB backend.
by Alexandre Julliard May 20, 2015

May 20, 2015

Module: wine Branch: master Commit: 5b911ed461c6f7f059668bac66bd49ddcd694045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b911ed461c6f7f059668bac6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:32 2015 +0200 wined3d: Fix fragment shaders sampling directly into oC[n] in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 118 ++++++++++++++++++++++++++------------ 1 file changed, 81 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a45d25f..1e8784e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1271,55 +1271,86 @@ static const char *shader_arb_get_fixup_swizzle(enum fixup_channel_source channe } } -static void gen_color_correction(struct wined3d_string_buffer *buffer, const char *reg, - DWORD dst_mask, const char *one, const char *two, struct color_fixup_desc fixup) +struct color_fixup_masks { - DWORD mask; + DWORD source; + DWORD sign; +}; + +static struct color_fixup_masks calc_color_correction(struct color_fixup_desc fixup, DWORD dst_mask) +{ + struct color_fixup_masks masks = {0, 0}; if (is_complex_fixup(fixup)) { enum complex_fixup complex_fixup = get_complex_fixup(fixup); FIXME("Complex fixup (%#x) not supported\n", complex_fixup); - return; + return masks; } - mask = 0; - if (fixup.x_source != CHANNEL_SOURCE_X) mask |= WINED3DSP_WRITEMASK_0; - if (fixup.y_source != CHANNEL_SOURCE_Y) mask |= WINED3DSP_WRITEMASK_1; - if (fixup.z_source != CHANNEL_SOURCE_Z) mask |= WINED3DSP_WRITEMASK_2; - if (fixup.w_source != CHANNEL_SOURCE_W) mask |= WINED3DSP_WRITEMASK_3; - mask &= dst_mask; + if (fixup.x_source != CHANNEL_SOURCE_X) + masks.source |= WINED3DSP_WRITEMASK_0; + if (fixup.y_source != CHANNEL_SOURCE_Y) + masks.source |= WINED3DSP_WRITEMASK_1; + if (fixup.z_source != CHANNEL_SOURCE_Z) + masks.source |= WINED3DSP_WRITEMASK_2; + if (fixup.w_source != CHANNEL_SOURCE_W) + masks.source |= WINED3DSP_WRITEMASK_3; + masks.source &= dst_mask; + + if (fixup.x_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_0; + if (fixup.y_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_1; + if (fixup.z_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_2; + if (fixup.w_sign_fixup) + masks.sign |= WINED3DSP_WRITEMASK_3; + masks.sign &= dst_mask; + + return masks; +} + +static void gen_color_correction(struct wined3d_string_buffer *buffer, const char *dst, + const char *src, const char *one, const char *two, + struct color_fixup_desc fixup, struct color_fixup_masks masks) +{ + const char *sign_fixup_src = dst; - if (mask) + if (masks.source) { - shader_addline(buffer, "SWZ %s, %s, %s, %s, %s, %s;\n", reg, reg, + if (masks.sign) + sign_fixup_src = "TA"; + + shader_addline(buffer, "SWZ %s, %s, %s, %s, %s, %s;\n", sign_fixup_src, src, shader_arb_get_fixup_swizzle(fixup.x_source), shader_arb_get_fixup_swizzle(fixup.y_source), shader_arb_get_fixup_swizzle(fixup.z_source), shader_arb_get_fixup_swizzle(fixup.w_source)); } + else if (masks.sign) + { + sign_fixup_src = src; + } - mask = 0; - if (fixup.x_sign_fixup) mask |= WINED3DSP_WRITEMASK_0; - if (fixup.y_sign_fixup) mask |= WINED3DSP_WRITEMASK_1; - if (fixup.z_sign_fixup) mask |= WINED3DSP_WRITEMASK_2; - if (fixup.w_sign_fixup) mask |= WINED3DSP_WRITEMASK_3; - mask &= dst_mask; - - if (mask) + if (masks.sign) { char reg_mask[6]; char *ptr = reg_mask; - if (mask != WINED3DSP_WRITEMASK_ALL) + if (masks.sign != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; - if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + if (masks.sign & WINED3DSP_WRITEMASK_0) + *ptr++ = 'x'; + if (masks.sign & WINED3DSP_WRITEMASK_1) + *ptr++ = 'y'; + if (masks.sign & WINED3DSP_WRITEMASK_2) + *ptr++ = 'z'; + if (masks.sign & WINED3DSP_WRITEMASK_3) + *ptr++ = 'w'; } *ptr = '\0'; - shader_addline(buffer, "MAD %s%s, %s, %s, -%s;\n", reg, reg_mask, reg, two, one); + shader_addline(buffer, "MAD %s%s, %s, %s, -%s;\n", dst, reg_mask, sign_fixup_src, two, one); } } @@ -1378,6 +1409,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD const struct wined3d_shader *shader; const struct wined3d_device *device; const struct wined3d_gl_info *gl_info; + const char *tex_dst = dst_str; + struct color_fixup_masks masks; /* D3D vertex shader sampler IDs are vertex samplers(0-3), not global d3d samplers */ if(!pshader) sampler_idx += MAX_FRAGMENT_SAMPLERS; @@ -1433,18 +1466,27 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD sampler_idx = priv->cur_vs_args->vertex.samplers[sampler_idx - MAX_FRAGMENT_SAMPLERS]; } + if (pshader) + { + masks = calc_color_correction(priv->cur_ps_args->super.color_fixup[sampler_idx], + ins->dst[0].write_mask); + + if (masks.source || masks.sign) + tex_dst = "TA"; + } + if (flags & TEX_DERIV) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivatives\n"); if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivatives\n"); - shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, - dsx, dsy,sampler_idx, tex_type); + shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, + dsx, dsy, sampler_idx, tex_type); } else if(flags & TEX_LOD) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with explicit lod\n"); if(flags & TEX_BIAS) FIXME("Biased texture sampling with explicit lod\n"); - shader_addline(buffer, "TXL%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, + shader_addline(buffer, "TXL%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } else if (flags & TEX_BIAS) @@ -1452,11 +1494,11 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD /* Shouldn't be possible, but let's check for it */ if(flags & TEX_PROJ) FIXME("Biased and Projected texture sampling\n"); /* TXB takes the 4th component of the source vector automatically, as d3d. Nothing more to do */ - shader_addline(buffer, "TXB%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXB%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } else if (flags & TEX_PROJ) { - shader_addline(buffer, "TXP%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXP%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } else { @@ -1466,18 +1508,18 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD shader_addline(buffer, "MUL TA, np2fixup[%u].%s, %s;\n", idx >> 1, (idx % 2) ? "zwxy" : "xyzw", coord_reg); - shader_addline(buffer, "TEX%s %s, TA, texture[%u], %s;\n", mod, dst_str, sampler_idx, tex_type); + shader_addline(buffer, "TEX%s %s, TA, texture[%u], %s;\n", mod, tex_dst, sampler_idx, tex_type); } else - shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, tex_dst, coord_reg, sampler_idx, tex_type); } if (pshader) { - gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, + gen_color_correction(buffer, dst_str, tex_dst, arb_get_helper_value(WINED3D_SHADER_TYPE_PIXEL, ARB_ONE), arb_get_helper_value(WINED3D_SHADER_TYPE_PIXEL, ARB_TWO), - priv->cur_ps_args->super.color_fixup[sampler_idx]); + priv->cur_ps_args->super.color_fixup[sampler_idx], masks); } } @@ -6238,6 +6280,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con BOOL op_equal; const char *final_combiner_src = "ret"; BOOL custom_linear_fog = FALSE; + struct color_fixup_masks masks; if (!string_buffer_init(&buffer)) { @@ -6426,8 +6469,9 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } sprintf(colorcor_dst, "tex%u", stage); - gen_color_correction(&buffer, colorcor_dst, WINED3DSP_WRITEMASK_ALL, "const.x", "const.y", - settings->op[stage].color_fixup); + masks = calc_color_correction(settings->op[stage].color_fixup, WINED3DSP_WRITEMASK_ALL); + gen_color_correction(&buffer, colorcor_dst, colorcor_dst, "const.x", "const.y", + settings->op[stage].color_fixup, masks); } if (settings->color_key_enabled)

1 0