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

Andrew Eikum : kernel32: Support extended pathnames in GetShortPathName.
by Alexandre Julliard May 6, 2015

May 6, 2015

Module: wine Branch: master Commit: 65f2690203089d55339cd2feca6e09b35dbc574a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f2690203089d55339cd2fec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 5 13:17:17 2015 -0500 kernel32: Support extended pathnames in GetShortPathName. --- dlls/kernel32/path.c | 28 +++++++++++++++++++++++----- dlls/kernel32/tests/path.c | 25 ++++++++++++++++++++----- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c2833b1..179c8e0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -440,7 +440,7 @@ DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) */ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortlen ) { - WCHAR tmpshortpath[MAX_PATHNAME_LEN]; + WCHAR *tmpshortpath; LPCWSTR p; DWORD sp = 0, lp = 0; DWORD tmplen; @@ -460,12 +460,28 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl return 0; } + /* code below only removes characters from string, never adds, so this is + * the largest buffer that tmpshortpath will need to have */ + tmpshortpath = HeapAlloc(GetProcessHeap(), 0, (strlenW(longpath) + 1) * sizeof(WCHAR)); + if (!tmpshortpath) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + + if (longpath[0] == '\\' && longpath[1] == '\\' && longpath[2] == '?' && longpath[3] == '\\') + { + memcpy(tmpshortpath, longpath, 4 * sizeof(WCHAR)); + sp = lp = 4; + } + /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) + if (longpath[lp] != '/' && longpath[lp + 1] == ':' ) { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; + tmpshortpath[sp] = longpath[lp]; + tmpshortpath[sp + 1] = ':'; + sp += 2; + lp += 2; } while (longpath[lp]) @@ -522,9 +538,11 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl tmplen--; /* length without 0 */ } + HeapFree(GetProcessHeap(), 0, tmpshortpath); return tmplen; notfound: + HeapFree(GetProcessHeap(), 0, tmpshortpath); TRACE("not found!\n" ); SetLastError ( ERROR_FILE_NOT_FOUND ); return 0; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index cdb565a..de6d92a 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1343,29 +1343,44 @@ static void test_GetLongPathNameW(void) static void test_GetShortPathNameW(void) { - WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; - WCHAR path[MAX_PATH]; + static const WCHAR extended_prefix[] = {'\\','\\','?','\\',0}; + static const WCHAR test_path[] = { 'L', 'o', 'n', 'g', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'N', 'a', 'm', 'e', 0 }; + static const WCHAR name[] = { 't', 'e', 's', 't', 0 }; + static const WCHAR backSlash[] = { '\\', 0 }; + WCHAR path[MAX_PATH], tmppath[MAX_PATH]; WCHAR short_path[MAX_PATH]; DWORD length; HANDLE file; int ret; - WCHAR name[] = { 't', 'e', 's', 't', 0 }; - WCHAR backSlash[] = { '\\', 0 }; SetLastError(0xdeadbeef); - GetTempPathW( MAX_PATH, path ); + GetTempPathW( MAX_PATH, tmppath ); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetTempPathW is not implemented\n"); return; } + lstrcpyW( path, tmppath ); lstrcatW( path, test_path ); lstrcatW( path, backSlash ); ret = CreateDirectoryW( path, NULL ); ok( ret, "Directory was not created. LastError = %d\n", GetLastError() ); /* Starting a main part of test */ + + /* extended path \\?\C:\path\ */ + lstrcpyW( path, extended_prefix ); + lstrcatW( path, tmppath ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); + short_path[0] = 0; + length = GetShortPathNameW( path, short_path, sizeof(short_path) / sizeof(*short_path) ); + ok( length, "GetShortPathNameW returned 0.\n" ); + + lstrcpyW( path, tmppath ); + lstrcatW( path, test_path ); + lstrcatW( path, backSlash ); length = GetShortPathNameW( path, short_path, 0 ); ok( length, "GetShortPathNameW returned 0.\n" ); ret = GetShortPathNameW( path, short_path, length );

1 0

Nikolay Sivov : dwrite: Initial implementation of Draw().
by Alexandre Julliard May 5, 2015

May 5, 2015

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

Nikolay Sivov : oleacc: Added proxies for oleacc.idl.
by Alexandre Julliard May 5, 2015

May 5, 2015

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 : atl100/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard May 5, 2015

May 5, 2015

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

Matteo Bruni : wined3d: Rename *emission* as *emissive*.
by Alexandre Julliard May 5, 2015

May 5, 2015

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

Nikolay Sivov : shell32/tests: A test for shellview QI for IOleWindow.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: a7b99a1f892693985f608b9286ab863763a88592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b99a1f892693985f608b928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 18:01:59 2015 +0300 shell32/tests: A test for shellview QI for IOleWindow. --- dlls/shell32/tests/shlview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 2d323d9..cab0630 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -938,6 +938,7 @@ static void test_IOleWindow(void) { IShellFolder *desktop; IShellView *view; + IOleWindow *wnd; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -946,6 +947,9 @@ static void test_IOleWindow(void) hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IShellView_QueryInterface(view, &IID_IOleWindow, (void**)&wnd); + ok(hr == E_NOINTERFACE, "got (0x%08x)\n", hr); + /* IShellView::ContextSensitiveHelp */ hr = IShellView_ContextSensitiveHelp(view, TRUE); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2::get_value implementation.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: 985d8afcd14ad0d94a70adae81e46886e00b3f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985d8afcd14ad0d94a70adae8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 19:14:19 2015 +0200 mshtml: Added IHTMLDOMAttribute2::get_value implementation. --- dlls/mshtml/htmlattr.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index bd0630e..861a594 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -303,8 +303,25 @@ static HRESULT WINAPI HTMLDOMAttribute2_put_value(IHTMLDOMAttribute2 *iface, BST static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BSTR *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + VARIANT val; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, ATTRFLAG_ASSTRING, &val); + if(FAILED(hres)) + return hres; + + assert(V_VT(&val) == VT_BSTR); + *p = V_BSTR(&val); + if(!*p && !(*p = SysAllocStringLen(NULL, 0))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLDOMAttribute2_get_expando(IHTMLDOMAttribute2 *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c8ab19d..3e83e64 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1806,6 +1806,24 @@ static void _test_attr_expando(unsigned line, IHTMLDOMAttribute *attr, VARIANT_B IHTMLDOMAttribute2_Release(attr2); } +#define test_attr_value(a,b) _test_attr_value(__LINE__,a,b) +static void _test_attr_value(unsigned line, IHTMLDOMAttribute *attr, const char *exval) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + BSTR val; + HRESULT hres; + + hres = IHTMLDOMAttribute2_get_value(attr2, &val); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line)(!strcmp_wa(val, exval), "value = %s, expected %s\n", wine_dbgstr_w(val), exval); + else + ok_(__FILE__,line)(!val, "value = %s, expected NULL\n", wine_dbgstr_w(val)); + + IHTMLDOMAttribute2_Release(attr2); + SysFreeString(val); +} + #define test_comment_attrs(c) _test_comment_attrs(__LINE__,c) static void _test_comment_attrs(unsigned line, IUnknown *unk) { @@ -3251,6 +3269,7 @@ static void test_attr_collection(IHTMLElement *elem) ok(V_VT(&val) == VT_BSTR, "id: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr"), "id: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_expando(dom_attr, VARIANT_FALSE); + test_attr_value(dom_attr, "attr"); } else if(!strcmp_wa(name, "attr1")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); @@ -3258,24 +3277,28 @@ static void test_attr_collection(IHTMLElement *elem) ok(V_VT(&val) == VT_BSTR, "attr1: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr1"), "attr1: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_expando(dom_attr, VARIANT_TRUE); + test_attr_value(dom_attr, "attr1"); } else if(!strcmp_wa(name, "attr2")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr2: V_VT(&val) = %d\n", V_VT(&val)); ok(!V_BSTR(&val), "attr2: V_BSTR(&val) != NULL\n"); + test_attr_value(dom_attr, ""); } else if(!strcmp_wa(name, "attr3")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr3: V_VT(&val) = %d\n", V_VT(&val)); ok(!strcmp_wa(V_BSTR(&val), "attr3"), "attr3: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); + test_attr_value(dom_attr, "attr3"); } else if(!strcmp_wa(name, "test")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); ok(V_VT(&val) == VT_I4, "test: V_VT(&val) = %d\n", V_VT(&val)); ok(V_I4(&val) == 1, "test: V_I4(&val) = %d\n", V_I4(&val)); + test_attr_value(dom_attr, "1"); } IHTMLDOMAttribute_Release(dom_attr);

1 0

Sebastian Lackner : wbemprox/tests: Fix memory leak when tests are skipped.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: a248418325bb4a4405a8a3c357052e7f5991af5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a248418325bb4a4405a8a3c35… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 07:58:06 2015 +0200 wbemprox/tests: Fix memory leak when tests are skipped. --- dlls/wbemprox/tests/query.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 8fd027e..56c97ff 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -158,7 +158,7 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - return; + goto out; } type = 0xdeadbeef; VariantInit( &state ); @@ -232,6 +232,7 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); +out: SysFreeString( empty ); SysFreeString( class ); } @@ -373,14 +374,14 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) if (!compname[0] || !username[0]) { skip( "Failed to get user or computer name\n" ); - return; + goto out; } hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) { win_skip( "Win32_ComputerSystem not available\n" ); - return; + goto out; } hr = IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); @@ -406,6 +407,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) IWbemClassObject_Release( service ); IEnumWbemClassObject_Release( result ); +out: SysFreeString( query ); SysFreeString( wql ); }

1 0

Matteo Bruni : ddraw/tests: Accept broken testbot result for test_clear_rect_count().
by Alexandre Julliard May 5, 2015

May 5, 2015

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

Nikolay Sivov : explorer: Added IDispatch support for IShellWindows.
by Alexandre Julliard May 5, 2015

May 5, 2015

Module: wine Branch: master Commit: d1e309abe2b7790f7a62c2536ce409200bcf9455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e309abe2b7790f7a62c2536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 22:27:44 2015 +0300 explorer: Added IDispatch support for IShellWindows. --- programs/explorer/desktop.c | 51 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 03008f4..7ee6174 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -67,13 +67,13 @@ static unsigned int nb_launchers, nb_allocated; static REFIID tid_ids[] = { - &IID_NULL, + &IID_IShellWindows, &IID_IWebBrowser2 }; typedef enum { - NULL_tid, + IShellWindows_tid, IWebBrowser2_tid, LAST_tid } tid_t; @@ -1071,24 +1071,39 @@ static ULONG WINAPI shellwindows_Release(IShellWindows *iface) static HRESULT WINAPI shellwindows_GetTypeInfoCount(IShellWindows *iface, UINT *pctinfo) { - FIXME("%p\n", pctinfo); - return E_NOTIMPL; + TRACE("%p\n", pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI shellwindows_GetTypeInfo(IShellWindows *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("%u 0x%x %p\n", iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%d %d %p\n", iTInfo, lcid, ppTInfo); + return get_typeinfo(IShellWindows_tid, ppTInfo); } static HRESULT WINAPI shellwindows_GetIDsOfNames(IShellWindows *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - FIXME("%s %p %u 0x%x %p\n", debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%s %p %d %d %p\n", debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if (!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IShellWindows_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, @@ -1096,9 +1111,21 @@ static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("0x%x %s 0x%x 0x%x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("%d %s %d %08x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IShellWindows_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI shellwindows_get_Count(IShellWindows *iface, LONG *count)

1 0