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

Alex Henrie : ntdll: Implement ProcessVmCounters for Linux for other processes.
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: 19a79f422818859dd5a052ddc8e270ffbfef6e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a79f422818859dd5a052ddc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 7 22:32:43 2017 -0600 ntdll: Implement ProcessVmCounters for Linux for other processes. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 20 +++++++++++++++++--- dlls/ntdll/tests/info.c | 22 ++++++++++++++++++++++ include/wine/server_protocol.h | 23 ++++++++++++++++++++++- server/process.c | 38 ++++++++++++++++++++++++++++++++++++++ server/protocol.def | 13 +++++++++++++ server/request.h | 11 +++++++++++ server/trace.c | 18 ++++++++++++++++++ 7 files changed, 141 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19a79f422818859dd5a05…

1 0

Jacek Caban : mshtml: Don't expose doScroll in IE11 document mode.
by Alexandre Julliard 09 May '17

09 May '17

Module: wine Branch: master Commit: 97e260060769558493ed99787f27fe96081d5dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e260060769558493ed99787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 9 17:32:33 2017 +0200 mshtml: Don't expose doScroll in IE11 document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 22 ++++++++++++++++------ dlls/mshtml/htmlelem.c | 6 +++++- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/tests/documentmode.js | 1 + 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 6e7f1be..baf251a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -325,9 +325,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } } -static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp_typeinfo) +static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp_typeinfo, const DISPID *blacklist_dispids) { unsigned i = 7; /* skip IDispatch functions */ + const DISPID *blacklist_iter; ITypeInfo *typeinfo; FUNCDESC *funcdesc; HRESULT hres; @@ -341,20 +342,29 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp if(FAILED(hres)) break; - TRACE("adding...\n"); + if(blacklist_dispids) { + for(blacklist_iter = blacklist_dispids; *blacklist_iter != DISPID_UNKNOWN; blacklist_iter++) { + if(*blacklist_iter == funcdesc->memid) + break; + } + } + + if(!blacklist_dispids || *blacklist_iter == DISPID_UNKNOWN) { + TRACE("adding...\n"); + add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo); + } - add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo); ITypeInfo_ReleaseFuncDesc(typeinfo, funcdesc); } return S_OK; } -void dispex_info_add_interface(dispex_data_t *info, tid_t tid) +void dispex_info_add_interface(dispex_data_t *info, tid_t tid, const DISPID *blacklist_dispids) { HRESULT hres; - hres = process_interface(info, tid, NULL); + hres = process_interface(info, tid, NULL, blacklist_dispids); if(FAILED(hres)) ERR("process_interface failed: %08x\n", hres); } @@ -406,7 +416,7 @@ static dispex_data_t *preprocess_dispex_data(const dispex_static_data_t *desc, c desc->init_info(data, compat_mode); for(tid = desc->iface_tids; *tid; tid++) { - hres = process_interface(data, *tid, dti); + hres = process_interface(data, *tid, dti, NULL); if(FAILED(hres)) break; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ccad114..4f7a383 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5174,8 +5174,12 @@ static void HTMLElement_bind_event(DispatchEx *dispex, int eid) void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const DISPID elem2_ie11_blacklist[] = {DISPID_IHTMLELEMENT2_DOSCROLL, DISPID_UNKNOWN}; + + dispex_info_add_interface(info, IHTMLElement2_tid, mode >= COMPAT_MODE_IE11 ? elem2_ie11_blacklist : NULL); + if(mode >= COMPAT_MODE_IE8) - dispex_info_add_interface(info, IElementSelector_tid); + dispex_info_add_interface(info, IElementSelector_tid, NULL); } static const tid_t HTMLElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b68579b..2914073 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3029,7 +3029,7 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { - dispex_info_add_interface(info, IHTMLWindow5_tid); + dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); } static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a927d69..d68816d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -318,7 +318,7 @@ void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; -void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN; +void dispex_info_add_interface(dispex_data_t*,tid_t,const DISPID*) DECLSPEC_HIDDEN; static inline void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *desc) { @@ -760,7 +760,6 @@ typedef struct { IHTMLDOMNode_tid, \ IHTMLDOMNode2_tid, \ IHTMLElement_tid, \ - IHTMLElement2_tid, \ IHTMLElement3_tid, \ IHTMLElement4_tid, \ IHTMLUniqueName_tid diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 96688ba..292955a 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -28,6 +28,7 @@ function test_elem_props() { var v = document.documentMode; + test_exposed("doScroll", v < 11); test_exposed("querySelectorAll", v >= 8); next_test();

1 0

Rosanne DiMesio : Remove Steam and GOG from licenses
by Jeremy Newman 09 May '17

09 May '17

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

Andrey Gusev : msi: Add MsiGetPatchFileListA/W stubs.
by Alexandre Julliard 08 May '17

08 May '17

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

Björn Bidar : wined3d: Add NVIDIA GTX 1080 Ti to the GPU list.
by Alexandre Julliard 08 May '17

08 May '17

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

Matteo Bruni : wined3d: Release context on CPU blit failure.
by Alexandre Julliard 08 May '17

08 May '17

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

Matteo Bruni : wined3d: Fix specular lighting calculation.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: c329ee5673c5c9864611d9276e892abdf1d1a852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c329ee5673c5c9864611d9276… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 7 20:32:37 2017 +0200 wined3d: Fix specular lighting calculation. 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/d3d8/tests/visual.c | 61 +++++++++++++++++++++++++++++++++------------- dlls/d3d9/tests/visual.c | 61 +++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 49 ++++++++++++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 51 +++++++++++++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 59 ++++++++++++++++++++++++++++++++------------ dlls/wined3d/glsl_shader.c | 50 +++++++++++++++---------------------- 6 files changed, 227 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c329ee5673c5c9864611d…

1 0

Matteo Bruni : wined3d: Ignore lights out of maximum range for legacy FFP lighting too.
by Alexandre Julliard 08 May '17

08 May '17

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

Józef Kucia : wined3d: Introduce wined3d_device_get_ds_sampler().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 3f3699b56166b2e6a69c030a9ffe77440f95f637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3699b56166b2e6a69c030a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:47:59 2017 +0200 wined3d: Introduce wined3d_device_get_ds_sampler(). 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/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5f07cb..2637411 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2789,6 +2789,13 @@ void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device, wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler); } +struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a90c215..916d296 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -63,6 +63,7 @@ @ cdecl wined3d_device_get_domain_shader(ptr) @ cdecl wined3d_device_get_ds_cb(ptr long) @ cdecl wined3d_device_get_ds_resource_view(ptr long) +@ cdecl wined3d_device_get_ds_sampler(ptr long) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d54666e..0bf3e55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2218,6 +2218,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wi struct wined3d_buffer * __cdecl wined3d_device_get_ds_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ds_resource_view(const struct wined3d_device *device, unsigned int idx); +struct wined3d_sampler * __cdecl wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSGetSamplers().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 4638ba7003e0f35f606e2890e89ebcce5a9da4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4638ba7003e0f35f606e2890e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:00 2017 +0200 d3d11: Implement d3d11_immediate_context_DSGetSamplers(). 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 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f4e540c..136917b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2185,8 +2185,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_ds_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0