January 2017 - Wine-commits

Alexandre Julliard : patches: Display multiple check marks for multiple signoffs.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: tools Branch: master Commit: 42fe39efa7f267d12ce85b1e13664f8595bc4f4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=42fe39efa7f267d12ce85b1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 21:40:59 2017 +0100 patches: Display multiple check marks for multiple signoffs. Suggested by Bruno Jesus. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/update b/patches/update index 4f381f0..0d991dc 100755 --- a/patches/update +++ b/patches/update @@ -229,7 +229,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k } if (defined($patch->{"signoff"})) { - printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">✓</td>"; + printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @{$patch->{"signoff"}}; } else {

1 0

Hans Leidekker : mapi32: Add a stub implementation of HrDispatchNotifications.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 454bccd63ebde54c88395e3917db8d7b58ff33aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=454bccd63ebde54c88395e391… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:28:40 2017 +0100 mapi32: Add a stub implementation of HrDispatchNotifications. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/mapi32.spec | 2 +- dlls/mapi32/util.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index f5a1bef..560784c 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -175,7 +175,7 @@ 236 stub cmc_read 237 stub cmc_send 238 stub cmc_send_documents -239 stub HrDispatchNotifications(a)4 +239 stdcall HrDispatchNotifications(a)4(long) HrDispatchNotifications 241 stub HrValidateParameters(a)8 244 stub ScCreateConversationIndex(a)16 246 stub HrGetOmiProvidersFlags diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 1d16a33..13e4aff 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -239,6 +239,15 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI } /************************************************************************* + * HrDispatchNotifications(a)4 (MAPI32.239) + */ +HRESULT WINAPI HrDispatchNotifications(ULONG flags) +{ + FIXME("(%08x)\n", flags); + return S_OK; +} + +/************************************************************************* * HrThisThreadAdviseSink(a)8 (MAPI32.42) * * Ensure that an advise sink is only notified in its originating thread.

1 0

Hans Leidekker : secur32: Implement SspiPrepareForCredWrite.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 7c6fbebf68cb36c9b889689f832e6b3e5b85c2d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6fbebf68cb36c9b889689f8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:28:41 2017 +0100 secur32: Implement SspiPrepareForCredWrite. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.spec | 1 + dlls/secur32/tests/secur32.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/sspicli/main.c | 57 +++++++++++++++++++++++++++++++++++++++++ dlls/sspicli/sspicli.spec | 2 +- include/sspi.h | 3 +++ 5 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 8135958..0d6895a 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -73,6 +73,7 @@ @ stdcall SspiEncodeStringsAsAuthIdentity(wstr wstr wstr ptr) sspicli.SspiEncodeStringsAsAuthIdentity @ stdcall SspiFreeAuthIdentity(ptr) sspicli.SspiFreeAuthIdentity @ stdcall SspiLocalFree(ptr) sspicli.SspiLocalFree +@ stdcall SspiPrepareForCredWrite(ptr wstr ptr ptr ptr ptr ptr) sspicli.SspiPrepareForCredWrite @ stdcall SspiZeroAuthIdentity(ptr) sspicli.SspiZeroAuthIdentity @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 49103bd..df9e627 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -27,6 +27,7 @@ #define SECURITY_WIN32 #include <security.h> #include <schannel.h> +#include <wincred.h> #include "wine/test.h" @@ -40,6 +41,8 @@ static void (SEC_ENTRY *pSspiFreeAuthIdentity) (PSEC_WINNT_AUTH_IDENTITY_OPAQUE); static void (SEC_ENTRY *pSspiLocalFree) (void *); +static SECURITY_STATUS (SEC_ENTRY *pSspiPrepareForCredWrite) + (PSEC_WINNT_AUTH_IDENTITY_OPAQUE, PCWSTR, PULONG, PCWSTR *, PCWSTR *, PUCHAR *, PULONG); static void (SEC_ENTRY *pSspiZeroAuthIdentity) (PSEC_WINNT_AUTH_IDENTITY_OPAQUE); @@ -317,6 +320,60 @@ static void test_SspiEncodeStringsAsAuthIdentity(void) pSspiFreeAuthIdentity( id ); } +static void test_SspiPrepareForCredWrite(void) +{ + static const WCHAR usernameW[] = + {'u','s','e','r','n','a','m','e',0}; + static const WCHAR domainnameW[] = + {'d','o','m','a','i','n','n','a','m','e',0}; + static const WCHAR passwordW[] = + {'p','a','s','s','w','o','r','d',0}; + static const WCHAR targetW[] = + {'d','o','m','a','i','n','n','a','m','e','\\','u','s','e','r','n','a','m','e',0}; + static const WCHAR target2W[] = + {'d','o','m','a','i','n','n','a','m','e','2','\\','u','s','e','r','n','a','m','e','2',0}; + const WCHAR *target, *username; + PSEC_WINNT_AUTH_IDENTITY_OPAQUE id; + SECURITY_STATUS status; + ULONG type, size; + UCHAR *blob; + + if (!pSspiPrepareForCredWrite) + { + win_skip( "SspiPrepareForCredWrite not exported by secur32.dll\n" ); + return; + } + + status = pSspiEncodeStringsAsAuthIdentity( usernameW, domainnameW, passwordW, &id ); + ok( status == SEC_E_OK, "got %08x\n", status ); + + type = size = 0; + status = pSspiPrepareForCredWrite( id, NULL, &type, &target, &username, &blob, &size ); + ok( status == SEC_E_OK, "got %08x\n", status ); + ok( type == CRED_TYPE_DOMAIN_PASSWORD, "got %u\n", type ); + ok( !lstrcmpW( target, targetW ), "got %s\n", wine_dbgstr_w(target) ); + ok( !lstrcmpW( username, targetW ), "got %s\n", wine_dbgstr_w(username) ); + ok( !memcmp( blob, passwordW, sizeof(passwordW) - sizeof(WCHAR) ), "wrong data\n" ); + ok( size == sizeof(passwordW) - sizeof(WCHAR), "got %u\n", size ); + pSspiLocalFree( (void *)target ); + pSspiLocalFree( (void *)username ); + pSspiLocalFree( blob ); + + type = size = 0; + status = pSspiPrepareForCredWrite( id, target2W, &type, &target, &username, &blob, &size ); + ok( status == SEC_E_OK, "got %08x\n", status ); + ok( type == CRED_TYPE_DOMAIN_PASSWORD, "got %u\n", type ); + ok( !lstrcmpW( target, target2W ), "got %s\n", wine_dbgstr_w(target) ); + ok( !lstrcmpW( username, targetW ), "got %s\n", wine_dbgstr_w(username) ); + ok( !memcmp( blob, passwordW, sizeof(passwordW) - sizeof(WCHAR) ), "wrong data\n" ); + ok( size == sizeof(passwordW) - sizeof(WCHAR), "got %u\n", size ); + pSspiLocalFree( (void *)target ); + pSspiLocalFree( (void *)username ); + pSspiLocalFree( blob ); + + pSspiFreeAuthIdentity( id ); +} + static void test_kerberos(void) { SecPkgInfoA *info; @@ -379,6 +436,7 @@ START_TEST(secur32) pSspiEncodeStringsAsAuthIdentity = (void *)GetProcAddress(secdll, "SspiEncodeStringsAsAuthIdentity"); pSspiFreeAuthIdentity = (void *)GetProcAddress(secdll, "SspiFreeAuthIdentity"); pSspiLocalFree = (void *)GetProcAddress(secdll, "SspiLocalFree"); + pSspiPrepareForCredWrite = (void *)GetProcAddress(secdll, "SspiPrepareForCredWrite"); pSspiZeroAuthIdentity = (void *)GetProcAddress(secdll, "SspiZeroAuthIdentity"); pGetComputerObjectNameA = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameA"); pGetComputerObjectNameW = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameW"); @@ -386,7 +444,7 @@ START_TEST(secur32) pGetUserNameExW = (PVOID)GetProcAddress(secdll, "GetUserNameExW"); pInitSecurityInterfaceA = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceA"); pInitSecurityInterfaceW = (PVOID)GetProcAddress(secdll, "InitSecurityInterfaceW"); - + if (pGetComputerObjectNameA) testGetComputerObjectNameA(); else @@ -409,6 +467,7 @@ START_TEST(secur32) test_InitSecurityInterface(); test_SspiEncodeStringsAsAuthIdentity(); + test_SspiPrepareForCredWrite(); FreeLibrary(secdll); } diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index 34f0a64..dfcc1cc 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "rpc.h" #include "sspi.h" +#include "wincred.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -140,3 +141,59 @@ void SEC_ENTRY SspiLocalFree( void *ptr ) TRACE( "%p\n", ptr ); HeapFree( GetProcessHeap(), 0, ptr ); } + +/*********************************************************************** + * SspiPrepareForCredWrite (SECUR32.0) + */ +SECURITY_STATUS SEC_ENTRY SspiPrepareForCredWrite( PSEC_WINNT_AUTH_IDENTITY_OPAQUE opaque_id, + PCWSTR target, PULONG type, PCWSTR *targetname, PCWSTR *username, PUCHAR *blob, PULONG size ) +{ + SEC_WINNT_AUTH_IDENTITY_W *id = (SEC_WINNT_AUTH_IDENTITY_W *)opaque_id; + WCHAR *str, *str2; + UCHAR *password; + ULONG len; + + FIXME( "%p %s %p %p %p %p %p\n", opaque_id, debugstr_w(target), type, targetname, username, + blob, size ); + + if (id->DomainLength) + { + len = (id->DomainLength + id->UserLength + 2) * sizeof(WCHAR); + if (!(str = HeapAlloc(GetProcessHeap(), 0 , len ))) return SEC_E_INSUFFICIENT_MEMORY; + memcpy( str, id->Domain, id->DomainLength * sizeof(WCHAR) ); + str[id->DomainLength] = '\\'; + memcpy( str + id->DomainLength + 1, id->User, id->UserLength * sizeof(WCHAR) ); + str[id->DomainLength + 1 + id->UserLength] = 0; + } + else + { + len = (id->UserLength + 1) * sizeof(WCHAR); + if (!(str = HeapAlloc(GetProcessHeap(), 0 , len ))) return SEC_E_INSUFFICIENT_MEMORY; + memcpy( str, id->User, id->UserLength * sizeof(WCHAR) ); + str[id->UserLength] = 0; + } + + str2 = target ? strdupW( target ) : strdupW( str ); + if (!str2) + { + HeapFree( GetProcessHeap(), 0, str ); + return SEC_E_INSUFFICIENT_MEMORY; + } + + len = id->PasswordLength * sizeof(WCHAR); + if (!(password = HeapAlloc(GetProcessHeap(), 0 , len ))) + { + HeapFree( GetProcessHeap(), 0, str ); + HeapFree( GetProcessHeap(), 0, str2 ); + return SEC_E_INSUFFICIENT_MEMORY; + } + memcpy( password, id->Password, len ); + + *type = CRED_TYPE_DOMAIN_PASSWORD; + *username = str; + *targetname = str2; + *blob = password; + *size = len; + + return SEC_E_OK; +} diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index 8876bc0..e18d359 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -95,7 +95,7 @@ @ stdcall SspiLocalFree(ptr) @ stub SspiMarshalAuthIdentity @ stub SspiPrepareForCredRead -@ stub SspiPrepareForCredWrite +@ stdcall SspiPrepareForCredWrite(ptr wstr ptr ptr ptr ptr ptr) @ stub SspiUnmarshalAuthIdentity @ stub SspiUnmarshalAuthIdentityInternal @ stub SspiValidateAuthIdentity diff --git a/include/sspi.h b/include/sspi.h index 9e44a6d..0e248fb 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -98,6 +98,9 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( PCWSTR, PCWSTR, PCWSTR, PSEC_WINNT_AUTH_IDENTITY_OPAQUE *); +SECURITY_STATUS SEC_ENTRY SspiPrepareForCredWrite( + PSEC_WINNT_AUTH_IDENTITY_OPAQUE, PCWSTR, PULONG, PCWSTR*, PCWSTR*, PUCHAR*, PULONG); + ULONG SEC_ENTRY SspiPromptForCredentialsA(PCSTR, void *, ULONG, PCSTR, PSEC_WINNT_AUTH_IDENTITY_OPAQUE, PSEC_WINNT_AUTH_IDENTITY_OPAQUE *, int *, ULONG);

1 0

Hans Leidekker : webservices: Set and restore the full floating point control word.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 35c09b52d97c91db1736e39d2756bb944a91f9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c09b52d97c91db1736e39d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:28:42 2017 +0100 webservices: Set and restore the full floating point control word. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 31 +++++++--------------- dlls/webservices/tests/writer.c | 47 ++++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 4 +-- dlls/webservices/writer.c | 4 +-- 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d67c47a..9e68cb4 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2294,17 +2294,14 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U return S_OK; } -#if defined(__i386__) || defined(__x86_64__) - -#define RC_DOWN 0x100; -BOOL set_fp_rounding( unsigned short *save ) +BOOL set_fpword( unsigned short new, unsigned short *old ) { -#ifdef __GNUC__ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) unsigned short fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); - *save = fpword; - fpword |= RC_DOWN; + *old = fpword; + fpword = new; __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); return TRUE; #else @@ -2312,25 +2309,15 @@ BOOL set_fp_rounding( unsigned short *save ) return FALSE; #endif } -void restore_fp_rounding( unsigned short fpword ) + +void restore_fpword( unsigned short fpword ) { -#ifdef __GNUC__ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); #else FIXME( "not implemented\n" ); #endif } -#else -BOOL set_fp_rounding( unsigned short *save ) -{ - FIXME( "not implemented\n" ); - return FALSE; -} -void restore_fp_rounding( unsigned short fpword ) -{ - FIXME( "not implemented\n" ); -} -#endif static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) { @@ -2373,7 +2360,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) else if (*p == '+') { p++; len--; }; if (!len) return S_OK; - if (!set_fp_rounding( &fpword )) return E_NOTIMPL; + if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; q = p; while (len && isdigit( *q )) { q++; len--; } @@ -2444,7 +2431,7 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) hr = S_OK; done: - restore_fp_rounding( fpword ); + restore_fpword( fpword ); return hr; } diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 6ad691f..039de55 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2065,9 +2065,28 @@ static void test_text_types(void) WsFreeWriter( writer ); } +static BOOL get_fpword( unsigned short *ret ) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + unsigned short fpword; + __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); + *ret = fpword; + return TRUE; +#endif + return FALSE; +} + +static void set_fpword( unsigned short fpword ) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#endif +} + static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + unsigned short fpword; static const struct { double val; @@ -2155,6 +2174,34 @@ static void test_double(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t>-INF</t>", __LINE__ ); + if (!get_fpword( &fpword )) + { + skip( "can't get floating point control word\n" ); + WsFreeWriter( writer ); + return; + } + ok( fpword == 0x27f, "got %04x\n", fpword ); + set_fpword( 0x1f7f ); + get_fpword( &fpword ); + ok( fpword == 0x1f7f, "got %04x\n", fpword ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + text.value = 100000000000000; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>100000000000000</t>", __LINE__ ); + + get_fpword( &fpword ); + ok( fpword == 0x1f7f, "got %04x\n", fpword ); + set_fpword( 0x27f ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b442838..3aafeb1 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -35,8 +35,8 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDE HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; -BOOL set_fp_rounding( unsigned short * ) DECLSPEC_HIDDEN; -void restore_fp_rounding( unsigned short ) DECLSPEC_HIDDEN; +BOOL set_fpword( unsigned short, unsigned short * ) DECLSPEC_HIDDEN; +void restore_fpword( unsigned short ) DECLSPEC_HIDDEN; HRESULT set_output( WS_XML_WRITER * ) DECLSPEC_HIDDEN; HRESULT set_input( WS_XML_READER *, char *, ULONG ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const WS_STRUCT_DESCRIPTION * ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1ccac53..f01a5a0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1373,9 +1373,9 @@ static HRESULT text_to_utf8text( const WS_XML_TEXT *text, WS_XML_UTF8_TEXT **ret unsigned short fpword; ULONG len; - if (!set_fp_rounding( &fpword )) return E_NOTIMPL; + if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; len = format_double( &double_text->value, buf ); - restore_fp_rounding( fpword ); + restore_fpword( fpword ); if (!len) return E_NOTIMPL; if (!(*ret = alloc_utf8_text( buf, len ))) return E_OUTOFMEMORY; return S_OK;

1 0

Hans Leidekker : wbemprox: Only include matching rows in the table row count.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: f2c005464ef4c0ec5f424d094eb6300e3514b288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c005464ef4c0ec5f424d094… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 09:16:55 2017 +0100 wbemprox: Only include matching rows in the table row count. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index cf9ae5c..14e819e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2350,7 +2350,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; - DWORD i, offset = 0, count = 0, size = 0; + DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; @@ -2382,9 +2382,10 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co continue; } offset += sizeof(*rec); + num_rows++; } - TRACE("created %u rows\n", count); - table->num_rows = count; + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; heap_free( info ); return status; @@ -2567,7 +2568,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; - UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, num_rows = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -2608,10 +2609,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * continue; } offset += sizeof(*rec); + num_rows++; } - TRACE("created %u rows\n", count); - table->num_rows = count; + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; return status; }

1 0

Hans Leidekker : winhttp: Accept NULL buffer for size queries in WinHttpCreateUrl.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 542998ee24fe05cf230288c47538ccf18807ec64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542998ee24fe05cf230288c47… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:28:43 2017 +0100 winhttp: Accept NULL buffer for size queries in WinHttpCreateUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 27 +++++++++++++++++++-------- dlls/winhttp/url.c | 8 ++++++-- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index b76e82c..6bde1de 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -118,7 +118,7 @@ static void WinHttpCreateUrl_test( void ) { URL_COMPONENTS uc; WCHAR *url; - DWORD len; + DWORD len, err; BOOL ret; /* NULL components */ @@ -144,22 +144,33 @@ static void WinHttpCreateUrl_test( void ) ok( !ret, "expected failure\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - /* valid components, NULL url */ + /* valid components, NULL url, insufficient length */ + len = 0; SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || - GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); + ok( len == 57, "expected len 57 got %u\n", len ); + + /* valid components, NULL url, sufficient length */ + SetLastError( 0xdeadbeef ); + len = 256; + ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); + err = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, + "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); /* correct size, NULL url */ fill_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); + err = GetLastError(); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || - GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, + "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); /* valid components, allocated url, short length */ SetLastError( 0xdeadbeef ); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index e7bb2a5..32b30da 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -417,13 +417,12 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW { static const WCHAR formatW[] = {'%','u',0}; static const WCHAR twoslashW[] = {'/','/'}; - DWORD len; INTERNET_SCHEME scheme; TRACE("%p, 0x%08x, %p, %p\n", uc, flags, url, required); - if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required || !url) + if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -437,6 +436,11 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } + if (!url) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } url[0] = 0; *required = len;

1 0

Henri Verbeet : wined3d: Just use glBufferSubData() in buffer_direct_upload().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 602a23a60aaab164acb8a2767094d545172ab4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=602a23a60aaab164acb8a2767… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:31 2017 +0100 wined3d: Just use glBufferSubData() in buffer_direct_upload(). It might seem like a good idea to try to use glMapBufferRange() in buffer_direct_upload(), but it really isn't. The interesting cases for glMapBufferRange() are GL_MAP_INVALIDATE_BUFFER_BIT or GL_MAP_UNSYNCHRONIZED_BIT, but the only way for those to be set here would be for the buffer to be mapped with WINED3D_MAP_DISCARD or WINED3D_MAP_NOOVERWRITE before the buffer object was created. In that case the GPU is obviously not using the buffer object, so glMapBufferRange() doesn't help. On the other hand, if the buffer is currently in use by the application and neither WINED3D_MAP_DISCARD nor WINED3D_MAP_NOOVERWRITE is set, glMapBufferRange() would need to wait for the GPU to finish using the buffer object, while glBufferSubData() may decide not to. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 67 +++++---------------------------------------------- 1 file changed, 6 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7d0552b..1f7292e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -33,9 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ #define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ -#define WINED3D_BUFFER_SYNC 0x10 /* There has been at least one synchronized map since the last preload. */ -#define WINED3D_BUFFER_MAP 0x20 /* There has been at least one map since the last preload. */ -#define WINED3D_BUFFER_APPLESYNC 0x40 /* Using sync as in GL_APPLE_flush_buffer_range. */ +#define WINED3D_BUFFER_APPLESYNC 0x10 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -807,44 +805,12 @@ drop_query: } /* The caller provides a GL context */ -static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_context *context, DWORD flags) +static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int start, len; - BYTE *map; buffer_bind(This, context); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GLbitfield mapflags; - mapflags = GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; - if (flags & WINED3D_BUFFER_DISCARD) - mapflags |= GL_MAP_INVALIDATE_BUFFER_BIT; - else if (flags & WINED3D_BUFFER_MAP && !(flags & WINED3D_BUFFER_SYNC)) - mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; - map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, - This->resource.size, mapflags)); - checkGLcall("glMapBufferRange"); - } - else - { - if (This->flags & WINED3D_BUFFER_APPLESYNC) - { - DWORD syncflags = 0; - if (flags & WINED3D_BUFFER_DISCARD) - syncflags |= WINED3D_MAP_DISCARD; - else if (flags & WINED3D_BUFFER_MAP && !(flags & WINED3D_BUFFER_SYNC)) - syncflags |= WINED3D_MAP_NOOVERWRITE; - buffer_sync_apple(This, syncflags, gl_info); - } - map = GL_EXTCALL(glMapBuffer(This->buffer_type_hint, GL_WRITE_ONLY)); - checkGLcall("glMapBuffer"); - } - if (!map) - { - ERR("Failed to map OpenGL buffer.\n"); - return; - } while (This->modified_areas) { @@ -852,21 +818,9 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con start = This->maps[This->modified_areas].offset; len = This->maps[This->modified_areas].size; - memcpy(map + start, (BYTE *)This->resource.heap_memory + start, len); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GL_EXTCALL(glFlushMappedBufferRange(This->buffer_type_hint, start, len)); - checkGLcall("glFlushMappedBufferRange"); - } - else if (This->flags & WINED3D_BUFFER_APPLESYNC) - { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, start, len)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); - } + GL_EXTCALL(glBufferSubData(This->buffer_type_hint, start, len, (BYTE *)This->resource.heap_memory + start)); + checkGLcall("glBufferSubData"); } - GL_EXTCALL(glUnmapBuffer(This->buffer_type_hint)); - checkGLcall("glUnmapBuffer"); wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); } @@ -931,14 +885,13 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined void buffer_mark_used(struct wined3d_buffer *buffer) { - buffer->flags &= ~(WINED3D_BUFFER_MAP | WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); + buffer->flags &= ~WINED3D_BUFFER_DISCARD; } /* Context activation is done by the caller. */ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { - DWORD flags = buffer->flags & (WINED3D_BUFFER_MAP | WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL decl_changed = FALSE; @@ -1009,11 +962,6 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * /* The declaration changed, reload the whole buffer. */ WARN("Reloading buffer because of a vertex declaration change.\n"); buffer_invalidate_bo_range(buffer, 0, 0); - - /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application - * cleared for unsynchronized updates. - */ - flags = 0; } else { @@ -1054,7 +1002,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) return; - buffer_direct_upload(buffer, context, flags); + buffer_direct_upload(buffer, context); } else { @@ -1173,11 +1121,8 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } } - buffer->flags |= WINED3D_BUFFER_MAP; if (flags & WINED3D_MAP_DISCARD) buffer->flags |= WINED3D_BUFFER_DISCARD; - else if (!(flags & WINED3D_MAP_NOOVERWRITE)) - buffer->flags |= WINED3D_BUFFER_SYNC; } base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory;

1 0

Henri Verbeet : wined3d: Introduce wined3d_buffer_upload_ranges().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: a11e301566b4f787b6e00fb1774ac52d8fa229dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11e301566b4f787b6e00fb17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:32 2017 +0100 wined3d: Introduce wined3d_buffer_upload_ranges(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1f7292e..a597f18 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -804,31 +804,27 @@ drop_query: This->flags &= ~WINED3D_BUFFER_APPLESYNC; } -/* The caller provides a GL context */ -static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_context *context) +/* Context activation is done by the caller. */ +static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) { const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int start, len; + const struct wined3d_map_range *range; - buffer_bind(This, context); + buffer_bind(buffer, context); - while (This->modified_areas) + while (range_count--) { - This->modified_areas--; - start = This->maps[This->modified_areas].offset; - len = This->maps[This->modified_areas].size; - - GL_EXTCALL(glBufferSubData(This->buffer_type_hint, start, len, (BYTE *)This->resource.heap_memory + start)); - checkGLcall("glBufferSubData"); + range = &ranges[range_count]; + GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset)); } - - wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); + checkGLcall("glBufferSubData"); } static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i, j, start, end, len, vertex_count; + unsigned int i, j, range_idx, start, end, vertex_count; BYTE *data; wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); @@ -842,13 +838,10 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined return; } - buffer_bind(buffer, context); - while (buffer->modified_areas) + for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) { - buffer->modified_areas--; - start = buffer->maps[buffer->modified_areas].offset; - len = buffer->maps[buffer->modified_areas].size; - end = start + len; + start = buffer->maps[range_idx].offset; + end = start + buffer->maps[range_idx].size; memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) @@ -873,14 +866,11 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } } - - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, start, len, data + start)); - checkGLcall("glBufferSubData"); } - HeapFree(GetProcessHeap(), 0, data); + wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + HeapFree(GetProcessHeap(), 0, data); } void buffer_mark_used(struct wined3d_buffer *buffer) @@ -1002,12 +992,14 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) return; - buffer_direct_upload(buffer, context); + wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, + buffer->modified_areas, buffer->maps); } else { buffer_conversion_upload(buffer, context); } + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Henri Verbeet : wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 6a70c55615731a99e1a834f6fcc62766a9d228d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a70c55615731a99e1a834f6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:33 2017 +0100 wined3d: Rename WINED3D_BUFFER_DOUBLEBUFFER to WINED3D_BUFFER_PIN_SYSMEM. For consistency with the texture code. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a597f18..2d0303f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ -#define WINED3D_BUFFER_DOUBLEBUFFER 0x04 /* Keep both a buffer object and a system memory copy for this buffer. */ +#define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ #define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_APPLESYNC 0x10 /* Using sync as in GL_APPLE_flush_buffer_range. */ @@ -249,7 +249,7 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi buffer->buffer_object_usage = gl_usage; - if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { buffer_invalidate_bo_range(buffer, 0, 0); } @@ -606,7 +606,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; break; case WINED3D_LOCATION_BUFFER: @@ -669,8 +669,8 @@ static void buffer_unload(struct wined3d_resource *resource) /* Download the buffer, but don't permanently enable double buffering. */ wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - if (!(flags & WINED3D_BUFFER_DOUBLEBUFFER)) - buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; + if (!(flags & WINED3D_BUFFER_PIN_SYSMEM)) + buffer->flags &= ~WINED3D_BUFFER_PIN_SYSMEM; wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); buffer_destroy_buffer_object(buffer, context); @@ -989,7 +989,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * TRACE("No conversion needed.\n"); /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) + if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM)) return; wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, @@ -1042,7 +1042,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI dirty_size = 0; } - if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { @@ -1149,7 +1149,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) return; } - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) && buffer->buffer_object) + if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) && buffer->buffer_object) { struct wined3d_device *device = buffer->resource.device; const struct wined3d_gl_info *gl_info; @@ -1420,7 +1420,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ TRACE("Using doublebuffer mode.\n"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } /* Observations show that draw_primitive_immediate_mode() is faster on

1 0

Henri Verbeet : wined3d: Introduce wined3d_buffer_evict_sysmem().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 7a18b2473f923f22f2038bb273b5bcc52735c1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a18b2473f923f22f2038bb27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:34 2017 +0100 wined3d: Introduce wined3d_buffer_evict_sysmem(). For consistency with the texture code. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2d0303f..5303d09 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -40,6 +40,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ +static void wined3d_buffer_evict_sysmem(struct wined3d_buffer *buffer) +{ + if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + { + TRACE("Not evicting system memory for buffer %p.\n", buffer); + return; + } + + TRACE("Evicting system memory for buffer %p.\n", buffer); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_resource_free_sysmem(&buffer->resource); +} + static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned int offset, unsigned int size) { if (!offset && (!size || size == buffer->resource.size)) @@ -250,15 +263,11 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi buffer->buffer_object_usage = gl_usage; if (buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) - { buffer_invalidate_bo_range(buffer, 0, 0); - } else - { - wined3d_resource_free_sysmem(&buffer->resource); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); - } + + wined3d_buffer_evict_sysmem(buffer); return TRUE;

1 0