December 2021 - Wine-Commits

Gabriel Ivăncescu : mshtml: Restructure element getAttribute.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 368199c640f275453389205edd6c7f9ac2d08839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368199c640f275453389205e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:50 2021 +0200 mshtml: Restructure element getAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index aa532098717..24301294144 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1158,6 +1158,9 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr LONG lFlags, VARIANT *AttributeValue) { HTMLElement *This = impl_from_IHTMLElement(iface); + compat_mode_t compat_mode = dispex_compat_mode(&This->node.event_target.dispex); + nsAString name_str, value_str; + nsresult nsres; DISPID dispid; HRESULT hres; @@ -1166,33 +1169,28 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) FIXME("Unsupported flags %x\n", lFlags); - if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { - nsAString name_str, value_str; - nsresult nsres; - - nsAString_InitDepend(&name_str, strAttributeName); - nsAString_InitDepend(&value_str, NULL); - nsres = nsIDOMElement_GetAttribute(This->dom_element, &name_str, &value_str); - nsAString_Finish(&name_str); - return return_nsstr_variant(nsres, &value_str, 0, AttributeValue); - } + if(compat_mode < COMPAT_MODE_IE8 || !This->dom_element) { + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + if(FAILED(hres)) { + V_VT(AttributeValue) = VT_NULL; + return (hres == DISP_E_UNKNOWNNAME) ? S_OK : hres; + } - hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, - lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); - if(hres == DISP_E_UNKNOWNNAME) { - V_VT(AttributeValue) = VT_NULL; - return S_OK; - } + hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); + if(FAILED(hres)) + return hres; - if(FAILED(hres)) { - V_VT(AttributeValue) = VT_NULL; + if(lFlags & ATTRFLAG_ASSTRING) + hres = attr_value_to_string(AttributeValue); return hres; } - hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); - if(SUCCEEDED(hres) && (lFlags & ATTRFLAG_ASSTRING)) - hres = attr_value_to_string(AttributeValue); - return hres; + nsAString_InitDepend(&name_str, strAttributeName); + nsAString_InitDepend(&value_str, NULL); + nsres = nsIDOMElement_GetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + return return_nsstr_variant(nsres, &value_str, 0, AttributeValue); } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName,

1 0

Eric Pouech : winedbg: Don't repeat last command (from empty input) when parsing a file.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 44f49d75ec27ba6109d62e090f2c27e45a70e6e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f49d75ec27ba6109d62e09… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:11 2021 +0100 winedbg: Don't repeat last command (from empty input) when parsing a file. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index b58875b6c31..612e6a4106d 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -524,10 +524,9 @@ size_t input_lex_read_buffer(char* buf, int size) len--; } - /* FIXME: should have a pair of buffers, and switch between the two, instead of - * reallocating a new one for each line - */ - if (dbg_parser.last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) + /* recall last command when empty input buffer and not parsing a file */ + if (dbg_parser.last_line && (len == 0 || (len == 1 && tmp[0] == '\n')) && + dbg_parser.output != INVALID_HANDLE_VALUE) { HeapFree(GetProcessHeap(), 0, tmp); }

1 0

Eric Pouech : winedbg: Fixed missing test.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 8dec81fb6f6e0e251b38d3514a6885886a96270a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dec81fb6f6e0e251b38d351… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:41 2021 +0100 winedbg: Fixed missing test. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 0ee6ab05f0f..ebee3449a37 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -757,6 +757,7 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v DWORD ret, tag, bt; ret = SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, ti, pInfo); if (!ret && + ti == TI_GET_SYMNAME && SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_SYMTAG, &tag) && tag == SymTagBaseType && SymGetTypeInfo(dbg_curr_process->handle, type->module, type->id, TI_GET_BASETYPE, &bt))

1 0

Gabriel Ivăncescu : mshtml: Restructure element removeAttribute.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: d224a2a88127fe5bf6737cafd7af0eff40d1a6c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d224a2a88127fe5bf6737caf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:51 2021 +0200 mshtml: Restructure element removeAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 55 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 24301294144..bc2a28fe334 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1197,46 +1197,47 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA LONG lFlags, VARIANT_BOOL *pfSuccess) { HTMLElement *This = impl_from_IHTMLElement(iface); + compat_mode_t compat_mode = dispex_compat_mode(&This->node.event_target.dispex); DISPID id; HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); - if(dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { - *pfSuccess = element_has_attribute(This, strAttributeName); - if(*pfSuccess) - return element_remove_attribute(This, strAttributeName); - return S_OK; - } + if(compat_mode < COMPAT_MODE_IE8 || !This->dom_element) { + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + if(hres == DISP_E_UNKNOWNNAME) { + *pfSuccess = VARIANT_FALSE; + return S_OK; + } + if(FAILED(hres)) + return hres; - hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, - lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); - if(hres == DISP_E_UNKNOWNNAME) { - *pfSuccess = VARIANT_FALSE; - return S_OK; - } - if(FAILED(hres)) - return hres; + if(id == DISPID_IHTMLELEMENT_STYLE) { + IHTMLStyle *style; - if(id == DISPID_IHTMLELEMENT_STYLE) { - IHTMLStyle *style; + TRACE("Special case: style\n"); - TRACE("Special case: style\n"); + hres = IHTMLElement_get_style(&This->IHTMLElement_iface, &style); + if(FAILED(hres)) + return hres; - hres = IHTMLElement_get_style(&This->IHTMLElement_iface, &style); - if(FAILED(hres)) - return hres; + hres = IHTMLStyle_put_cssText(style, NULL); + IHTMLStyle_Release(style); + if(FAILED(hres)) + return hres; - hres = IHTMLStyle_put_cssText(style, NULL); - IHTMLStyle_Release(style); - if(FAILED(hres)) - return hres; + *pfSuccess = VARIANT_TRUE; + return S_OK; + } - *pfSuccess = VARIANT_TRUE; - return S_OK; + return remove_attribute(&This->node.event_target.dispex, id, pfSuccess); } - return remove_attribute(&This->node.event_target.dispex, id, pfSuccess); + *pfSuccess = element_has_attribute(This, strAttributeName); + if(*pfSuccess) + return element_remove_attribute(This, strAttributeName); + return S_OK; } static HRESULT WINAPI HTMLElement_put_className(IHTMLElement *iface, BSTR v)

1 0

Eric Pouech : winedbg: Move lex buffers inside struct parser_context.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 956a978801e1403f4944d779c183230900fa89c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=956a978801e1403f4944d779… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:05 2021 +0100 winedbg: Move lex buffers inside struct parser_context. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ace29039753..b58875b6c31 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -458,9 +458,11 @@ struct parser_context HANDLE input; HANDLE output; unsigned line_no; + char* last_line; + size_t last_line_idx; }; -static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0}; +static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0, NULL, 0}; static int input_fetch_entire_line(const char* pfx, char** line) { @@ -504,11 +506,9 @@ static int input_fetch_entire_line(const char* pfx, char** line) size_t input_lex_read_buffer(char* buf, int size) { int len; - static char* last_line = NULL; - static size_t last_line_idx = 0; /* try first to fetch the remaining of an existing line */ - if (last_line_idx == 0) + if (dbg_parser.last_line_idx == 0) { char* tmp = NULL; /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ @@ -527,22 +527,22 @@ size_t input_lex_read_buffer(char* buf, int size) /* FIXME: should have a pair of buffers, and switch between the two, instead of * reallocating a new one for each line */ - if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) + if (dbg_parser.last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) { HeapFree(GetProcessHeap(), 0, tmp); } else { - HeapFree(GetProcessHeap(), 0, last_line); - last_line = tmp; + HeapFree(GetProcessHeap(), 0, dbg_parser.last_line); + dbg_parser.last_line = tmp; } } - len = min(strlen(last_line + last_line_idx), size - 1); - memcpy(buf, last_line + last_line_idx, len); + len = min(strlen(dbg_parser.last_line + dbg_parser.last_line_idx), size - 1); + memcpy(buf, dbg_parser.last_line + dbg_parser.last_line_idx, len); buf[len] = '\0'; - if ((last_line_idx += len) >= strlen(last_line)) - last_line_idx = 0; + if ((dbg_parser.last_line_idx += len) >= strlen(dbg_parser.last_line)) + dbg_parser.last_line_idx = 0; return len; } @@ -585,6 +585,8 @@ void parser_handle(const char* filename, HANDLE input) } dbg_parser.line_no = 0; dbg_parser.filename = filename; + dbg_parser.last_line = NULL; + dbg_parser.last_line_idx = 0; do { __TRY

1 0

Eric Pouech : winedbg: Move YY_INPUT implementation to dbg.y.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 5ffd0d05a8482bad7cdd182ef16138aeec330849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ffd0d05a8482bad7cdd182e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:29:59 2021 +0100 winedbg: Move YY_INPUT implementation to dbg.y. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/dbg.y | 47 ++++++++++++++++++++++++++++++++++++++++++++- programs/winedbg/debug.l | 47 +-------------------------------------------- programs/winedbg/debugger.h | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 2106b8414e8..ace29039753 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -462,7 +462,7 @@ struct parser_context static struct parser_context dbg_parser = {NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, 0}; -int input_fetch_entire_line(const char* pfx, char** line) +static int input_fetch_entire_line(const char* pfx, char** line) { char* buffer; char ch; @@ -501,6 +501,51 @@ int input_fetch_entire_line(const char* pfx, char** line) return len; } +size_t input_lex_read_buffer(char* buf, int size) +{ + int len; + static char* last_line = NULL; + static size_t last_line_idx = 0; + + /* try first to fetch the remaining of an existing line */ + if (last_line_idx == 0) + { + char* tmp = NULL; + /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ + lexeme_flush(); + len = input_fetch_entire_line("Wine-dbg>", &tmp); + if (len < 0) return 0; /* eof */ + + /* remove carriage return in newline */ + if (len >= 2 && tmp[len - 2] == '\r') + { + tmp[len - 2] = '\n'; + tmp[len - 1] = '\0'; + len--; + } + + /* FIXME: should have a pair of buffers, and switch between the two, instead of + * reallocating a new one for each line + */ + if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) + { + HeapFree(GetProcessHeap(), 0, tmp); + } + else + { + HeapFree(GetProcessHeap(), 0, last_line); + last_line = tmp; + } + } + + len = min(strlen(last_line + last_line_idx), size - 1); + memcpy(buf, last_line + last_line_idx, len); + buf[len] = '\0'; + if ((last_line_idx += len) >= strlen(last_line)) + last_line_idx = 0; + return len; +} + int input_read_line(const char* pfx, char* buf, int size) { char* line = NULL; diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 3c9acc5fe60..a497f34e6b0 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -60,53 +60,8 @@ void lexeme_flush(void) next_lexeme = 0; } -static size_t read_input(const char* pfx, char* buf, int size) -{ - int len; - static char* last_line = NULL; - static size_t last_line_idx = 0; - - /* try first to fetch the remaining of an existing line */ - if (last_line_idx == 0) - { - char* tmp = NULL; - /* no remaining chars to be read from last line, grab a brand new line up to '\n' */ - lexeme_flush(); - len = input_fetch_entire_line(pfx, &tmp); - if (len < 0) return 0; /* eof */ - - /* remove carriage return in newline */ - if (len >= 2 && tmp[len - 2] == '\r') - { - tmp[len - 2] = '\n'; - tmp[len - 1] = '\0'; - len--; - } - - /* FIXME: should have a pair of buffers, and switch between the two, instead of - * reallocating a new one for each line - */ - if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) - { - HeapFree(GetProcessHeap(), 0, tmp); - } - else - { - HeapFree(GetProcessHeap(), 0, last_line); - last_line = tmp; - } - } - - len = min(strlen(last_line + last_line_idx), size - 1); - memcpy(buf, last_line + last_line_idx, len); - buf[len] = '\0'; - if ((last_line_idx += len) >= strlen(last_line)) - last_line_idx = 0; - return len; -} - #define YY_INPUT(buf,result,max_size) \ - (result = read_input("Wine-dbg>", buf, max_size)) + (result = input_lex_read_buffer(buf, max_size)) static int syntax_error; %} diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 8180488d1e5..c511f3f76bc 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -311,7 +311,7 @@ extern int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UI /* dbg.y */ extern void parser_handle(const char*, HANDLE); extern int input_read_line(const char* pfx, char* buffer, int size); -extern int input_fetch_entire_line(const char* pfx, char** line); +extern size_t input_lex_read_buffer(char* pfx, int size); extern HANDLE WINAPIV parser_generate_command_file(const char*, ...); /* debug.l */

1 0

Alexandre Julliard : include: Remove wine/port.h.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

1 0

Huw Davies : winecoreaudio: Introduce a helper to retrieve the time.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 3b043e72b52f16ce3aa0a1f97dfe6c6d31db9448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b043e72b52f16ce3aa0a1f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 07:56:28 2021 +0000 winecoreaudio: Introduce a helper to retrieve the time. The motivation is that this will need to be called from a non-Win32 thread and so shouldn't use the Win32 API. An added benefit is that it will eliminate the 16ms jitter associated with GetTickCount(). The instance of the helper on the user-side is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 12 ++++++++++-- dlls/winecoreaudio.drv/midi.c | 13 +++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 9dc9f452c29..2e92d9ac2cb 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -143,6 +143,14 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W * CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. */ +static uint64_t get_time_ms(void) +{ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info(&timebase); + return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; +} + static void midi_in_read_proc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, midi_in_thread_port_name); @@ -917,7 +925,7 @@ static DWORD midi_in_start(WORD dev_id) return MMSYSERR_BADDEVICEID; } srcs[dev_id].state = 1; - srcs[dev_id].startTime = NtGetTickCount(); + srcs[dev_id].startTime = get_time_ms(); return MMSYSERR_NOERROR; } @@ -936,7 +944,7 @@ static DWORD midi_in_stop(WORD dev_id) static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { - DWORD cur_time = NtGetTickCount(); + DWORD cur_time = get_time_ms(); DWORD err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index dcb9a7e1b69..b3adb09886d 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,6 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +#include <mach/mach_time.h> #include <CoreAudio/CoreAudio.h> #define WINE_DEFINITIONS @@ -61,6 +62,14 @@ static MIDIPortRef MIDIInPort = NULL; MIDISource *sources; +static uint64_t get_time_ms(void) +{ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info(&timebase); + return mach_absolute_time() / 1000000 * timebase.numer / timebase.denom; +} + static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -183,7 +192,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } midi_lock( TRUE ); - currentTime = GetTickCount() - src->startTime; + currentTime = get_time_ms() - src->startTime; while (len) { LPMIDIHDR lpMidiHdr = src->lpQueueHdr; @@ -218,7 +227,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } midi_lock( TRUE ); - currentTime = GetTickCount() - src->startTime; + currentTime = get_time_ms() - src->startTime; while (pos < msg->length) {

1 0

Robert Wilhelm : scrrun: Implement folder_CreateTextFile.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 4c04fb00f03a40d122bb4d8ae73a1d8be3b3b677 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c04fb00f03a40d122bb4d8a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sun Nov 28 22:58:10 2021 +0100 scrrun: Implement folder_CreateTextFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 16 +++++++-- dlls/scrrun/tests/filesystem.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 359d86bb8fd..7b0b2e110a6 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2518,9 +2518,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..91729bb047f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,86 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10], buff2W[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + DWORD r; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + str = SysAllocString(dirW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + SysFreeString(str); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); + ok(ret && r==2, "read %d, got %d, %d\n", r, ret, GetLastError()); + buffW[r/sizeof(WCHAR)] = 0; + + buff2W[0] = 0xfeff; + buff2W[1] = 0; + ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); + CloseHandle(file); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2596,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read();

1 0

Eric Pouech : winedbg: Be more strict when detecting a string from an array.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 9061634a01d358dd6b071ebcca5a7567d604219e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9061634a01d358dd6b071ebc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:29:39 2021 +0100 winedbg: Be more strict when detecting a string from an array. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5e9188ccc6e..0ee6ab05f0f 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -519,24 +519,29 @@ void print_value(const struct dbg_lvalue* lvalue, char format, int level) count = 1; size = 1; types_get_info(&type, TI_GET_COUNT, &count); types_get_info(&type, TI_GET_LENGTH, &size); + lvalue_field = *lvalue; + types_get_info(&lvalue_field.type, TI_GET_TYPE, &lvalue_field.type.id); + types_get_real_type(&lvalue_field.type, &tag); - if (size == count) - { - unsigned len; - char buffer[256]; - /* - * Special handling for character arrays. - */ - /* FIXME should check basic type here (should be a char!!!!)... */ - len = min(count, sizeof(buffer)); - memory_get_string(dbg_curr_process, - memory_to_linear_addr(&lvalue->addr), - lvalue->cookie == DLV_TARGET, TRUE, buffer, len); - dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); - break; + if (size == count && tag == SymTagBaseType) + { + DWORD basetype; + + types_get_info(&lvalue_field.type, TI_GET_BASETYPE, &basetype); + if (basetype == btChar) + { + char buffer[256]; + /* + * Special handling for character arrays. + */ + unsigned len = min(count, sizeof(buffer)); + memory_get_string(dbg_curr_process, + memory_to_linear_addr(&lvalue->addr), + lvalue->cookie == DLV_TARGET, TRUE, buffer, len); + dbg_printf("\"%s%s\"", buffer, (len < count) ? "..." : ""); + break; + } } - lvalue_field = *lvalue; - types_get_info(&type, TI_GET_TYPE, &lvalue_field.type.id); dbg_printf("{"); for (i = 0; i < count; i++) {

1 0