winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
304 discussions
Start a n
N
ew thread
Sebastian Lackner : ntdll/tests: Add tests for FILE_PIPE_INFORMATION.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: b765561b493eac002dd129dfedfef0df53a19111 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b765561b493eac002dd129dfe…
Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 12 21:31:00 2014 +0200 ntdll/tests: Add tests for FILE_PIPE_INFORMATION. Based on a patch by Adam Martinson. --- dlls/ntdll/tests/pipe.c | 194 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index c275e3d..4bf2ad2 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -34,6 +34,11 @@ #ifndef __WINE_WINTERNL_H typedef struct { + ULONG ReadMode; + ULONG CompletionMode; +} FILE_PIPE_INFORMATION; + +typedef struct { ULONG NamedPipeType; ULONG NamedPipeConfiguration; ULONG MaximumInstances; @@ -68,6 +73,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, ULONG inbound_quota, ULONG outbound_quota, PLARGE_INTEGER timeout); static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); +static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); static void (WINAPI *pRtlInitUnicodeString) (PUNICODE_STRING target, PCWSTR source); @@ -87,6 +93,7 @@ static BOOL init_func_ptrs(void) loadfunc(NtFsControlFile) loadfunc(NtCreateNamedPipeFile) loadfunc(NtQueryInformationFile) + loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) loadfunc(RtlInitUnicodeString) @@ -479,6 +486,190 @@ static void test_cancelio(void) CloseHandle(hPipe); } +static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG completion) +{ + IO_STATUS_BLOCK iosb; + FILE_PIPE_INFORMATION fpi; + NTSTATUS res; + if (handle != INVALID_HANDLE_VALUE) + { + memset(&fpi, 0x55, sizeof(fpi)); + res = pNtQueryInformationFile(handle, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok_(__FILE__, line)(!res, "NtQueryInformationFile returned %x\n", res); + ok_(__FILE__, line)(fpi.ReadMode == read, "Unexpected ReadMode, expected %x, got %x\n", + read, fpi.ReadMode); + ok_(__FILE__, line)(fpi.CompletionMode == completion, "Unexpected CompletionMode, expected %x, got %x\n", + completion, fpi.CompletionMode); + } +} +#define check_pipe_handle_state(handle, r, c) _check_pipe_handle_state(__LINE__, handle, r, c) + +static void test_filepipeinfo(void) +{ + IO_STATUS_BLOCK iosb; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + LARGE_INTEGER timeout; + HANDLE hServer, hClient; + FILE_PIPE_INFORMATION fpi; + NTSTATUS res; + + pRtlInitUnicodeString(&name, testpipe_nt); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = 0x40; /* case insensitive */ + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + timeout.QuadPart = -100000000000ll; + + /* test with INVALID_HANDLE_VALUE */ + res = pNtQueryInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtQueryInformationFile returned %x\n", res); + + fpi.ReadMode = 0; + fpi.CompletionMode = 0; + res = pNtSetInformationFile(INVALID_HANDLE_VALUE, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_OBJECT_TYPE_MISMATCH, "NtSetInformationFile returned %x\n", res); + + /* server end with read-only attributes */ + res = pNtCreateNamedPipeFile(&hServer, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /* FILE_CREATE */, + 0, 0, 0, 1, 0xFFFFFFFF, 500, 500, &timeout); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + check_pipe_handle_state(hServer, 0, 1); + + hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); + ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); + + check_pipe_handle_state(hServer, 0, 1); + check_pipe_handle_state(hClient, 0, 0); + + fpi.ReadMode = 0; + fpi.CompletionMode = 0; + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); + + check_pipe_handle_state(hServer, 0, 1); + check_pipe_handle_state(hClient, 0, 0); + + fpi.ReadMode = 1; /* invalid on a byte stream pipe */ + fpi.CompletionMode = 1; + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); + + check_pipe_handle_state(hServer, 0, 1); + check_pipe_handle_state(hClient, 0, 0); + + if (hClient != INVALID_HANDLE_VALUE) + { + fpi.ReadMode = 1; /* invalid on a byte stream pipe */ + fpi.CompletionMode = 1; + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_INVALID_PARAMETER, "NtSetInformationFile returned %x\n", res); + } + + check_pipe_handle_state(hServer, 0, 1); + check_pipe_handle_state(hClient, 0, 0); + + if (hClient != INVALID_HANDLE_VALUE) + { + fpi.ReadMode = 0; + fpi.CompletionMode = 1; + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(!res, "NtSetInformationFile returned %x\n", res); + } + + check_pipe_handle_state(hServer, 0, 1); + check_pipe_handle_state(hClient, 0, 1); + + if (hClient != INVALID_HANDLE_VALUE) + { + fpi.ReadMode = 0; + fpi.CompletionMode = 2; /* not in range 0-1 */ + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); + + fpi.ReadMode = 2; /* not in range 0-1 */ + fpi.CompletionMode = 0; + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); + } + + CloseHandle(hClient); + + check_pipe_handle_state(hServer, 0, 1); + + fpi.ReadMode = 0; + fpi.CompletionMode = 0; + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_ACCESS_DENIED, "NtSetInformationFile returned %x\n", res); + + CloseHandle(hServer); + + /* message mode server with read/write attributes */ + res = pNtCreateNamedPipeFile(&hServer, FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /* FILE_CREATE */, + 0, 1, 1, 0, 0xFFFFFFFF, 500, 500, &timeout); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + check_pipe_handle_state(hServer, 1, 0); + + hClient = CreateFileW(testpipe, GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0); + ok(hClient != INVALID_HANDLE_VALUE, "can't open pipe, GetLastError: %x\n", GetLastError()); + + check_pipe_handle_state(hServer, 1, 0); + check_pipe_handle_state(hClient, 0, 0); + + if (hClient != INVALID_HANDLE_VALUE) + { + fpi.ReadMode = 1; + fpi.CompletionMode = 1; + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(!res, "NtSetInformationFile returned %x\n", res); + } + + check_pipe_handle_state(hServer, 1, 0); + check_pipe_handle_state(hClient, 1, 1); + + fpi.ReadMode = 0; + fpi.CompletionMode = 1; + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(!res, "NtSetInformationFile returned %x\n", res); + + check_pipe_handle_state(hServer, 0, 1); + check_pipe_handle_state(hClient, 1, 1); + + if (hClient != INVALID_HANDLE_VALUE) + { + fpi.ReadMode = 0; + fpi.CompletionMode = 2; /* not in range 0-1 */ + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); + + fpi.ReadMode = 2; /* not in range 0-1 */ + fpi.CompletionMode = 0; + res = pNtSetInformationFile(hClient, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(res == STATUS_INVALID_PARAMETER || broken(!res) /* < Vista */, "NtSetInformationFile returned %x\n", res); + } + + CloseHandle(hClient); + + check_pipe_handle_state(hServer, 0, 1); + + fpi.ReadMode = 1; + fpi.CompletionMode = 0; + res = pNtSetInformationFile(hServer, &iosb, &fpi, sizeof(fpi), (FILE_INFORMATION_CLASS)23); + ok(!res, "NtSetInformationFile returned %x\n", res); + + check_pipe_handle_state(hServer, 1, 0); + + CloseHandle(hServer); +} + START_TEST(pipe) { if (!init_func_ptrs()) @@ -493,6 +684,9 @@ START_TEST(pipe) trace("starting overlapped tests\n"); test_overlapped(); + trace("starting FILE_PIPE_INFORMATION tests\n"); + test_filepipeinfo(); + if (!pOpenThread || !pQueueUserAPC) return;
1
0
0
0
Aric Stewart : dwrite/tests: Add a font resource and use it for tests.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: 2dec8d6fb2f310daa1c807f504f1c3db304d66c4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2dec8d6fb2f310daa1c807f50…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 20 15:50:21 2014 -0500 dwrite/tests: Add a font resource and use it for tests. --- dlls/dwrite/tests/Makefile.in | 5 + dlls/dwrite/tests/font.c | 174 ++++++++++++++++++++++++++++ dlls/dwrite/tests/resource.rc | 24 ++++ dlls/dwrite/tests/wine_test.sfd | 244 ++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/wine_test.ttf | Bin 0 -> 1776 bytes 5 files changed, 447 insertions(+) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=2dec8d6fb2f310daa1c80…
1
0
0
0
Zhenbo Li : mshtml: Added IHTMLStyle::listStyle property implementation.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: bde260411c6710c03f6527220b363cd9a467d6e8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bde260411c6710c03f6527220…
Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 20 21:35:43 2014 +0800 mshtml: Added IHTMLStyle::listStyle property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9c9c96e..aa19da7 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -128,6 +128,8 @@ static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrLineHeight[] = {'l','i','n','e','-','h','e','i','g','h','t',0}; +static const WCHAR attrListStyle[] = + {'l','i','s','t','-','s','t','y','l','e',0}; static const WCHAR attrListStyleType[] = {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0}; static const WCHAR attrListStylePosition[] = @@ -252,6 +254,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, + {attrListStyle, DISPID_IHTMLSTYLE_LISTSTYLE}, {attrListStylePosition, DISPID_IHTMLSTYLE_LISTSTYLEPOSITION}, {attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, @@ -2241,15 +2244,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleImage(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_listStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_LIST_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_listStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_LIST_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_whiteSpace(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9b44a30..3c6bb6c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -79,6 +79,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_LINE_HEIGHT, + STYLEID_LIST_STYLE, STYLEID_LISTSTYLEPOSITION, STYLEID_LISTSTYLETYPE, STYLEID_MARGIN, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94226e1..5297246 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -59,6 +59,22 @@ static BSTR a2bstr(const char *str) return ret; } +static const WCHAR *strstr_wa(const WCHAR *str, const char *suba) +{ + BSTR sub; + const WCHAR *ret = NULL; + sub = a2bstr(suba); + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) {ret = str; break;} + str++; + } + SysFreeString(sub); + return ret; +} + #define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) { @@ -2194,6 +2210,24 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "inside"), "listStyleType = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = a2bstr("decimal-leading-zero none inside"); + hres = IHTMLStyle_put_listStyle(style, str); + ok(hres == S_OK || broken(hres == E_INVALIDARG), /* win 2000 */ + "put_listStyle(%s) failed: %08x\n", wine_dbgstr_w(str), hres); + SysFreeString(str); + + if (hres != E_INVALIDARG) { + hres = IHTMLStyle_get_listStyle(style, &str); + ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); + ok(strstr_wa(str, "decimal-leading-zero") == str && + strstr_wa(str, "none") != NULL && + strstr_wa(str, "inside") != NULL, + "listStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } else { + win_skip("IHTMLStyle_put_listStyle already failed\n"); + } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {
1
0
0
0
Gerald Pfeifer : ws2_32: Define fill_control_message only when it' s really used.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: 7432a8588c321145f6b4341aff93d38a38b2851d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7432a8588c321145f6b4341af…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 17 00:28:05 2014 +0200 ws2_32: Define fill_control_message only when it's really used. --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5900c8f..d5e9fd1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -569,6 +569,7 @@ static const int ws_eai_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS +#ifdef IP_PKTINFO static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -586,6 +587,7 @@ static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR * /* Return the pointer to where next entry should go */ return (WSACMSGHDR *) (ptr + WSA_CMSG_ALIGN(len)); } +#endif /* IP_PKTINFO */ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) {
1
0
0
0
Henri Verbeet : wined3d: Use rendertarget views for color output instead of surfaces.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: b005ad6f905dc0051b17ea45b3690e0662e48481 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b005ad6f905dc0051b17ea45b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:55 2014 +0200 wined3d: Use rendertarget views for color output instead of surfaces. --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/view.c | 3 +- dlls/d3d8/d3d8_private.h | 4 ++ dlls/d3d8/device.c | 26 ++++---- dlls/d3d8/surface.c | 47 ++++++++++++++ dlls/d3d8/texture.c | 25 ++++++++ dlls/d3d9/d3d9_private.h | 4 ++ dlls/d3d9/device.c | 12 ++-- dlls/d3d9/surface.c | 47 ++++++++++++++ dlls/d3d9/texture.c | 25 ++++++++ dlls/ddraw/ddraw.c | 20 +++--- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 10 +-- dlls/ddraw/surface.c | 68 +++++++++++++++++--- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/context.c | 47 ++++++++------ dlls/wined3d/cs.c | 28 ++++----- dlls/wined3d/device.c | 123 ++++++++++++++++++++++--------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 35 +++++------ dlls/wined3d/surface.c | 34 ++++++---- dlls/wined3d/texture.c | 4 +- dlls/wined3d/utils.c | 4 +- dlls/wined3d/view.c | 50 ++++++++++++++- dlls/wined3d/wined3d.spec | 9 ++- dlls/wined3d/wined3d_private.h | 33 ++++++++-- include/wine/wined3d.h | 15 +++-- 29 files changed, 512 insertions(+), 179 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=b005ad6f905dc0051b17e…
1
0
0
0
Henri Verbeet : wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: 7ede9788d4ac6b61514b83cfe0a0908c701905b9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7ede9788d4ac6b61514b83cfe…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:54 2014 +0200 wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources. --- dlls/wined3d/device.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f5a46c..962c9c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3741,22 +3741,32 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color) + struct wined3d_rendertarget_view *view, const struct wined3d_color *color) { struct wined3d_resource *resource; HRESULT hr; RECT rect; - resource = rendertarget_view->resource; - if (resource->type != WINED3D_RTYPE_SURFACE) + TRACE("device %p, view %p, color {%.8e, %.8e, %.8e, %.8e}.\n", + device, view, color->r, color->g, color->b, color->a); + + resource = view->resource; + if (resource->type != WINED3D_RTYPE_TEXTURE && resource->type != WINED3D_RTYPE_CUBE_TEXTURE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return; + } + + if (view->depth > 1) { - FIXME("Only supported on surface resources\n"); + FIXME("Layered clears not implemented.\n"); return; } - SetRect(&rect, 0, 0, resource->width, resource->height); - hr = surface_color_fill(surface_from_resource(resource), &rect, color); - if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); + SetRect(&rect, 0, 0, view->width, view->height); + resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(resource), view->sub_resource_idx); + if (FAILED(hr = surface_color_fill(surface_from_resource(resource), &rect, color))) + ERR("Color fill failed, hr %#x.\n", hr); } struct wined3d_surface * CDECL wined3d_device_get_render_target(const struct wined3d_device *device,
1
0
0
0
Henri Verbeet : wined3d: Introduce struct wined3d_rendertarget_view_desc.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: fb7135efd134cc45d4fff683afece7e1116c713b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fb7135efd134cc45d4fff683a…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:53 2014 +0200 wined3d: Introduce struct wined3d_rendertarget_view_desc. --- dlls/d3d10core/view.c | 68 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/view.c | 42 ++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 8 +++++ include/wine/wined3d.h | 23 ++++++++++++-- 5 files changed, 129 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index e7aac3b..7394466 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -654,9 +654,73 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = d3d10_rendertarget_view_GetDesc, }; +static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendertarget_view_desc *wined3d_desc, + const D3D10_RENDER_TARGET_VIEW_DESC *desc) +{ + wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); + + switch (desc->ViewDimension) + { + case D3D10_RTV_DIMENSION_BUFFER: + wined3d_desc->u.buffer.start_idx = desc->u.Buffer.ElementOffset; + wined3d_desc->u.buffer.count = desc->u.Buffer.ElementWidth; + break; + + case D3D10_RTV_DIMENSION_TEXTURE1D: + wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE1DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture1DArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2D: + wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DMS: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE3D: + wined3d_desc->u.texture.level_idx = desc->u.Texture3D.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture3D.FirstWSlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture3D.WSize; + break; + + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + } +} + HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { + struct wined3d_rendertarget_view_desc wined3d_desc; struct wined3d_resource *wined3d_resource; HRESULT hr; @@ -680,8 +744,8 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return E_FAIL; } - hr = wined3d_rendertarget_view_create(wined3d_resource, view, &view->wined3d_view); - if (FAILED(hr)) + wined3d_rendertarget_view_desc_from_d3d10core(&wined3d_desc, &view->desc); + if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, view, &view->wined3d_view))) { WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index bfec1ef..7d9e742 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -63,30 +63,54 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str } static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - struct wined3d_resource *resource, void *parent) + const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent) { + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + view->refcount = 1; view->resource = resource; wined3d_resource_incref(resource); view->parent = parent; + + view->format = wined3d_get_format(gl_info, desc->format_id); + if (resource->type == WINED3D_RTYPE_BUFFER) + { + view->sub_resource_idx = 0; + view->buffer_offset = desc->u.buffer.start_idx; + view->width = desc->u.buffer.count; + view->height = 1; + view->depth = 1; + } + else + { + struct wined3d_texture *texture = wined3d_texture_from_resource(resource); + struct wined3d_resource *sub_resource; + + view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + sub_resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx); + + view->buffer_offset = 0; + view->width = sub_resource->width; + view->height = sub_resource->height; + view->depth = desc->u.texture.layer_count; + } } -HRESULT CDECL wined3d_rendertarget_view_create(struct wined3d_resource *resource, - void *parent, struct wined3d_rendertarget_view **rendertarget_view) +HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, + struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **view) { struct wined3d_rendertarget_view *object; - TRACE("resource %p, parent %p, rendertarget_view %p.\n", - resource, parent, rendertarget_view); + TRACE("desc %p, resource %p, parent %p, view %p.\n", + desc, resource, parent, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_rendertarget_view_init(object, resource, parent); + wined3d_rendertarget_view_init(object, desc, resource, parent); TRACE("Created render target view %p.\n", object); - *rendertarget_view = object; + *view = object; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e3baac2..722ad18 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -177,7 +177,7 @@ @ cdecl wined3d_resource_set_parent(ptr ptr) @ cdecl wined3d_resource_set_priority(ptr long) -@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr) +@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @ cdecl wined3d_rendertarget_view_get_parent(ptr) @ cdecl wined3d_rendertarget_view_get_resource(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16ae4c3..81cbb29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2617,6 +2617,14 @@ struct wined3d_rendertarget_view struct wined3d_resource *resource; void *parent; + + const struct wined3d_format *format; + unsigned int sub_resource_idx; + unsigned int buffer_offset; + + unsigned int width; + unsigned int height; + unsigned int depth; }; struct wined3d_swapchain_ops diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2aacecb..216e8ab 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1934,6 +1934,25 @@ struct wined3d_buffer_desc UINT misc_flags; }; +struct wined3d_rendertarget_view_desc +{ + enum wined3d_format_id format_id; + union + { + struct + { + unsigned int start_idx; + unsigned int count; + } buffer; + struct + { + unsigned int level_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } u; +}; + struct wined3d_shader_signature_element { const char *semantic_name; @@ -2357,8 +2376,8 @@ DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resou void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority); -HRESULT __cdecl wined3d_rendertarget_view_create(struct wined3d_resource *resource, - void *parent, struct wined3d_rendertarget_view **rendertarget_view); +HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, + struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **view); ULONG __cdecl wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view); void * __cdecl wined3d_rendertarget_view_get_parent(const struct wined3d_rendertarget_view *view); struct wined3d_resource * __cdecl wined3d_rendertarget_view_get_resource(const struct wined3d_rendertarget_view *view);
1
0
0
0
Henri Verbeet : wined3d: Keep a reference to the resource in rendertarget views.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: eb24c9578c83ba1684e65f2e5f2cfd091fdea752 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eb24c9578c83ba1684e65f2e5…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:52 2014 +0200 wined3d: Keep a reference to the resource in rendertarget views. --- dlls/wined3d/buffer.c | 12 ++++++++++++ dlls/wined3d/surface.c | 12 ++++++++++++ dlls/wined3d/texture.c | 12 ++++++++++++ dlls/wined3d/view.c | 4 ++++ dlls/wined3d/volume.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 6 files changed, 64 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9af0adb..989026f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1113,8 +1113,20 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } +static ULONG buffer_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_buffer_incref(buffer_from_resource(resource)); +} + +static ULONG buffer_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_buffer_decref(buffer_from_resource(resource)); +} + static const struct wined3d_resource_ops buffer_resource_ops = { + buffer_resource_incref, + buffer_resource_decref, buffer_unload, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20b36f2..65517ec 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1158,6 +1158,16 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); } +static ULONG surface_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_surface_incref(surface_from_resource(resource)); +} + +static ULONG surface_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_surface_decref(surface_from_resource(resource)); +} + static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1236,6 +1246,8 @@ static void surface_unload(struct wined3d_resource *resource) static const struct wined3d_resource_ops surface_resource_ops = { + surface_resource_incref, + surface_resource_decref, surface_unload, }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 07667f3..f595e16 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -771,6 +771,16 @@ static const struct wined3d_texture_ops texture2d_ops = texture2d_sub_resource_cleanup, }; +static ULONG texture_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_texture_incref(wined3d_texture_from_resource(resource)); +} + +static ULONG texture_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_texture_decref(wined3d_texture_from_resource(resource)); +} + static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); @@ -791,6 +801,8 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) static const struct wined3d_resource_ops texture_resource_ops = { + texture_resource_incref, + texture_resource_decref, wined3d_texture_unload, }; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 54ed9e4..bfec1ef 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -40,7 +40,10 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_resource_decref(view->resource); HeapFree(GetProcessHeap(), 0, view); + } return refcount; } @@ -64,6 +67,7 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie { view->refcount = 1; view->resource = resource; + wined3d_resource_incref(resource); view->parent = parent; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f1d09e5..b8dab3e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -772,8 +772,20 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) return WINED3D_OK; } +static ULONG volume_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_volume_incref(volume_from_resource(resource)); +} + +static ULONG volume_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_volume_decref(volume_from_resource(resource)); +} + static const struct wined3d_resource_ops volume_resource_ops = { + volume_resource_incref, + volume_resource_decref, volume_unload, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4d8815..16ae4c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2020,6 +2020,8 @@ static inline void context_invalidate_active_texture(struct wined3d_context *con struct wined3d_resource_ops { + ULONG (*resource_incref)(struct wined3d_resource *resource); + ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); }; @@ -2051,6 +2053,16 @@ struct wined3d_resource const struct wined3d_resource_ops *resource_ops; }; +static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) +{ + return resource->resource_ops->resource_incref(resource); +} + +static inline ULONG wined3d_resource_decref(struct wined3d_resource *resource) +{ + return resource->resource_ops->resource_decref(resource); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format,
1
0
0
0
Henri Verbeet : wined3d: Pass a texture instead of a surface to upload_palette().
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: 3a160432f801b4528b0d5e8d3e9446cfc0093347 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a160432f801b4528b0d5e8d3…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:51 2014 +0200 wined3d: Pass a texture instead of a surface to upload_palette(). --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d6214a..3d3816f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7278,10 +7278,10 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, } /* Context activation is done by the caller. */ -static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) +static void upload_palette(const struct wined3d_texture *texture, struct wined3d_context *context) { - const struct wined3d_palette *palette = surface->container->swapchain ? surface->container->swapchain->palette : NULL; - struct wined3d_device *device = surface->resource.device; + const struct wined3d_palette *palette = texture->swapchain ? texture->swapchain->palette : NULL; + struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; @@ -7538,7 +7538,7 @@ err_out: } if (fixup == COMPLEX_FIXUP_P8) - upload_palette(surface, context); + upload_palette(surface->container, context); gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)");
1
0
0
0
Gerald Pfeifer : winex11.drv: Remove wxr_color_shifts.
by Alexandre Julliard
21 Aug '14
21 Aug '14
Module: wine Branch: master Commit: b0e508a9d3475a0231267b33d7206629dadb9fe7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b0e508a9d3475a0231267b33d…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:16:34 2014 +0200 winex11.drv: Remove wxr_color_shifts. --- dlls/winex11.drv/xrender.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ca2d3da..d2a1c45 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -102,23 +102,6 @@ static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = /* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; -static const ColorShifts wxr_color_shifts[WXR_NB_FORMATS] = -{ - /* format phys red phys green phys blue log red log green log blue */ -/* WXR_FORMAT_MONO */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, -/* WXR_FORMAT_GRAY */ { { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, { 0,0,0 } }, -/* WXR_FORMAT_X1R5G5B5 */ { {10,5,31}, { 5,5,31}, { 0,5,31}, {10,5,31}, { 5,5,31}, { 0,5,31} }, -/* WXR_FORMAT_X1B5G5R5 */ { { 0,5,31}, { 5,5,31}, {10,5,31}, { 0,5,31}, { 5,5,31}, {10,5,31} }, -/* WXR_FORMAT_R5G6B5 */ { {11,5,31}, { 5,6,63}, { 0,5,31}, {11,5,31}, { 5,6,63}, { 0,5,31} }, -/* WXR_FORMAT_B5G6R5 */ { { 0,5,31}, { 5,6,63}, {11,5,31}, { 0,5,31}, { 5,6,63}, {11,5,31} }, -/* WXR_FORMAT_R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8 */ { { 0,8,255}, { 8,8,255}, {16,8,255}, { 0,8,255}, { 8,8,255}, {16,8,255} }, -/* WXR_FORMAT_A8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8A8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, -/* WXR_FORMAT_X8R8G8B8 */ { {16,8,255}, { 8,8,255}, { 0,8,255}, {16,8,255}, { 8,8,255}, { 0,8,255} }, -/* WXR_FORMAT_B8G8R8X8 */ { { 8,8,255}, {16,8,255}, {24,8,255}, { 8,8,255}, {16,8,255}, {24,8,255} }, -}; - static enum wxr_format default_format = WXR_INVALID_FORMAT; static XRenderPictFormat *pict_formats[WXR_NB_FORMATS + 1 /* invalid format */];
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
31
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Results per page:
10
25
50
100
200