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

Matteo Bruni : wined3d: Rename *emission* as *emissive*.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 0c05f9f8fdfeb9988953aefe643dbde1c19da969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c05f9f8fdfeb9988953aefe6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:11 2015 +0200 wined3d: Rename *emission* as *emissive*. Emission is the OpenGL name, emissive the D3D one. Prefer the latter. --- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fe1cef1..a5399b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -126,7 +126,7 @@ struct glsl_vs_program GLint material_ambient_location; GLint material_diffuse_location; GLint material_specular_location; - GLint material_emission_location; + GLint material_emissive_location; GLint material_shininess_location; GLint light_ambient_location; struct @@ -1111,7 +1111,7 @@ static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context } GL_EXTCALL(glUniform4fv(prog->vs.material_ambient_location, 1, &state->material.ambient.r)); GL_EXTCALL(glUniform4fv(prog->vs.material_diffuse_location, 1, &state->material.diffuse.r)); - GL_EXTCALL(glUniform4fv(prog->vs.material_emission_location, 1, &state->material.emissive.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_emissive_location, 1, &state->material.emissive.r)); checkGLcall("setting FFP material uniforms"); } @@ -5413,7 +5413,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info, BOOL legacy_lighting) { - const char *diffuse, *specular, *emission, *ambient; + const char *diffuse, *specular, *emissive, *ambient; enum wined3d_light_type light_type; unsigned int i; @@ -5433,7 +5433,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer ambient = shader_glsl_ffp_mcs(settings->ambient_source, "ffp_material.ambient"); diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "ffp_material.diffuse"); specular = shader_glsl_ffp_mcs(settings->specular_source, "ffp_material.specular"); - emission = shader_glsl_ffp_mcs(settings->emission_source, "ffp_material.emission"); + emissive = shader_glsl_ffp_mcs(settings->emissive_source, "ffp_material.emissive"); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { @@ -5563,7 +5563,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer } shader_addline(buffer, "gl_FrontColor.xyz = %s.xyz * ambient + %s.xyz * diffuse + %s.xyz;\n", - ambient, diffuse, emission); + ambient, diffuse, emissive); shader_addline(buffer, "gl_FrontColor.w = %s.w;\n", diffuse); shader_addline(buffer, "gl_FrontSecondaryColor = %s * specular;\n", specular); } @@ -5587,7 +5587,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", MAX_TEXTURES); shader_addline(buffer, "uniform struct\n{\n"); - shader_addline(buffer, " vec4 emission;\n"); + shader_addline(buffer, " vec4 emissive;\n"); shader_addline(buffer, " vec4 ambient;\n"); shader_addline(buffer, " vec4 diffuse;\n"); shader_addline(buffer, " vec4 specular;\n"); @@ -6410,7 +6410,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->material_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.ambient")); vs->material_diffuse_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.diffuse")); vs->material_specular_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.specular")); - vs->material_emission_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emission")); + vs->material_emissive_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emissive")); vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); vs->light_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_light_ambient")); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index eb2cbfa..f2088bf 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4232,14 +4232,14 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1 << WINED3D_FFP_DIFFUSE))) { settings->diffuse_source = state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]; - settings->emission_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; + settings->emissive_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; settings->ambient_source = state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]; settings->specular_source = state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]; } else { settings->diffuse_source = WINED3D_MCS_MATERIAL; - settings->emission_source = WINED3D_MCS_MATERIAL; + settings->emissive_source = WINED3D_MCS_MATERIAL; settings->ambient_source = WINED3D_MCS_MATERIAL; settings->specular_source = WINED3D_MCS_MATERIAL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fafdb20..f23197d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1870,7 +1870,7 @@ struct wined3d_ffp_vs_settings { DWORD light_type : 24; /* MAX_ACTIVE_LIGHTS, 8 * 3 */ DWORD diffuse_source : 2; - DWORD emission_source : 2; + DWORD emissive_source : 2; DWORD ambient_source : 2; DWORD specular_source : 2;

1 0

Matteo Bruni : wined3d: Check all the ffp_material fields.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 2bab1f7250b89021e7c0c246c4594cf919a98c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bab1f7250b89021e7c0c246c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:12 2015 +0200 wined3d: Check all the ffp_material fields. The application can override each material parameter with one of the two FFP vertex color attributes. The 'ambient' struct field in the GLSL shader can thus happen to be unused and the GL driver may optimize it away. --- dlls/wined3d/glsl_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a5399b2..0a130e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6761,7 +6761,10 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const break; } } - if (entry->vs.material_ambient_location != -1) + if (entry->vs.material_ambient_location != -1 || entry->vs.material_diffuse_location != -1 + || entry->vs.material_specular_location != -1 + || entry->vs.material_emissive_location != -1 + || entry->vs.material_shininess_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; if (entry->vs.light_ambient_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_LIGHTS;

1 0

Matteo Bruni : ddraw/tests: Accept broken testbot result for test_clear_rect_count().
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 6418a489e075ade7fa32dd3ea2eafb3b54fe86e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6418a489e075ade7fa32dd3ea… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:13 2015 +0200 ddraw/tests: Accept broken testbot result for test_clear_rect_count(). --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index da550b5..39e1570 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3212,7 +3212,8 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ce31cd6..8e543ab 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3457,7 +3457,8 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); IDirectDrawSurface_Release(rt); destroy_viewport(device, viewport); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d3c9a34..f8e6e21 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4321,7 +4321,8 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear the viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); IDirect3DViewport3_Release(viewport); IDirectDrawSurface4_Release(rt); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b8691b8..573be3b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3942,7 +3942,7 @@ static void test_clear_rect_count(void) ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x00ffffff, 1), + ok(compare_color(color, 0x00ffffff, 1) || broken(compare_color(color, 0x00ff0000, 1)), "Clear with count = 0, rect != NULL has color %#08x.\n", color); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ffffff, 1.0f, 0);

1 0

Matteo Bruni : ddraw/tests: Add a ddraw2 specular lighting test.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 0cc7daebd84cc8cad79b4dd16a829cb5a3457418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc7daebd84cc8cad79b4dd16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:14 2015 +0200 ddraw/tests: Add a ddraw2 specular lighting test. --- dlls/ddraw/tests/ddraw2.c | 284 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 283 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cc7daebd84cc8cad79b4…

1 0

Matteo Bruni : wined3d: Fix the TIMESTAMP_DISJOINT query.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 4b35cf730f12f993176be85aa9aabf9b532aed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b35cf730f12f993176be85aa… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 4 23:16:15 2015 +0200 wined3d: Fix the TIMESTAMP_DISJOINT query. Spotted by Patrick Rudolph. --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 0ec578d..9e6f21a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -650,7 +650,7 @@ static HRESULT wined3d_timestamp_disjoint_query_ops_get_data(struct wined3d_quer if (query->type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) { - static const struct wined3d_query_data_timestamp_disjoint disjoint_data = {FALSE, 1000 * 1000 * 1000}; + static const struct wined3d_query_data_timestamp_disjoint disjoint_data = {1000 * 1000 * 1000, FALSE}; if (query->state == QUERY_BUILDING) {

1 0

Nikolay Sivov : atl100/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 7839aa22c3398a0efd0fd69461f3dfbef94f3908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7839aa22c3398a0efd0fd6946… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 10:34:19 2015 +0300 atl100/tests: Fixed some leaks (Valgrind). --- dlls/atl100/tests/atl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index f6cc85b..d07a523 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -916,6 +916,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -926,6 +928,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -936,6 +940,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -946,6 +952,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = (IUnknown *)0xdeadbeef; @@ -976,6 +984,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); /* test file:// scheme */ @@ -989,6 +999,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); /* test file:// scheme on non-existent file. */ @@ -1002,6 +1014,8 @@ static void test_AtlAxCreateControl(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : oleacc: Added proxies for oleacc.idl.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 40a311c8212edd979d563f7a74eeb4a3196b6d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40a311c8212edd979d563f7a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 12:17:44 2015 +0300 oleacc: Added proxies for oleacc.idl. --- dlls/oleacc/Makefile.in | 4 +++- dlls/oleacc/main.c | 30 +++++++++++++++++++++++++----- dlls/oleacc/oleacc_classes.idl | 8 ++++++++ dlls/oleacc/oleacc_private.h | 3 ++- dlls/oleacc/propservice.c | 11 ++--------- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index fda1b75..331229f 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = uuid oleaut32 ole32 user32 +IMPORTS = uuid oleaut32 ole32 user32 rpcrt4 C_SRCS = \ client.c \ @@ -11,3 +11,5 @@ C_SRCS = \ IDL_SRCS = oleacc_classes.idl RC_SRCS = oleacc.rc + +dlldata_EXTRADEFS = -DENTRY_PREFIX=OLEACC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 4d9c55e..3cfe7c1 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -49,6 +49,11 @@ static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W' typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); +extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; +extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLEACC_DllUnregisterServer(void) DECLSPEC_HIDDEN; + static struct { const WCHAR *name; DWORD idx; @@ -406,19 +411,34 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, DisableThreadLibraryCalls(hinstDLL); break; } - return TRUE; + + return OLEACC_DllMain(hinstDLL, fdwReason, lpvReserved); } HRESULT WINAPI DllRegisterServer(void) { - TRACE("()\n"); - return __wine_register_resources(oleacc_handle); + return OLEACC_DllRegisterServer(); } HRESULT WINAPI DllUnregisterServer(void) { - TRACE("()\n"); - return __wine_unregister_resources(oleacc_handle); + return OLEACC_DllUnregisterServer(); +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +{ + if(IsEqualGUID(&CLSID_CAccPropServices, rclsid)) { + TRACE("(CLSID_CAccPropServices %s %p)\n", debugstr_guid(iid), ppv); + return get_accpropservices_factory(iid, ppv); + } + + if(IsEqualGUID(&CLSID_PSFactoryBuffer, rclsid)) { + TRACE("(CLSID_PSFactoryBuffer %s %p)\n", debugstr_guid(iid), ppv); + return OLEACC_DllGetClassObject(rclsid, iid, ppv); + } + + FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; } void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) diff --git a/dlls/oleacc/oleacc_classes.idl b/dlls/oleacc/oleacc_classes.idl index 44b0693..15eda9c 100644 --- a/dlls/oleacc/oleacc_classes.idl +++ b/dlls/oleacc/oleacc_classes.idl @@ -17,5 +17,13 @@ */ #pragma makedep regtypelib +#pragma makedep proxy +#pragma makedep register #include "oleacc.idl" + +[ + threading(both), + uuid(03022430-abc4-11d0-bde2-00aa001a1953) /* IAccessibleHandler */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 1bbb9f6..06e3ba6 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -16,10 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <oleacc.h> +#include "oleacc_classes.h" HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; +HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; diff --git a/dlls/oleacc/propservice.c b/dlls/oleacc/propservice.c index f27a8da..3ed1818 100644 --- a/dlls/oleacc/propservice.c +++ b/dlls/oleacc/propservice.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#include "oleacc.h" #include "oleacc_private.h" #include "wine/debug.h" @@ -245,13 +244,7 @@ static const IClassFactoryVtbl CAccPropServicesFactoryVtbl = { static IClassFactory CAccPropServicesFactory = { &CAccPropServicesFactoryVtbl }; -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +HRESULT get_accpropservices_factory(REFIID riid, void **ppv) { - if(IsEqualGUID(&CLSID_CAccPropServices, rclsid)) { - TRACE("(CLSID_CAccPropServices %s %p)\n", debugstr_guid(iid), ppv); - return IClassFactory_QueryInterface(&CAccPropServicesFactory, iid, ppv); - } - - FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - return E_NOTIMPL; + return IClassFactory_QueryInterface(&CAccPropServicesFactory, riid, ppv); }

1 0

Nikolay Sivov : dwrite: Initial implementation of Draw().
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: 38775875c7f165fae0f1daab54df281adbfe402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38775875c7f165fae0f1daab5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 15:23:17 2015 +0300 dwrite: Initial implementation of Draw(). --- dlls/dwrite/layout.c | 289 +++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 1 - 2 files changed, 269 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38775875c7f165fae0f1d…

1 0

Sebastian Lackner : ntdll: Return failure in NtProtectVirtualMemory when last argument is omitted.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: ee6a477cab209aa34787d4711123993eed380d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6a477cab209aa34787d4711… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:46:38 2015 +0200 ntdll: Return failure in NtProtectVirtualMemory when last argument is omitted. --- dlls/kernel32/tests/virtual.c | 5 ----- dlls/ntdll/virtual.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2dea156..4f50df8 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2492,27 +2492,22 @@ static void test_VirtualProtect(void) SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, PAGE_READONLY, NULL); - todo_wine ok(!ret, "VirtualProtect should fail\n"); - todo_wine ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %d\n", GetLastError()); old_prot = 0xdeadbeef; ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "VirtualProtect failed %d\n", GetLastError()); - todo_wine ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); addr = base; size = si.dwPageSize; status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_READONLY, NULL); - todo_wine ok(status == STATUS_ACCESS_VIOLATION, "NtProtectVirtualMemory should fail, got %08x\n", status); addr = base; size = si.dwPageSize; old_prot = 0xdeadbeef; status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_NOACCESS, &old_prot); ok(status == STATUS_SUCCESS, "NtProtectVirtualMemory should succeed, got %08x\n", status); - todo_wine ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9d29c33..0629816 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2164,6 +2164,9 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T TRACE("%p %p %08lx %08x\n", process, addr, size, new_prot ); + if (!old_prot) + return STATUS_ACCESS_VIOLATION; + if (process != NtCurrentProcess()) { apc_call_t call;

1 0

Sebastian Lackner : wbemprox/tests: Actually test the return value of IEnumWbemClassObject_Next.
by Alexandre Julliard 05 May '15

05 May '15

Module: wine Branch: master Commit: a5414e8bed17fca54b25d14f291fd20b31513787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5414e8bed17fca54b25d14f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 06:49:55 2015 +0200 wbemprox/tests: Actually test the return value of IEnumWbemClassObject_Next. --- dlls/wbemprox/tests/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index eb3bd58..8fd027e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -383,7 +383,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) return; } - IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); ok( hr == S_OK, "got %08x\n", hr ); type = 0xdeadbeef;

1 0