June 2013 - Wine-Commits - list.winehq.org

André Hentschel : difxapi: Add stubs for DriverPackageInstall{A, W}.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 741cb979057b55b31eb02075be1a6012979bad87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741cb979057b55b31eb02075b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:37:06 2013 +0200 difxapi: Add stubs for DriverPackageInstall{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 6fbc0bb..b4409bd 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -2,8 +2,8 @@ @ stub DIFXAPISetLogCallbackW @ stub DriverPackageGetPathA @ stub DriverPackageGetPathW -@ stub DriverPackageInstallA -@ stub DriverPackageInstallW +@ stdcall DriverPackageInstallA(str long ptr ptr) +@ stdcall DriverPackageInstallW(wstr long ptr ptr) @ stdcall DriverPackagePreinstallA(str long) @ stdcall DriverPackagePreinstallW(wstr long) @ stub DriverPackageUninstallA diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 047b912..ff1d310 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -36,3 +36,17 @@ DWORD WINAPI DriverPackagePreinstallW(LPCWSTR inf, DWORD flags) FIXME("(%s, %u) stub\n", wine_dbgstr_w(inf), flags); return ERROR_SUCCESS; } + +DWORD WINAPI DriverPackageInstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot) +{ + FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); + if (reboot) *reboot = FALSE; + return ERROR_SUCCESS; +} + +DWORD WINAPI DriverPackageInstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot) +{ + FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); + if (reboot) *reboot = FALSE; + return ERROR_SUCCESS; +}

1 0

André Hentschel : difxapi: Add stubs for DriverPackageGetPath{A, W}.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 849bbd90ac3aeec8c4136fc2521d8f2f85bff545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849bbd90ac3aeec8c4136fc25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:37:51 2013 +0200 difxapi: Add stubs for DriverPackageGetPath{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 8ce068d..ad03719 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -1,7 +1,7 @@ @ stub DIFXAPISetLogCallbackA @ stub DIFXAPISetLogCallbackW -@ stub DriverPackageGetPathA -@ stub DriverPackageGetPathW +@ stdcall DriverPackageGetPathA(str ptr ptr) +@ stdcall DriverPackageGetPathW(wstr ptr ptr) @ stdcall DriverPackageInstallA(str long ptr ptr) @ stdcall DriverPackageInstallW(wstr long ptr ptr) @ stdcall DriverPackagePreinstallA(str long) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 8f3f339..820a4b3 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -64,3 +64,15 @@ DWORD WINAPI DriverPackageUninstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } + +DWORD WINAPI DriverPackageGetPathA(LPCSTR inf, CHAR *dest, DWORD *count) +{ + FIXME("(%s, %p, %p) stub\n", wine_dbgstr_a(inf), dest, count); + return ERROR_UNSUPPORTED_TYPE; +} + +DWORD WINAPI DriverPackageGetPathW(LPCWSTR inf, WCHAR *dest, DWORD *count) +{ + FIXME("(%s, %p, %p) stub\n", wine_dbgstr_w(inf), dest, count); + return ERROR_UNSUPPORTED_TYPE; +}

1 0

Dmitry Timoshkov : server: Mark the process as disconnected from desktop/ winstation before closing its handles.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: df6c2a841824cf9edb438f9aea2ccb25922b671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6c2a841824cf9edb438f9ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 3 18:15:15 2013 +0900 server: Mark the process as disconnected from desktop/winstation before closing its handles. --- dlls/kernel32/tests/process.c | 1 - server/process.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 64e333e..9d3e983 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1957,7 +1957,6 @@ static void test_TerminateProcess(void) SetLastError(0xdeadbeef); ret = TerminateProcess(pi.hProcess, 0); -todo_wine ok(ret, "TerminateProcess error %u\n", GetLastError()); CloseHandle(pi.hProcess); diff --git a/server/process.c b/server/process.c index 61d9d17..f1046c0 100644 --- a/server/process.c +++ b/server/process.c @@ -628,9 +628,9 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; if (!process->is_system) close_process_desktop( process ); - close_process_handles( process ); process->winstation = 0; process->desktop = 0; + close_process_handles( process ); if (process->idle_event) { release_object( process->idle_event );

1 0

Alistair Leslie-Hughes : ole32/tests: Check function pointer.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: f0806fd68c9f11f20175dae1ca82ba09d514845c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0806fd68c9f11f20175dae1c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 2 20:25:15 2013 +1000 ole32/tests: Check function pointer. --- dlls/ole32/tests/compobj.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d0adf79..f2cdf6d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -431,6 +431,12 @@ static void test_CoGetClassObject(void) CloseHandle(info.wait); CloseHandle(info.stop); + if (!pRegOverridePredefKey) + { + win_skip("RegOverridePredefKey not available\n"); + return; + } + pCoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk);

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMUSERVISUAL.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 97bc1eb389b99114b7071b7b8d3f932b4d50245a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bc1eb389b99114b7071b7b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:36 2013 +0200 d3drm: Avoid LPDIRECT3DRMUSERVISUAL. --- dlls/d3drm/d3drm.c | 25 +++++++++---------------- include/d3drm.h | 6 +++--- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index df3b9cc..b39db28 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -305,11 +305,10 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateWrap(IDirect3DRM *iface, D3DRMWRAPTY return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM* iface, D3DRMUSERVISUALCALLBACK cb, LPVOID pArg, LPDIRECT3DRMUSERVISUAL * ppUserVisual) +static HRESULT WINAPI IDirect3DRMImpl_CreateUserVisual(IDirect3DRM *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, pArg, ppUserVisual); + FIXME("iface %p, cb %p, ctx %p visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } @@ -677,13 +676,10 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateWrap(IDirect3DRM2 *iface, D3DRMWRAP return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2* iface, - D3DRMUSERVISUALCALLBACK cb, LPVOID pArg, - LPDIRECT3DRMUSERVISUAL * ppUserVisual) +static HRESULT WINAPI IDirect3DRM2Impl_CreateUserVisual(IDirect3DRM2 *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, pArg, ppUserVisual); + FIXME("iface %p, cb %p, ctx %p, visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } @@ -1074,13 +1070,10 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3 *iface, D3DRMWRAP return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateUserVisual(IDirect3DRM3* iface, - D3DRMUSERVISUALCALLBACK cb, LPVOID arg, - LPDIRECT3DRMUSERVISUAL* UserVisual) +static HRESULT WINAPI IDirect3DRM3Impl_CreateUserVisual(IDirect3DRM3 *iface, + D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%p,%p): stub\n", iface, This, cb, arg, UserVisual); + FIXME("iface %p, cb %p, ctx %p, visual %p stub!\n", iface, cb, ctx, visual); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 4a6ae4c..2a23e51 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -86,7 +86,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HRSRC resource, IDirect3DRMTexture **texture) PURE; STDMETHOD(SetSearchPath)(THIS_ LPCSTR) PURE; @@ -225,7 +225,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE type, IDirect3DRMFrame *reference, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) PURE; @@ -368,7 +368,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, IDirect3DRMWrap **wrap) PURE; - STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK, LPVOID pArg, LPDIRECT3DRMUSERVISUAL *) PURE; + STDMETHOD(CreateUserVisual)(THIS_ D3DRMUSERVISUALCALLBACK cb, void *ctx, IDirect3DRMUserVisual **visual) PURE; STDMETHOD(LoadTexture)(THIS_ const char *filename, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(LoadTextureFromResource)(THIS_ HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) PURE;

1 0

Henri Verbeet : wined3d: Allow 32 bpc UINT formats in vertex declarations.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 51bbfa5ced84fccf4a0f2e0ec5b10865ca0087ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bbfa5ced84fccf4a0f2e0ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 3 09:19:33 2013 +0200 wined3d: Allow 32 bpc UINT formats in vertex declarations. --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d2fd22c..91e5d1f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4692,6 +4692,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) position_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + position_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func; @@ -4710,6 +4711,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) diffuse_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; diffuse_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + diffuse_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; /* No 4 component entry points here */ specular_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; @@ -4744,6 +4746,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) specular_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; specular_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; specular_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + specular_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; /* Only 3 component entry points here. Test how others behave. Float4 normals are used * by one of our tests, trying to pass it to the pixel shader, which fails on Windows. @@ -4765,6 +4768,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) normal_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_func; normal_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_func; normal_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_func; + normal_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_func; multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT1] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord1fvARB); multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT2] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord2fvARB); @@ -4790,6 +4794,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = invalid_texcoord_func; multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = invalid_texcoord_func; } + multi_texcoord_funcs[WINED3D_FFP_EMIT_INVALID] = invalid_texcoord_func; } static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8f27e61..7c4f188 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -120,6 +120,9 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_R16_UINT, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R32_UINT, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, + {WINED3DFMT_R32G32_UINT, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, + {WINED3DFMT_R32G32B32_UINT, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, + {WINED3DFMT_R32G32B32A32_UINT, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, {WINED3DFMT_R16G16B16A16_SNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -218,7 +221,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, 3, GL_FALSE, sizeof(short int)}, {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, 3, GL_TRUE, sizeof(short int)}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_FLOAT, 2, GL_FALSE, sizeof(GLhalfNV)}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)} + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, 1, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, 2, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, 3, GL_FALSE, sizeof(UINT)}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, 4, GL_FALSE, sizeof(UINT)}, }; struct wined3d_format_texture_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7c088eb..7a4633b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -901,7 +901,8 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_DEC3N = 14, WINED3D_FFP_EMIT_FLOAT16_2 = 15, WINED3D_FFP_EMIT_FLOAT16_4 = 16, - WINED3D_FFP_EMIT_COUNT = 17 + WINED3D_FFP_EMIT_INVALID = 17, + WINED3D_FFP_EMIT_COUNT = 18 }; struct wined3d_bo_address

1 0

Nikolay Sivov : shell32: Fix some tests failures on Win8.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 7a5ca2d3d45a447f18dba26898538b01ba480e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5ca2d3d45a447f18dba2689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 1 13:38:51 2013 +0400 shell32: Fix some tests failures on Win8. --- dlls/shell32/ebrowser.c | 5 +-- dlls/shell32/tests/ebrowser.c | 64 +++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 90be5f8..f7242e9 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1414,9 +1414,8 @@ static HRESULT WINAPI IShellBrowser_fnGetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); - TRACE("%p (%d, %p)\n", This, id, phwnd); - - /* Not implemented. */ + TRACE("(%p)->(%d, %p)\n", This, id, phwnd); + if (phwnd) *phwnd = NULL; return E_NOTIMPL; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 8149f8f..c56dffb 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -61,6 +61,14 @@ DEFINE_GUID(IID_UnknownInterface7, 0x68A4FDBA, 0xA48A, 0x4A86, 0xA3,0x29, 0x1 DEFINE_GUID(IID_UnknownInterface8, 0xD3B1CAF5, 0xEC4F, 0x4B2E, 0xBC,0xB0, 0x60,0xD7,0x15,0xC9,0x3C,0xB2); DEFINE_GUID(IID_UnknownInterface9, 0x9536CA39, 0x1ACB, 0x4AE6, 0xAD,0x27, 0x24,0x03,0xD0,0x4C,0xA2,0x8F); DEFINE_GUID(IID_UnknownInterface10, 0xB722BE00, 0x4E68, 0x101B, 0xA2,0xBC, 0x00,0xAA,0x00,0x40,0x47,0x70); +DEFINE_GUID(IID_UnknownInterface11, 0x691ecf9f, 0x6b9c, 0x4311, 0xa1,0x7b, 0xad,0x15,0x4c,0x30,0xe9,0x1f); +DEFINE_GUID(IID_UnknownInterface12, 0x7e3159f5, 0x21ca, 0x4ec2, 0x8f,0xbe, 0x66,0x2d,0x08,0x2c,0xa3,0xeb); +DEFINE_GUID(IID_UnknownInterface13, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); +DEFINE_GUID(IID_UnknownInterface14, 0x16770868, 0x239c, 0x445b, 0xa0,0x1d, 0xf2,0x6c,0x7f,0xbb,0xf2,0x6c); +DEFINE_GUID(IID_UnknownInterface15, 0x05a89298, 0x6246, 0x4c63, 0xbb,0x0d, 0x9b,0xda,0xf1,0x40,0xbf,0x3b); +DEFINE_GUID(IID_UnknownInterface16, 0x35094a87, 0x8bb1, 0x4237, 0x96,0xc6, 0xc4,0x17,0xee,0xbd,0xb0,0x78); +DEFINE_GUID(IID_UnknownInterface17, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); +DEFINE_GUID(IID_UnknownInterface18, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); static HWND hwnd; @@ -113,11 +121,19 @@ static void process_msgs(void) } } -static void dbg_print_guid(const GUID *guid) { - WCHAR buf[MAX_PATH]; +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); - StringFromGUID2(guid, buf, MAX_PATH); - printf("guid:[%s]\n", wine_dbgstr_wn(buf, lstrlenW(buf))); + return buf; } /********************************************************************* @@ -215,8 +231,7 @@ static inline IExplorerPaneVisibilityImpl *impl_from_IExplorerPaneVisibility(IEx static HRESULT WINAPI IExplorerPaneVisibility_fnQueryInterface(IExplorerPaneVisibility *iface, REFIID riid, LPVOID *ppvObj) { - ok(0, "Not called.\n"); - trace("REFIID:"); dbg_print_guid(riid); + ok(0, "unexpected, %s\n", debugstr_guid(riid)); *ppvObj = NULL; return E_NOINTERFACE; } @@ -260,7 +275,7 @@ static HRESULT WINAPI IExplorerPaneVisibility_fnGetPaneState(IExplorerPaneVisibi else if(IsEqualGUID(&EP_AdvQueryPane, ep)) This->aqp++; else { - trace("Unknown explorer pane: "); dbg_print_guid(ep); + trace("Unknown explorer pane: %s\n", debugstr_guid(ep)); This->unk++; } @@ -305,8 +320,7 @@ static inline ICommDlgBrowser3Impl *impl_from_ICommDlgBrowser3(ICommDlgBrowser3 static HRESULT WINAPI ICommDlgBrowser3_fnQueryInterface(ICommDlgBrowser3 *iface, REFIID riid, LPVOID *ppvObj) { - ok(0, "Not called.\n"); - trace("riid:"); dbg_print_guid(riid); + ok(0, "unexpected %s\n", debugstr_guid(riid)); *ppvObj = NULL; return E_NOINTERFACE; } @@ -476,8 +490,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryInterface(IServiceProvider *iface, return E_NOINTERFACE; } - ok(0, "Unexpected interface requested.\n"); - trace("riid: "); dbg_print_guid(riid); + ok(0, "Unexpected interface requested, %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -521,12 +534,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, } } - ok(was_in_list, "-- Unknown service requested --\n"); - if(!was_in_list) - { - trace("guidService: "); dbg_print_guid(guidService); - trace("riid: "); dbg_print_guid(riid); - } + ok(was_in_list, "unknown service, serviceID: %s, riid: %s\n", debugstr_guid(guidService), debugstr_guid(riid)); /* Give back an interface, if any. */ if(punk) @@ -617,22 +625,25 @@ static void test_SB_misc(void) } /* Some unimplemented methods */ - retHwnd = (HWND)0xDEADBEEF; + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_TOOLBAR, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_STATUS, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_TREE, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); + retHwnd = (HWND)0xdeadbeef; hr = IShellBrowser_GetControlWindow(psb, FCW_PROGRESS, &retHwnd); ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr); - ok(retHwnd == (HWND)0xDEADBEEF, "HWND overwritten\n"); + ok(retHwnd == NULL || broken(retHwnd == (HWND)0xdeadbeef), "got %p\n", retHwnd); /* ::InsertMenuSB */ hr = IShellBrowser_InsertMenusSB(psb, NULL, NULL); @@ -927,6 +938,15 @@ static void test_SetSite(void) { &IID_UnknownInterface4, &IID_IUnknown, 0, NULL }, { &IID_UnknownInterface6, &IID_UnknownInterface7, 0, NULL }, { &IID_IBrowserWithActivationNotification, &IID_IBrowserWithActivationNotification, 0, NULL }, + /* Win 8 */ + { &IID_ICommDlgBrowser, &IID_UnknownInterface11, 0, NULL }, + { &IID_ICommDlgBrowser, &IID_UnknownInterface12, 0, NULL }, + { &IID_UnknownInterface13, &IID_IUnknown, 0, NULL }, + { &IID_UnknownInterface14, &IID_UnknownInterface14, 0, NULL }, + { &IID_UnknownInterface15, &IID_UnknownInterface15, 0, NULL }, + { &IID_UnknownInterface16, &IID_UnknownInterface16, 0, NULL }, + { &IID_UnknownInterface17, &IID_UnknownInterface17, 0, NULL }, + { &IID_UnknownInterface18, &IID_UnknownInterface18, 0, NULL }, /* Other services requested in Vista, Windows 2008 but not in Windows 7 */ { &IID_IBrowserSettings_Vista, &IID_IBrowserSettings_Vista, 0, NULL },

1 0

André Hentschel : winetest: Set font in resources.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 70a7c6d3d160ac470fb411cf351c891859aea09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a7c6d3d160ac470fb411cf3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 1 00:11:23 2013 +0200 winetest: Set font in resources. --- programs/winetest/winetest.rc | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index ff9ca7b..a9dcc18 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -27,9 +27,10 @@ IDD_TAG DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No tag supplied" +FONT 8, "MS Shell Dlg" BEGIN CTEXT "Please supply a tag for your report. You can use letters, digits, dashes and periods." - IDC_STATIC, 10, 5, 130, 30 + IDC_STATIC, 5, 5, 130, 30 EDITTEXT IDC_TAG, 35, 30, 80, 10, ES_AUTOHSCROLL DEFPUSHBUTTON "Start", IDOK, 25, 45, 40, 14 PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 @@ -38,9 +39,10 @@ END IDD_EMAIL DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No email supplied" +FONT 8, "MS Shell Dlg" BEGIN CTEXT "Please supply an email address to enable developers to contact you about your report." - IDC_STATIC, 10, 5, 130, 30 + IDC_STATIC, 5, 5, 130, 30 EDITTEXT IDC_EMAIL, 10, 30, 130, 10, ES_AUTOHSCROLL DEFPUSHBUTTON "Start", IDOK, 25, 45, 40, 14 PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 @@ -49,21 +51,22 @@ END IDD_STATUS DIALOG 0, 0, 160, 150 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX CAPTION "Wine Test Shell" +FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Extracting:", IDC_ST0, 10, 5, 140, 10 + LTEXT "Extracting:", IDC_ST0, 5, 5, 140, 10 CONTROL "PB0", IDC_PB0, PROGRESS_CLASSA, 0, 5, 15, 150, 10 - LTEXT "Running:", IDC_ST1, 10, 30, 140, 10 + LTEXT "Running:", IDC_ST1, 5, 30, 140, 10 CONTROL "PB1", IDC_PB1, PROGRESS_CLASSA, 0, 5, 40, 150, 10 - LTEXT "Network transfer:", IDC_ST2, 10, 55, 140, 10 + LTEXT "Network transfer:", IDC_ST2, 5, 55, 140, 10 CONTROL "PB2", IDC_PB2, PROGRESS_CLASSA, 0, 5, 65, 150, 10 - LTEXT "Tag:", IDC_STATIC, 10, 89, 100, 10 + LTEXT "Tag:", IDC_STATIC, 5, 89, 100, 10 EDITTEXT IDC_TAG, 25, 88, 125, 10, ES_READONLY - LTEXT "Working directory:", IDC_STATIC, 10, 100, 100, 10 + LTEXT "Working directory:", IDC_STATIC, 5, 100, 100, 10 EDITTEXT IDC_DIR, 71, 99, 79, 10, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Output file:", IDC_STATIC, 10, 111, 100, 10 + LTEXT "Output file:", IDC_STATIC, 5, 111, 100, 10 EDITTEXT IDC_OUT, 46, 110, 104, 10, ES_READONLY | ES_AUTOHSCROLL @@ -78,9 +81,10 @@ END IDD_ABOUT DIALOG 0, 0, 150, 60 STYLE WS_POPUP CAPTION "About Wine Test Shell" +FONT 8, "MS Shell Dlg" BEGIN CTEXT "This program extracts and runs a series of tests which check Wine's conformance to the Windows API.", - IDC_STATIC, 10, 5, 130, 30 + IDC_STATIC, 5, 5, 130, 30 DEFPUSHBUTTON "Close", IDCANCEL, 55, 40, 40, 14 END

1 0

André Hentschel : winecfg: Add more room for the license.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 09fb0ca5eed93c16ebc33b965e0c72f7a34edb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fb0ca5eed93c16ebc33b965… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 31 23:15:31 2013 +0200 winecfg: Add more room for the license. --- programs/winecfg/winecfg.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 1f06c77..f856de1 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -130,7 +130,7 @@ BEGIN LTEXT "",IDC_ABT_PANEL_TEXT,160,43,140,8 CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", - IDC_ABT_LICENSE_TEXT,105,64,145,60 + IDC_ABT_LICENSE_TEXT,105,64,145,66 GROUPBOX "Windows registration information", IDC_STATIC, 15, 155, 230, 55 LTEXT "&Owner:", IDC_STATIC, 22, 171, 40, 20 EDITTEXT IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetVarHelpContext.
by Alexandre Julliard June 3, 2013

June 3, 2013

Module: wine Branch: master Commit: 5ae88daf6334ec47a1689971dd8f182574416340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae88daf6334ec47a1689971d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:14 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetVarHelpContext. --- dlls/oleaut32/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b6f2e92..098100d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9220,8 +9220,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *ifa UINT index, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %d - stub\n", This, index, helpContext); - return E_NOTIMPL; + TLBVarDesc *var_desc = &This->vardescs[index]; + + TRACE("%p %u %d\n", This, index, helpContext); + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + var_desc->HelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetMops(ICreateTypeInfo2 *iface,

1 0