- Wine-Devel - list.winehq.org

[PATCH] winecoreaudio.drv: Only read 'length' bytes from received MIDIPackets.
by Brendan Shanks Nov. 5, 2020

Nov. 5, 2020

The Core MIDI MIDIPacket struct is declared with a 256-byte data array, but this is just for convenience. There may be only one accessible byte, or there may be more than 256. Only read 'length' bytes from the packet, and correctly handle a length > 256. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- The previous code was also passing a 260 byte struct by value, and copying around 256 bytes even though most MIDI messages are only a few bytes. dlls/winecoreaudio.drv/coremidi.c | 7 ++----- dlls/winecoreaudio.drv/coremidi.h | 8 +------- dlls/winecoreaudio.drv/midi.c | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5ec564603a9..94761b05c4f 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -57,15 +57,12 @@ void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size) void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { unsigned int i; - MIDIMessage msg; MIDIPacket *packet = (MIDIPacket *)pktlist->packet; for (i = 0; i < pktlist->numPackets; ++i) { - msg.devID = *((UInt16 *)connRefCon); - msg.length = packet->length; - memcpy(msg.data, packet->data, sizeof(packet->data)); + UInt16 devID = *((UInt16 *)connRefCon); - MIDIIn_SendMessage(msg); + MIDIIn_SendMessage(devID, packet->data, packet->length); packet = MIDIPacketNext(packet); } diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index c93edc6c31d..3433a1d4342 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -65,12 +65,6 @@ extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[256]; -} MIDIMessage; - /* coremidi.c */ extern MIDIClientRef CoreMIDI_CreateClient(CFStringRef name); extern void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size); @@ -79,6 +73,6 @@ extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *c extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); /* midi.c */ -void MIDIIn_SendMessage(MIDIMessage msg); +void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length); #endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index edaf1283124..c299d116f12 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -78,6 +78,12 @@ typedef struct tagMIDISource { DWORD startTime; } MIDISource; +typedef struct { + UInt16 devID; + UInt16 length; + Byte data[]; +} MIDIMessage; + static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ static CFStringRef MIDIInThreadPortName = NULL; @@ -797,16 +803,22 @@ static DWORD MIDIIn_Reset(WORD wDevID) * Call from CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. */ -void MIDIIn_SendMessage(MIDIMessage msg) +void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length) { - CFDataRef data; + MIDIMessage msg; + CFMutableDataRef data; CFMessagePortRef messagePort; messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); - data = CFDataCreate(kCFAllocatorDefault, (UInt8 *) &msg, sizeof(msg)); + msg.devID = devID; + msg.length = length; + + data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + length); if (data) { + CFDataAppendBytes(data, (UInt8 *) &msg, sizeof(msg)); + CFDataAppendBytes(data, buffer, length); CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); CFRelease(data); } -- 2.26.2

2 1

[PATCH v4 3/5] winegstreamer: Implement IMFMediaStream::GetMediaSource.
by Derek Lesho Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v4: Fix typo in commit name and sign-off. --- dlls/winegstreamer/media_source.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5baa4106409..9d7df347dab 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -681,12 +681,15 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi { struct media_stream *stream = impl_from_IMFMediaStream(iface); - FIXME("stub (%p)->(%p)\n", stream, source); + TRACE("(%p)->(%p)\n", stream, source); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + IMFMediaSource_AddRef(&stream->parent_source->IMFMediaSource_iface); + *source = &stream->parent_source->IMFMediaSource_iface; + + return S_OK; } static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IMFStreamDescriptor **descriptor) -- 2.28.0

2 1

[RFC PATCH] conhost: Register as a system process.
by Torge Matthies Nov. 5, 2020

Nov. 5, 2020

I wrote a program called winestreamproxy [1] that proxys data between a named pipe in Wine and a unix domain socket outside of Wine. This program should automatically exit when no other non-system program is running in the bottle/prefix if the parameter --system is supplied. For this purpose it marks itself as a system process using __wine_make_process_system() from ntdll, and waits on the returned event handle to exit. This worked fine, until a change was introduced that seemingly made every non-system process spawn a conhost.exe instance. Since conhost.exe is not a system process, this breaks the auto-exit functionality of winestreamproxy. I understand that using Wine-internal functions is not supported, however the desired behavior seems hard if not impossible to implement otherwise. Making conhost mark itself as a system process would allow the automatic exit to work again. I don't think this would break anything, because at the point in the bottle/prefix lifecycle where this becomes relevant there are no non-system processes anymore, and anything else has either explicitly opted into this behavior or not received a conhost instance in the first place. As to why winestreamproxy is necessary at all: It allows Windows games running under Wine to communicate with Linux-native Discord [2] and show status messages and invite buttons on a user's profile. [1] https://github.com/openglfreak/winestreamproxy [2] https://discord.com/ Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- programs/conhost/conhost.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 6985a9ca0b0..46b48d086d4 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -42,6 +42,8 @@ static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static void *ioctl_buffer; static size_t ioctl_buffer_size; +extern HANDLE CDECL __wine_make_process_system(void); + static void *alloc_ioctl_buffer( size_t size ) { if (size > ioctl_buffer_size) @@ -2526,7 +2528,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) static int main_loop( struct console *console, HANDLE signal ) { HANDLE signal_event = NULL; - HANDLE wait_handles[3]; + HANDLE wait_handles[4]; unsigned int wait_cnt = 0; unsigned short signal_id; IO_STATUS_BLOCK signal_io; @@ -2544,6 +2546,7 @@ static int main_loop( struct console *console, HANDLE signal ) if (!alloc_ioctl_buffer( 4096 )) return 1; + wait_handles[wait_cnt++] = __wine_make_process_system(); wait_handles[wait_cnt++] = console->server; if (signal) wait_handles[wait_cnt++] = signal_event; if (console->input_thread) wait_handles[wait_cnt++] = console->input_thread; @@ -2570,13 +2573,14 @@ static int main_loop( struct console *console, HANDLE signal ) switch (res) { case WAIT_OBJECT_0: + case WAIT_OBJECT_0 + 1: EnterCriticalSection( &console_section ); status = process_console_ioctls( console ); LeaveCriticalSection( &console_section ); - if (status) return 0; + if (status || res == WAIT_OBJECT_0) return 0; break; - case WAIT_OBJECT_0 + 1: + case WAIT_OBJECT_0 + 2: if (signal_io.Status || signal_io.Information != sizeof(signal_id)) { TRACE( "signaled quit\n" ); -- 2.29.2

2 3

[PATCH 1/2] vbscript: Allow keywords to be used as function name.
by Robert Wilhelm Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/lex.c | 10 +++++++++- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 251374d90e6..78fca8271cc 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -99,6 +99,14 @@ static inline BOOL is_identifier_char(WCHAR c) return iswalnum(c) || c == '_'; } +static BOOL is_identifier( int token) +{ + if (token == tIdentifier || token == tDEFAULT || token == tERROR || + token == tEXPLICIT || token == tPROPERTY || token == tSTEP) + return TRUE; + return FALSE; +} + static int check_keyword(parser_ctx_t *ctx, const WCHAR *word, const WCHAR **lval) { const WCHAR *p1 = ctx->ptr; @@ -425,7 +433,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) * Parser can't predict if bracket is part of argument expression or an argument * in call expression. We predict it here instead. */ - if(ctx->last_token == tIdentifier || ctx->last_token == ')') + if(is_identifier(ctx->last_token) || ctx->last_token == ')') return '('; return tEXPRLBRACKET; case '"': diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 65f8a458cd7..570bb7fbcb3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1631,9 +1631,31 @@ sub test_identifiers Dim step step = "xx" Call ok(step = "xx", "step = " & step & " expected ""xx""") + + Dim property + property = "xx" + Call ok(property = "xx", "property = " & property & " expected ""xx""") end sub call test_identifiers() +Class class_test_identifiers_as_function_name + Sub Property ( par ) + End Sub + + Function Error( par ) + End Function + + Sub Default () + End Sub + + Function Explicit (par) + Explicit = par + End Function + + Sub Step ( default ) + End Sub +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") -- 2.26.2

2 1

[PATCH] jscript: Use wide-char string literals in struct initialization.
by Michael Stefaniuc Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/bool.c | 7 +- dlls/jscript/date.c | 146 +++++++++++++------------------------- dlls/jscript/enumerator.c | 13 ++-- dlls/jscript/error.c | 3 +- dlls/jscript/function.c | 20 +++--- dlls/jscript/global.c | 54 +++++--------- dlls/jscript/json.c | 7 +- dlls/jscript/jsregexp.c | 72 +++++++------------ dlls/jscript/math.c | 79 +++++++-------------- dlls/jscript/number.c | 19 ++--- dlls/jscript/vbarray.c | 16 ++--- 11 files changed, 143 insertions(+), 293 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 3a28dddb4b1..f31117e2141 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -31,9 +31,6 @@ typedef struct { BOOL val; } BoolInstance; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; - static inline BoolInstance *bool_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, BoolInstance, dispex); @@ -114,8 +111,8 @@ static HRESULT Bool_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign } static const builtin_prop_t Bool_props[] = { - {toStringW, Bool_toString, PROPF_METHOD}, - {valueOfW, Bool_valueOf, PROPF_METHOD} + {L"toString", Bool_toString, PROPF_METHOD}, + {L"valueOf", Bool_valueOf, PROPF_METHOD} }; static const builtin_info_t Bool_info = { diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 60591bb045b..4809cc976d8 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -44,56 +44,6 @@ typedef struct { LONG daylightBias; } DateInstance; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; -static const WCHAR toISOStringW[] = {'t','o','I','S','O','S','t','r','i','n','g',0}; -static const WCHAR toUTCStringW[] = {'t','o','U','T','C','S','t','r','i','n','g',0}; -static const WCHAR toGMTStringW[] = {'t','o','G','M','T','S','t','r','i','n','g',0}; -static const WCHAR toDateStringW[] = {'t','o','D','a','t','e','S','t','r','i','n','g',0}; -static const WCHAR toTimeStringW[] = {'t','o','T','i','m','e','S','t','r','i','n','g',0}; -static const WCHAR toLocaleDateStringW[] = {'t','o','L','o','c','a','l','e','D','a','t','e','S','t','r','i','n','g',0}; -static const WCHAR toLocaleTimeStringW[] = {'t','o','L','o','c','a','l','e','T','i','m','e','S','t','r','i','n','g',0}; -static const WCHAR getTimeW[] = {'g','e','t','T','i','m','e',0}; -static const WCHAR getFullYearW[] = {'g','e','t','F','u','l','l','Y','e','a','r',0}; -static const WCHAR getUTCFullYearW[] = {'g','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; -static const WCHAR getMonthW[] = {'g','e','t','M','o','n','t','h',0}; -static const WCHAR getUTCMonthW[] = {'g','e','t','U','T','C','M','o','n','t','h',0}; -static const WCHAR getDateW[] = {'g','e','t','D','a','t','e',0}; -static const WCHAR getUTCDateW[] = {'g','e','t','U','T','C','D','a','t','e',0}; -static const WCHAR getDayW[] = {'g','e','t','D','a','y',0}; -static const WCHAR getUTCDayW[] = {'g','e','t','U','T','C','D','a','y',0}; -static const WCHAR getHoursW[] = {'g','e','t','H','o','u','r','s',0}; -static const WCHAR getUTCHoursW[] = {'g','e','t','U','T','C','H','o','u','r','s',0}; -static const WCHAR getMinutesW[] = {'g','e','t','M','i','n','u','t','e','s',0}; -static const WCHAR getUTCMinutesW[] = {'g','e','t','U','T','C','M','i','n','u','t','e','s',0}; -static const WCHAR getSecondsW[] = {'g','e','t','S','e','c','o','n','d','s',0}; -static const WCHAR getUTCSecondsW[] = {'g','e','t','U','T','C','S','e','c','o','n','d','s',0}; -static const WCHAR getMillisecondsW[] = {'g','e','t','M','i','l','l','i','s','e','c','o','n','d','s',0}; -static const WCHAR getUTCMillisecondsW[] = {'g','e','t','U','T','C','M','i','l','l','i','s','e','c','o','n','d','s',0}; -static const WCHAR getTimezoneOffsetW[] = {'g','e','t','T','i','m','e','z','o','n','e','O','f','f','s','e','t',0}; -static const WCHAR setTimeW[] = {'s','e','t','T','i','m','e',0}; -static const WCHAR setMillisecondsW[] = {'s','e','t','M','i','l','l','i','s','e','c','o','n','d','s',0}; -static const WCHAR setUTCMillisecondsW[] = {'s','e','t','U','T','C','M','i','l','l','i','s','e','c','o','n','d','s',0}; -static const WCHAR setSecondsW[] = {'s','e','t','S','e','c','o','n','d','s',0}; -static const WCHAR setUTCSecondsW[] = {'s','e','t','U','T','C','S','e','c','o','n','d','s',0}; -static const WCHAR setMinutesW[] = {'s','e','t','M','i','n','u','t','e','s',0}; -static const WCHAR setUTCMinutesW[] = {'s','e','t','U','T','C','M','i','n','u','t','e','s',0}; -static const WCHAR setHoursW[] = {'s','e','t','H','o','u','r','s',0}; -static const WCHAR setUTCHoursW[] = {'s','e','t','U','T','C','H','o','u','r','s',0}; -static const WCHAR setDateW[] = {'s','e','t','D','a','t','e',0}; -static const WCHAR setUTCDateW[] = {'s','e','t','U','T','C','D','a','t','e',0}; -static const WCHAR setMonthW[] = {'s','e','t','M','o','n','t','h',0}; -static const WCHAR setUTCMonthW[] = {'s','e','t','U','T','C','M','o','n','t','h',0}; -static const WCHAR setFullYearW[] = {'s','e','t','F','u','l','l','Y','e','a','r',0}; -static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; -static const WCHAR getYearW[] = {'g','e','t','Y','e','a','r',0}; -static const WCHAR setYearW[] = {'s','e','t','Y','e','a','r',0}; - -static const WCHAR UTCW[] = {'U','T','C',0}; -static const WCHAR nowW[] = {'n','o','w',0}; -static const WCHAR parseW[] = {'p','a','r','s','e',0}; - static inline DateInstance *date_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, DateInstance, dispex); @@ -1932,51 +1882,51 @@ static HRESULT Date_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) } static const builtin_prop_t Date_props[] = { - {getDateW, Date_getDate, PROPF_METHOD}, - {getDayW, Date_getDay, PROPF_METHOD}, - {getFullYearW, Date_getFullYear, PROPF_METHOD}, - {getHoursW, Date_getHours, PROPF_METHOD}, - {getMillisecondsW, Date_getMilliseconds, PROPF_METHOD}, - {getMinutesW, Date_getMinutes, PROPF_METHOD}, - {getMonthW, Date_getMonth, PROPF_METHOD}, - {getSecondsW, Date_getSeconds, PROPF_METHOD}, - {getTimeW, Date_getTime, PROPF_METHOD}, - {getTimezoneOffsetW, Date_getTimezoneOffset, PROPF_METHOD}, - {getUTCDateW, Date_getUTCDate, PROPF_METHOD}, - {getUTCDayW, Date_getUTCDay, PROPF_METHOD}, - {getUTCFullYearW, Date_getUTCFullYear, PROPF_METHOD}, - {getUTCHoursW, Date_getUTCHours, PROPF_METHOD}, - {getUTCMillisecondsW, Date_getUTCMilliseconds, PROPF_METHOD}, - {getUTCMinutesW, Date_getUTCMinutes, PROPF_METHOD}, - {getUTCMonthW, Date_getUTCMonth, PROPF_METHOD}, - {getUTCSecondsW, Date_getUTCSeconds, PROPF_METHOD}, - {getYearW, Date_getYear, PROPF_METHOD}, - {setDateW, Date_setDate, PROPF_METHOD|1}, - {setFullYearW, Date_setFullYear, PROPF_METHOD|3}, - {setHoursW, Date_setHours, PROPF_METHOD|4}, - {setMillisecondsW, Date_setMilliseconds, PROPF_METHOD|1}, - {setMinutesW, Date_setMinutes, PROPF_METHOD|3}, - {setMonthW, Date_setMonth, PROPF_METHOD|2}, - {setSecondsW, Date_setSeconds, PROPF_METHOD|2}, - {setTimeW, Date_setTime, PROPF_METHOD|1}, - {setUTCDateW, Date_setUTCDate, PROPF_METHOD|1}, - {setUTCFullYearW, Date_setUTCFullYear, PROPF_METHOD|3}, - {setUTCHoursW, Date_setUTCHours, PROPF_METHOD|4}, - {setUTCMillisecondsW, Date_setUTCMilliseconds, PROPF_METHOD|1}, - {setUTCMinutesW, Date_setUTCMinutes, PROPF_METHOD|3}, - {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD|2}, - {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD|2}, - {setYearW, Date_setYear, PROPF_METHOD|1}, - {toDateStringW, Date_toDateString, PROPF_METHOD}, - {toGMTStringW, Date_toGMTString, PROPF_METHOD}, - {toISOStringW, Date_toISOString, PROPF_METHOD|PROPF_ES5}, - {toLocaleDateStringW, Date_toLocaleDateString, PROPF_METHOD}, - {toLocaleStringW, Date_toLocaleString, PROPF_METHOD}, - {toLocaleTimeStringW, Date_toLocaleTimeString, PROPF_METHOD}, - {toStringW, Date_toString, PROPF_METHOD}, - {toTimeStringW, Date_toTimeString, PROPF_METHOD}, - {toUTCStringW, Date_toUTCString, PROPF_METHOD}, - {valueOfW, Date_valueOf, PROPF_METHOD}, + {L"getDate", Date_getDate, PROPF_METHOD}, + {L"getDay", Date_getDay, PROPF_METHOD}, + {L"getFullYear", Date_getFullYear, PROPF_METHOD}, + {L"getHours", Date_getHours, PROPF_METHOD}, + {L"getMilliseconds", Date_getMilliseconds, PROPF_METHOD}, + {L"getMinutes", Date_getMinutes, PROPF_METHOD}, + {L"getMonth", Date_getMonth, PROPF_METHOD}, + {L"getSeconds", Date_getSeconds, PROPF_METHOD}, + {L"getTime", Date_getTime, PROPF_METHOD}, + {L"getTimezoneOffset", Date_getTimezoneOffset, PROPF_METHOD}, + {L"getUTCDate", Date_getUTCDate, PROPF_METHOD}, + {L"getUTCDay", Date_getUTCDay, PROPF_METHOD}, + {L"getUTCFullYear", Date_getUTCFullYear, PROPF_METHOD}, + {L"getUTCHours", Date_getUTCHours, PROPF_METHOD}, + {L"getUTCMilliseconds", Date_getUTCMilliseconds, PROPF_METHOD}, + {L"getUTCMinutes", Date_getUTCMinutes, PROPF_METHOD}, + {L"getUTCMonth", Date_getUTCMonth, PROPF_METHOD}, + {L"getUTCSeconds", Date_getUTCSeconds, PROPF_METHOD}, + {L"getYear", Date_getYear, PROPF_METHOD}, + {L"setDate", Date_setDate, PROPF_METHOD|1}, + {L"setFullYear", Date_setFullYear, PROPF_METHOD|3}, + {L"setHours", Date_setHours, PROPF_METHOD|4}, + {L"setMilliseconds", Date_setMilliseconds, PROPF_METHOD|1}, + {L"setMinutes", Date_setMinutes, PROPF_METHOD|3}, + {L"setMonth", Date_setMonth, PROPF_METHOD|2}, + {L"setSeconds", Date_setSeconds, PROPF_METHOD|2}, + {L"setTime", Date_setTime, PROPF_METHOD|1}, + {L"setUTCDate", Date_setUTCDate, PROPF_METHOD|1}, + {L"setUTCFullYear", Date_setUTCFullYear, PROPF_METHOD|3}, + {L"setUTCHours", Date_setUTCHours, PROPF_METHOD|4}, + {L"setUTCMilliseconds", Date_setUTCMilliseconds, PROPF_METHOD|1}, + {L"setUTCMinutes", Date_setUTCMinutes, PROPF_METHOD|3}, + {L"setUTCMonth", Date_setUTCMonth, PROPF_METHOD|2}, + {L"setUTCSeconds", Date_setUTCSeconds, PROPF_METHOD|2}, + {L"setYear", Date_setYear, PROPF_METHOD|1}, + {L"toDateString", Date_toDateString, PROPF_METHOD}, + {L"toGMTString", Date_toGMTString, PROPF_METHOD}, + {L"toISOString", Date_toISOString, PROPF_METHOD|PROPF_ES5}, + {L"toLocaleDateString", Date_toLocaleDateString, PROPF_METHOD}, + {L"toLocaleString", Date_toLocaleString, PROPF_METHOD}, + {L"toLocaleTimeString", Date_toLocaleTimeString, PROPF_METHOD}, + {L"toString", Date_toString, PROPF_METHOD}, + {L"toTimeString", Date_toTimeString, PROPF_METHOD}, + {L"toUTCString", Date_toUTCString, PROPF_METHOD}, + {L"valueOf", Date_valueOf, PROPF_METHOD}, }; static const builtin_info_t Date_info = { @@ -2513,9 +2463,9 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } static const builtin_prop_t DateConstr_props[] = { - {UTCW, DateConstr_UTC, PROPF_METHOD}, - {nowW, DateConstr_now, PROPF_HTML|PROPF_METHOD}, - {parseW, DateConstr_parse, PROPF_METHOD} + {L"UTC", DateConstr_UTC, PROPF_METHOD}, + {L"now", DateConstr_now, PROPF_HTML|PROPF_METHOD}, + {L"parse", DateConstr_parse, PROPF_METHOD} }; static const builtin_info_t DateConstr_info = { diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index ffe01c565ad..6971150bbb4 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -33,11 +33,6 @@ typedef struct { BOOL atend; } EnumeratorInstance; -static const WCHAR atEndW[] = {'a','t','E','n','d',0}; -static const WCHAR itemW[] = {'i','t','e','m',0}; -static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; -static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; - static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); @@ -177,10 +172,10 @@ static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag } static const builtin_prop_t Enumerator_props[] = { - {atEndW, Enumerator_atEnd, PROPF_METHOD}, - {itemW, Enumerator_item, PROPF_METHOD}, - {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, - {moveNextW, Enumerator_moveNext, PROPF_METHOD}, + {L"atEnd", Enumerator_atEnd, PROPF_METHOD}, + {L"item", Enumerator_item, PROPF_METHOD}, + {L"moveFirst", Enumerator_moveFirst, PROPF_METHOD}, + {L"moveNext", Enumerator_moveNext, PROPF_METHOD}, }; static const builtin_info_t Enumerator_info = { diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 2b2cddc1142..07ebc1144eb 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -32,7 +32,6 @@ static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n' static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; static const WCHAR nameW[] = {'n','a','m','e',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; /* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, @@ -139,7 +138,7 @@ static HRESULT Error_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } static const builtin_prop_t Error_props[] = { - {toStringW, Error_toString, PROPF_METHOD} + {L"toString", Error_toString, PROPF_METHOD} }; static const builtin_info_t Error_info = { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 6361eefc677..f0bd20d75a2 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -95,10 +95,6 @@ static inline ArgumentsInstance *arguments_from_jsdisp(jsdisp_t *jsdisp) static const WCHAR prototypeW[] = {'p','r','o','t','o','t', 'y', 'p','e',0}; static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR applyW[] = {'a','p','p','l','y',0}; -static const WCHAR bindW[] = {'b','i','n','d',0}; -static const WCHAR callW[] = {'c','a','l','l',0}; static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; static HRESULT Arguments_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, @@ -546,12 +542,12 @@ static void Function_destructor(jsdisp_t *dispex) } static const builtin_prop_t Function_props[] = { - {applyW, Function_apply, PROPF_METHOD|2}, - {argumentsW, NULL, 0, Function_get_arguments}, - {bindW, Function_bind, PROPF_METHOD|PROPF_ES5|1}, - {callW, Function_call, PROPF_METHOD|1}, - {lengthW, NULL, 0, Function_get_length}, - {toStringW, Function_toString, PROPF_METHOD} + {L"apply", Function_apply, PROPF_METHOD|2}, + {L"arguments", NULL, 0, Function_get_arguments}, + {L"bind", Function_bind, PROPF_METHOD|PROPF_ES5|1}, + {L"call", Function_call, PROPF_METHOD|1}, + {L"length", NULL, 0, Function_get_length}, + {L"toString", Function_toString, PROPF_METHOD} }; static const builtin_info_t Function_info = { @@ -564,8 +560,8 @@ static const builtin_info_t Function_info = { }; static const builtin_prop_t FunctionInst_props[] = { - {argumentsW, NULL, 0, Function_get_arguments}, - {lengthW, NULL, 0, Function_get_length} + {L"arguments", NULL, 0, Function_get_arguments}, + {L"length", NULL, 0, Function_get_length} }; static const builtin_info_t FunctionInst_info = { diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 64b910faa72..64f7bbda959 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -48,28 +48,8 @@ static const WCHAR RegExpErrorW[] = {'R','e','g','E','x','p','E','r','r','o','r' static const WCHAR ActiveXObjectW[] = {'A','c','t','i','v','e','X','O','b','j','e','c','t',0}; static const WCHAR VBArrayW[] = {'V','B','A','r','r','a','y',0}; static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; -static const WCHAR escapeW[] = {'e','s','c','a','p','e',0}; -static const WCHAR evalW[] = {'e','v','a','l',0}; -static const WCHAR isNaNW[] = {'i','s','N','a','N',0}; -static const WCHAR isFiniteW[] = {'i','s','F','i','n','i','t','e',0}; -static const WCHAR parseIntW[] = {'p','a','r','s','e','I','n','t',0}; -static const WCHAR parseFloatW[] = {'p','a','r','s','e','F','l','o','a','t',0}; -static const WCHAR unescapeW[] = {'u','n','e','s','c','a','p','e',0}; -static const WCHAR _GetObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; -static const WCHAR ScriptEngineW[] = {'S','c','r','i','p','t','E','n','g','i','n','e',0}; -static const WCHAR ScriptEngineMajorVersionW[] = - {'S','c','r','i','p','t','E','n','g','i','n','e','M','a','j','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR ScriptEngineMinorVersionW[] = - {'S','c','r','i','p','t','E','n','g','i','n','e','M','i','n','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR ScriptEngineBuildVersionW[] = - {'S','c','r','i','p','t','E','n','g','i','n','e','B','u','i','l','d','V','e','r','s','i','o','n',0}; -static const WCHAR CollectGarbageW[] = {'C','o','l','l','e','c','t','G','a','r','b','a','g','e',0}; static const WCHAR MathW[] = {'M','a','t','h',0}; static const WCHAR JSONW[] = {'J','S','O','N',0}; -static const WCHAR encodeURIW[] = {'e','n','c','o','d','e','U','R','I',0}; -static const WCHAR decodeURIW[] = {'d','e','c','o','d','e','U','R','I',0}; -static const WCHAR encodeURIComponentW[] = {'e','n','c','o','d','e','U','R','I','C','o','m','p','o','n','e','n','t',0}; -static const WCHAR decodeURIComponentW[] = {'d','e','c','o','d','e','U','R','I','C','o','m','p','o','n','e','n','t',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; @@ -931,23 +911,23 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W } static const builtin_prop_t JSGlobal_props[] = { - {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, - {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, - {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, - {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, - {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, - {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD|1}, - {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD|1}, - {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD|1}, - {encodeURIComponentW, JSGlobal_encodeURIComponent, PROPF_METHOD|1}, - {escapeW, JSGlobal_escape, PROPF_METHOD|1}, - {evalW, JSGlobal_eval, PROPF_METHOD|1}, - {isFiniteW, JSGlobal_isFinite, PROPF_METHOD|1}, - {isNaNW, JSGlobal_isNaN, PROPF_METHOD|1}, - {parseFloatW, JSGlobal_parseFloat, PROPF_METHOD|1}, - {parseIntW, JSGlobal_parseInt, PROPF_METHOD|2}, - {unescapeW, JSGlobal_unescape, PROPF_METHOD|1} + {L"CollectGarbage", JSGlobal_CollectGarbage, PROPF_METHOD}, + {L"GetObject", JSGlobal_GetObject, PROPF_METHOD|2}, + {L"ScriptEngine", JSGlobal_ScriptEngine, PROPF_METHOD}, + {L"ScriptEngineBuildVersion", JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, + {L"ScriptEngineMajorVersion", JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, + {L"ScriptEngineMinorVersion", JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, + {L"decodeURI", JSGlobal_decodeURI, PROPF_METHOD|1}, + {L"decodeURIComponent", JSGlobal_decodeURIComponent, PROPF_METHOD|1}, + {L"encodeURI", JSGlobal_encodeURI, PROPF_METHOD|1}, + {L"encodeURIComponent", JSGlobal_encodeURIComponent, PROPF_METHOD|1}, + {L"escape", JSGlobal_escape, PROPF_METHOD|1}, + {L"eval", JSGlobal_eval, PROPF_METHOD|1}, + {L"isFinite", JSGlobal_isFinite, PROPF_METHOD|1}, + {L"isNaN", JSGlobal_isNaN, PROPF_METHOD|1}, + {L"parseFloat", JSGlobal_parseFloat, PROPF_METHOD|1}, + {L"parseInt", JSGlobal_parseInt, PROPF_METHOD|2}, + {L"unescape", JSGlobal_unescape, PROPF_METHOD|1} }; static const builtin_info_t JSGlobal_info = { diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 3c198de3c2c..433c7858cb6 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -26,9 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR parseW[] = {'p','a','r','s','e',0}; -static const WCHAR stringifyW[] = {'s','t','r','i','n','g','i','f','y',0}; - static const WCHAR nullW[] = {'n','u','l','l',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; static const WCHAR falseW[] = {'f','a','l','s','e',0}; @@ -821,8 +818,8 @@ static HRESULT JSON_stringify(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } static const builtin_prop_t JSON_props[] = { - {parseW, JSON_parse, PROPF_METHOD|2}, - {stringifyW, JSON_stringify, PROPF_METHOD|3} + {L"parse", JSON_parse, PROPF_METHOD|2}, + {L"stringify", JSON_stringify, PROPF_METHOD|3} }; static const builtin_info_t JSON_info = { diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 94abb6a3c95..709f00fa160 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -34,30 +34,6 @@ typedef struct { jsval_t last_index_val; } RegExpInstance; -static const WCHAR sourceW[] = {'s','o','u','r','c','e',0}; -static const WCHAR globalW[] = {'g','l','o','b','a','l',0}; -static const WCHAR ignoreCaseW[] = {'i','g','n','o','r','e','C','a','s','e',0}; -static const WCHAR multilineW[] = {'m','u','l','t','i','l','i','n','e',0}; -static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR execW[] = {'e','x','e','c',0}; -static const WCHAR testW[] = {'t','e','s','t',0}; - -static const WCHAR leftContextW[] = - {'l','e','f','t','C','o','n','t','e','x','t',0}; -static const WCHAR rightContextW[] = - {'r','i','g','h','t','C','o','n','t','e','x','t',0}; - -static const WCHAR idx1W[] = {'$','1',0}; -static const WCHAR idx2W[] = {'$','2',0}; -static const WCHAR idx3W[] = {'$','3',0}; -static const WCHAR idx4W[] = {'$','4',0}; -static const WCHAR idx5W[] = {'$','5',0}; -static const WCHAR idx6W[] = {'$','6',0}; -static const WCHAR idx7W[] = {'$','7',0}; -static const WCHAR idx8W[] = {'$','8',0}; -static const WCHAR idx9W[] = {'$','9',0}; - static inline RegExpInstance *regexp_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, RegExpInstance, dispex); @@ -580,14 +556,14 @@ static void RegExp_destructor(jsdisp_t *dispex) } static const builtin_prop_t RegExp_props[] = { - {execW, RegExp_exec, PROPF_METHOD|1}, - {globalW, NULL,0, RegExp_get_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, - {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline}, - {sourceW, NULL,0, RegExp_get_source}, - {testW, RegExp_test, PROPF_METHOD|1}, - {toStringW, RegExp_toString, PROPF_METHOD} + {L"exec", RegExp_exec, PROPF_METHOD|1}, + {L"global", NULL,0, RegExp_get_global}, + {L"ignoreCase", NULL,0, RegExp_get_ignoreCase}, + {L"lastIndex", NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, + {L"multiline", NULL,0, RegExp_get_multiline}, + {L"source", NULL,0, RegExp_get_source}, + {L"test", RegExp_test, PROPF_METHOD|1}, + {L"toString", RegExp_toString, PROPF_METHOD} }; static const builtin_info_t RegExp_info = { @@ -600,11 +576,11 @@ static const builtin_info_t RegExp_info = { }; static const builtin_prop_t RegExpInst_props[] = { - {globalW, NULL,0, RegExp_get_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, - {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline}, - {sourceW, NULL,0, RegExp_get_source} + {L"global", NULL,0, RegExp_get_global}, + {L"ignoreCase", NULL,0, RegExp_get_ignoreCase}, + {L"lastIndex", NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, + {L"multiline", NULL,0, RegExp_get_multiline}, + {L"source", NULL,0, RegExp_get_source} }; static const builtin_info_t RegExpInst_info = { @@ -970,17 +946,17 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } static const builtin_prop_t RegExpConstr_props[] = { - {idx1W, NULL,0, RegExpConstr_get_idx1, builtin_set_const}, - {idx2W, NULL,0, RegExpConstr_get_idx2, builtin_set_const}, - {idx3W, NULL,0, RegExpConstr_get_idx3, builtin_set_const}, - {idx4W, NULL,0, RegExpConstr_get_idx4, builtin_set_const}, - {idx5W, NULL,0, RegExpConstr_get_idx5, builtin_set_const}, - {idx6W, NULL,0, RegExpConstr_get_idx6, builtin_set_const}, - {idx7W, NULL,0, RegExpConstr_get_idx7, builtin_set_const}, - {idx8W, NULL,0, RegExpConstr_get_idx8, builtin_set_const}, - {idx9W, NULL,0, RegExpConstr_get_idx9, builtin_set_const}, - {leftContextW, NULL,0, RegExpConstr_get_leftContext, builtin_set_const}, - {rightContextW, NULL,0, RegExpConstr_get_rightContext, builtin_set_const} + {L"$1", NULL,0, RegExpConstr_get_idx1, builtin_set_const}, + {L"$2", NULL,0, RegExpConstr_get_idx2, builtin_set_const}, + {L"$3", NULL,0, RegExpConstr_get_idx3, builtin_set_const}, + {L"$4", NULL,0, RegExpConstr_get_idx4, builtin_set_const}, + {L"$5", NULL,0, RegExpConstr_get_idx5, builtin_set_const}, + {L"$6", NULL,0, RegExpConstr_get_idx6, builtin_set_const}, + {L"$7", NULL,0, RegExpConstr_get_idx7, builtin_set_const}, + {L"$8", NULL,0, RegExpConstr_get_idx8, builtin_set_const}, + {L"$9", NULL,0, RegExpConstr_get_idx9, builtin_set_const}, + {L"leftContext", NULL,0, RegExpConstr_get_leftContext, builtin_set_const}, + {L"rightContext", NULL,0, RegExpConstr_get_rightContext, builtin_set_const} }; static const builtin_info_t RegExpConstr_info = { diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f0953d48765..475b9b20a71 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -28,33 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR EW[] = {'E',0}; -static const WCHAR LOG2EW[] = {'L','O','G','2','E',0}; -static const WCHAR LOG10EW[] = {'L','O','G','1','0','E',0}; -static const WCHAR LN2W[] = {'L','N','2',0}; -static const WCHAR LN10W[] = {'L','N','1','0',0}; -static const WCHAR PIW[] = {'P','I',0}; -static const WCHAR SQRT2W[] = {'S','Q','R','T','2',0}; -static const WCHAR SQRT1_2W[] = {'S','Q','R','T','1','_','2',0}; -static const WCHAR absW[] = {'a','b','s',0}; -static const WCHAR acosW[] = {'a','c','o','s',0}; -static const WCHAR asinW[] = {'a','s','i','n',0}; -static const WCHAR atanW[] = {'a','t','a','n',0}; -static const WCHAR atan2W[] = {'a','t','a','n','2',0}; -static const WCHAR ceilW[] = {'c','e','i','l',0}; -static const WCHAR cosW[] = {'c','o','s',0}; -static const WCHAR expW[] = {'e','x','p',0}; -static const WCHAR floorW[] = {'f','l','o','o','r',0}; -static const WCHAR logW[] = {'l','o','g',0}; -static const WCHAR maxW[] = {'m','a','x',0}; -static const WCHAR minW[] = {'m','i','n',0}; -static const WCHAR powW[] = {'p','o','w',0}; -static const WCHAR randomW[] = {'r','a','n','d','o','m',0}; -static const WCHAR roundW[] = {'r','o','u','n','d',0}; -static const WCHAR sinW[] = {'s','i','n',0}; -static const WCHAR sqrtW[] = {'s','q','r','t',0}; -static const WCHAR tanW[] = {'t','a','n',0}; - /* ECMA-262 3rd Edition 15.8.2.12 */ static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -497,24 +470,24 @@ static HRESULT Math_tan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned } static const builtin_prop_t Math_props[] = { - {absW, Math_abs, PROPF_METHOD|1}, - {acosW, Math_acos, PROPF_METHOD|1}, - {asinW, Math_asin, PROPF_METHOD|1}, - {atanW, Math_atan, PROPF_METHOD|1}, - {atan2W, Math_atan2, PROPF_METHOD|2}, - {ceilW, Math_ceil, PROPF_METHOD|1}, - {cosW, Math_cos, PROPF_METHOD|1}, - {expW, Math_exp, PROPF_METHOD|1}, - {floorW, Math_floor, PROPF_METHOD|1}, - {logW, Math_log, PROPF_METHOD|1}, - {maxW, Math_max, PROPF_METHOD|2}, - {minW, Math_min, PROPF_METHOD|2}, - {powW, Math_pow, PROPF_METHOD|2}, - {randomW, Math_random, PROPF_METHOD}, - {roundW, Math_round, PROPF_METHOD|1}, - {sinW, Math_sin, PROPF_METHOD|1}, - {sqrtW, Math_sqrt, PROPF_METHOD|1}, - {tanW, Math_tan, PROPF_METHOD|1} + {L"abs", Math_abs, PROPF_METHOD|1}, + {L"acos", Math_acos, PROPF_METHOD|1}, + {L"asin", Math_asin, PROPF_METHOD|1}, + {L"atan", Math_atan, PROPF_METHOD|1}, + {L"atan2", Math_atan2, PROPF_METHOD|2}, + {L"ceil", Math_ceil, PROPF_METHOD|1}, + {L"cos", Math_cos, PROPF_METHOD|1}, + {L"exp", Math_exp, PROPF_METHOD|1}, + {L"floor", Math_floor, PROPF_METHOD|1}, + {L"log", Math_log, PROPF_METHOD|1}, + {L"max", Math_max, PROPF_METHOD|2}, + {L"min", Math_min, PROPF_METHOD|2}, + {L"pow", Math_pow, PROPF_METHOD|2}, + {L"random", Math_random, PROPF_METHOD}, + {L"round", Math_round, PROPF_METHOD|1}, + {L"sin", Math_sin, PROPF_METHOD|1}, + {L"sqrt", Math_sqrt, PROPF_METHOD|1}, + {L"tan", Math_tan, PROPF_METHOD|1} }; static const builtin_info_t Math_info = { @@ -536,14 +509,14 @@ HRESULT create_math(script_ctx_t *ctx, jsdisp_t **ret) const WCHAR *name; DOUBLE val; }constants[] = { - {EW, M_E}, /* ECMA-262 3rd Edition 15.8.1.1 */ - {LN10W, M_LN10}, /* ECMA-262 3rd Edition 15.8.1.2 */ - {LN2W, M_LN2}, /* ECMA-262 3rd Edition 15.8.1.3 */ - {LOG2EW, M_LOG2E}, /* ECMA-262 3rd Edition 15.8.1.4 */ - {LOG10EW, M_LOG10E}, /* ECMA-262 3rd Edition 15.8.1.5 */ - {PIW, M_PI}, /* ECMA-262 3rd Edition 15.8.1.6 */ - {SQRT1_2W, M_SQRT1_2}, /* ECMA-262 3rd Edition 15.8.1.7 */ - {SQRT2W, M_SQRT2}, /* ECMA-262 3rd Edition 15.8.1.8 */ + {L"E", M_E}, /* ECMA-262 3rd Edition 15.8.1.1 */ + {L"LN10", M_LN10}, /* ECMA-262 3rd Edition 15.8.1.2 */ + {L"LN2", M_LN2}, /* ECMA-262 3rd Edition 15.8.1.3 */ + {L"LOG2E", M_LOG2E}, /* ECMA-262 3rd Edition 15.8.1.4 */ + {L"LOG10E", M_LOG10E}, /* ECMA-262 3rd Edition 15.8.1.5 */ + {L"PI", M_PI}, /* ECMA-262 3rd Edition 15.8.1.6 */ + {L"SQRT1_2", M_SQRT1_2}, /* ECMA-262 3rd Edition 15.8.1.7 */ + {L"SQRT2", M_SQRT2}, /* ECMA-262 3rd Edition 15.8.1.8 */ }; math = heap_alloc_zero(sizeof(jsdisp_t)); diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 540f510f1b6..36384bf0621 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -31,13 +31,6 @@ typedef struct { double value; } NumberInstance; -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR toFixedW[] = {'t','o','F','i','x','e','d',0}; -static const WCHAR toExponentialW[] = {'t','o','E','x','p','o','n','e','n','t','i','a','l',0}; -static const WCHAR toPrecisionW[] = {'t','o','P','r','e','c','i','s','i','o','n',0}; -static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; - #define NUMBER_TOSTRING_BUF_SIZE 64 #define NUMBER_DTOA_SIZE 18 @@ -513,12 +506,12 @@ static HRESULT Number_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) } static const builtin_prop_t Number_props[] = { - {toExponentialW, Number_toExponential, PROPF_METHOD|1}, - {toFixedW, Number_toFixed, PROPF_METHOD}, - {toLocaleStringW, Number_toLocaleString, PROPF_METHOD}, - {toPrecisionW, Number_toPrecision, PROPF_METHOD|1}, - {toStringW, Number_toString, PROPF_METHOD|1}, - {valueOfW, Number_valueOf, PROPF_METHOD} + {L"toExponential", Number_toExponential, PROPF_METHOD|1}, + {L"toFixed", Number_toFixed, PROPF_METHOD}, + {L"toLocaleString", Number_toLocaleString, PROPF_METHOD}, + {L"toPrecision", Number_toPrecision, PROPF_METHOD|1}, + {L"toString", Number_toString, PROPF_METHOD|1}, + {L"valueOf", Number_valueOf, PROPF_METHOD} }; static const builtin_info_t Number_info = { diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index a896738140e..b2678443d2c 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -28,12 +28,6 @@ typedef struct { SAFEARRAY *safearray; } VBArrayInstance; -static const WCHAR dimensionsW[] = {'d','i','m','e','n','s','i','o','n','s',0}; -static const WCHAR getItemW[] = {'g','e','t','I','t','e','m',0}; -static const WCHAR lboundW[] = {'l','b','o','u','n','d',0}; -static const WCHAR toArrayW[] = {'t','o','A','r','r','a','y',0}; -static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; - static inline VBArrayInstance *vbarray_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, VBArrayInstance, dispex); @@ -248,11 +242,11 @@ static void VBArray_destructor(jsdisp_t *dispex) } static const builtin_prop_t VBArray_props[] = { - {dimensionsW, VBArray_dimensions, PROPF_METHOD}, - {getItemW, VBArray_getItem, PROPF_METHOD|1}, - {lboundW, VBArray_lbound, PROPF_METHOD}, - {toArrayW, VBArray_toArray, PROPF_METHOD}, - {uboundW, VBArray_ubound, PROPF_METHOD} + {L"dimensions", VBArray_dimensions, PROPF_METHOD}, + {L"getItem", VBArray_getItem, PROPF_METHOD|1}, + {L"lbound", VBArray_lbound, PROPF_METHOD}, + {L"toArray", VBArray_toArray, PROPF_METHOD}, + {L"ubound", VBArray_ubound, PROPF_METHOD} }; static const builtin_info_t VBArray_info = { -- 2.26.2

2 1

[PATCH] mshtml: Ignore attempts to set read only builtin properties in IE9+ mode.
by Jacek Caban Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 4 ++++ dlls/mshtml/tests/es5.js | 5 +++++ 2 files changed, 9 insertions(+)

2 1

[PATCH] winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive changes.
by Jan Sikorski Nov. 5, 2020

Nov. 5, 2020

The motivating example is when a newly created window gets moved off the system menu bar. A program might not be prepared to handle these messages yet. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 10 ++++++---- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b6c5386469c..8c3fffcdc6a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2114,7 +2114,7 @@ - (void) postBroughtForwardEvent macdrv_release_event(event); } - - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing notified:(BOOL)wasNotified { macdrv_event* event; NSUInteger style = self.styleMask; @@ -2134,6 +2134,7 @@ - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resi event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); event->window_frame_changed.fullscreen = isFullscreen; event->window_frame_changed.in_resize = resizing; + event->window_frame_changed.was_notified = wasNotified; [queue postEvent:event]; macdrv_release_event(event); } @@ -2853,7 +2854,7 @@ - (void) windowDidExitFullScreen:(NSNotification*)notification { exitingFullScreen = FALSE; [self setFrameAndWineFrame:nonFullscreenFrame]; - [self windowDidResize:nil]; + [self windowDidResize:notification]; if (pendingOrderOut) [self doOrderOut]; } @@ -2920,7 +2921,8 @@ - (void)windowDidResize:(NSNotification *)notification [self postWindowFrameChanged:frame fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 - resizing:[self inLiveResize]]; + resizing:[self inLiveResize] + wasNotified:notification != nil]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; @@ -2982,7 +2984,7 @@ - (void) windowWillEnterFullScreen:(NSNotification*)notification - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; - [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE wasNotified:notification != nil]; } - (void)windowWillMiniaturize:(NSNotification *)notification diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b02ad79f025..f75602d9616 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -443,6 +443,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, CGRect frame; int fullscreen; int in_resize; + int was_notified; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7f5327fcdc..b9ea9bea7c3 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2322,10 +2322,11 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize && !being_dragged) + int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && event->window_frame_changed.was_notified; + if (send_sizemove) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize && !being_dragged) + if (send_sizemove) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } } -- 2.27.0

1 0

[PATCH 1/2] mfmediaengine: Implement GetVideoAspectRatio().
by Nikolay Sivov Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 69 ++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index cbea4263702..27f6a26d6b7 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -74,7 +74,8 @@ enum media_engine_flags struct video_frame { LONGLONG pts; - UINT64 size; + SIZE size; + SIZE ratio; TOPOID node_id; }; @@ -252,15 +253,34 @@ static struct media_engine *impl_from_IMFSampleGrabberSinkCallback(IMFSampleGrab return CONTAINING_RECORD(iface, struct media_engine, grabber_callback); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology *topology) { IMFMediaTypeHandler *handler; IMFMediaType *media_type; IMFStreamDescriptor *sd; IMFTopologyNode *node; + unsigned int gcd; + UINT64 size; HRESULT hr; - engine->video_frame.size = 0; + engine->video_frame.size.cx = 0; + engine->video_frame.size.cy = 0; + engine->video_frame.ratio.cx = 1; + engine->video_frame.ratio.cy = 1; if (FAILED(IMFTopology_GetNodeByID(topology, engine->video_frame.node_id, &node))) return; @@ -284,7 +304,17 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology return; } - IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &engine->video_frame.size); + IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); + + engine->video_frame.size.cx = size >> 32; + engine->video_frame.size.cy = size; + + if ((gcd = get_gcd(engine->video_frame.size.cx, engine->video_frame.size.cy))) + { + engine->video_frame.ratio.cx = engine->video_frame.size.cx / gcd; + engine->video_frame.ratio.cy = engine->video_frame.size.cy / gcd; + } + IMFMediaType_Release(media_type); } @@ -533,8 +563,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi UINT64 duration; HRESULT hr; - engine->video_frame.node_id = 0; - engine->video_frame.size = 0; + memset(&engine->video_frame, 0, sizeof(engine->video_frame)); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -1309,12 +1338,12 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO EnterCriticalSection(&engine->cs); - if (!engine->video_frame.size) + if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) hr = E_FAIL; else { - if (cx) *cx = engine->video_frame.size >> 32; - if (cy) *cy = engine->video_frame.size; + if (cx) *cx = engine->video_frame.size.cx; + if (cy) *cy = engine->video_frame.size.cy; } LeaveCriticalSection(&engine->cs); @@ -1324,9 +1353,29 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) { - FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, cx, cy); + + if (!cx && !cy) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) + hr = E_FAIL; + else + { + if (cx) *cx = engine->video_frame.ratio.cx; + if (cy) *cy = engine->video_frame.ratio.cy; + } + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 21ead1b0afa..2f062741f60 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -383,7 +383,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaEngine_Release(media_engine); -- 2.28.0

1 1

[PATCH 1/2] evr/presenter: Create dedicated thread to handle presentation time.
by Nikolay Sivov Nov. 5, 2020

Nov. 5, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 54ad9fee994..01623815dd3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -40,6 +40,18 @@ enum presenter_state PRESENTER_STATE_PAUSED, }; +enum streaming_thread_message +{ + EVRM_STOP = WM_USER, +}; + +struct streaming_thread +{ + HANDLE hthread; + HANDLE ready_event; + DWORD tid; +}; + struct video_presenter { IMFVideoPresenter IMFVideoPresenter_iface; @@ -58,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + struct streaming_thread thread; UINT reset_token; HWND video_window; MFVideoNormalizedRect src_rect; @@ -184,6 +197,80 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre return hr; } +static DWORD CALLBACK video_presenter_streaming_thread(void *arg) +{ + struct video_presenter *presenter = arg; + BOOL stop_thread = FALSE; + MSG msg; + + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(presenter->thread.ready_event); + + while (!stop_thread) + { + MsgWaitForMultipleObjects(0, NULL, FALSE, INFINITE, QS_POSTMESSAGE); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + switch (msg.message) + { + case EVRM_STOP: + stop_thread = TRUE; + break; + + default: + ; + } + } + } + + return 0; +} + +static HRESULT video_presenter_start_streaming(struct video_presenter *presenter) +{ + if (presenter->thread.hthread) + return S_OK; + + if (!(presenter->thread.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(presenter->thread.hthread = CreateThread(NULL, 0, video_presenter_streaming_thread, + presenter, 0, &presenter->thread.tid))) + { + WARN("Failed to create streaming thread.\n"); + CloseHandle(presenter->thread.ready_event); + presenter->thread.ready_event = NULL; + return E_FAIL; + } + + WaitForSingleObject(presenter->thread.ready_event, INFINITE); + CloseHandle(presenter->thread.ready_event); + presenter->thread.ready_event = NULL; + + TRACE("Started streaming thread, tid %#x.\n", presenter->thread.tid); + + return S_OK; +} + +static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) +{ + if (!presenter->thread.hthread) + return S_OK; + + PostThreadMessageW(presenter->thread.tid, EVRM_STOP, 0, 0); + + WaitForSingleObject(presenter->thread.hthread, INFINITE); + CloseHandle(presenter->thread.hthread); + + TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid); + + memset(&presenter->thread, 0, sizeof(presenter->thread)); + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -266,6 +353,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) if (!refcount) { + video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) @@ -374,6 +462,12 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M case MFVP_MESSAGE_INVALIDATEMEDIATYPE: hr = video_presenter_invalidate_media_type(presenter); break; + case MFVP_MESSAGE_BEGINSTREAMING: + hr = video_presenter_start_streaming(presenter); + break; + case MFVP_MESSAGE_ENDSTREAMING: + hr = video_presenter_end_streaming(presenter); + break; default: FIXME("Unsupported message %u.\n", message); hr = E_NOTIMPL; -- 2.28.0

1 1

[PATCH] oleacc/tests: Fix the window name and keyboard shortcut tests.
by Francois Gouget Nov. 5, 2020

Nov. 5, 2020

Unlike button names and static messages, window titles don't contain keyboard shortcuts so they should be returned as is. Windows did not make any distinction between these cases before Windows 10 1607. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 75 +++++++++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index e4ef0e78bf2..ce44e06abe4 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -715,12 +715,17 @@ static void test_AccessibleChildren(IAccessible *acc) ok(V_VT(children) == VT_I4, "V_VT(children) = %d\n", V_VT(children)); ok(V_I4(children) == 1, "V_I4(children) = %d\n", V_I4(children)); + + ok(count == 1, "count = %d\n", count); + ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); }else { ok(V_VT(children) == VT_DISPATCH, "V_VT(children) = %d\n", V_VT(children)); IDispatch_Release(V_DISPATCH(children)); + + ok(count == 2, "count = %d\n", count); + ok(V_VT(children+1) == VT_DISPATCH, "V_VT(children+1) = %d\n", V_VT(children+1)); + IDispatch_Release(V_DISPATCH(children+1)); } - ok(count == 1, "count = %d\n", count); - ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); } @@ -730,7 +735,7 @@ static void test_default_client_accessible_object(void) IDispatch *disp; IOleWindow *ow; IEnumVARIANT *ev; - HWND chld, hwnd, hwnd2; + HWND chld, btn, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -739,16 +744,59 @@ static void test_default_client_accessible_object(void) LONG l, left, top, width, height; ULONG fetched; - hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + hwnd = CreateWindowA("oleacc_test", "wnd &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed\n"); - chld = CreateWindowA("static", "message", WS_CHILD | WS_VISIBLE, + chld = CreateWindowA("static", "static &t &junk", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, NULL, NULL, NULL); ok(chld != NULL, "CreateWindow failed\n"); + btn = CreateWindowA("BUTTON", "btn &t &junk", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, + 50, 0, 50, 50, hwnd, NULL, NULL, NULL); + ok(btn != NULL, "CreateWindow failed\n"); hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == E_FAIL, "got %x\n", hr); + + /* Test the static message */ + hr = CreateStdAccessibleObject(chld, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"static t &junk"), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IAccessible_Release(acc); + + + /* Test the button */ + hr = CreateStdAccessibleObject(btn, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"btn t &junk"), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IAccessible_Release(acc); + + + /* Now we can test and destroy the top-level window */ hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); @@ -764,7 +812,7 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); - ok(l == 1, "l = %d\n", l); + ok(l == 2, "l = %d\n", l); V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; @@ -810,7 +858,15 @@ static void test_default_client_accessible_object(void) V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, L"test t &junk"), "name = %s\n", wine_dbgstr_w(str)); + /* Window names don't have keyboard shortcuts */ + todo_wine ok(!lstrcmpW(str, L"wnd &t &junk") || + broken(!lstrcmpW(str, L"wnd t &junk")), /* Windows < 10 1607 */ + "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + todo_wine ok(hr == S_FALSE || broken(hr == S_OK), "got %x\n", hr); + todo_wine ok(str == NULL || broken(!lstrcmpW(str, L"Alt+t")), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_I4(&vid) = 1; @@ -850,11 +906,6 @@ static void test_default_client_accessible_object(void) ok(hr == S_FALSE, "got %x\n", hr); ok(!str, "str != NULL\n"); - hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); - ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - str = (void*)0xdeadbeef; hr = IAccessible_get_accDefaultAction(acc, vid, &str); ok(hr == S_FALSE, "got %x\n", hr); -- 2.20.1

1 0