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

Michael Müller : mfplat: Implement MFTUnregister.
by Alexandre Julliard May 9, 2017

May 9, 2017

Module: wine Branch: master Commit: 4615f4db3ad665957995c574236072a7abb4eb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4615f4db3ad665957995c5742… Author: Michael Müller <michael(a)fds-team.de> Date: Mon May 8 22:50:38 2017 +0000 mfplat: Implement MFTUnregister. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 19e3cab..b54dc9d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -164,6 +164,44 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags } /*********************************************************************** + * MFTUnregister (mfplat.@) + */ +HRESULT WINAPI MFTUnregister(CLSID clsid) +{ + WCHAR buffer[64], category[MAX_PATH]; + HKEY htransform, hcategory, htmp; + DWORD size = MAX_PATH; + DWORD index = 0; + + TRACE("(%s)\n", debugstr_guid(&clsid)); + + GUIDToString(buffer, &clsid); + + if (!RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &htransform)) + { + RegDeleteKeyW(htransform, buffer); + RegCloseKey(htransform); + } + + if (!RegOpenKeyW(HKEY_CLASSES_ROOT, categories_keyW, &hcategory)) + { + while (RegEnumKeyExW(hcategory, index, category, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + if (!RegOpenKeyW(hcategory, category, &htmp)) + { + RegDeleteKeyW(htmp, buffer); + RegCloseKey(htmp); + } + size = MAX_PATH; + index++; + } + RegCloseKey(hcategory); + } + + return S_OK; +} + +/*********************************************************************** * MFStartup (mfplat.@) */ HRESULT WINAPI MFStartup(ULONG version, DWORD flags) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 042a919..dc6f402 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -140,7 +140,7 @@ @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) @ stub MFTRegisterLocal @ stub MFTRegisterLocalByCLSID -@ stub MFTUnregister +@ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError diff --git a/include/mfapi.h b/include/mfapi.h index 2eca9c3..a37d655 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -39,6 +39,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); +HRESULT WINAPI MFTUnregister(CLSID clsid); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */

1 0

Józef Kucia : d3d11: Handle unsupported vertex buffer slots in better way.
by Alexandre Julliard May 9, 2017

May 9, 2017

Module: wine Branch: master Commit: eb4792a9af952f540602413b07b857bb0960b6f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4792a9af952f540602413b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 9 12:51:38 2017 +0200 d3d11: Handle unsupported vertex buffer slots in better way. D3D11 supports 32 buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 69642ef..84a878c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1583,12 +1583,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11D wined3d_mutex_lock(); for (i = 0; i < buffer_count; ++i) { - struct wined3d_buffer *wined3d_buffer; + struct wined3d_buffer *wined3d_buffer = NULL; struct d3d_buffer *buffer_impl; if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, &wined3d_buffer, &offsets[i], &strides[i]))) - ERR("Failed to get vertex buffer %u.\n", start_slot + i); + { + FIXME("Failed to get vertex buffer %u.\n", start_slot + i); + if (strides) + strides[i] = 0; + if (offsets) + offsets[i] = 0; + } if (!wined3d_buffer) { @@ -4415,7 +4421,7 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device1 *ifa wined3d_mutex_lock(); for (i = 0; i < buffer_count; ++i) { - struct wined3d_buffer *wined3d_buffer; + struct wined3d_buffer *wined3d_buffer = NULL; struct d3d_buffer *buffer_impl; if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i,

1 0

Rosanne DiMesio : Remove Steam and GOG from licenses
by Jeremy Newman May 9, 2017

May 9, 2017

Module: appdb Branch: master Commit: d0e262d6b7106afe09fb17ae69b291d96968929b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d0e262d6b7106afe09fb17ae… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon May 8 16:09:18 2017 -0500 Remove Steam and GOG from licenses Steam and GOG are distribution platforms, not licenses. See bug 42970. Entries already using the mistakenly-added items will have to be manually fixed in the live database. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 6 ++---- tables/appdb_tables.sql | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/version.php b/include/version.php index 5ee4974..45459fd 100644 --- a/include/version.php +++ b/include/version.php @@ -20,8 +20,6 @@ define("LICENSE_DEMO", "Demo"); define("LICENSE_RETAIL", "Retail"); define('LICENSE_FREETOUSE', 'Free to use'); define('LICENSE_FREETOSHARE', 'Free to use and share'); -define('LICENSE_STEAM', 'Steam'); -define('LICENSE_GOG', 'GOG'); /** * Version class for handling versions. @@ -1371,7 +1369,7 @@ EOT; public static function getLicenses() { return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM, LICENSE_GOG); + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); } // returns a string containing the html for a selection list @@ -1405,7 +1403,7 @@ EOT; public static function checkLicense($sLicense) { $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM, LICENSE_GOG); + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); foreach($aLicense as $sElement) { diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d1cbeb4..be556d3 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -48,6 +48,7 @@ create table appFamily ( /* * a version of an application + * TODO: remove Steam and GOG from the list of licenses after entries using them have been corrected in the live database */ create table appVersion ( versionId int not null auto_increment,

1 0

Ken Thomases : winemac: Track whether a view has ever had an OpenGL context attached.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: b6a4b2f593503a105dde01e7bd11ffdde243117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a4b2f593503a105dde01e7b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 15:31:48 2017 -0500 winemac: Track whether a view has ever had an OpenGL context attached. ... rather than whether it currently has one. This is for OpenGLSurfaceMode=behind. In that mode, we need to make the window transparent wherever a GL-rendered view should not be clipped by GDI-rendered children or sibling views. Some apps attach a GL context to the view only temporarily, do some rendering, and then detach it. But the GL surface remains, with the rendered graphics. In order for those to show, the window needs to remain transparent even though none of its views has a GL context currently attached. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7cb3459..a9290c3 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -296,6 +296,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; + BOOL _everHadGLContext; BOOL _cachedHasGLDescendant; BOOL _cachedHasGLDescendantValid; BOOL clearedGlSurface; @@ -306,6 +307,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi int backingSize[2]; } +(a)property (readonly, nonatomic) BOOL everHadGLContext; + - (void) addGLContext:(WineOpenGLContext*)context; - (void) removeGLContext:(WineOpenGLContext*)context; - (void) updateGLContexts; @@ -358,6 +361,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @implementation WineContentView +(a)synthesize everHadGLContext = _everHadGLContext; + - (void) dealloc { [markedText release]; @@ -467,7 +472,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; + BOOL hadContext = _everHadGLContext; if (!glContexts) glContexts = [[NSMutableArray alloc] init]; if (!pendingGlContexts) @@ -489,6 +494,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setNeedsDisplay:YES]; } + _everHadGLContext = YES; if (!hadContext) [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; @@ -496,11 +502,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) removeGLContext:(WineOpenGLContext*)context { - BOOL hadContext = [self hasGLContext]; [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; - if (hadContext && ![self hasGLContext]) - [self invalidateHasGLDescendant]; [(WineWindow*)[self window] updateForGLSubviews]; } @@ -519,16 +522,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self updateGLContexts:NO]; } - - (BOOL) hasGLContext - { - return [glContexts count] || [pendingGlContexts count]; - } - - (BOOL) _hasGLDescendant { if ([self isHidden]) return NO; - if ([self hasGLContext]) + if (_everHadGLContext) return YES; for (WineContentView* view in [self subviews]) { @@ -2485,7 +2483,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSRect contentRect = [[self contentView] frame]; BOOL coveredByGLView = FALSE; WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && [view hasGLContext]) + if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) { NSRect frame = [view convertRect:[view bounds] toView:nil]; if (NSContainsRect(frame, contentRect))

1 0

Owen Rudge : wsdapi/tests: Add tests for WSDXMLAddSibling.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: e90aaaabe66019903832731c49274466f1b6aed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90aaaabe66019903832731c4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed May 3 23:55:58 2017 +0100 wsdapi/tests: Add tests for WSDXMLAddSibling. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 4af81af..fd8ac03 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -194,8 +194,97 @@ static void AddChild_tests(void) WSDFreeLinkedMemory(parent); } +static void AddSibling_tests(void) +{ + WSDXML_ELEMENT *parent, *child1, *child2, *child3; + WSDXML_NAME parentName, child1Name, child2Name; + WSDXML_NAMESPACE ns; + WCHAR parentNameText[] = {'D','a','d',0}; + WCHAR child1NameText[] = {'T','i','m',0}; + WCHAR child2NameText[] = {'B','o','b',0}; + static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; + static const WCHAR prefix[] = {'t',0}; + HRESULT hr; + + /* Test invalid values */ + hr = WSDXMLAddSibling(NULL, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + hr = WSDXMLAddSibling(child1, NULL); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + hr = WSDXMLAddSibling(NULL, child2); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + + /* Populate structures */ + ns.Uri = uri; + ns.PreferredPrefix = prefix; + + parentName.LocalName = parentNameText; + parentName.Space = &ns; + + child1Name.LocalName = child1NameText; + child1Name.Space = &ns; + + child2Name.LocalName = child2NameText; + child2Name.Space = &ns; + + /* Create some elements */ + hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child3); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + + /* Add child1 to parent */ + hr = WSDXMLAddChild(parent, child1); + ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + + ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + ok(parent->Node.Next == NULL, "parent->Node.Next == %p\n", parent->Node.Next); + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->FirstChild != NULL, "child1->FirstChild == NULL\n"); + ok(child1->FirstChild->Type == TextType, "child1->FirstChild.Type == %d\n", child1->FirstChild->Type); + ok(child1->Node.Next == NULL, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == NULL, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->FirstChild == NULL, "child2->FirstChild == %p\n", child2->FirstChild); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + + /* Try to add child2 as sibling of child1 */ + hr = WSDXMLAddSibling(child1, child2); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + + /* Try to add child3 as sibling of child1 */ + hr = WSDXMLAddSibling(child1, child3); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + + ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); + ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); + ok(child2->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child2->Node.Next == (WSDXML_NODE *)child3, "child2->Node.Next == %p\n", child2->Node.Next); + ok(child3->Node.Parent == parent, "child2->Node.Parent == %p\n", child2->Node.Parent); + ok(child3->Node.Next == NULL, "child2->Node.Next == %p\n", child2->Node.Next); + ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); + + WSDFreeLinkedMemory(parent); +} + START_TEST(xml) { BuildAnyForSingleElement_tests(); AddChild_tests(); + AddSibling_tests(); }

1 0

Matteo Bruni : wined3d: Ignore lights out of maximum range for legacy FFP lighting too.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 43b6bfbc3708a0824792dc76e1e9a869a144446a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b6bfbc3708a0824792dc76e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 7 20:32:38 2017 +0200 wined3d: Ignore lights out of maximum range for legacy FFP lighting too. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 25 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 25 +++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 14 ++++++-------- 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f81be7f..9d77521 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7101,6 +7101,17 @@ static void test_specular_lighting(void) 100.0f, 0.0f, 1.0f, 0.0f, 0.0f, + }, + point_far = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 1.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, }; static const struct expected_color { @@ -7166,6 +7177,18 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_point_far[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00000000}, + {480, 120, 0x00000000}, + {160, 240, 0x00000000}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00000000}, + {160, 360, 0x00000000}, + {320, 360, 0x00000000}, + {480, 360, 0x00000000}, }; static const struct { @@ -7186,6 +7209,8 @@ static void test_specular_lighting(void) sizeof(expected_parallelpoint) / sizeof(expected_parallelpoint[0])}, {&point_side, 0.0f, expected_point_side, sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&point_far, 1.0f, expected_point_far, + sizeof(expected_point_far) / sizeof(expected_point_far[0])}, }; IDirect3D2 *d3d; IDirect3DDevice2 *device; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 47b94f7..b401544 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4156,6 +4156,17 @@ static void test_specular_lighting(void) 100.0f, 0.0f, 1.0f, 0.0f, 0.0f, + }, + point_far = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 1.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, }; static const struct expected_color { @@ -4221,6 +4232,18 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_point_far[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00000000}, + {480, 120, 0x00000000}, + {160, 240, 0x00000000}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00000000}, + {160, 360, 0x00000000}, + {320, 360, 0x00000000}, + {480, 360, 0x00000000}, }; static const struct { @@ -4246,6 +4269,8 @@ static void test_specular_lighting(void) sizeof(expected_parallelpoint) / sizeof(expected_parallelpoint[0])}, {&point_side, TRUE, 0.0f, expected_point_side, sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&point_far, TRUE, 1.0f, expected_point_far, + sizeof(expected_point_far) / sizeof(expected_point_far[0])}, }; IDirect3D3 *d3d; IDirect3DDevice3 *device; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dfbe46d..166a4ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7720,6 +7720,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer { shader_addline(buffer, "dst.y = (ffp_light[%u].range - dst.y) / ffp_light[%u].range;\n", idx, idx); shader_addline(buffer, "dst.z = dst.y * dst.y;\n"); + shader_addline(buffer, "if (dst.y > 0.0)\n{\n"); } else { @@ -7732,14 +7733,12 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", idx); if (!settings->normal) { - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); continue; } shader_addline(buffer, "dir = normalize(dir);\n"); shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); } for (i = 0; i < settings->spot_light_count; ++i, ++idx) @@ -7752,6 +7751,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer { shader_addline(buffer, "dst.y = (ffp_light[%u].range - dst.y) / ffp_light[%u].range;\n", idx, idx); shader_addline(buffer, "dst.z = dst.y * dst.y;\n"); + shader_addline(buffer, "if (dst.y > 0.0)\n{\n"); } else { @@ -7775,13 +7775,11 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", idx); if (!settings->normal) { - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); continue; } shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); } for (i = 0; i < settings->directional_light_count; ++i, ++idx)

1 0

Matteo Bruni : wined3d: Release context on CPU blit failure.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 1ed54d6ce376ea7029a8baf8ef2f8edc1ae5561f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed54d6ce376ea7029a8baf8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 7 20:32:33 2017 +0200 wined3d: Release context on CPU blit failure. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e86119d..c68c4c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2929,6 +2929,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id), debug_d3dformat(dst_texture->resource.format->id)); + if (context) + context_release(context); return WINED3DERR_NOTAVAILABLE; } src_texture = converted_texture;

1 0

Björn Bidar : wined3d: Add NVIDIA GTX 1080 Ti to the GPU list.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 5f0fd6c063e2ed4d5d8f0d798625adf1966909fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0fd6c063e2ed4d5d8f0d798… Author: Björn Bidar <theodorstormgrade(a)googlemail.com> Date: Fri May 5 19:28:26 2017 +0200 wined3d: Add NVIDIA GTX 1080 Ti to the GPU list. Signed-off-by: Björn Bidar <theodorstormgrade(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f5d4882..fc015a8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1390,6 +1390,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ @@ -1876,6 +1877,7 @@ cards_nvidia_binary[] = { /* Direct 3D 11 */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ + {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e0e8e9..d628ba5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2201,6 +2201,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Andrey Gusev : msi: Add MsiGetPatchFileListA/W stubs.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 635457bb7271215410b02bdbd37c49514284a961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635457bb7271215410b02bdbd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 8 12:46:32 2017 +0300 msi: Add MsiGetPatchFileListA/W stubs. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 16 ++++++++++++++++ dlls/msi/msi.spec | 4 ++-- include/msi.h | 4 ++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f6b6151..8a11e83 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1595,6 +1595,22 @@ done: return r; } +UINT WINAPI MsiGetPatchFileListA(LPCSTR szProductCode, LPCSTR szPatchList, + LPDWORD pcFiles, MSIHANDLE **pphFileRecords) +{ + FIXME("(%s, %s, %p, %p) stub!\n", debugstr_a(szProductCode), + debugstr_a(szPatchList), pcFiles, pphFileRecords); + return ERROR_FUNCTION_FAILED; +} + +UINT WINAPI MsiGetPatchFileListW(LPCWSTR szProductCode, LPCWSTR szPatchList, + LPDWORD pcFiles, MSIHANDLE **pphFileRecords) +{ + FIXME("(%s, %s, %p, %p) stub!\n", debugstr_w(szProductCode), + debugstr_w(szPatchList), pcFiles, pphFileRecords); + return ERROR_FUNCTION_FAILED; +} + UINT WINAPI MsiGetPatchInfoExA(LPCSTR szPatchCode, LPCSTR szProductCode, LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, LPCSTR szProperty, LPSTR lpValue, DWORD *pcchValue) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 025ad6e..4288c9d 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -275,8 +275,8 @@ 279 stdcall MsiMessageBoxExA(long str str long long long long) 280 stdcall MsiMessageBoxExW(long wstr wstr long long long long) 281 stdcall MsiSetExternalUIRecord(ptr long ptr ptr) -282 stub MsiGetPatchFileListA -283 stub MsiGetPatchFileListW +282 stdcall MsiGetPatchFileListA(str str ptr ptr) +283 stdcall MsiGetPatchFileListW(wstr wstr ptr ptr) 284 stdcall MsiBeginTransactionA(str long ptr ptr) 285 stdcall MsiBeginTransactionW(wstr long ptr ptr) 286 stdcall MsiEndTransaction(long) diff --git a/include/msi.h b/include/msi.h index 55c8f92..b227fbd 100644 --- a/include/msi.h +++ b/include/msi.h @@ -519,6 +519,10 @@ UINT WINAPI MsiGetProductInfoExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPST UINT WINAPI MsiGetProductInfoExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); #define MsiGetProductInfoEx WINELIB_NAME_AW(MsiGetProductInfoEx) +UINT WINAPI MsiGetPatchFileListA(LPCSTR, LPCSTR, LPDWORD, MSIHANDLE**); +UINT WINAPI MsiGetPatchFileListW(LPCWSTR, LPCWSTR, LPDWORD, MSIHANDLE**); +#define MsiGetPatchFileList WINELIB_NAME_AW(MsiGetPatchFileList) + UINT WINAPI MsiGetPatchInfoExA(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); UINT WINAPI MsiGetPatchInfoExW(LPCWSTR, LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); #define MsiGetPatchInfoEx WINELIB_NAME_AW(MsiGetPatchInfoEx)

1 0

Ken Thomases : winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock.
by Alexandre Julliard May 8, 2017

May 8, 2017

Module: wine Branch: master Commit: 24d3795285102170834ee624e3d07036c87005ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d3795285102170834ee624e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon May 8 12:52:02 2017 -0500 winemac: Move CVDisplayLink operations out of @synchronized blocks to avoid potential deadlock. The -fire method called by the display link callback also synchronizes on self (while accessing the windows array). Display link operations use a lock to synchronize, too, and it's held while the callback is running. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1150322..7cb3459 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -218,22 +218,26 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) addWindow:(WineWindow*)window { + BOOL needsStart; @synchronized(self) { - BOOL needsStart = !_windows.count; + needsStart = !_windows.count; [_windows addObject:window]; - if (needsStart) - CVDisplayLinkStart(_link); } + if (needsStart) + CVDisplayLinkStart(_link); } - (void) removeWindow:(WineWindow*)window { + BOOL shouldStop = FALSE; @synchronized(self) { BOOL wasRunning = _windows.count > 0; [_windows removeObject:window]; if (wasRunning && !_windows.count) - CVDisplayLinkStop(_link); + shouldStop = TRUE; } + if (shouldStop) + CVDisplayLinkStop(_link); } - (void) fire

1 0