wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Jiaxing Wang : regedit: Avoid appending '\0' to string value of imported key.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: a53371497f62ee4ff5a379941cc2cd58ac5cbb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53371497f62ee4ff5a379941… Author: Jiaxing Wang <hello.wjx(a)gmail.com> Date: Thu Nov 20 15:29:07 2014 +0800 regedit: Avoid appending '\0' to string value of imported key. --- programs/regedit/regproc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 80beb21..643b559 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -376,7 +376,6 @@ static LONG setValue(WCHAR* val_name, WCHAR* val_data, BOOL is_unicode) return ERROR_INVALID_DATA; val_data[dwLen-1] = '\0'; /* remove last quotes */ lpbData = (BYTE*) val_data; - dwLen++; /* include terminating null */ dwLen = dwLen * sizeof(WCHAR); /* size is in bytes */ } else if (dwParseType == REG_DWORD) /* Convert the dword types */

1 0

Sebastian Lackner : wineconsole: Allocate fake hwnds for curses backend.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 2100d3e1ec3e47194fb7076de30f1acfe2b60bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2100d3e1ec3e47194fb7076de… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 13 19:06:23 2015 +0200 wineconsole: Allocate fake hwnds for curses backend. Based on a patch by Qian Hong. --- programs/wineconsole/curses.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 24aab88..2903b80 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1001,6 +1001,7 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) #endif endwin(); + if (data->hWnd) DestroyWindow(data->hWnd); HeapFree(GetProcessHeap(), 0, PRIVATE(data)->line); HeapFree(GetProcessHeap(), 0, PRIVATE(data)); data->private = NULL; @@ -1042,6 +1043,8 @@ static int WCCURSES_MainLoop(struct inner_data* data) */ enum init_return WCCURSES_InitBackend(struct inner_data* data) { + static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; + if( !WCCURSES_bind_libcurses() ) return init_not_supported; @@ -1058,7 +1061,8 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) data->fnScroll = WCCURSES_Scroll; data->fnSetFont = WCCURSES_SetFont; data->fnDeleteBackend = WCCURSES_DeleteBackend; - data->hWnd = NULL; + data->hWnd = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, + GetModuleHandleW(0), NULL); /* FIXME: should find a good way to enable buffer scrolling * For the time being, setting this to 1 will allow scrolling up/down

1 0

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

20 May '15

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

Austin English : dbghelp: Ignore some more symbol ids.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: f832f85c80ef69f182790a9183d50d53826cac85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f832f85c80ef69f182790a918… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 19 21:28:18 2015 -0500 dbghelp: Ignore some more symbol ids. These are from MSVC 2013. --- dlls/dbghelp/msc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 3b12a3a..1554414 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1992,6 +1992,12 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case 0x1142: case 0x1143: case 0x1144: + case 0x114c: + case 0x114d: + case 0x114e: + case 0x1145: + case 0x115a: + case 0x1153: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

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

20 May '15

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

Matteo Bruni : ntdll: Ignore positive matches in read_directory_stat() for case-insensitive filesystems.
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: 2f0febe60a9f0b29840fc8d60679a8585b788ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0febe60a9f0b29840fc8d60… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 19 23:32:34 2015 +0200 ntdll: Ignore positive matches in read_directory_stat() for case-insensitive filesystems. It's necessary to return the actual filename with correct casing and a plain stat doesn't allow that. Make read_directory_stat() return the result of the stat() call on a case-insensitive filesystem only when the file is missing. --- dlls/ntdll/directory.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 81b5c2e..455fbc6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2065,8 +2065,9 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG int unix_len, ret, used_default; char *unix_name; struct stat st; + BOOL case_sensitive = get_dir_case_sensitivity("."); - TRACE("trying optimisation for file %s\n", debugstr_us( mask )); + 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))) @@ -2091,7 +2092,7 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } ret = stat( unix_name, &st ); - if (!ret) + if (case_sensitive && !ret) { union file_directory_info *info = append_entry( buffer, io, length, unix_name, NULL, NULL, class ); if (info) @@ -2101,6 +2102,19 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } else io->u.Status = STATUS_NO_MORE_FILES; } + else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) + { + /* If the file does not exist, return that info. + * If the file DOES exist, return failure and fallback to the next + * read_directory_* function (we need to return the case-preserved + * filename stored on the filesystem). */ + ret = 0; + io->u.Status = STATUS_NO_MORE_FILES; + } + else + { + ret = -1; + } } else ret = -1;

1 0

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

20 May '15

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 20 May '15

20 May '15

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

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

20 May '15

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

Nikolay Sivov : xmllite/writer: Implement WriteEndDocument().
by Alexandre Julliard 20 May '15

20 May '15

Module: wine Branch: master Commit: aadd9ff1599c3addcf81c63e676a12a65b37ceec URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadd9ff1599c3addcf81c63e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 19 21:59:59 2015 +0300 xmllite/writer: Implement WriteEndDocument(). --- dlls/xmllite/tests/writer.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 44 ++++++++++++++++++++++++++--- 2 files changed, 107 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 984a34d..d81a934 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -670,6 +670,72 @@ static void test_writeendelement(void) IStream_Release(stream); } +static void test_writeenddocument(void) +{ + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* WriteEndDocument resets it to initial state */ + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr == NULL, "got %p\n", ptr); + + /* we still need to flush manually, WriteEndDocument doesn't do that */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(ptr != NULL, "got %p\n", ptr); + ok(!strncmp(ptr, "<a><b /></a>", 12), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { if (!init_pointers()) @@ -683,4 +749,5 @@ START_TEST(writer) test_flush(); test_omitxmldeclaration(); test_bom(); + test_writeenddocument(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index abbe07d..8387935 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -59,7 +59,8 @@ typedef enum XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ XmlWriterState_ElemStarted, /* writing element */ - XmlWriterState_Content /* content is accepted at this point */ + XmlWriterState_Content, /* content is accepted at this point */ + XmlWriterState_DocClosed /* WriteEndDocument was called */ } XmlWriterState; typedef struct @@ -608,6 +609,8 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr case XmlWriterState_ElemStarted: writer_close_starttag(This); break; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; default: ; } @@ -631,10 +634,34 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); + HRESULT hr = S_OK; - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + switch (This->state) + { + case XmlWriterState_Initial: + hr = E_UNEXPECTED; + break; + case XmlWriterState_Ready: + case XmlWriterState_DocClosed: + hr = WR_E_INVALIDACTION; + break; + default: + ; + } + + if (FAILED(hr)) { + This->state = XmlWriterState_DocClosed; + return hr; + } + + /* empty element stack */ + while (IXmlWriter_WriteEndElement(iface) == S_OK) + ; + + This->state = XmlWriterState_DocClosed; + return S_OK; } static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) @@ -749,6 +776,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP return WR_E_INVALIDACTION; break; case XmlWriterState_ElemStarted: + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; @@ -812,6 +840,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal return S_OK; case XmlWriterState_DocStarted: case XmlWriterState_ElemStarted: + case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: ; @@ -853,8 +882,15 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); - if (This->state == XmlWriterState_Initial) + switch (This->state) + { + case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; + } if (!local_name) return E_INVALIDARG;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015