September 2012 - Wine-commits

Jacek Caban : jscript: Store exception value as jsval_t instead of VARIANT.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: daf0b8dad2f68292524787bf52e413b972cd2d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0b8dad2f68292524787bf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:17:36 2012 +0200 jscript: Store exception value as jsval_t instead of VARIANT. --- dlls/jscript/engine.c | 38 +++++++------------------------------- dlls/jscript/error.c | 2 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 11 ++++++----- dlls/jscript/jsutils.c | 2 +- dlls/jscript/regexp.c | 2 +- 6 files changed, 17 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1cc8884..10e47f6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -674,19 +674,9 @@ static HRESULT interp_case(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.13 */ static HRESULT interp_throw(exec_ctx_t *ctx) { - VARIANT v; - jsval_t val; - HRESULT hres; - TRACE("\n"); - val = stack_pop(ctx); - hres = jsval_to_variant(val, &v); - jsval_release(val); - if(FAILED(hres)) - return hres; - - ctx->ei->var = v; + ctx->ei->val = stack_pop(ctx); return DISP_E_EXCEPTION; } @@ -778,9 +768,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) jsval_release(v); stack_popn(ctx, 1); - v = stack_pop(ctx); - hres = jsval_to_variant(v, &ctx->ei->var); - jsval_release(v); + ctx->ei->val = stack_pop(ctx); return SUCCEEDED(hres) ? DISP_E_EXCEPTION : hres; } @@ -2382,7 +2370,7 @@ OP_LIST static HRESULT unwind_exception(exec_ctx_t *ctx) { except_frame_t *except_frame; - VARIANT except_val; + jsval_t except_val; BSTR ident; HRESULT hres; @@ -2397,7 +2385,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) ctx->ip = except_frame->catch_off; - except_val = ctx->ei->var; + except_val = ctx->ei->val; memset(ctx->ei, 0, sizeof(*ctx->ei)); ident = except_frame->ident; @@ -2408,30 +2396,18 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) hres = create_dispex(ctx->script, NULL, NULL, &scope_obj); if(SUCCEEDED(hres)) { - jsval_t val; - - hres = variant_to_jsval(&except_val, &val); - if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(scope_obj, ident, val, ctx->ei); - jsval_release(val); - } + hres = jsdisp_propput_name(scope_obj, ident, except_val, ctx->ei); if(FAILED(hres)) jsdisp_release(scope_obj); } - VariantClear(&except_val); + jsval_release(except_val); if(FAILED(hres)) return hres; hres = scope_push(ctx->scope_chain, scope_obj, to_disp(scope_obj), &ctx->scope_chain); jsdisp_release(scope_obj); }else { - jsval_t exceptv; - - hres = variant_to_jsval(&except_val, &exceptv); - if(FAILED(hres)) - return hres; - - hres = stack_push(ctx, exceptv); + hres = stack_push(ctx, except_val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 407bd3b..77497a9 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -400,7 +400,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, HRESULT error, con return hres; if(ei) - var_set_jsdisp(&ei->var, err); + ei->val = jsval_obj(err); return error; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index bf6710b..f106be9 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,7 +110,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) memset(&jsexcept, 0, sizeof(jsexcept)); hres = exec_source(exec_ctx, code, &code->global_code, FALSE, &jsexcept, NULL); - VariantClear(&jsexcept.var); + jsval_release(jsexcept.val); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ef20c54..41c67c9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -37,11 +37,7 @@ typedef struct _jsval_t jsval_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; - -typedef struct { - EXCEPINFO ei; - VARIANT var; -} jsexcept_t; +typedef struct _jsexcept_t jsexcept_t; typedef struct { void **blocks; @@ -548,3 +544,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) } #include "jsval.h" + +struct _jsexcept_t { + EXCEPINFO ei; + jsval_t val; +}; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a4f84c5..0439b10 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -1062,7 +1062,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY } if(FAILED(hres)) { - VariantClear(&ei.var); + jsval_release(ei.val); return hres; } diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e783c54..1c891a6 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3525,7 +3525,7 @@ static INT index_from_val(script_ctx_t *ctx, jsval_t v) memset(&ei, 0, sizeof(ei)); hres = to_number_jsval(ctx, v, &ei, &n); if(FAILED(hres)) { /* FIXME: Move ignoring exceptions to to_primitive */ - VariantClear(&ei.var); + jsval_release(ei.val); return 0; }

1 0

Jacek Caban : jscript: Always use jsval-based to_primitive.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: c1eb4326a05d13afa501435f00aae23cc871a34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1eb4326a05d13afa501435f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:17:50 2012 +0200 jscript: Always use jsval-based to_primitive. --- dlls/jscript/date.c | 16 +++----- dlls/jscript/dispex.c | 29 ++------------ dlls/jscript/engine.c | 12 +++--- dlls/jscript/jscript.h | 5 +- dlls/jscript/jsutils.c | 103 ++++++++++++----------------------------------- 5 files changed, 45 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1eb4326a05d13afa5014…

1 0

Jacek Caban : jscript: Always use jsval-based to_boolean.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 26576b83da35aabe7ba181b89fcad1cbd25feba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26576b83da35aabe7ba181b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:03 2012 +0200 jscript: Always use jsval-based to_boolean. --- dlls/jscript/bool.c | 2 +- dlls/jscript/engine.c | 8 ++-- dlls/jscript/jscript.h | 3 +- dlls/jscript/jsutils.c | 84 +++++++++++++++++------------------------------ 4 files changed, 37 insertions(+), 60 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index f8b4f84..9675965 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -128,7 +128,7 @@ static HRESULT BoolConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, HRESULT hres; if(argc) { - hres = to_boolean_jsval(argv[0], &value); + hres = to_boolean(argv[0], &value); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8595c52..1ffb3d4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1212,7 +1212,7 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) TRACE("\n"); - hres = to_boolean_jsval(stack_top(ctx), &b); + hres = to_boolean(stack_top(ctx), &b); if(FAILED(hres)) return hres; @@ -1234,7 +1234,7 @@ static HRESULT interp_cnd_z(exec_ctx_t *ctx) TRACE("\n"); - hres = to_boolean_jsval(stack_top(ctx), &b); + hres = to_boolean(stack_top(ctx), &b); if(FAILED(hres)) return hres; @@ -2185,7 +2185,7 @@ static HRESULT interp_neg(exec_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = to_boolean_jsval(v, &b); + hres = to_boolean(v, &b); jsval_release(v); if(FAILED(hres)) return hres; @@ -2325,7 +2325,7 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = to_boolean_jsval(v, &b); + hres = to_boolean(v, &b); jsval_release(v); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 651b49c..f9820bc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -255,8 +255,7 @@ typedef enum { } hint_t; HRESULT to_primitive(script_ctx_t*,jsval_t,jsexcept_t*,jsval_t*, hint_t) DECLSPEC_HIDDEN; -HRESULT to_boolean(VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; -HRESULT to_boolean_jsval(jsval_t,BOOL*) DECLSPEC_HIDDEN; +HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_number_jsval(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3a96a51..b5c3632 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -437,60 +437,32 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, jsval_t *re } /* ECMA-262 3rd Edition 9.2 */ -HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) +HRESULT to_boolean(jsval_t val, BOOL *ret) { - switch(V_VT(v)) { - case VT_EMPTY: - case VT_NULL: - *b = VARIANT_FALSE; - break; - case VT_I4: - *b = V_I4(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_R8: - if(isnan(V_R8(v))) *b = VARIANT_FALSE; - else *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_BSTR: - *b = V_BSTR(v) && *V_BSTR(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_DISPATCH: - *b = V_DISPATCH(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_BOOL: - *b = V_BOOL(v); - break; - default: - FIXME("unimplemented for vt %d\n", V_VT(v)); - return E_NOTIMPL; - } - - return S_OK; -} - -/* ECMA-262 3rd Edition 9.2 */ -HRESULT to_boolean_jsval(jsval_t v, BOOL *ret) -{ - VARIANT_BOOL b; - VARIANT var; - HRESULT hres; - - if(v.type == JSV_BOOL) { - *ret = v.u.b; + switch(val.type) { + case JSV_UNDEFINED: + case JSV_NULL: + *ret = VARIANT_FALSE; + return S_OK; + case JSV_OBJECT: + *ret = get_object(val) != NULL; + return S_OK; + case JSV_STRING: + *ret = get_string(val) && *get_string(val); return S_OK; + case JSV_NUMBER: + *ret = !isnan(get_number(val)) && get_number(val); + return S_OK; + case JSV_BOOL: + *ret = get_bool(val); + return S_OK; + case JSV_VARIANT: + FIXME("unimplemented for variant %s\n", debugstr_variant(get_variant(val))); + return E_NOTIMPL; } - hres = jsval_to_variant(v, &var); - if(FAILED(hres)) - return hres; - - hres = to_boolean(&var, &b); - VariantClear(&var); - if(FAILED(hres)) - return hres; - - *ret = !!b; - return S_OK; + assert(0); + return E_FAIL; } static int hex_to_int(WCHAR c) @@ -986,11 +958,17 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY break; } case VT_BOOL: { - VARIANT_BOOL b; + jsval_t val; + BOOL b; + + hres = variant_to_jsval(src, &val); + if(FAILED(hres)) + return hres; - hres = to_boolean(src, &b); + hres = to_boolean(val, &b); + jsval_release(val); if(SUCCEEDED(hres)) - V_BOOL(dst) = b; + V_BOOL(dst) = b ? VARIANT_TRUE : VARIANT_FALSE; break; } case VT_BSTR: {

1 0

Jacek Caban : jscript: Always use jsval-based to_number implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 0bab034faceead6fafacf643ca5e908744d46df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bab034faceead6fafacf643c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:20 2012 +0200 jscript: Always use jsval-based to_number implementation. --- dlls/jscript/array.c | 8 ++-- dlls/jscript/date.c | 84 +++++++++++++++++----------------- dlls/jscript/engine.c | 20 ++++---- dlls/jscript/error.c | 2 +- dlls/jscript/global.c | 4 +- dlls/jscript/jscript.h | 4 +- dlls/jscript/jsutils.c | 118 ++++++++++++++++------------------------------- dlls/jscript/math.c | 42 +++++++++--------- dlls/jscript/number.c | 4 +- dlls/jscript/regexp.c | 2 +- 10 files changed, 124 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bab034faceead6fafacf…

1 0

Piotr Caban : msvcp71: Don't forward _Getcat functions to msvcp80.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 08eab0ed229ded05aba8175433887ffe1b4f52b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eab0ed229ded05aba817543… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:26:03 2012 +0200 msvcp71: Don't forward _Getcat functions to msvcp80. --- dlls/msvcp71/locale.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 48 +++++++++++++------------- 2 files changed, 109 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08eab0ed229ded05aba81…

1 0

Piotr Caban : msvcp71: Updated spec file.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: e0936feebd40437214ee20afbd94c9ab6bed3b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0936feebd40437214ee20afb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:27:32 2012 +0200 msvcp71: Updated spec file. --- dlls/msvcp71/msvcp71.spec | 7630 ++++++++++++++++++++++---------------------- 1 files changed, 3815 insertions(+), 3815 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0936feebd40437214ee2…

1 0

Piotr Caban : msvcp71: Removed unused functions.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 06d5c487c7e8fcf0fff64e3f1fde50ce49da4216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d5c487c7e8fcf0fff64e3f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:27:48 2012 +0200 msvcp71: Removed unused functions. --- dlls/msvcp71/cxx.h | 2 - dlls/msvcp71/exception.c | 24 +-- dlls/msvcp71/ios.c | 547 ++-------------------------------------------- dlls/msvcp71/locale.c | 450 ++++---------------------------------- dlls/msvcp71/memory.c | 248 +-------------------- dlls/msvcp71/misc.c | 49 +---- dlls/msvcp71/msvcp.h | 12 +- dlls/msvcp71/msvcp71.c | 16 -- dlls/msvcp71/string.c | 417 +---------------------------------- 9 files changed, 103 insertions(+), 1662 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06d5c487c7e8fcf0fff64…

1 0

Alexandre Julliard : ddraw/tests: Fix clip region tests for older ddraw too .
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 8ab2ed64fd28b357bba355fb3b7c7e3f52a4b34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab2ed64fd28b357bba355fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 12:10:55 2012 +0200 ddraw/tests: Fix clip region tests for older ddraw too. --- dlls/ddraw/tests/ddraw1.c | 11 ++--------- dlls/ddraw/tests/ddraw2.c | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb8b0be..2a84dc1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -536,7 +536,7 @@ static void test_coop_level_create_device_window(void) static void test_clipper_blt(void) { IDirectDrawSurface *src_surface, *dst_surface; - RECT client_rect, src_rect, *rect; + RECT client_rect, src_rect; IDirectDrawClipper *clipper; DDSURFACEDESC surface_desc; unsigned int i, j, x, y; @@ -602,19 +602,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to get clip list, hr %#x.\n", hr); ok(rgn_data->rdh.dwSize == sizeof(rgn_data->rdh), "Got unexpected structure size %#x.\n", rgn_data->rdh.dwSize); ok(rgn_data->rdh.iType == RDH_RECTANGLES, "Got unexpected type %#x.\n", rgn_data->rdh.iType); - ok(rgn_data->rdh.nCount == 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); - ok(rgn_data->rdh.nRgnSize == 16 || broken(rgn_data->rdh.nRgnSize == 168 /* NT4 */), - "Got unexpected region size %u.\n", rgn_data->rdh.nRgnSize); + ok(rgn_data->rdh.nCount >= 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); ok(EqualRect(&rgn_data->rdh.rcBound, &client_rect), "Got unexpected bounding rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", rgn_data->rdh.rcBound.left, rgn_data->rdh.rcBound.top, rgn_data->rdh.rcBound.right, rgn_data->rdh.rcBound.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); - rect = (RECT *)&rgn_data->Buffer[0]; - ok(EqualRect(rect, &client_rect), - "Got unexpected clip rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - rect->left, rect->top, rect->right, rect->bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); HeapFree(GetProcessHeap(), 0, rgn_data); r1 = CreateRectRgn(0, 0, 320, 240); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c6641ae..6426576 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -478,7 +478,7 @@ static void test_coop_level_create_device_window(void) static void test_clipper_blt(void) { IDirectDrawSurface *src_surface, *dst_surface; - RECT client_rect, src_rect, *rect; + RECT client_rect, src_rect; IDirectDrawClipper *clipper; DDSURFACEDESC surface_desc; unsigned int i, j, x, y; @@ -544,19 +544,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to get clip list, hr %#x.\n", hr); ok(rgn_data->rdh.dwSize == sizeof(rgn_data->rdh), "Got unexpected structure size %#x.\n", rgn_data->rdh.dwSize); ok(rgn_data->rdh.iType == RDH_RECTANGLES, "Got unexpected type %#x.\n", rgn_data->rdh.iType); - ok(rgn_data->rdh.nCount == 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); - ok(rgn_data->rdh.nRgnSize == 16 || broken(rgn_data->rdh.nRgnSize == 168 /* NT4 */), - "Got unexpected region size %u.\n", rgn_data->rdh.nRgnSize); + ok(rgn_data->rdh.nCount >= 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); ok(EqualRect(&rgn_data->rdh.rcBound, &client_rect), "Got unexpected bounding rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", rgn_data->rdh.rcBound.left, rgn_data->rdh.rcBound.top, rgn_data->rdh.rcBound.right, rgn_data->rdh.rcBound.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); - rect = (RECT *)&rgn_data->Buffer[0]; - ok(EqualRect(rect, &client_rect), - "Got unexpected clip rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - rect->left, rect->top, rect->right, rect->bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); HeapFree(GetProcessHeap(), 0, rgn_data); r1 = CreateRectRgn(0, 0, 320, 240);

1 0

Alistair Leslie-Hughes : oledb32: Register typelib.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 65a15809d57fd18a9283545f5b5652b07c479b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a15809d57fd18a9283545f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 17 13:58:17 2012 +1000 oledb32: Register typelib. --- dlls/oledb32/Makefile.in | 2 ++ dlls/oledb32/oledb32_typelib.idl | 20 ++++++++++++++++++++ include/msdasc.idl | 2 +- 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index c5c11e4..5c66a2c 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -10,4 +10,6 @@ IDL_I_SRCS = convert.idl IDL_R_SRCS = oledb32_classes.idl +IDL_TLB_SRCS = oledb32_typelib.idl + @MAKE_DLL_RULES@ diff --git a/dlls/oledb32/oledb32_typelib.idl b/dlls/oledb32/oledb32_typelib.idl new file mode 100644 index 0000000..e47ab8e --- /dev/null +++ b/dlls/oledb32/oledb32_typelib.idl @@ -0,0 +1,20 @@ +/* + * Typelib Classes for oledb32 + * + * Copyright 2012 Alistair Leslie-Hughes + * + * 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 + */ +#include "msdasc.idl" diff --git a/include/msdasc.idl b/include/msdasc.idl index 1033516..ca879e8 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -64,7 +64,7 @@ library MSDASC [ uuid(2206CDB0-19C1-11D1-89E0-00C04FD7A829), progid("MSDASC.MSDAINITIALIZE.1"), - vi_progid("MSDASC.MSDAINITIALIZE.1"), + vi_progid("MSDASC.MSDAINITIALIZE"), ] coclass MSDAINITIALIZE {

1 0

André Hentschel : vcomp90: Add new stub dll.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: a6086e1161aa12c17fa880f83c4120f6dccc4c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6086e1161aa12c17fa880f83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 16 17:10:20 2012 +0200 vcomp90: Add new stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp100/vcomp100.spec | 6 +- dlls/vcomp90/Makefile.in | 6 ++ dlls/vcomp90/main.c | 48 ++++++++++++++++++ dlls/vcomp90/vcomp90.spec | 112 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 172 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d9157fa..87f93f9 100755 --- a/configure +++ b/configure @@ -15731,6 +15731,7 @@ 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 vcomp100 enable_vcomp100 +wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 2c9e582..8a69570 100644 --- a/configure.ac +++ b/configure.ac @@ -3004,6 +3004,7 @@ WINE_CONFIG_DLL(vbscript) WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vcomp100) +WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index cd5a964..d888577 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -85,7 +85,7 @@ @ stub _vcomp_reduction_u8 @ stub _vcomp_sections_init @ stub _vcomp_sections_next -@ stub _vcomp_set_num_threads +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ stub _vcomp_single_begin @ stub _vcomp_single_end @ stub omp_destroy_lock @@ -93,11 +93,11 @@ @ stub omp_get_dynamic @ stub omp_get_max_threads @ stub omp_get_nested -@ stub omp_get_num_procs +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs @ stub omp_get_num_threads @ stub omp_get_thread_num @ stub omp_get_wtick -@ stub omp_get_wtime +@ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock diff --git a/dlls/vcomp90/Makefile.in b/dlls/vcomp90/Makefile.in new file mode 100644 index 0000000..48dafbd --- /dev/null +++ b/dlls/vcomp90/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp90.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/vcomp90/main.c b/dlls/vcomp90/main.c new file mode 100644 index 0000000..4c2d864 --- /dev/null +++ b/dlls/vcomp90/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp90 implementation + * + * Copyright 2012 André Hentschel + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp90); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec new file mode 100644 index 0000000..d888577 --- /dev/null +++ b/dlls/vcomp90/vcomp90.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index a39889f..301345c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -109,6 +109,7 @@ my @dll_groups = [ "vcomp", "vcomp100", + "vcomp90", ], [ "atl",

1 0