wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Hans Leidekker : msi: Initialize assembly caches before disabling redirection.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: a70ece68b7fa98e55e62eaed1006ceea961666ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a70ece68b7fa98e55e62eaed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 15 10:32:30 2019 +0100 msi: Initialize assembly caches before disabling redirection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46638 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 13 ++++++------- dlls/msi/assembly.c | 5 +++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9407d36..d959605 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -995,13 +995,6 @@ UINT msi_load_all_components( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; - if (!msi_init_assembly_caches( package )) - { - ERR("can't initialize assembly caches\n"); - msiobj_release( &view->hdr ); - return ERROR_FUNCTION_FAILED; - } - r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); return r; @@ -8094,6 +8087,12 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) TRACE("Performing action (%s)\n", debugstr_w(action)); + if (!msi_init_assembly_caches( package )) + { + ERR("can't initialize assembly caches\n"); + return ERROR_FUNCTION_FAILED; + } + package->action_progress_increment = 0; rc = ACTION_HandleStandardAction(package, action); diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index f46ff02..cb40611 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, D static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; +static BOOL assembly_caches_initialized; static BOOL init_function_pointers( void ) { @@ -91,12 +92,16 @@ static BOOL init_function_pointers( void ) BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { + if (assembly_caches_initialized) return TRUE; if (!init_function_pointers()) return FALSE; + if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); + + assembly_caches_initialized = TRUE; return TRUE; }

1 0

Jacek Caban : mshtml: Suport load event in HTMLXMLHttpRequest object.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: a5c79dc8a908f0bbab9ce6107f270ac332df2f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5c79dc8a908f0bbab9ce610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 15 14:30:04 2019 +0100 mshtml: Suport load event in HTMLXMLHttpRequest object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 1 + dlls/mshtml/tests/xhr.js | 9 +++- dlls/mshtml/xmlhttprequest.c | 111 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 106 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2e13f9b..c0ddc81 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3463,6 +3463,7 @@ static void run_js_tests(void) init_protocol_handler(); + run_script_as_http_with_mode("xhr.js", NULL, "9"); run_script_as_http_with_mode("xhr.js", NULL, "11"); run_script_as_http_with_mode("elements.js", NULL, "11"); run_script_as_http_with_mode("es5.js", NULL, "11"); diff --git a/dlls/mshtml/tests/xhr.js b/dlls/mshtml/tests/xhr.js index fb198c1..8c42816 100644 --- a/dlls/mshtml/tests/xhr.js +++ b/dlls/mshtml/tests/xhr.js @@ -18,14 +18,21 @@ function test_xhr() { var xhr = new XMLHttpRequest(); + var complete_cnt = 0; xhr.onreadystatechange = function() { if(xhr.readyState != 4) return; ok(xhr.responseText === "Testing...", "unexpected responseText " + xhr.responseText); - next_test(); + if(complete_cnt++) + next_test(); } + var onload_func = xhr.onload = function() { + if(complete_cnt++) + next_test(); + }; + ok(xhr.onload === onload_func, "xhr.onload != onload_func"); xhr.open("POST", "echo.php", true); xhr.setRequestHeader("X-Test", "True"); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 5164570..e235bf9 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD MSHTML_DISPID_CUSTOM_MIN + static HRESULT bstr_to_nsacstr(BSTR bstr, nsACString *str) { char *cstr = heap_strdupWtoU(bstr); @@ -96,6 +98,8 @@ typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; LONG ref; HTMLXMLHttpRequest *xhr; + BOOL readystatechange_event; + BOOL load_event; } XMLHttpReqEventListener; struct HTMLXMLHttpRequest { @@ -113,15 +117,27 @@ static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) nsAString str; nsresult nsres; + static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR readystatechangeW[] = {'o','n','r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; nsres = nsIXMLHttpRequest_QueryInterface(event_listener->xhr->nsxhr, &IID_nsIDOMEventTarget, (void**)&event_target); assert(nsres == NS_OK); - nsAString_InitDepend(&str, readystatechangeW); - nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); - nsAString_Finish(&str); + if(event_listener->readystatechange_event) { + nsAString_InitDepend(&str, readystatechangeW); + nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); + nsAString_Finish(&str); + assert(nsres == NS_OK); + } + + if(event_listener->load_event) { + nsAString_InitDepend(&str, loadW); + nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); + nsAString_Finish(&str); + assert(nsres == NS_OK); + } + nsIDOMEventTarget_Release(event_target); event_listener->xhr->event_listener = NULL; @@ -738,6 +754,49 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); } +static HRESULT HTMLXMLHttpRequest_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) +{ + static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; + + /* onload event handler property is supported, but not exposed by any interface. We implement as a custom property. */ + if(!strcmpW(onloadW, name)) { + *dispid = MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD; + return S_OK; + } + + return DISP_E_UNKNOWNNAME; +} + +static HRESULT HTMLXMLHttpRequest_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); + + if(id == MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD) { + switch(flags) { + case DISPATCH_PROPERTYGET: + TRACE("(%p) get onload\n", This); + return get_event_handler(&This->event_target, EVENTID_LOAD, res); + + case DISPATCH_PROPERTYPUT: + if(params->cArgs != 1 || (params->cNamedArgs == 1 && *params->rgdispidNamedArgs != DISPID_PROPERTYPUT) + || params->cNamedArgs > 1) { + FIXME("invalid args\n"); + return E_INVALIDARG; + } + + TRACE("(%p)->(%p) set onload\n", This, params->rgvarg); + return set_event_handler(&This->event_target, EVENTID_LOAD, params->rgvarg); + + default: + FIXME("Unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + } + + return DISP_E_UNKNOWNNAME; +} + static nsISupports *HTMLXMLHttpRequest_get_gecko_target(DispatchEx *dispex) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); @@ -748,37 +807,61 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); nsIDOMEventTarget *nstarget; + const WCHAR *type_name; nsAString type_str; nsresult nsres; static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; + static const WCHAR loadW[] = {'l','o','a','d',0}; TRACE("(%p)\n", This); - if(eid != EVENTID_READYSTATECHANGE || This->event_listener) + switch(eid) { + case EVENTID_READYSTATECHANGE: + type_name = readystatechangeW; + break; + case EVENTID_LOAD: + type_name = loadW; + break; + default: return; + } - This->event_listener = heap_alloc(sizeof(*This->event_listener)); - if(!This->event_listener) - return; + if(!This->event_listener) { + This->event_listener = heap_alloc(sizeof(*This->event_listener)); + if(!This->event_listener) + return; - This->event_listener->nsIDOMEventListener_iface.lpVtbl = &XMLHttpReqEventListenerVtbl; - This->event_listener->ref = 1; - This->event_listener->xhr = This; + This->event_listener->nsIDOMEventListener_iface.lpVtbl = &XMLHttpReqEventListenerVtbl; + This->event_listener->ref = 1; + This->event_listener->xhr = This; + This->event_listener->readystatechange_event = FALSE; + This->event_listener->load_event = FALSE; + } nsres = nsIXMLHttpRequest_QueryInterface(This->nsxhr, &IID_nsIDOMEventTarget, (void**)&nstarget); assert(nsres == NS_OK); - nsAString_InitDepend(&type_str, readystatechangeW); + nsAString_InitDepend(&type_str, type_name); nsres = nsIDOMEventTarget_AddEventListener(nstarget, &type_str, &This->event_listener->nsIDOMEventListener_iface, FALSE, TRUE, 2); nsAString_Finish(&type_str); - nsIDOMEventTarget_Release(nstarget); if(NS_FAILED(nsres)) - ERR("AddEventListener failed: %08x\n", nsres); + ERR("AddEventListener(%s) failed: %08x\n", debugstr_w(type_name), nsres); + + nsIDOMEventTarget_Release(nstarget); + + if(eid == EVENTID_READYSTATECHANGE) + This->event_listener->readystatechange_event = TRUE; + else + This->event_listener->load_event = TRUE; } static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { - {NULL}, + { + NULL, + HTMLXMLHttpRequest_get_dispid, + HTMLXMLHttpRequest_invoke + }, HTMLXMLHttpRequest_get_gecko_target, HTMLXMLHttpRequest_bind_event };

1 0

Brendan McGrath : vbscript: Allow more keywords to be used as identifiers.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: d2937bfff2d59e3b5d41baa173e9c634b0a12a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2937bfff2d59e3b5d41baa1… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Fri Feb 15 14:06:15 2019 +0100 vbscript: Allow more keywords to be used as identifiers. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 9 +++++---- dlls/vbscript/parser.y | 21 ++++++++++++--------- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 571854d..fa467f0 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -156,7 +156,7 @@ static inline BOOL is_identifier_char(WCHAR c) return isalnumW(c) || c == '_'; } -static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) +static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval) { const WCHAR *p1 = ctx->ptr; const WCHAR *p2 = word; @@ -174,17 +174,18 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) return 1; ctx->ptr = p1; + *lval = word; return 0; } -static int check_keywords(parser_ctx_t *ctx) +static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) { int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; - r = check_keyword(ctx, keywords[i].word); + r = check_keyword(ctx, keywords[i].word, lval); if(!r) return keywords[i].token; @@ -412,7 +413,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return parse_numeric_literal(ctx, lval); if(isalphaW(c)) { - int ret = check_keywords(ctx); + int ret = check_keywords(ctx, lval); if(!ret) return parse_identifier(ctx, lval); if(ret != tREM) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0201099..b81d791 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -71,8 +71,6 @@ static class_decl_t *add_dim_prop(parser_ctx_t*,class_decl_t*,dim_decl_t*,unsign static statement_t *link_statements(statement_t*,statement_t*); -static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; - #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -108,17 +106,18 @@ static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD -%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET tCONST +%token tCALL tDIM tSUB tFUNCTION tGET tLET tCONST %token tIF tELSE tELSEIF tEND tTHEN tEXIT -%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tSTEP tEACH tIN +%token tWHILE tWEND tDO tLOOP tUNTIL tFOR tTO tEACH tIN %token tSELECT tCASE %token tBYREF tBYVAL -%token tOPTION tEXPLICIT +%token tOPTION %token tSTOP %token tNOTHING tEMPTY tNULL -%token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME -%token tERROR tNEXT tON tRESUME tGOTO +%token tCLASS tSET tNEW tPUBLIC tPRIVATE tME +%token tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString +%token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP %token <lng> tLong tShort %token <dbl> tDouble @@ -443,10 +442,14 @@ ArgumentDecl | tBYREF Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, TRUE); } | tBYVAL Identifier EmptyBrackets_opt { $$ = new_argument_decl(ctx, $2, FALSE); } -/* 'property' may be both keyword and identifier, depending on context */ +/* these keywords may also be an identifier, depending on context */ Identifier : tIdentifier { $$ = $1; } - | tPROPERTY { $$ = propertyW; } + | tDEFAULT { $$ = $1; } + | tERROR { $$ = $1; } + | tEXPLICIT { $$ = $1; } + | tPROPERTY { $$ = $1; } + | tSTEP { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2af77bd..15ad84a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1345,4 +1345,24 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +sub test_identifiers + ' test keywords that can also be a declared identifier + Dim default + default = "xx" + Call ok(default = "xx", "default = " & default & " expected ""xx""") + + Dim error + error = "xx" + Call ok(error = "xx", "error = " & error & " expected ""xx""") + + Dim explicit + explicit = "xx" + Call ok(explicit = "xx", "explicit = " & explicit & " expected ""xx""") + + Dim step + step = "xx" + Call ok(step = "xx", "step = " & step & " expected ""xx""") +end sub +call test_identifiers() + reportSuccess()

1 0

Piotr Caban : msvcrt: Change __getmainargs signature.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 35e570eb0949742a00e691a2149a347756e139c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35e570eb0949742a00e691a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 12:25:14 2019 +0100 msvcrt: Change __getmainargs signature. It was changed in newer versions of msvcrt/msvcrXX dlls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index c781503..82ad47b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -444,7 +444,7 @@ static int build_expanded_argv(int *argc, char **argv) /********************************************************************* * __getmainargs (MSVCRT.@) */ -void CDECL __getmainargs(int *argc, char** *argv, char** *envp, +int CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, argv, envp, expand_wildcards, new_mode); @@ -475,6 +475,7 @@ void CDECL __getmainargs(int *argc, char** *argv, char** *envp, if (new_mode) MSVCRT__set_new_mode( *new_mode ); + return 0; } static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) @@ -542,7 +543,7 @@ static int build_expanded_wargv(int *argc, MSVCRT_wchar_t **argv) /********************************************************************* * __wgetmainargs (MSVCRT.@) */ -void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, +int CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** *wenvp, int expand_wildcards, int *new_mode) { TRACE("(%p,%p,%p,%d,%p).\n", argc, wargv, wenvp, expand_wildcards, new_mode); @@ -575,6 +576,7 @@ void CDECL __wgetmainargs(int *argc, MSVCRT_wchar_t** *wargv, MSVCRT_wchar_t** * *wenvp = MSVCRT___winitenv; if (new_mode) MSVCRT__set_new_mode( *new_mode ); + return 0; } /*********************************************************************

1 0

Nikolay Sivov : msvcrt: Add _ismbcl2().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: cebb94702761914ee169b3c421f3d744d09ae567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cebb94702761914ee169b3c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 15 12:24:57 2019 +0100 msvcrt: Add _ismbcl2(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index eefa573..aa817bf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -990,7 +990,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a6ed5c1..1b85830 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1336,7 +1336,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 441c0be..769ee50 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1341,7 +1341,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 629dce9..1a68a65 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -383,7 +383,7 @@ @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) @ cdecl _ismbcl1(long) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f0009be..f4c0e6d 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -378,7 +378,7 @@ @ cdecl _ismbckata(long) @ cdecl _ismbcl0(long) @ cdecl _ismbcl1(long) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbclegal(long) @ cdecl _ismbclower(long) @ cdecl _ismbcprint(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 43c3e46..8295a71 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -662,7 +662,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9bf0a2..9e97770 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -640,7 +640,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ca6dca3..9b22adc 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2629,3 +2629,11 @@ int CDECL _ismbcl2_l(unsigned int c, MSVCRT__locale_t locale) return 0; } + +/********************************************************************* + * _ismbcl2 (MSVCRT.@) + */ +int CDECL _ismbcl2(unsigned int c) +{ + return _ismbcl2_l(c, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 42de9ce..c2c272b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -611,7 +611,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 53fbfd3..eb8e304 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3278,6 +3278,9 @@ static void test__ismbclx(void) ret = _ismbcl1(0); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0); + ok(!ret, "got %d\n", ret); + cp = _setmbcp(1252); ret = _ismbcl0(0x8140); @@ -3286,6 +3289,9 @@ static void test__ismbclx(void) ret = _ismbcl1(0x889f); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0x989f); + ok(!ret, "got %d\n", ret); + _setmbcp(932); ret = _ismbcl0(0); @@ -3306,6 +3312,15 @@ static void test__ismbclx(void) ret = _ismbcl1(0x88fd); ok(!ret, "got %d\n", ret); + ret = _ismbcl2(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl2(0x989f); + ok(ret, "got %d\n", ret); + + ret = _ismbcl2(0x993f); + ok(!ret, "got %d\n", ret); + _setmbcp(cp); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e1315ec..eb08843 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -480,7 +480,7 @@ @ cdecl _ismbcl0_l(long ptr) @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) -@ stub _ismbcl2(long) +@ cdecl _ismbcl2(long) @ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr)

1 0

Nikolay Sivov : msvcrt: Add _ismbcl2_l().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: c166dfec00419c13b29684d0e77d993e0a586c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c166dfec00419c13b29684d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 15 12:24:48 2019 +0100 msvcrt: Add _ismbcl2_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 21 +++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 270e2c2..3f60bb4 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -43,7 +43,7 @@ @ cdecl _ismbcl1(long) ucrtbase._ismbcl1 @ cdecl _ismbcl1_l(long ptr) ucrtbase._ismbcl1_l @ cdecl _ismbcl2(long) ucrtbase._ismbcl2 -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) ucrtbase._ismbcl2_l @ cdecl _ismbclegal(long) ucrtbase._ismbclegal @ cdecl _ismbclegal_l(long ptr) ucrtbase._ismbclegal_l @ cdecl _ismbclower(long) ucrtbase._ismbclower diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 202042d..eefa573 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -991,7 +991,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1f4bfe3..a6ed5c1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1337,7 +1337,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7e03eb1..441c0be 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1342,7 +1342,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7dc4ea8..43c3e46 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -663,7 +663,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 16a2473..a9bf0a2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -641,7 +641,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c8ee84d..ca6dca3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2608,3 +2608,24 @@ int CDECL _ismbcl1(unsigned int c) { return _ismbcl1_l(c, NULL); } + +/********************************************************************* + * _ismbcl2_l (MSVCRT.@) + */ +int CDECL _ismbcl2_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(mbcinfo->mbcodepage == 932) + { + /* JIS level-2 */ + return _ismbclegal_l(c, locale) && c >= 0x989f && c <= 0xeaa4; + } + + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1f9ad64..42de9ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -612,7 +612,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -# stub _ismbcl2_l(long ptr) +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index db894a0..e1315ec 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -481,7 +481,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long)

1 0

Piotr Caban : msvcrt: Use correct locale when validating character in _ismbcl0_l and _ismbcl1_l.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 7d383d573da3b29614e1adc343f34d762176e42e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d383d573da3b29614e1adc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 12:24:37 2019 +0100 msvcrt: Use correct locale when validating character in _ismbcl0_l and _ismbcl1_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 909ea46..c8ee84d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2566,7 +2566,7 @@ int CDECL _ismbcl0_l(unsigned int c, MSVCRT__locale_t locale) if(mbcinfo->mbcodepage == 932) { /* JIS non-Kanji */ - return _ismbclegal(c) && c >= 0x8140 && c <= 0x889e; + return _ismbclegal_l(c, locale) && c >= 0x8140 && c <= 0x889e; } return 0; @@ -2595,7 +2595,7 @@ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) if(mbcinfo->mbcodepage == 932) { /* JIS level-1 */ - return _ismbclegal(c) && c >= 0x889f && c <= 0x9872; + return _ismbclegal_l(c, locale) && c >= 0x889f && c <= 0x9872; } return 0;

1 0

Piotr Caban : msvcrt: Use mbtowc/wctomb for string conversion in printf.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: a808235e459e3cbd4b6a1f7d9392b7c50b3a3478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a808235e459e3cbd4b6a1f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 14 18:27:59 2019 +0100 msvcrt: Use mbtowc/wctomb for string conversion in printf. This changes printf behaviour for C locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/printf.h | 97 +++++++++++++++++++++++++++++----------------- dlls/msvcrt/tests/printf.c | 12 ++++++ 3 files changed, 75 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a808235e459e3cbd4b6a…

1 0

Jactry Zeng : propsys: Implement PropVariantToDouble().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 3fc1180623b9a0c9fc9e16abf358b179f2eff49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc1180623b9a0c9fc9e16ab… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:33:14 2019 +0800 propsys: Implement PropVariantToDouble(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 18 ++++++++++++++ dlls/propsys/tests/propsys.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 19c5a24..9193f36 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -112,7 +112,7 @@ @ stub PropVariantToBooleanVectorAlloc @ stub PropVariantToBooleanWithDefault @ stub PropVariantToBuffer -@ stub PropVariantToDouble +@ stdcall PropVariantToDouble(ptr ptr) @ stub PropVariantToDoubleVector @ stub PropVariantToDoubleVectorAlloc @ stub PropVariantToDoubleWithDefault diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index ae96e4e..0edf462 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -129,6 +129,12 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, src_signed = *res < 0; break; } + case VT_R8: + { + src_signed = TRUE; + *res = pv->u.dblVal; + break; + } default: FIXME("unhandled vt %d\n", pv->vt); return E_NOTIMPL; @@ -155,6 +161,18 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, return S_OK; } +HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret) +{ + LONGLONG res; + HRESULT hr; + + TRACE("(%p, %p)\n", propvarIn, ret); + + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); + if (SUCCEEDED(hr)) *ret = (double)res; + return hr; +} + HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) { LONGLONG res; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 34c51b3..a9c0a77 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1248,6 +1248,62 @@ static void test_InitPropVariantFromCLSID(void) PropVariantClear(&propvar); } +static void test_PropVariantToDouble(void) +{ + PROPVARIANT propvar; + double value; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_R8; + propvar.u.dblVal = 15.0; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 15.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I4; + propvar.u.lVal = 123; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 123.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I4; + propvar.u.lVal = -256; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == -256, "Unexpected value: %f\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I8; + propvar.u.lVal = 65536; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 65536.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_I8; + propvar.u.lVal = -321; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 4294966975.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_UI4; + propvar.u.ulVal = 6; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 6.0, "Unexpected value: %f.\n", value); + + PropVariantClear(&propvar); + propvar.vt = VT_UI8; + propvar.u.uhVal.QuadPart = 8; + hr = PropVariantToDouble(&propvar, &value); + ok(hr == S_OK, "PropVariantToDouble failed: 0x%08x.\n", hr); + ok(value == 8.0, "Unexpected value: %f.\n", value); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1263,4 +1319,5 @@ START_TEST(propsys) test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); + test_PropVariantToDouble(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 0285caf..80f081c 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -71,6 +71,7 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); +HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret); HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret); HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret);

1 0

Jactry Zeng : propsys/tests: Add tests of IPropertyStore interface.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 2e2fc55009d1c168a7af41bfc31a6b9a1c9acf99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2fc55009d1c168a7af41bf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:32:38 2019 +0800 propsys/tests: Add tests of IPropertyStore interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 132f5ff..5aeb562 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -302,6 +303,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -309,6 +368,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019