wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Nikolay Sivov : dwrite: Use helper to trace 4 byte tags.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 95a83bc942cee73772a8e74d44931b886d222d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a83bc942cee73772a8e74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:38 2019 +0300 dwrite: Use helper to trace 4 byte tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 15 +++++++-------- dlls/dwrite/dwrite_private.h | 5 +++++ dlls/dwrite/font.c | 5 ----- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c6bcdfa..69e6b11 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -192,8 +192,7 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last const char *debugstr_sa_script(UINT16 script) { - return script < Script_LastId ? debugstr_an((char*)&dwritescripts_properties[script].props.isoScriptCode, 4): - "undefined"; + return script < Script_LastId ? debugstr_tag(dwritescripts_properties[script].props.isoScriptCode) : "undefined"; } /* system font falback configuration */ @@ -1054,7 +1053,7 @@ done: static UINT32 get_opentype_language(const WCHAR *locale) { - UINT32 language = DWRITE_FONT_FEATURE_TAG_DEFAULT; + UINT32 language = DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'); if (locale) { WCHAR tag[5]; @@ -1145,7 +1144,7 @@ static void analyzer_dump_user_features(DWRITE_TYPOGRAPHIC_FEATURES const **feat for (i = 0, start = 0; i < feature_ranges; start += feature_range_lengths[i++]) { TRACE("feature range [%u,%u)\n", start, start + feature_range_lengths[i]); for (j = 0; j < features[i]->featureCount; j++) - TRACE("feature %s, parameter %u\n", debugstr_an((char *)&features[i]->features[j].nameTag, 4), + TRACE("feature %s, parameter %u\n", debugstr_tag(features[i]->features[j].nameTag), features[i]->features[j].parameter); } } @@ -1836,11 +1835,11 @@ static HRESULT WINAPI dwritetextanalyzer2_GetTypographicFeatures(IDWriteTextAnal }; static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAnalyzer2 *iface, - IDWriteFontFace *face, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *localeName, - DWRITE_FONT_FEATURE_TAG feature, UINT32 glyph_count, const UINT16 *indices, UINT8 *feature_applies) + IDWriteFontFace *face, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *locale, DWRITE_FONT_FEATURE_TAG feature, + UINT32 glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) { - FIXME("(%p %u %s %x %u %p %p): stub\n", face, sa.script, debugstr_w(localeName), feature, glyph_count, indices, - feature_applies); + FIXME("(%p %u %s %s %u %p %p): stub\n", face, sa.script, debugstr_w(locale), debugstr_tag(feature), glyph_count, + glyphs, feature_applies); return E_NOTIMPL; } diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a19380a..b8fb250 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -76,6 +76,11 @@ static inline const char *debugstr_matrix(const DWRITE_MATRIX *m) m->dx, m->dy); } +static inline const char *debugstr_tag(DWORD tag) +{ + return debugstr_an((char *)&tag, 4); +} + const char *debugstr_sa_script(UINT16) DECLSPEC_HIDDEN; static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 97b99f9..c657eeb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -320,11 +320,6 @@ static inline struct dwrite_fontfacereference *impl_from_IDWriteFontFaceReferenc return CONTAINING_RECORD(iface, struct dwrite_fontfacereference, IDWriteFontFaceReference_iface); } -static inline const char *debugstr_tag(UINT32 tag) -{ - return debugstr_an((char*)&tag, 4); -} - static HRESULT get_cached_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) { static const DWRITE_GLYPH_METRICS nil;

1 0

Nikolay Sivov : dwrite: Use array for script tags.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 17e9560e361d4077a7a9c38fd4193715126fe3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17e9560e361d4077a7a9c38f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 25 14:56:37 2019 +0300 dwrite: Use array for script tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 293 +++++++++++++++++++++++++------------------------ 1 file changed, 147 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17e9560e361d4077a7a9…

1 0

Jacek Caban : mshtml: Expose IDOMCustomEvent to scripts.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 7c2ec67d1eea4f5c4bcb71320c89eba940b4c42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c2ec67d1eea4f5c4bcb7132… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:29 2019 +0100 mshtml: Expose IDOMCustomEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/tests/events.js | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1403542..c0171c8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2211,6 +2211,18 @@ static dispex_static_data_t DOMKeyboardEvent_dispex = { DOMKeyboardEvent_iface_tids }; +static const tid_t DOMCustomEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMCustomEvent_tid, + 0 +}; + +static dispex_static_data_t DOMCustomEvent_dispex = { + NULL, + DispDOMCustomEvent_tid, + DOMCustomEvent_iface_tids +}; + static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) { nsISupports *iface; @@ -2243,6 +2255,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) custom_event->event.query_interface = DOMCustomEvent_query_interface; custom_event->event.destroy = DOMCustomEvent_destroy; event = &custom_event->event; + dispex_data = &DOMCustomEvent_dispex; }else if(!event) { event = heap_alloc_zero(sizeof(*event)); if(!event) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index dc9ce5a..46077b2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -769,6 +769,20 @@ function test_keyboard_event() { next_test(); } +function test_custom_event() { + var e = document.createEvent("CustomEvent"); + + ok(e.detail === undefined, "detail = " + e.detail); + + e.initCustomEvent("test", true, false, 123); + ok(e.type === "test", "type = " + e.type); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.cancelable === false, "cancelable = " + e.cancelable); + ok(e.detail === 123, "detail = " + e.detail); + + next_test(); +} + function test_error_event() { document.body.innerHTML = '<div><img></img></div>'; var div = document.body.firstChild; @@ -822,6 +836,7 @@ var tests = [ test_ui_event, test_mouse_event, test_keyboard_event, + test_custom_event, test_error_event, test_detached_img_error_event, test_time_stamp,

1 0

Jacek Caban : mshtml: Add IDOMCustomEvent::detail property implementation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 757c3025c1b1acf588f6ea59f845bba59539c0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=757c3025c1b1acf588f6ea59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:16 2019 +0100 mshtml: Add IDOMCustomEvent::detail property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0ec147d..1403542 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2108,8 +2108,11 @@ static HRESULT WINAPI DOMCustomEvent_Invoke(IDOMCustomEvent *iface, DISPID dispI static HRESULT WINAPI DOMCustomEvent_get_detail(IDOMCustomEvent *iface, VARIANT *p) { DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + V_VT(p) = VT_EMPTY; + return VariantCopy(p, &This->detail); } static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BSTR type, VARIANT_BOOL can_bubble,

1 0

Jacek Caban : mshtml: Add IDOMCustomEvent::initCustomEvent implementation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 7e15e494955d632c52dd10264270ea1cd4dbc00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e15e494955d632c52dd1026… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:14:09 2019 +0100 mshtml: Add IDOMCustomEvent::initCustomEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 62ae8d3..0ec147d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2116,8 +2116,15 @@ static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BST VARIANT_BOOL cancelable, VARIANT *detail) { DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); - FIXME("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); + + hres = IDOMEvent_initEvent(&This->event.IDOMEvent_iface, type, can_bubble, cancelable); + if(FAILED(hres)) + return hres; + + return VariantCopy(&This->detail, detail); } static const IDOMCustomEventVtbl DOMCustomEventVtbl = {

1 0

Jacek Caban : rpcrt4/tests: Add context handle marshaling tests.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 78d75e4a22c089f860b593ede17c1a762ecbdc5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78d75e4a22c089f860b593ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:35 2019 +0100 rpcrt4/tests: Add context handle marshaling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 41 ++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 8 ++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5c6b216..4f8f043 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -141,6 +141,9 @@ static void (__cdecl *stop_autolisten)(void); static void (__cdecl *ip_test)(ipu_t *a); static int (__cdecl *sum_ptr_array)(int *a[2]); static int (__cdecl *sum_array_ptr)(int (*a)[2]); +static ctx_handle_t __cdecl (*get_handle)(void); +static void (__cdecl *get_handle_by_ptr)(ctx_handle_t *r); +static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); #define SERVER_FUNCTIONS \ X(int_return) \ @@ -228,7 +231,10 @@ static int (__cdecl *sum_array_ptr)(int (*a)[2]); X(stop_autolisten) \ X(ip_test) \ X(sum_ptr_array) \ - X(sum_array_ptr) + X(sum_array_ptr) \ + X(get_handle) \ + X(get_handle_by_ptr) \ + X(test_handle) /* type check statements generated in header file */ fnprintf *p_printf = printf; @@ -1068,6 +1074,26 @@ int __cdecl s_sum_array_ptr(int (*a)[2]) return (*a)[0] + (*a)[1]; } +ctx_handle_t __cdecl s_get_handle(void) +{ + return (ctx_handle_t)0xdeadbeef; +} + +void __cdecl s_get_handle_by_ptr(ctx_handle_t *r) +{ + *r = (ctx_handle_t)0xdeadbeef; +} + +void __cdecl s_test_handle(ctx_handle_t ctx_handle) +{ + ok(ctx_handle == (ctx_handle_t)0xdeadbeef, "Unexpected ctx_handle %p\n", ctx_handle); +} + +void __RPC_USER ctx_handle_t_rundown(ctx_handle_t ctx_handle) +{ + ok(ctx_handle == (ctx_handle_t)0xdeadbeef, "Unexpected ctx_handle %p\n", ctx_handle); +} + static void make_cmdline(char buffer[MAX_PATH], const char *test) { @@ -1809,6 +1835,18 @@ void __cdecl s_authinfo_test(unsigned int protseq, int secure) } } +static void test_handle_return(void) +{ + ctx_handle_t handle, handle2; + + if (!is_interp) return; /* broken in widl */ + + handle = get_handle(); + test_handle(handle); + get_handle_by_ptr(&handle2); + test_handle(handle2); +} + static void run_tests(void) { @@ -1817,6 +1855,7 @@ run_tests(void) pointer_tests(); array_tests(); context_handle_test(); + test_handle_return(); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 65ba293..143d506 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -446,4 +446,12 @@ cpp_quote("#endif") int sum_ptr_array([in] int *a[2]); int sum_array_ptr([in] int (*a)[2]); + +cpp_quote("#ifndef SKIP_STRUCT_DECLS") + typedef [context_handle] void *ctx_handle_t; +cpp_quote("#endif") + + ctx_handle_t get_handle(); + void get_handle_by_ptr([out] ctx_handle_t *r); + void test_handle(ctx_handle_t ctx_handle); }

1 0

Jacek Caban : rpcrt4: Fix context handle return value unmarshaling.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 464ba54b4cc99e1c1903a189f31845352a9faeba URL: https://source.winehq.org/git/wine.git/?a=commit;h=464ba54b4cc99e1c1903a189… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:23 2019 +0100 rpcrt4: Fix context handle return value unmarshaling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 77bbf98..d71d2fa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7031,10 +7031,15 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( if (pStubMsg->IsClient) { + NDR_CCONTEXT *ccontext; + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + ccontext = *(NDR_CCONTEXT **)ppMemory; + else + ccontext = (NDR_CCONTEXT *)ppMemory; /* [out]-only or [ret] param */ if ((pFormat[1] & (HANDLE_PARAM_IS_IN|HANDLE_PARAM_IS_OUT)) == HANDLE_PARAM_IS_OUT) - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + *ccontext = NULL; + NdrClientContextUnmarshall(pStubMsg, ccontext, pStubMsg->RpcMsg->Handle); } else {

1 0

Jacek Caban : rpcrt4: Fix context handle return value marshaling.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b6c48de699a11097b9557d045c0aa78758d615a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c48de699a11097b9557d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 12:01:16 2019 +0100 rpcrt4: Fix context handle return value marshaling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index c2f260c..813d7e8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1232,6 +1232,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, { NDR_SCONTEXT ctxt = NdrContextHandleInitialize(pStubMsg, pTypeFormat); *(void **)pArg = NDRSContextValue(ctxt); + if (params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)NDRSContextValue(ctxt); } else { @@ -1243,6 +1244,7 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, } } } + if (!retval_ptr && params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)pArg; break; case STUBLESS_UNMARSHAL: if (params[i].attr.ServerAllocSize) @@ -1260,9 +1262,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, RpcRaiseException(RPC_S_INTERNAL_ERROR); } TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg); - - /* make a note of the address of the return value parameter for later */ - if (params[i].attr.IsReturn) retval_ptr = (LONG_PTR *)pArg; } return retval_ptr; }

1 0

Gijs Vermeulen : msvcp: Set target to null on error in _Open_dir.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b51cee00a7bfdfb44d88f500eceb9d1c5fd8193a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51cee00a7bfdfb44d88f500… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jan 25 17:51:41 2019 +0100 msvcp: Set target to null on error in _Open_dir. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 8 ++++---- dlls/msvcp140/tests/msvcp140.c | 8 ++++---- dlls/msvcp90/ios.c | 6 ++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6d72f9f..534c015 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1792,7 +1792,7 @@ static void test_tr2_sys__dir_operation(void) while(lstrlenA(longer_path) < MAX_PATH-1) strcat(longer_path, "s"); ok(lstrlenA(longer_path) == MAX_PATH-1, "tr2_sys__Open_dir(): expect MAX_PATH, got %d\n", lstrlenA(longer_path)); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_tr2_sys__Open_dir(first_file_name, longer_path, &err, &type); @@ -1801,7 +1801,7 @@ static void test_tr2_sys__dir_operation(void) ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect 0xdeadbeef, got %d\n", type); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); memset(dest, 0, MAX_PATH); err = type = 0xdeadbeef; result_handle = NULL; @@ -1832,7 +1832,7 @@ static void test_tr2_sys__dir_operation(void) ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); err = type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); @@ -1842,7 +1842,7 @@ static void test_tr2_sys__dir_operation(void) ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); CreateDirectoryA("empty_dir", NULL); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); err = type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1bae2b9..b2bdafa 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -938,7 +938,7 @@ static void test_dir_operation(void) wcscat(longer_path, backslashW); while(lstrlenW(longer_path) < MAX_PATH-1) wcscat(longer_path, sW); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_Open_dir(first_file_name, longer_path, &err, &type); @@ -947,7 +947,7 @@ static void test_dir_operation(void) ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect 0xdeadbeef, got %d\n", type); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); memset(dest, 0, sizeof(dest)); err = type = 0xdeadbeef; result_handle = NULL; @@ -978,7 +978,7 @@ static void test_dir_operation(void) ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); @@ -988,7 +988,7 @@ static void test_dir_operation(void) ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); CreateDirectoryW(empty_dirW, NULL); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; result_handle = p_Open_dir(first_file_name, empty_dirW, &err, &type); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 32bd2e7..743e4ca 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14976,6 +14976,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); if(wcslen(dest) > MAX_PATH - 3) { *err_code = ERROR_BAD_PATHNAME; + *target = '\0'; return NULL; } wcscpy(temppath, dest); @@ -14984,12 +14985,14 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { *err_code = ERROR_BAD_PATHNAME; + *target = '\0'; return NULL; } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; + *target = '\0'; FindClose(handle); return NULL; } @@ -15023,8 +15026,7 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e handle = tr2_sys__Open_dir_wchar(target_w, dest ? dest_w : NULL, err_code, type); - if (handle) - WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); return handle; }

1 0

Gijs Vermeulen : msvcp: Set correct error code on non-existing path in _Open_dir.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 64aba27f6a99becb61a879d713bae39397920134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64aba27f6a99becb61a879d7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jan 25 17:51:40 2019 +0100 msvcp: Set correct error code on non-existing path in _Open_dir. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- dlls/msvcp90/ios.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index ac38aa6..6d72f9f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1837,7 +1837,7 @@ static void test_tr2_sys__dir_operation(void) result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); - todo_wine ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 229741a..1bae2b9 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -983,7 +983,7 @@ static void test_dir_operation(void) result_handle = file; result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); - todo_wine ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index bf7eea2..32bd2e7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14983,7 +14983,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { - *err_code = GetLastError(); + *err_code = ERROR_BAD_PATHNAME; return NULL; } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) {

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
50
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 January 2019