July 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ddrawex/tests: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 04f57b9b0c8b29290d7ef2d136884f38c265123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f57b9b0c8b29290d7ef2d13… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:07:16 2011 +0200 ddrawex/tests: Use FAILED instead of !SUCCEEDED. --- dlls/ddrawex/tests/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index 4dcae02..099c6d2 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -422,13 +422,13 @@ START_TEST(surface) hr = pDllGetClassObject(&CLSID_DirectDrawFactory, &IID_IClassFactory, (void **) &classfactory); ok(hr == S_OK, "Failed to create a IClassFactory\n"); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { skip("Failed to get DirectDrawFactory\n"); return; } hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IDirectDrawFactory, (void **) &factory); ok(hr == S_OK, "Failed to create a IDirectDrawFactory\n"); - if (!SUCCEEDED(hr)) { + if (FAILED(hr)) { IClassFactory_Release(classfactory); skip("Failed to get a DirectDrawFactory\n"); return;

1 0

Michael Stefaniuc : vbscript: Don't bother with a FIXME in DllCanUnloadNow( ).
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: d15b567ca54a468e56f3473a50c16e617a6c6c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15b567ca54a468e56f3473a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 15:31:15 2011 +0200 vbscript: Don't bother with a FIXME in DllCanUnloadNow(). --- dlls/vbscript/vbscript_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 53f2841..3389bf4 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -125,7 +125,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("()\n"); return S_FALSE; }

1 0

Henri Verbeet : wined3d: Make the priv parameter to map_register() const.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: c6c76f5a1a2bf95f63873de90231fea72be75163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c76f5a1a2bf95f63873de90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:13 2011 +0200 wined3d: Make the priv parameter to map_register() const. --- dlls/wined3d/shader_sm4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d0b36c6..19f8c30 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -230,7 +230,7 @@ static void map_sysval(enum wined3d_sysval_semantic sysval, struct wined3d_shade } } -static void map_register(struct wined3d_sm4_data *priv, struct wined3d_shader_register *reg) +static void map_register(const struct wined3d_sm4_data *priv, struct wined3d_shader_register *reg) { switch (priv->shader_version.type) {

1 0

Henri Verbeet : wined3d: Make the query parameter to wined3d_event_query_test() const.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 2e636aae296eedebd388beaa346a807628f1632d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e636aae296eedebd388beaa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:14 2011 +0200 wined3d: Make the query parameter to wined3d_event_query_test() const. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 2deb337..edc6864 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -35,7 +35,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) HeapFree(GetProcessHeap(), 0, query); } -static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, +static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, struct wined3d_device *device) { struct wined3d_context *context;

1 0

Jacek Caban : vbscript: Added creation tests.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 68c6f58e6ef8ed6ee0c5f10d65ec7ed125125ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c6f58e6ef8ed6ee0c5f10d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 13:46:50 2011 +0200 vbscript: Added creation tests. --- configure | 1 + configure.ac | 1 + dlls/vbscript/tests/Makefile.in | 7 ++++ dlls/vbscript/tests/vbscript.c | 71 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d6a4958..4ecbcb6 100755 --- a/configure +++ b/configure @@ -15124,6 +15124,7 @@ wine_fn_config_lib uuid wine_fn_config_dll uxtheme enable_uxtheme implib wine_fn_config_test dlls/uxtheme/tests uxtheme_test wine_fn_config_dll vbscript enable_vbscript +wine_fn_config_test dlls/vbscript/tests vbscript_test wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib diff --git a/configure.ac b/configure.ac index cd5fc18..b213923 100644 --- a/configure.ac +++ b/configure.ac @@ -2797,6 +2797,7 @@ WINE_CONFIG_LIB(uuid) WINE_CONFIG_DLL(uxtheme,,[implib]) WINE_CONFIG_TEST(dlls/uxtheme/tests) WINE_CONFIG_DLL(vbscript) +WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in new file mode 100644 index 0000000..87742f0 --- /dev/null +++ b/dlls/vbscript/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = vbscript.dll +IMPORTS = ole32 + +C_SRCS = \ + vbscript.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c new file mode 100644 index 0000000..7de424f --- /dev/null +++ b/dlls/vbscript/tests/vbscript.c @@ -0,0 +1,71 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include <initguid.h> +#include <ole2.h> +#include <activscp.h> + +#include "wine/test.h" + +DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); + +static void test_vbscript(void) +{ + IActiveScriptParse *parser; + IActiveScript *vbscript; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void**)&vbscript); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hres); + + IActiveScriptParse64_Release(parser); + IActiveScript_Release(vbscript); +} + +static BOOL check_vbscript(void) +{ + IActiveScript *vbscript; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void**)&vbscript); + if(SUCCEEDED(hres)) + IActiveScript_Release(vbscript); + + return hres == S_OK; +} + + +START_TEST(vbscript) +{ + CoInitialize(NULL); + + if(check_vbscript()) + test_vbscript(); + else + win_skip("VBScript engine not available\n"); + + CoUninitialize(); +}

1 0

Henri Verbeet : wined3d: Make the query parameter to wined3d_event_query_finish() const.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 6ffd0668341c0410c11fa8654be2e51c5bbb4f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffd0668341c0410c11fa8654… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 19 12:56:15 2011 +0200 wined3d: Make the query parameter to wined3d_event_query_finish() const. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index edc6864..b26fc26 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -110,7 +110,7 @@ static enum wined3d_event_query_result wined3d_event_query_test(const struct win return ret; } -enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, +enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, struct wined3d_device *device) { struct wined3d_context *context; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0d0ecf2..77ea8c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1041,7 +1041,7 @@ enum wined3d_event_query_result }; void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; -enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, +enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add format conversion to the null driver StretchBlt implementation.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: cc8c831c4dc1a7901f5c64a7c155ffddb956efc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8c831c4dc1a7901f5c64a7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:10:30 2011 +0200 gdi32: Add format conversion to the null driver StretchBlt implementation. --- dlls/gdi32/bitblt.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 8bd404c..e87ecfd 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -149,15 +149,9 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, } } -static DWORD convert_bits( const BITMAPINFO *src_info, struct gdi_image_bits *src_bits, - const RECT *src_rect, BITMAPINFO *dst_info, struct gdi_image_bits *dst_bits ) +static void free_heap_bits( struct gdi_image_bits *bits ) { - FIXME( "%u -> %u not implemented\n", src_info->bmiHeader.biBitCount, dst_info->bmiHeader.biBitCount ); - dst_bits->ptr = src_bits->ptr; - dst_bits->offset = src_bits->offset; - dst_bits->is_copy = src_bits->is_copy; - dst_bits->free = NULL; - return ERROR_SUCCESS; + HeapFree( GetProcessHeap(), 0, bits->ptr ); } /* nulldrv fallback implementation using StretchDIBits */ @@ -229,14 +223,20 @@ try_get_image: if (err == ERROR_BAD_FORMAT) { RECT src_rect = src->visrect; - offset_rect( &src_rect, src_bits.offset - src->visrect.left, -src->visrect.top ); - err = convert_bits( src_info, &src_bits, &src_rect, dst_info, &dst_bits ); - if (!err) + offset_rect( &src_rect, src_bits.offset - src->visrect.left, -src->visrect.top ); + dst_info->bmiHeader.biWidth = src_rect.right - src_rect.left; + dst_bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); + if (dst_bits.ptr) { - err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, &dst->visrect, rop ); + dst_bits.is_copy = TRUE; + dst_bits.offset = 0; + dst_bits.free = free_heap_bits; + if (!(err = convert_bitmapinfo( src_info, src_bits.ptr, &src_rect, dst_info, dst_bits.ptr ))) + err = dst_dev->funcs->pPutImage( dst_dev, 0, dst_info, &dst_bits, &dst->visrect, rop ); if (dst_bits.free) dst_bits.free( &dst_bits ); } + else err = ERROR_OUTOFMEMORY; } if (src_bits.free) src_bits.free( &src_bits ); return !err;

1 0

Alexandre Julliard : gdi32: Add inline helpers to compute DIB stride and total size.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: eb87e694a2b8a42df0db9612e577115000d8a57e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb87e694a2b8a42df0db9612e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 14:09:03 2011 +0200 gdi32: Add inline helpers to compute DIB stride and total size. --- dlls/gdi32/brush.c | 4 +-- dlls/gdi32/dib.c | 50 ++-------------------------------------- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/objects.c | 4 +- dlls/gdi32/enhmfdrv/bitblt.c | 19 +++++---------- dlls/gdi32/enhmfdrv/objects.c | 6 +--- dlls/gdi32/gdi_private.h | 14 +++++++++- dlls/gdi32/mfdrv/bitblt.c | 32 ++++++++------------------ dlls/gdi32/mfdrv/objects.c | 6 +--- 9 files changed, 39 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb87e694a2b8a42df0db9…

1 0

Alexandre Julliard : gdi32: Move GET_DC_PHYSDEV back to gdi_private.h, it can't be used from external drivers.
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 1f8a0eb40e75f24b16b6c93173af777548259400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8a0eb40e75f24b16b6c9317… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 17:35:17 2011 +0200 gdi32: Move GET_DC_PHYSDEV back to gdi_private.h, it can't be used from external drivers. --- dlls/gdi32/gdi_private.h | 3 +++ include/wine/gdi_driver.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7fa14d3..21a92c8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -273,6 +273,9 @@ static inline INT GDI_ROUND(double val) return (int)floor(val + 0.5); } +#define GET_DC_PHYSDEV(dc,func) \ + get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(struct gdi_dc_funcs,func)) + /* bitmap object */ typedef struct tagBITMAPOBJ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2c05d82..3a9685c 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -200,7 +200,7 @@ static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) return dev; } -#define GET_DC_PHYSDEV(dc,func) get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(DC_FUNCTIONS,func)) -#define GET_NEXT_PHYSDEV(dev,func) get_physdev_entry_point( (dev)->next, FIELD_OFFSET(DC_FUNCTIONS,func)) +#define GET_NEXT_PHYSDEV(dev,func) \ + get_physdev_entry_point( (dev)->next, FIELD_OFFSET(struct gdi_dc_funcs,func)) #endif /* __WINE_WINE_GDI_DRIVER_H */

1 0

Hans Leidekker : server: Include groups in file mode calculation if the security descriptor matches the current user .
by Alexandre Julliard July 19, 2011

July 19, 2011

Module: wine Branch: master Commit: 3321c450384e56e9153e0fff32b5933a18a7a6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3321c450384e56e9153e0fff3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 19 09:52:54 2011 +0200 server: Include groups in file mode calculation if the security descriptor matches the current user. --- server/file.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/file.c b/server/file.c index fcfd572..07dab39 100644 --- a/server/file.c +++ b/server/file.c @@ -505,15 +505,15 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { denied_mode |= (mode << 6) | (mode << 3) | mode; /* all */ } - else if (security_equal_sid( sid, owner )) - { - denied_mode |= (mode << 6); /* user only */ - } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, TRUE ))) { denied_mode |= (mode << 6) | (mode << 3); /* user + group */ } + else if (security_equal_sid( sid, owner )) + { + denied_mode |= (mode << 6); /* user only */ + } break; case ACCESS_ALLOWED_ACE_TYPE: aa_ace = (const ACCESS_ALLOWED_ACE *)ace; @@ -523,15 +523,15 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) { new_mode |= (mode << 6) | (mode << 3) | mode; /* all */ } - else if (security_equal_sid( sid, owner )) - { - new_mode |= (mode << 6); /* user only */ - } else if ((security_equal_sid( user, owner ) && token_sid_present( current->process->token, sid, FALSE ))) { new_mode |= (mode << 6) | (mode << 3); /* user + group */ } + else if (security_equal_sid( sid, owner )) + { + new_mode |= (mode << 6); /* user only */ + } break; } }

1 0