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

Nikolay Sivov : explorer: Added stub IServiceProvider support for shell browser window.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 3c7bf0350a1df45f6bbe52cdb631ebb6b49ca11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7bf0350a1df45f6bbe52cdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 12:00:54 2015 +0300 explorer: Added stub IServiceProvider support for shell browser window. --- dlls/shell32/tests/shelldispatch.c | 6 +++--- programs/explorer/desktop.c | 44 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3d238f0..84d6246 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -572,12 +572,12 @@ if (hr == S_OK) { ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); hr = IDispatch_QueryInterface(disp, &IID_IServiceProvider, (void**)&sp); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - +if (hr == S_OK) { hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(sb == sb2, "got %p, %p\n", sb, sb2); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 62a07f4..4c7bcd4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -139,6 +139,7 @@ struct shellwindows struct shellbrowserwindow { IWebBrowser2 IWebBrowser2_iface; + IServiceProvider IServiceProvider_iface; }; static struct shellwindows shellwindows; @@ -154,6 +155,11 @@ static inline struct shellbrowserwindow *impl_from_IWebBrowser2(IWebBrowser2 *if return CONTAINING_RECORD(iface, struct shellbrowserwindow, IWebBrowser2_iface); } +static inline struct shellbrowserwindow *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, struct shellbrowserwindow, IServiceProvider_iface); +} + static void shellwindows_init(void); static void desktopshellbrowserwindow_init(void); @@ -1281,6 +1287,10 @@ static HRESULT WINAPI webbrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid { *ppv = &This->IWebBrowser2_iface; } + else if (IsEqualGUID(&IID_IServiceProvider, riid)) + { + *ppv = &This->IServiceProvider_iface; + } if (*ppv) { @@ -1908,9 +1918,43 @@ static const IWebBrowser2Vtbl webbrowser2vtbl = webbrowser_put_Resizable }; +static HRESULT WINAPI serviceprovider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + return IWebBrowser2_QueryInterface(&This->IWebBrowser2_iface, riid, ppv); +} + +static ULONG WINAPI serviceprovider_AddRef(IServiceProvider *iface) +{ + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI serviceprovider_Release(IServiceProvider *iface) +{ + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); +} + +static HRESULT WINAPI serviceprovider_QueryService(IServiceProvider *iface, REFGUID service, + REFIID riid, void **ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(service), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static const IServiceProviderVtbl serviceprovidervtbl = +{ + serviceprovider_QueryInterface, + serviceprovider_AddRef, + serviceprovider_Release, + serviceprovider_QueryService +}; + static void desktopshellbrowserwindow_init(void) { desktopshellbrowserwindow.IWebBrowser2_iface.lpVtbl = &webbrowser2vtbl; + desktopshellbrowserwindow.IServiceProvider_iface.lpVtbl = &serviceprovidervtbl; } static void shellwindows_init(void)

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a generated shader line.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: f129e2fbb157457588a437ce595e5fb32240e46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f129e2fbb157457588a437ce5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 23:50:59 2015 +0200 wined3d: Add a trailing '\n' to a generated shader line. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b9d95e6..fe1cef1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5457,7 +5457,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "att = dot(dst.xyz, vec3(ffp_light[%u].c_att," " ffp_light[%u].l_att, ffp_light[%u].q_att));\n", i, i, i); if (!legacy_lighting) - shader_addline(buffer, "att = 1.0 / att;"); + shader_addline(buffer, "att = 1.0 / att;\n"); shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", i); if (!settings->normal) {

1 0

Sebastian Lackner : krnl386.exe16: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 5f069c160102adbab3dbffe04ff19e4dfce8636d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f069c160102adbab3dbffe04… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:05 2015 +0200 krnl386.exe16: Do not omit mandatory argument for VirtualProtect. --- dlls/krnl386.exe16/dosmem.c | 6 ++++-- dlls/krnl386.exe16/dosvm.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index f0feba9..b899f7b 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -302,6 +302,7 @@ BOOL DOSMEM_InitDosMemory(void) { static BOOL done; static HANDLE hRunOnce; + DWORD old_prot; if (done) return TRUE; @@ -317,7 +318,7 @@ BOOL DOSMEM_InitDosMemory(void) /* ok, we're the winning thread */ if (!(ret = VirtualProtect( DOSMEM_dosmem + DOSMEM_protect, DOSMEM_SIZE - DOSMEM_protect, - PAGE_READWRITE, NULL ))) + PAGE_READWRITE, &old_prot ))) ERR("Cannot load access low 1Mb, DOS subsystem unavailable\n"); RemoveVectoredExceptionHandler( vectored_handler ); @@ -650,10 +651,11 @@ UINT DOSMEM_Available(void) BOOL DOSMEM_MapDosLayout(void) { static BOOL already_mapped; + DWORD old_prot; if (!already_mapped) { - if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL )) + if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, &old_prot )) { ERR( "Need full access to the first megabyte for DOS mode\n" ); ExitProcess(1); diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c index 87adf33..4e76215 100644 --- a/dlls/krnl386.exe16/dosvm.c +++ b/dlls/krnl386.exe16/dosvm.c @@ -827,6 +827,7 @@ LPVOID DOSVM_AllocDataUMB( DWORD size, WORD *segment, WORD *selector ) */ void DOSVM_InitSegments(void) { + DWORD old_prot; LPSTR ptr; int i; @@ -966,7 +967,7 @@ void DOSVM_InitSegments(void) /* * As we store code in UMB we should make sure it is executable */ - VirtualProtect((void *)DOSVM_UMB_BOTTOM, DOSVM_UMB_TOP - DOSVM_UMB_BOTTOM, PAGE_EXECUTE_READWRITE, NULL); + VirtualProtect((void *)DOSVM_UMB_BOTTOM, DOSVM_UMB_TOP - DOSVM_UMB_BOTTOM, PAGE_EXECUTE_READWRITE, &old_prot); event_notifier = CreateEventW(NULL, FALSE, FALSE, NULL); }

1 0

Alexandre Julliard : Wine release 1.7.42
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: website Branch: master Commit: f93903a79309bfd74bce82bb5a5d60436abc8476 URL: http://source.winehq.org/git/website.git/?a=commit;h=f93903a79309bfd74bce82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:50:20 2015 +0900 Wine release 1.7.42 --- news/en/2015050101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2015050101.xml b/news/en/2015050101.xml new file mode 100644 index 0000000..1834956 --- /dev/null +++ b/news/en/2015050101.xml @@ -0,0 +1,15 @@ +<news> +<date>May 1, 2015</date> +<title>Wine 1.7.42 Released</title> +<body> + The Wine development release 1.7.42 is now available. + <a href="{$root}/announce/1.7.42">What's new</a> in this release: +<ul> + <li>Support for dynamic timezone information.</li> + <li>Initial desktop shell window support.</li> + <li>Some more Direct2D support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.42 : Alexandre Julliard : Release 1.7.42
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: refs/tags/wine-1.7.42 Tag: 758126d337e3d9b72d080ff5fc4fc8da85e85b3b URL: http://source.winehq.org/git/wine.git/?a=tag;h=758126d337e3d9b72d080ff5fc4f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:48:19 2015 +0900 Release 1.7.42

1 0

Alexandre Julliard : Release 1.7.42.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: e7a405ad9e377baf691042b877e88ef37cc617d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a405ad9e377baf691042b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 21:48:19 2015 +0900 Release 1.7.42. --- ANNOUNCE | 579 +++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 318 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7a405ad9e377baf69104…

1 0

Nikolay Sivov : ole32/tests: Fix a test failure on Win8.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: bb37d7507415cb88551c4eb3fa1f9366093ebb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb37d7507415cb88551c4eb3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 12:13:09 2015 +0300 ole32/tests: Fix a test failure on Win8. --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 38d82a8..220052d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1554,7 +1554,7 @@ static void test_registered_object_thread_affinity(void) ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); GetExitCodeThread(thread, &exitcode); hr = exitcode; - ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " + ok(hr == RPC_E_WRONG_THREAD || broken(hr == S_OK) /* win8 */, "CoRevokeClassObject called from different " "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); thread = CreateThread(NULL, 0, register_class_object_thread, NULL, 0, &tid);

1 0

Nikolay Sivov : setupapi/tests: Trace error codes when SetupOpenLog fails.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: 21b9c5f023e0a6db7911ae0162964c37c32f5c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b9c5f023e0a6db7911ae016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 11:59:24 2015 +0300 setupapi/tests: Trace error codes when SetupOpenLog fails. --- dlls/setupapi/tests/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7423738..d5cfa01 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -787,8 +787,9 @@ static void test_SetupLogError(void) ok(!ret, "SetupLogError succeeded\n"); ok(error == ERROR_FILE_INVALID, "got wrong error: %d\n", error); + SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); - ok(ret, "SetupOpenLog failed\n"); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupLogErrorA("Test with wrong log severity\r\n", LogSevMaximum); @@ -803,8 +804,9 @@ static void test_SetupLogError(void) ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER /* Win Vista+ */), "SetupLogError failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SetupOpenLog(FALSE); - ok(ret, "SetupOpenLog failed\n"); + ok(ret, "SetupOpenLog failed, error %d\n", GetLastError()); SetupCloseLog(); }

1 0

Matteo Bruni : include: Fix comments about the availability of D3D light types.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: e35f82665cfdb40231c2e0a8a41c81642273160d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35f82665cfdb40231c2e0a8a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:17 2015 +0200 include: Fix comments about the availability of D3D light types. --- include/wine/wined3d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a5f53c4..bb7007c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -76,8 +76,8 @@ enum wined3d_light_type WINED3D_LIGHT_POINT = 1, WINED3D_LIGHT_SPOT = 2, WINED3D_LIGHT_DIRECTIONAL = 3, - WINED3D_LIGHT_PARALLELPOINT = 4, /* D3D7 */ - WINED3D_LIGHT_GLSPOT = 5, /* D3D7 */ + WINED3D_LIGHT_PARALLELPOINT = 4, /* < D3D7 */ + WINED3D_LIGHT_GLSPOT = 5, /* < D3D5, not actually usable */ }; enum wined3d_primitive_type

1 0

Matteo Bruni : ddraw: D3DRENDERSTATE_LOCALVIEWER doesn' t exist before d3d7.
by Alexandre Julliard May 1, 2015

May 1, 2015

Module: wine Branch: master Commit: 72722222a74b6caa337d8e234fa27b002636f74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72722222a74b6caa337d8e234… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 30 23:22:15 2015 +0200 ddraw: D3DRENDERSTATE_LOCALVIEWER doesn't exist before d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bc19897..408eb24 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2529,6 +2529,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, case D3DRENDERSTATE_LIGHTING: case D3DRENDERSTATE_NORMALIZENORMALS: + case D3DRENDERSTATE_LOCALVIEWER: *value = 0xffffffff; return D3D_OK; @@ -2889,6 +2890,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, case D3DRENDERSTATE_LIGHTING: case D3DRENDERSTATE_NORMALIZENORMALS: + case D3DRENDERSTATE_LOCALVIEWER: hr = D3D_OK; break;

1 0