August 2013 - Wine-commits - list.winehq.org

Dmitry Timoshkov : ntdll/tests: Mark the NtReadFile call which doesn' t return STATUS_PENDING for an overlapped IO call as broken, and don' t test returned values in broken case.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 8eb9ffb3fa095783f2ddbd48c7b0daf51248f48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb9ffb3fa095783f2ddbd48c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 13:35:45 2013 +0900 ntdll/tests: Mark the NtReadFile call which doesn't return STATUS_PENDING for an overlapped IO call as broken, and don't test returned values in broken case. --- dlls/ntdll/tests/file.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 58bcdb1..240c627 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -781,6 +781,8 @@ static void read_file_test(void) iosb.Information = 0xdeadbeef; offset.QuadPart = strlen(text) + 2; status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); +todo_wine + ok(status == STATUS_PENDING || broken(status == STATUS_END_OF_FILE) /* before Vista */, "expected STATUS_PENDING, got %#x\n", status); if (status == STATUS_PENDING) /* vista */ { WaitForSingleObject( event, 1000 ); @@ -791,16 +793,6 @@ static void read_file_test(void) SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc was not called\n" ); } - else - { - ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status ); - ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); - ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); - ok( !is_signaled( event ), "event is signaled\n" ); - ok( !apc_count, "apc was called\n" ); - SleepEx( 1, TRUE ); /* alertable sleep */ - ok( !apc_count, "apc was called\n" ); - } CloseHandle( handle ); /* now a non-overlapped file */

1 0

Dmitry Timoshkov : ntdll/tests: Fix one more place regarding temp path usage.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: b126d7c7ce1626e8440b7fef83947fa2de5444c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b126d7c7ce1626e8440b7fef8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 13:59:55 2013 +0900 ntdll/tests: Fix one more place regarding temp path usage. --- dlls/ntdll/tests/file.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 240c627..99e769e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -101,10 +101,11 @@ static BOOL create_pipe( HANDLE *read, HANDLE *write, ULONG flags, ULONG size ) static HANDLE create_temp_file( ULONG flags ) { - char buffer[MAX_PATH]; + char path[MAX_PATH], buffer[MAX_PATH]; HANDLE handle; - GetTempFileNameA( ".", "foo", 0, buffer ); + GetTempPathA( MAX_PATH, path ); + GetTempFileNameA( path, "foo", 0, buffer ); handle = CreateFileA(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, flags | FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" );

1 0

Dmitry Timoshkov : ntdll/tests: Use WAIT_OBJECT_0 instead of 0.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 42cad0ebb1075842b73cd4b45bb5e0a9f8221da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cad0ebb1075842b73cd4b45… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 23 15:03:45 2013 +0900 ntdll/tests: Use WAIT_OBJECT_0 instead of 0. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 99e769e..9ce3834 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -81,7 +81,7 @@ static NTSTATUS (WINAPI *pNtQueryVolumeInformationFile)(HANDLE,PIO_STATUS_BLOCK, static inline BOOL is_signaled( HANDLE obj ) { - return WaitForSingleObject( obj, 0 ) == 0; + return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c"

1 0

Nikolay Sivov : kernel32/tests: Some tests for typelib sections.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 1faebbd20299aa44f35ec1a40f400cfbe142b2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1faebbd20299aa44f35ec1a40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 09:20:16 2013 +0400 kernel32/tests: Some tests for typelib sections. --- dlls/kernel32/tests/actctx.c | 113 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ed38571..bd8ab13 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -24,6 +24,7 @@ #include <winnls.h> #include <stdio.h> +#include "oaidl.h" #include "initguid.h" static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); @@ -85,6 +86,9 @@ static const char manifest2[] = DEFINE_GUID(IID_CoTest, 0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x11, 0x11, 0x22, 0x22, 0x33, 0x33); DEFINE_GUID(IID_TlibTest, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_TlibTest2, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); +DEFINE_GUID(IID_TlibTest3, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); +DEFINE_GUID(IID_TlibTest4, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x58); static const char manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" @@ -107,6 +111,7 @@ static const char manifest_wndcls1[] = "<file name=\"testlib1.dll\">" "<windowClass versioned=\"yes\">wndClass1</windowClass>" "<windowClass>wndClass2</windowClass>" +" <typelib tlbid=\"{99999999-8888-7777-6666-555555555558}\" version=\"1.0\" helpdir=\"\" />" "</file>" "<file name=\"testlib1_2.dll\" />" "</assembly>"; @@ -115,8 +120,12 @@ static const char manifest_wndcls2[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"4.3.2.1\" name=\"testdep2\" type=\"win32\" processorArchitecture=\"" ARCH "\" />" "<file name=\"testlib2.dll\">" -"<windowClass versioned=\"no\">wndClass3</windowClass>" -"<windowClass>wndClass4</windowClass>" +" <windowClass versioned=\"no\">wndClass3</windowClass>" +" <windowClass>wndClass4</windowClass>" +" <typelib tlbid=\"{99999999-8888-7777-6666-555555555555}\" version=\"1.0\" helpdir=\"help\" resourceid=\"409\"" +" flags=\"HIDDEN,CONTROL,RESTRICTED\" />" +" <typelib tlbid=\"{99999999-8888-7777-6666-555555555556}\" version=\"1.0\" helpdir=\"help1\" resourceid=\"409\" />" +" <typelib tlbid=\"{99999999-8888-7777-6666-555555555557}\" version=\"1.0\" helpdir=\"\" />" "</file>" "<file name=\"testlib2_2.dll\" />" "</assembly>"; @@ -776,6 +785,26 @@ struct string_index ULONG rosterindex; }; +struct guidsection_header +{ + DWORD magic; + ULONG size; + DWORD unk[3]; + ULONG count; + ULONG index_offset; + DWORD unk2; + ULONG names_offset; + ULONG names_len; +}; + +struct guid_index +{ + GUID guid; + ULONG data_offset; + ULONG data_len; + ULONG rosterindex; +}; + struct wndclass_redirect_data { ULONG size; @@ -793,6 +822,20 @@ struct dllredirect_data DWORD res[3]; }; +struct tlibredirect_data +{ + ULONG size; + DWORD res; + ULONG name_len; + ULONG name_offset; + LANGID langid; + WORD flags; + ULONG help_len; + ULONG help_offset; + WORD major_version; + WORD minor_version; +}; + static void test_find_dll_redirection(HANDLE handle, LPCWSTR libname, ULONG exid, int line) { ACTCTX_SECTION_KEYED_DATA data; @@ -1244,6 +1287,71 @@ static void test_dllredirect_section(void) pReleaseActCtx(handle); } +static void test_typelib_section(void) +{ + static const WCHAR helpW[] = {'h','e','l','p'}; + ACTCTX_SECTION_KEYED_DATA data, data2; + struct guidsection_header *section; + struct tlibredirect_data *tlib; + ULONG_PTR cookie; + HANDLE handle; + BOOL ret; + + /* use two dependent manifests, 4 'files' total */ + create_manifest_file("testdep1.manifest", manifest_wndcls1, -1, NULL, NULL); + create_manifest_file("testdep2.manifest", manifest_wndcls2, -1, NULL, NULL); + create_manifest_file("main_wndcls.manifest", manifest_wndcls_main, -1, NULL, NULL); + + handle = test_create("main_wndcls.manifest"); + DeleteFileA("testdep1.manifest"); + DeleteFileA("testdep2.manifest"); + DeleteFileA("main_wndcls.manifest"); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + memset(&data, 0, sizeof(data)); + memset(&data2, 0, sizeof(data2)); + data.cbSize = sizeof(data); + data2.cbSize = sizeof(data2); + + /* get data for two typelibs from different assemblies */ + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, + &IID_TlibTest, &data); +todo_wine + ok(ret, "got %d\n", ret); + if (!ret) return; + + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, + &IID_TlibTest4, &data2); + ok(ret, "got %d\n", ret); + + section = (struct guidsection_header*)data.lpSectionBase; + ok(section->count == 4, "got %d\n", section->count); + ok(section->size == sizeof(*section), "got %d\n", section->size); + + /* For both GUIDs same section is returned */ + ok(data.lpSectionBase == data2.lpSectionBase, "got %p, %p\n", data.lpSectionBase, data2.lpSectionBase); + ok(data.ulSectionTotalLength == data2.ulSectionTotalLength, "got %u, %u\n", data.ulSectionTotalLength, + data2.ulSectionTotalLength); + + /* test some actual data */ + tlib = (struct tlibredirect_data*)data.lpData; + ok(tlib->size == sizeof(*tlib), "got %d\n", tlib->size); + ok(tlib->major_version == 1, "got %d\n", tlib->major_version); + ok(tlib->minor_version == 0, "got %d\n", tlib->minor_version); + ok(tlib->help_offset > 0, "got %d\n", tlib->help_offset); + ok(tlib->help_len == sizeof(helpW), "got %d\n", tlib->help_len); + ok(tlib->flags == (LIBFLAG_FHIDDEN|LIBFLAG_FCONTROL|LIBFLAG_FRESTRICTED), "got %x\n", tlib->flags); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + + pReleaseActCtx(handle); +} + static void test_actctx(void) { ULONG_PTR cookie; @@ -1464,6 +1572,7 @@ static void test_actctx(void) test_wndclass_section(); test_dllredirect_section(); + test_typelib_section(); } static void test_app_manifest(void)

1 0

Nikolay Sivov : ntdll: Parse 'flags' and 'version' attributes of typelib sections.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 1ca7eb649c5065cedaa86d6a9393cd6a9c912a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca7eb649c5065cedaa86d6a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 09:38:29 2013 +0400 ntdll: Parse 'flags' and 'version' attributes of typelib sections. --- dlls/ntdll/actctx.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 56a28fa..37ab11b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -57,6 +57,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); #define RT_MANIFEST ((ULONG_PTR)24) #define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +/* from oaidl.h */ +typedef enum tagLIBFLAGS { + LIBFLAG_FRESTRICTED = 0x1, + LIBFLAG_FCONTROL = 0x2, + LIBFLAG_FHIDDEN = 0x4, + LIBFLAG_FHASDISKIMAGE = 0x8 +} LIBFLAGS; + typedef struct { const WCHAR *ptr; @@ -179,8 +187,10 @@ struct entity struct { WCHAR *tlbid; - WCHAR *version; WCHAR *helpdir; + WORD flags; + WORD major; + WORD minor; } typelib; struct { @@ -311,6 +321,11 @@ static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const WCHAR versionedW[] = {'v','e','r','s','i','o','n','e','d',0}; static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; +static const WCHAR restrictedW[] = {'R','E','S','T','R','I','C','T','E','D',0}; +static const WCHAR controlW[] = {'C','O','N','T','R','O','L',0}; +static const WCHAR hiddenW[] = {'H','I','D','D','E','N',0}; +static const WCHAR hasdiskimageW[] = {'H','A','S','D','I','S','K','I','M','A','G','E',0}; +static const WCHAR flagsW[] = {'f','l','a','g','s',0}; static const WCHAR xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; @@ -503,7 +518,6 @@ static void free_entity_array(struct entity_array *array) break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.version); RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.helpdir); break; case ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION: @@ -1076,6 +1090,72 @@ static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redi return parse_expect_end_elem(xmlbuf, comInterfaceProxyStubW, asmv1W); } +static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) +{ + WORD *flags = &entity->u.typelib.flags; + const WCHAR *str = value->ptr, *start; + int i = 0; + + *flags = 0; + + /* it's comma separated list of flags */ + while (i < value->len) + { + start = str; + while (*str != ',' && (i++ < value->len)) str++; + + if (!strncmpW(start, restrictedW, str-start)) + *flags |= LIBFLAG_FRESTRICTED; + else if (!strncmpW(start, controlW, str-start)) + *flags |= LIBFLAG_FCONTROL; + else if (!strncmpW(start, hiddenW, str-start)) + *flags |= LIBFLAG_FHIDDEN; + else if (!strncmpW(start, hasdiskimageW, str-start)) + *flags |= LIBFLAG_FHASDISKIMAGE; + else + { + WARN("unknown flags value %s\n", debugstr_xmlstr(value)); + return FALSE; + } + + /* skip separator */ + str++; + i++; + } + + return TRUE; +} + +static BOOL parse_typelib_version(const xmlstr_t *str, struct entity *entity) +{ + unsigned int ver[2]; + unsigned int pos; + const WCHAR *curr; + + /* major.minor */ + ver[0] = ver[1] = pos = 0; + for (curr = str->ptr; curr < str->ptr + str->len; curr++) + { + if (*curr >= '0' && *curr <= '9') + { + ver[pos] = ver[pos] * 10 + *curr - '0'; + if (ver[pos] >= 0x10000) goto error; + } + else if (*curr == '.') + { + if (++pos >= 2) goto error; + } + else goto error; + } + entity->u.typelib.major = ver[0]; + entity->u.typelib.minor = ver[1]; + return TRUE; + +error: + FIXME("wrong typelib version value (%s)\n", debugstr_xmlstr(str)); + return FALSE; +} + static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { xmlstr_t attr_name, attr_value; @@ -1091,14 +1171,18 @@ static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { if (!(entity->u.typelib.tlbid = xmlstrdupW(&attr_value))) return FALSE; } - if (xmlstr_cmp(&attr_name, versionW)) + else if (xmlstr_cmp(&attr_name, versionW)) { - if (!(entity->u.typelib.version = xmlstrdupW(&attr_value))) return FALSE; + if (!parse_typelib_version(&attr_value, entity)) return FALSE; } - if (xmlstr_cmp(&attr_name, helpdirW)) + else if (xmlstr_cmp(&attr_name, helpdirW)) { if (!(entity->u.typelib.helpdir = xmlstrdupW(&attr_value))) return FALSE; } + else if (xmlstr_cmp(&attr_name, flagsW)) + { + if (!parse_typelib_flags(&attr_value, entity)) return FALSE; + } else { WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), debugstr_xmlstr(&attr_value));

1 0

Nikolay Sivov : ntdll: Implement compatible typelib section.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 36acd61447904f5b59fe1df45161a19935abd547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36acd61447904f5b59fe1df45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 23 09:48:34 2013 +0400 ntdll: Implement compatible typelib section. --- dlls/kernel32/tests/actctx.c | 2 - dlls/ntdll/actctx.c | 311 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 296 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36acd61447904f5b59fe1…

1 0

Gediminas Jakutis : wined3d: Recognize Nvidia GeForce GTX 770.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 6ca8b274bbe3525e8c32135856743987809fa5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca8b274bbe3525e8c3213585… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Aug 22 23:30:36 2013 +0300 wined3d: Recognize Nvidia GeForce GTX 770. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6e96233..6aba6a3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1257,6 +1257,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1660,6 +1661,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl cards[] = { {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ + {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46b0fdd..a09ee80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1466,6 +1466,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, + CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_INTEL_830M = 0x3577, CARD_INTEL_855GM = 0x3582,

1 0

Stefan Dösinger : wined3d: Move volume sysmem allocation into a separate function.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: a89f2e6301c22cb6b76df1500946cd9582706988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89f2e6301c22cb6b76df1500… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 23:22:45 2013 +0200 wined3d: Move volume sysmem allocation into a separate function. --- dlls/wined3d/volume.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 8ef841d..e2adf05 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -203,6 +203,19 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * wined3d_volume_load_location(volume, context, WINED3D_LOCATION_TEXTURE_RGB); } +static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) +{ + if (volume->resource.allocatedMemory) + return TRUE; + + volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); + if (!volume->resource.heap_memory) + return FALSE; + volume->resource.allocatedMemory = volume->resource.heap_memory; + return TRUE; +} + + static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); @@ -214,13 +227,19 @@ static void volume_unload(struct wined3d_resource *resource) TRACE("texture %p.\n", resource); - context = context_acquire(device, NULL); - - wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); - - context_release(context); - - wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); + if (volume_prepare_system_memory(volume)) + { + context = context_acquire(device, NULL); + wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); + context_release(context); + wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); + } + else + { + ERR("Out of memory when unloading volume %p.\n", volume); + wined3d_volume_validate_location(volume, WINED3D_LOCATION_DISCARDED); + wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_DISCARDED); + } /* The texture name is managed by the container. */ volume->flags &= ~WINED3D_VFLAG_ALLOCATED; @@ -306,16 +325,11 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); - if (!volume->resource.allocatedMemory) + if (!volume_prepare_system_memory(volume)) { - volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); - if (!volume->resource.heap_memory) - { - WARN("Out of memory.\n"); - map_desc->data = NULL; - return E_OUTOFMEMORY; - } - volume->resource.allocatedMemory = volume->resource.heap_memory; + WARN("Out of memory.\n"); + map_desc->data = NULL; + return E_OUTOFMEMORY; } if (!(volume->locations & WINED3D_LOCATION_SYSMEM))

1 0

Stefan Dösinger : wined3d: Free volume sysmem after upload.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: 5ff1237563bdb8723c368ceca63385fe1227cf55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff1237563bdb8723c368ceca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 23:22:46 2013 +0200 wined3d: Free volume sysmem after upload. --- dlls/wined3d/volume.c | 30 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e2adf05..d95fd91 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -113,6 +113,26 @@ static void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DW } /* Context activation is done by the caller. */ +static void wined3d_volume_download_data(struct wined3d_volume *volume, + const struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format *format = volume->resource.format; + + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, volume->texture_level, + format->glFormat, format->glType, volume->resource.allocatedMemory); + checkGLcall("glGetTexImage"); +} + +static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) +{ + wined3d_resource_free_sysmem(volume->resource.heap_memory); + volume->resource.heap_memory = NULL; + volume->resource.allocatedMemory = NULL; + wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); +} + +/* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) { @@ -160,6 +180,10 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, return; } wined3d_volume_validate_location(volume, WINED3D_LOCATION_TEXTURE_RGB); + + if (volume->resource.pool == WINED3D_POOL_MANAGED && volume->download_count < 10) + wined3d_volume_evict_sysmem(volume); + break; case WINED3D_LOCATION_SYSMEM: @@ -174,6 +198,12 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, TRACE("Volume previously discarded, nothing to do.\n"); wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_DISCARDED); } + else if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB) + { + volume_bind_and_dirtify(volume, context); + volume->download_count++; + wined3d_volume_download_data(volume, context); + } else { FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a09ee80..0bc84bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2067,6 +2067,7 @@ struct wined3d_volume DWORD flags, locations; GLint texture_level; + DWORD download_count; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)

1 0

Stefan Dösinger : wined3d: Don' t lock the dst volume in device_update_volume.
by Alexandre Julliard 23 Aug '13

23 Aug '13

Module: wine Branch: master Commit: aa3a43f7698f7b0ac2e925e8da50fa9b1af77e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3a43f7698f7b0ac2e925e8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 22 23:22:47 2013 +0200 wined3d: Don't lock the dst volume in device_update_volume. --- dlls/wined3d/device.c | 27 +++++++++++++-------------- dlls/wined3d/volume.c | 36 +++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fddf4da..ce0e083 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4092,29 +4092,28 @@ static HRESULT device_update_volume(struct wined3d_device *device, struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) { struct wined3d_map_desc src; - struct wined3d_map_desc dst; HRESULT hr; + struct wined3d_bo_address data; + struct wined3d_context *context; TRACE("device %p, src_volume %p, dst_volume %p.\n", device, src_volume, dst_volume); - /* TODO: Implement direct loading into the gl volume instead of using - * memcpy and dirtification to improve loading performance. */ if (FAILED(hr = wined3d_volume_map(src_volume, &src, NULL, WINED3D_MAP_READONLY))) return hr; - if (FAILED(hr = wined3d_volume_map(dst_volume, &dst, NULL, WINED3D_MAP_DISCARD))) - { - wined3d_volume_unmap(src_volume); - return hr; - } - memcpy(dst.data, src.data, dst_volume->resource.size); + context = context_acquire(device, NULL); - hr = wined3d_volume_unmap(dst_volume); - if (FAILED(hr)) - wined3d_volume_unmap(src_volume); - else - hr = wined3d_volume_unmap(src_volume); + wined3d_volume_load(dst_volume, context, FALSE); + + data.buffer_object = 0; + data.addr = src.data; + wined3d_volume_upload_data(dst_volume, context, &data); + wined3d_volume_invalidate_location(dst_volume, ~WINED3D_LOCATION_TEXTURE_RGB); + + context_release(context); + + hr = wined3d_volume_unmap(src_volume); return hr; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d95fd91..71b2937 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -69,7 +69,7 @@ static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, } /* Context activation is done by the caller. */ -static void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, +void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_bo_address *data) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -105,7 +105,7 @@ static void wined3d_volume_validate_location(struct wined3d_volume *volume, DWOR TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations)); } -static void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) +void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) { TRACE("Volume %p, clearing %s.\n", volume, wined3d_debug_location(location)); volume->locations &= ~location; @@ -132,10 +132,31 @@ static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } +static DWORD volume_access_from_location(DWORD location) +{ + switch (location) + { + case WINED3D_LOCATION_DISCARDED: + return 0; + + case WINED3D_LOCATION_SYSMEM: + return WINED3D_RESOURCE_ACCESS_CPU; + + case WINED3D_LOCATION_TEXTURE_RGB: + return WINED3D_RESOURCE_ACCESS_GPU; + + default: + FIXME("Unhandled location %#x.\n", location); + return 0; + } +} + /* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) { + DWORD required_access = volume_access_from_location(location); + TRACE("Volume %p, loading %s, have %s.\n", volume, wined3d_debug_location(location), wined3d_debug_location(volume->locations)); @@ -145,14 +166,11 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, return; } - if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_GPU)) + if ((volume->resource.access_flags & required_access) != required_access) { - if (location & ~WINED3D_LOCATION_SYSMEM) - { - ERR("Trying to load a cpu-only access volume into %s.\n", - wined3d_debug_location(location)); - return; - } + ERR("Operation requires %#x access, but volume only has %#x.\n", + required_access, volume->resource.access_flags); + return; } switch (location) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bc84bf..71c50ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2077,6 +2077,9 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; +void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; +void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, + const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; struct wined3d_surface_dib {

1 0