- wine-devel - winehq.org

[PATCH resend] ntdll: Handle 64-bit addresses in +seh traces on x64.
by Daniel Lehman 26 Nov '20

26 Nov '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- -0110:trace:seh:dump_scope_table 0: 40004cdc-40004ce2 handler 4000b1a0 target 40000000 -0110:trace:seh:dump_scope_table 1: 40004cdc-40004d1b handler 4000b1ce target 40004d1b -0110:trace:seh:dump_scope_table 2: 40004cdc-40004d4f handler 4000b1fe target 40000000 -0110:trace:seh:dump_scope_table 3: 40004cdc-40004d88 handler 4000b22c target 40004d88 +0110:trace:seh:dump_scope_table 0: 140004cdc-140004ce2 handler 14000b1a0 target 140000000 +0110:trace:seh:dump_scope_table 1: 140004cdc-140004d1b handler 14000b1ce target 140004d1b +0110:trace:seh:dump_scope_table 2: 140004cdc-140004d4f handler 14000b1fe target 140000000 +0110:trace:seh:dump_scope_table 3: 140004cdc-140004d88 handler 14000b22c target 140004d88 -0110:trace:seh:__C_specific_handler unwinding to target 40005569 +0110:trace:seh:__C_specific_handler unwinding to target 140005569 -0110:trace:seh:RtlRestoreContext returning to 40005336 stack 21ed00 +0110:trace:seh:RtlRestoreContext returning to 140005336 stack 21ed00 -0110:trace:seh:RtlVirtualUnwind type 2 rip 40005567 rsp 21fd00 +0110:trace:seh:RtlVirtualUnwind type 2 rip 140005567 rsp 21fd00 -0110:trace:seh:dispatch_exception code=c0000094 flags=0 addr=000000014000225C ip=4000225c tid=0110 +0110:trace:seh:dispatch_exception code=c0000094 flags=0 addr=000000014000225C ip=14000225c tid=0110 --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a332f961908..96c3a5a6c69 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -241,7 +241,7 @@ static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) TRACE( "scope table at %p\n", table ); for (i = 0; i < table->Count; i++) - TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, + TRACE( " %u: %llx-%llx handler %llx target %llx\n", i, base + table->ScopeRecord[i].BeginAddress, base + table->ScopeRecord[i].EndAddress, base + table->ScopeRecord[i].HandlerAddress, @@ -384,7 +384,7 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C frame.Handler = nested_exception_handler; __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", + TRACE( "calling handler %p (rec=%p, frame=0x%llx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); @@ -445,7 +445,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %llx (%p-%p)\n", dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -480,7 +480,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %lx handler %p\n", + TRACE( "found wine frame %p rsp %llx handler %p\n", teb_frame, context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) @@ -521,7 +521,7 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; - TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", + TRACE( "code=%x flags=%x addr=%p ip=%llx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) @@ -780,7 +780,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; BOOL mach_frame = FALSE; - TRACE( "type %x rip %lx rsp %lx\n", type, pc, context->Rsp ); + TRACE( "type %x rip %llx rsp %llx\n", type, pc, context->Rsp ); if (TRACE_ON(seh)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; @@ -944,7 +944,7 @@ static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dis frame.dispatch = dispatch; __wine_push_frame( &frame.frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", + TRACE( "calling handler %p (rec=%p, frame=0x%llx context=%p, dispatch=%p)\n", dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res ); @@ -1162,7 +1162,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) teb_frame = __wine_pop_frame( teb_frame ); } - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + TRACE( "returning to %llx stack %llx\n", context->Rip, context->Rsp ); NtSetContextThread( GetCurrentThread(), context ); } @@ -1226,7 +1226,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %llx (%p-%p)\n", dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -1236,7 +1236,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { if (end_frame && (dispatch.EstablisherFrame > (ULONG64)end_frame)) { - ERR( "invalid end frame %lx/%p\n", dispatch.EstablisherFrame, end_frame ); + ERR( "invalid end frame %llx/%p\n", dispatch.EstablisherFrame, end_frame ); raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; @@ -1381,7 +1381,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, return ExceptionContinueExecution; } } - TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + TRACE( "unwinding to target %llx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); RtlUnwindEx( frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); } @@ -1471,7 +1471,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %llx (%p-%p)\n", dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); break; } -- 2.25.1

1 0

[PATCH] shcore: Return failure on Read past end of memory stream.
by Daniel Lehman 26 Nov '20

26 Nov '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/shcore/main.c | 18 ++++++------ dlls/shlwapi/tests/istream.c | 55 ++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index dc782e8be08..d5fce76eade 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -603,17 +603,19 @@ static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); if (stream->u.mem.position >= stream->u.mem.length) - length = 0; - else - length = stream->u.mem.length - stream->u.mem.position; - - length = buff_size > length ? length : buff_size; - if (length != 0) /* not at end of buffer and we want to read something */ { - memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); - stream->u.mem.position += length; /* adjust pointer */ + if (read_len) + *read_len = 0; + return S_FALSE; } + length = stream->u.mem.length - stream->u.mem.position; + if (buff_size < length) + length = buff_size; + + memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); + stream->u.mem.position += length; + if (read_len) *read_len = length; diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index d3e7dbb8810..84957ac8cd1 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -736,8 +736,10 @@ static void test_SHCreateMemStream(void) { static const BYTE initial[10]; IStream *stream, *stream2; + LARGE_INTEGER off; IUnknown *unk; char buff[10]; + ULONG i, num; HRESULT hr; stream = SHCreateMemStream(initial, 0); @@ -756,9 +758,56 @@ static void test_SHCreateMemStream(void) if (unk) IUnknown_Release(unk); - hr = IStream_Read(stream, buff, sizeof(buff), NULL); -todo_wine - ok(hr == S_FALSE || broken(hr == S_OK) /* WinXP */, "Unexpected hr %#x.\n", hr); + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); + + num = ~0; + memset(buff, 0x55, sizeof(buff)); + hr = IStream_Write(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to write, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + num = ~0; + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + for (i = 0; i < ARRAY_SIZE(buff); i++) + ok(buff[i] == 0x55, "expected 0x55, got 0x%02x at %u\n", buff[i], i); + + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); + + num = ~0; + memset(buff, 0x11, sizeof(buff)); + hr = IStream_Write(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to write, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + + off.QuadPart = -sizeof(buff); + hr = IStream_Seek(stream, off, STREAM_SEEK_CUR, NULL); + ok(hr == S_OK, "Failed to seek, hr %#x.\n", hr); + + num = ~0; + memset(buff, 0, sizeof(buff)); + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_OK, "Failed to read, hr %#x.\n", hr); + ok(num == sizeof(buff), "expected %u, got %u\n", sizeof(buff), num); + for (i = 0; i < ARRAY_SIZE(buff); i++) + ok(buff[i] == 0x11, "expected 0x11, got 0x%02x at %u\n", buff[i], i); + + num = ~0; + hr = IStream_Read(stream, buff, sizeof(buff), &num); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(num == 0, "expected 0, got 0x%08x\n", num); hr = IStream_Clone(stream, &stream2); todo_wine -- 2.25.1

1 0

[PATCH 7/7] msvcrt: Remove MSVCRT prefix from locale functions.
by Piotr Caban 26 Nov '20

26 Nov '20

1 0

[PATCH 6/7] msvcrt: Remove MSVCRT__locale_t type.
by Piotr Caban 26 Nov '20

26 Nov '20

1 0

[PATCH 5/7] msvcrt: Remove MSVCRT_pthreadmbcinfo type.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 6 +++--- dlls/msvcrt/mbcs.c | 32 ++++++++++++++++---------------- dlls/msvcrt/msvcrt.h | 16 +++++++--------- 3 files changed, 26 insertions(+), 28 deletions(-)

1 0

[PATCH 4/7] msvcrt: Remove MSVCRT_pthreadlocinfo type.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 6 ++--- dlls/msvcrt/locale.c | 56 +++++++++++++++++++------------------- dlls/msvcrt/mbcs.c | 10 +++---- dlls/msvcrt/msvcrt.h | 58 ++++++---------------------------------- dlls/msvcrt/scanf.h | 4 +-- dlls/msvcrt/string.c | 26 +++++++++--------- dlls/msvcrt/time.c | 12 ++++----- dlls/msvcrt/wcs.c | 20 +++++++------- include/msvcrt/corecrt.h | 17 +++++++++++- 9 files changed, 91 insertions(+), 118 deletions(-)

1 0

[PATCH 3/7] msvcrt: Remove MSVCRT_lconv type.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 8 ++++---- dlls/msvcrt/math.c | 1 + dlls/msvcrt/msvcrt.h | 33 +-------------------------------- dlls/msvcrt/string.c | 1 + dlls/msvcrt/wcs.c | 1 + include/msvcrt/locale.h | 10 ++++++++++ 6 files changed, 18 insertions(+), 36 deletions(-)

1 0

[PATCH 2/7] msvcrt: Move towctrans to wcs.c file.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/locale.c | 10 ---------- dlls/msvcrt/wcs.c | 11 +++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)

1 0

[PATCH 1/7] msvcrt: Move btowc implementation to mbcs.c file.
by Piotr Caban 26 Nov '20

26 Nov '20

1 0

[PATCH] wininet: Use wide-char string literals.
by Michael Stefaniuc 26 Nov '20

26 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/cookie.c | 13 +- dlls/wininet/dialogs.c | 9 +- dlls/wininet/ftp.c | 26 ++-- dlls/wininet/http.c | 284 +++++++++++++++------------------------- dlls/wininet/internet.c | 52 +++----- dlls/wininet/urlcache.c | 24 +--- 6 files changed, 146 insertions(+), 262 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 66c012a0db0..6def9ebf9d9 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -392,8 +392,6 @@ static BOOL load_persistent_cookie(substr_t domain, substr_t path) static BOOL save_persistent_cookie(cookie_container_t *container) { - static const WCHAR txtW[] = {'t','x','t',0}; - WCHAR cookie_file[MAX_PATH]; HANDLE cookie_handle; cookie_t *cookie_container = NULL, *cookie_iter; @@ -424,7 +422,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) return TRUE; } - if(!CreateUrlCacheEntryW(container->cookie_url, 0, txtW, cookie_file, 0)) + if(!CreateUrlCacheEntryW(container->cookie_url, 0, L"txt", cookie_file, 0)) return FALSE; cookie_handle = CreateFileW(cookie_file, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -500,13 +498,12 @@ static BOOL save_persistent_cookie(cookie_container_t *container) } memset(&time, 0, sizeof(time)); - return CommitUrlCacheEntryW(container->cookie_url, cookie_file, time, time, 0, NULL, 0, txtW, 0); + return CommitUrlCacheEntryW(container->cookie_url, cookie_file, time, time, 0, NULL, 0, L"txt", 0); } static BOOL cookie_parse_url(const WCHAR *url, substr_t *host, substr_t *path) { URL_COMPONENTSW comp = { sizeof(comp) }; - static const WCHAR rootW[] = {'/',0}; comp.dwHostNameLength = 1; comp.dwUrlPathLength = 1; @@ -519,7 +516,7 @@ static BOOL cookie_parse_url(const WCHAR *url, substr_t *host, substr_t *path) comp.dwUrlPathLength--; *host = substr(comp.lpszHostName, comp.dwHostNameLength); - *path = comp.dwUrlPathLength ? substr(comp.lpszUrlPath, comp.dwUrlPathLength) : substr(rootW, 1); + *path = comp.dwUrlPathLength ? substr(comp.lpszUrlPath, comp.dwUrlPathLength) : substr(L"/", 1); return TRUE; } @@ -533,8 +530,6 @@ typedef struct { static DWORD get_cookie(substr_t host, substr_t path, DWORD flags, cookie_set_t *res) { - static const WCHAR empty_path[] = { '/',0 }; - const WCHAR *p; cookie_domain_t *domain; cookie_container_t *container; @@ -549,7 +544,7 @@ static DWORD get_cookie(substr_t host, substr_t path, DWORD flags, cookie_set_t while(p > host.str && p[-1] != '.') p--; if(p == host.str) break; - load_persistent_cookie(substr(p, host.str+host.len-p), substr(empty_path, 1)); + load_persistent_cookie(substr(p, host.str+host.len-p), substr(L"/", 1)); } p = path.str + path.len; diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 29fb10cdf79..a425534fa87 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -59,7 +59,6 @@ static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz, BO { LPWSTR p, q; DWORD index, query; - static const WCHAR szRealm[] = { 'r','e','a','l','m','=',0 }; if (proxy) query = HTTP_QUERY_PROXY_AUTHENTICATE; @@ -76,7 +75,7 @@ static BOOL WININET_GetAuthRealm( HINTERNET hRequest, LPWSTR szBuf, DWORD sz, BO * dealing with 'Basic' Authentication */ p = wcschr( szBuf, ' ' ); - if( !p || wcsncmp( p+1, szRealm, lstrlenW(szRealm) ) ) + if( !p || wcsncmp( p+1, L"realm=", lstrlenW(L"realm=") ) ) { ERR("response wrong? (%s)\n", debugstr_w(szBuf)); return FALSE; @@ -112,15 +111,13 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, DWORD r, dwMagic = 19; UINT r_len, u_len; WORD sz; - static const WCHAR szColon[] = { ':',0 }; - static const WCHAR szbs[] = { '/', 0 }; hUserItem = GetDlgItem( hdlg, IDC_USERNAME ); hPassItem = GetDlgItem( hdlg, IDC_PASSWORD ); /* now try fetch the username and password */ lstrcpyW( szResource, szServer); - lstrcatW( szResource, szbs); + lstrcatW( szResource, L"/"); lstrcatW( szResource, szRealm); /* @@ -133,7 +130,7 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, { szUserPass[0] = 0; GetWindowTextW( hUserItem, szUserPass, ARRAY_SIZE( szUserPass ) - 1 ); - lstrcatW(szUserPass, szColon); + lstrcatW(szUserPass, L":"); u_len = lstrlenW( szUserPass ); GetWindowTextW( hPassItem, szUserPass+u_len, ARRAY_SIZE( szUserPass ) - u_len ); diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 09dc1f36fbf..05236972b26 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -159,7 +159,6 @@ static const CHAR *const szFtpCommands[] = { }; static const CHAR szMonths[] = "JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC"; -static const WCHAR szNoAccount[] = {'n','o','a','c','c','o','u','n','t','\0'}; static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam, INTERNET_STATUS_CALLBACK lpfnStatusCB, object_header_t *hdr, DWORD_PTR dwContext); @@ -2427,14 +2426,6 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags) { - static const WCHAR szKey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; - static const WCHAR szValue[] = {'E','m','a','i','l','N','a','m','e',0}; - static const WCHAR szDefaultUsername[] = {'a','n','o','n','y','m','o','u','s','\0'}; - static const WCHAR szEmpty[] = {'\0'}; struct sockaddr_in socketAddr; INT nsocket = -1; socklen_t sock_namelen; @@ -2490,14 +2481,14 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, WCHAR szPassword[MAX_PATH]; DWORD len = sizeof(szPassword); - lpwfs->lpszUserName = heap_strdupW(szDefaultUsername); + lpwfs->lpszUserName = heap_strdupW(L"anonymous"); - RegOpenKeyW(HKEY_CURRENT_USER, szKey, &key); - if (RegQueryValueExW(key, szValue, NULL, NULL, (LPBYTE)szPassword, &len)) { + RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", &key); + if (RegQueryValueExW(key, L"EmailName", NULL, NULL, (LPBYTE)szPassword, &len)) { /* Nothing in the registry, get the username and use that as the password */ if (!GetUserNameW(szPassword, &len)) { /* Should never get here, but use an empty password as failsafe */ - lstrcpyW(szPassword, szEmpty); + lstrcpyW(szPassword, L""); } } RegCloseKey(key); @@ -2507,7 +2498,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, } else { lpwfs->lpszUserName = heap_strdupW(lpszUserName); - lpwfs->lpszPassword = heap_strdupW(lpszPassword ? lpszPassword : szEmpty); + lpwfs->lpszPassword = heap_strdupW(lpszPassword ? lpszPassword : L""); } lpwfs->servername = heap_strdupW(lpszServerName); @@ -2877,7 +2868,7 @@ static BOOL FTP_SendAccount(ftp_session_t *lpwfs) BOOL bSuccess = FALSE; TRACE("\n"); - if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_ACCT, szNoAccount, 0, 0, 0)) + if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_ACCT, L"noaccount", 0, 0, 0)) goto lend; nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); @@ -3011,7 +3002,7 @@ lend: static BOOL FTP_SendType(ftp_session_t *lpwfs, DWORD dwType) { INT nResCode; - WCHAR type[] = { 'I','\0' }; + WCHAR type[] = L"I"; BOOL bSuccess = FALSE; TRACE("\n"); @@ -3092,13 +3083,12 @@ lend: */ static BOOL FTP_SendPort(ftp_session_t *lpwfs) { - static const WCHAR szIPFormat[] = {'%','d',',','%','d',',','%','d',',','%','d',',','%','d',',','%','d','\0'}; INT nResCode; WCHAR szIPAddress[64]; BOOL bSuccess = FALSE; TRACE("\n"); - swprintf(szIPAddress, ARRAY_SIZE(szIPAddress), szIPFormat, + swprintf(szIPAddress, ARRAY_SIZE(szIPAddress), L"%d,%d,%d,%d,%d,%d", lpwfs->lstnSocketAddress.sin_addr.S_un.S_addr&0x000000FF, (lpwfs->lstnSocketAddress.sin_addr.S_un.S_addr&0x0000FF00)>>8, (lpwfs->lstnSocketAddress.sin_addr.S_un.S_addr&0x00FF0000)>>16, diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8701e32067b..c770c312ba9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -60,35 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0}; -static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0}; -static const WCHAR szOK[] = {'O','K',0}; -static const WCHAR hostW[] = { 'H','o','s','t',0 }; -static const WCHAR szAuthorization[] = { 'A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; -static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u','t','h','o','r','i','z','a','t','i','o','n',0 }; -static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; -static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; -static const WCHAR szGET[] = { 'G','E','T', 0 }; -static const WCHAR szHEAD[] = { 'H','E','A','D', 0 }; - -static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; -static const WCHAR szCache_Control[] = { 'C','a','c','h','e','-','C','o','n','t','r','o','l',0 }; -static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 }; -static const WCHAR szContent_Encoding[] = { 'C','o','n','t','e','n','t','-','E','n','c','o','d','i','n','g',0 }; -static const WCHAR szContent_Length[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0 }; -static const WCHAR szContent_Type[] = { 'C','o','n','t','e','n','t','-','T','y','p','e',0 }; -static const WCHAR szExpires[] = { 'E','x','p','i','r','e','s',0 }; -static const WCHAR szLast_Modified[] = { 'L','a','s','t','-','M','o','d','i','f','i','e','d',0 }; -static const WCHAR szProxy_Connection[] = { 'P','r','o','x','y','-','C','o','n','n','e','c','t','i','o','n',0 }; -static const WCHAR szReferer[] = { 'R','e','f','e','r','e','r',0 }; -static const WCHAR szSet_Cookie[] = { 'S','e','t','-','C','o','o','k','i','e',0 }; - -static const WCHAR emptyW[] = {0}; - -#define HTTP_REFERER szReferer -#define HTTP_ACCEPT szAccept -#define HTTP_USERAGENT szUser_Agent - #define HTTP_ADDHDR_FLAG_ADD 0x20000000 #define HTTP_ADDHDR_FLAG_ADD_IF_NEW 0x10000000 #define HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA 0x40000000 @@ -196,17 +167,13 @@ static BOOL process_host_port(server_t *server) size_t name_len, len; WCHAR *buf; - static const WCHAR httpW[] = {'h','t','t','p',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',0}; - static const WCHAR formatW[] = {'%','s',':','/','/','%','s',':','%','u',0}; - name_len = lstrlenW(server->name); - len = name_len + 10 /* strlen("://:<port>") */ + ARRAY_SIZE(httpsW); + len = name_len + 10 /* strlen("://:<port>") */ + ARRAY_SIZE(L"https"); buf = heap_alloc( len * sizeof(WCHAR) ); if(!buf) return FALSE; - swprintf(buf, len, formatW, server->is_https ? httpsW : httpW, server->name, server->port); + swprintf(buf, len, L"%s://%s:%u", server->is_https ? L"https" : L"http", server->name, server->port); server->scheme_host_port = buf; server->host_port = server->scheme_host_port + 7 /* strlen("http://") */; @@ -326,7 +293,7 @@ static WCHAR *get_host_header( http_request_t *req ) WCHAR *ret = NULL; EnterCriticalSection( &req->headers_section ); - if ((header = HTTP_GetHeader( req, hostW ))) ret = heap_strdupW( header->lpszValue ); + if ((header = HTTP_GetHeader( req, L"Host" ))) ret = heap_strdupW( header->lpszValue ); else ret = heap_strdupW( req->server->canon_host_port ); LeaveCriticalSection( &req->headers_section ); return ret; @@ -514,7 +481,7 @@ static DWORD init_gzip_stream(http_request_t *req, BOOL is_gzip) return ERROR_OUTOFMEMORY; } - remove_header(req, szContent_Length, FALSE); + remove_header(req, L"Content-Length", FALSE); if(req->read_size) { memcpy(gzip_stream->buf, req->read_buf+req->read_pos, req->read_size); @@ -542,12 +509,9 @@ static void HTTP_FreeTokens(LPWSTR * token_array) static void HTTP_FixURL(http_request_t *request) { - static const WCHAR szSlash[] = { '/',0 }; - static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/', 0 }; - /* If we don't have a path we set it to root */ if (NULL == request->path) - request->path = heap_strdupW(szSlash); + request->path = heap_strdupW(L"/"); else /* remove \r and \n*/ { int nLen = lstrlenW(request->path); @@ -564,7 +528,7 @@ static void HTTP_FixURL(http_request_t *request) } if(CSTR_EQUAL != CompareStringW( LOCALE_INVARIANT, NORM_IGNORECASE, - request->path, lstrlenW(request->path), szHttp, lstrlenW(szHttp) ) + request->path, lstrlenW(request->path), L"http://", lstrlenW(L"http://") ) && request->path[0] != '/') /* not an absolute path ?? --> fix it !! */ { WCHAR *fixurl = heap_alloc((lstrlenW(request->path) + 2)*sizeof(WCHAR)); @@ -578,10 +542,6 @@ static void HTTP_FixURL(http_request_t *request) static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, const WCHAR *path, const WCHAR *version, BOOL use_cr) { - static const WCHAR szSpace[] = {' ',0}; - static const WCHAR szColon[] = {':',' ',0}; - static const WCHAR szCr[] = {'\r',0}; - static const WCHAR szLf[] = {'\n',0}; LPWSTR requestString; DWORD len, n; LPCWSTR *req; @@ -600,13 +560,13 @@ static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, /* add the verb, path and HTTP version string */ n = 0; req[n++] = verb; - req[n++] = szSpace; + req[n++] = L" "; req[n++] = path; - req[n++] = szSpace; + req[n++] = L" "; req[n++] = version; if (use_cr) - req[n++] = szCr; - req[n++] = szLf; + req[n++] = L"\r"; + req[n++] = L"\n"; /* Append custom request headers */ for (i = 0; i < request->nCustHeaders; i++) @@ -614,11 +574,11 @@ static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, if (request->custHeaders[i].wFlags & HDR_ISREQUEST) { req[n++] = request->custHeaders[i].lpszField; - req[n++] = szColon; + req[n++] = L": "; req[n++] = request->custHeaders[i].lpszValue; if (use_cr) - req[n++] = szCr; - req[n++] = szLf; + req[n++] = L"\r"; + req[n++] = L"\n"; TRACE("Adding custom header %s (%s)\n", debugstr_w(request->custHeaders[i].lpszField), @@ -626,8 +586,8 @@ static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, } } if (use_cr) - req[n++] = szCr; - req[n++] = szLf; + req[n++] = L"\r"; + req[n++] = L"\n"; req[n] = NULL; requestString = HTTP_build_req( req, 4 ); @@ -638,10 +598,6 @@ static WCHAR* build_request_header(http_request_t *request, const WCHAR *verb, static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) { - static const WCHAR colonW[] = { ':',' ',0 }; - static const WCHAR crW[] = { '\r',0 }; - static const WCHAR lfW[] = { '\n',0 }; - static const WCHAR status_fmt[] = { ' ','%','u',' ',0 }; const WCHAR **req; WCHAR *ret, buf[14]; DWORD i, n = 0; @@ -657,25 +613,25 @@ static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) if (request->status_code) { req[n++] = request->version; - swprintf(buf, ARRAY_SIZE(buf), status_fmt, request->status_code); + swprintf(buf, ARRAY_SIZE(buf), L" %u ", request->status_code); req[n++] = buf; req[n++] = request->statusText; if (use_cr) - req[n++] = crW; - req[n++] = lfW; + req[n++] = L"\r"; + req[n++] = L"\n"; } for(i = 0; i < request->nCustHeaders; i++) { if(!(request->custHeaders[i].wFlags & HDR_ISREQUEST) - && wcscmp(request->custHeaders[i].lpszField, szStatus)) + && wcscmp(request->custHeaders[i].lpszField, L"Status")) { req[n++] = request->custHeaders[i].lpszField; - req[n++] = colonW; + req[n++] = L": "; req[n++] = request->custHeaders[i].lpszValue; if(use_cr) - req[n++] = crW; - req[n++] = lfW; + req[n++] = L"\r"; + req[n++] = L"\n"; TRACE("Adding custom header %s (%s)\n", debugstr_w(request->custHeaders[i].lpszField), @@ -683,8 +639,8 @@ static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) } } if(use_cr) - req[n++] = crW; - req[n++] = lfW; + req[n++] = L"\r"; + req[n++] = L"\n"; req[n] = NULL; ret = HTTP_build_req(req, 0); @@ -704,7 +660,7 @@ static void HTTP_ProcessCookies( http_request_t *request ) EnterCriticalSection( &request->headers_section ); - while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, szSet_Cookie, numCookies++, FALSE)) != -1) + while((HeaderIndex = HTTP_GetCustomHeaderIndex(request, L"Set-Cookie", numCookies++, FALSE)) != -1) { const WCHAR *data; substr_t name; @@ -1023,8 +979,7 @@ static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, if (is_basic_auth_value(pszAuthValue,NULL)) { - static const WCHAR szBasic[] = {'B','a','s','i','c',0}; - pAuthInfo->scheme = heap_strdupW(szBasic); + pAuthInfo->scheme = heap_strdupW(L"Basic"); if (!pAuthInfo->scheme) { heap_free(pAuthInfo); @@ -1615,7 +1570,6 @@ static WCHAR *encode_auth_data( const WCHAR *scheme, const char *data, UINT data */ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthInfo *pAuthInfo, LPCWSTR header ) { - static const WCHAR wszBasic[] = {'B','a','s','i','c',0}; WCHAR *host, *authorization = NULL; if (pAuthInfo) @@ -1628,7 +1582,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn /* clear the data as it isn't valid now that it has been sent to the * server, unless it's Basic authentication which doesn't do * connection tracking */ - if (wcsicmp(pAuthInfo->scheme, wszBasic)) + if (wcsicmp(pAuthInfo->scheme, L"Basic")) { heap_free(pAuthInfo->auth_data); pAuthInfo->auth_data = NULL; @@ -1648,7 +1602,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn char *data; /* Don't use cached credentials when a username or Authorization was specified */ - if ((request->session->userName && request->session->userName[0]) || wcscmp(header, szAuthorization)) + if ((request->session->userName && request->session->userName[0]) || wcscmp(header, L"Authorization")) return TRUE; if (!(host = get_host_header(request))) @@ -1658,7 +1612,7 @@ static BOOL HTTP_InsertAuthorization( http_request_t *request, struct HttpAuthIn { TRACE("Found cached basic authorization for %s\n", debugstr_w(host)); - if (!(authorization = encode_auth_data(wszBasic, data, data_len))) + if (!(authorization = encode_auth_data(L"Basic", data, data_len))) { heap_free(data); heap_free(host); @@ -1702,11 +1656,10 @@ static WCHAR *build_proxy_path_url(http_request_t *req) static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain) { - static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 }; const WCHAR *dot, *ptr; int len; - if(domain.len == ARRAY_SIZE(localW)-1 && !wcsnicmp(domain.str, localW, domain.len) && !wcschr(server, '.' )) + if(domain.len == ARRAY_SIZE(L"<local>")-1 && !wcsnicmp(domain.str, L"<local>", domain.len) && !wcschr(server, '.' )) return TRUE; if(domain.len && *domain.str != '*') @@ -1771,24 +1724,22 @@ static BOOL HTTP_ShouldBypassProxy(appinfo_t *lpwai, LPCWSTR server) */ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_request_t *request) { - static const WCHAR protoHttp[] = { 'h','t','t','p',0 }; - static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; - static WCHAR szNul[] = { 0 }; + static WCHAR szNul[] = L""; URL_COMPONENTSW UrlComponents = { sizeof(UrlComponents) }; server_t *new_server = NULL; WCHAR *proxy; - proxy = INTERNET_FindProxyForProtocol(hIC->proxy, protoHttp); + proxy = INTERNET_FindProxyForProtocol(hIC->proxy, L"http"); if(!proxy) return FALSE; if(CSTR_EQUAL != CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - proxy, lstrlenW(szHttp), szHttp, lstrlenW(szHttp))) { - WCHAR *proxy_url = heap_alloc(lstrlenW(proxy)*sizeof(WCHAR) + sizeof(szHttp)); + proxy, lstrlenW(L"http://"), L"http://", lstrlenW(L"http://"))) { + WCHAR *proxy_url = heap_alloc(lstrlenW(proxy)*sizeof(WCHAR) + sizeof(L"http://")); if(!proxy_url) { heap_free(proxy); return FALSE; } - lstrcpyW(proxy_url, szHttp); + lstrcpyW(proxy_url, L"http://"); lstrcatW(proxy_url, proxy); heap_free(proxy); proxy = proxy_url; @@ -1840,8 +1791,6 @@ static DWORD HTTP_ResolveName(http_request_t *request) static WCHAR *compose_request_url(http_request_t *req) { - static const WCHAR http[] = { 'h','t','t','p',':','/','/',0 }; - static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; const WCHAR *host, *scheme; WCHAR *buf, *ptr; size_t len; @@ -1849,9 +1798,9 @@ static WCHAR *compose_request_url(http_request_t *req) host = req->server->canon_host_port; if (req->server->is_https) - scheme = https; + scheme = L"https://"; else - scheme = http; + scheme = L"http://"; len = lstrlenW(scheme) + lstrlenW(host) + (req->path[0] != '/' ? 1 : 0) + lstrlenW(req->path); ptr = buf = heap_alloc((len+1) * sizeof(WCHAR)); @@ -1981,7 +1930,7 @@ static BOOL HTTP_KeepAlive(http_request_t *request) /* as per RFC 2068, S8.1.2.1, if the client is HTTP/1.1 then assume that * the connection is keep-alive by default */ if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_VERSION, szVersion, &dwBufferSize, NULL) == ERROR_SUCCESS - && !wcsicmp(szVersion, g_szHttp1_1)) + && !wcsicmp(szVersion, L"HTTP/1.1")) { keepalive = TRUE; } @@ -1990,7 +1939,7 @@ static BOOL HTTP_KeepAlive(http_request_t *request) if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) == ERROR_SUCCESS || HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) == ERROR_SUCCESS) { - keepalive = !wcsicmp(szConnectionResponse, szKeepAlive); + keepalive = !wcsicmp(szConnectionResponse, L"Keep-Alive"); } return keepalive; @@ -2471,9 +2420,6 @@ static void commit_cache_entry(http_request_t *req) static void create_cache_entry(http_request_t *req) { - static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; - static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; - WCHAR file_name[MAX_PATH+1]; WCHAR *url; BOOL b = TRUE; @@ -2496,7 +2442,7 @@ static void create_cache_entry(http_request_t *req) EnterCriticalSection( &req->headers_section ); - header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); + header_idx = HTTP_GetCustomHeaderIndex(req, L"Cache-Control", 0, FALSE); if(header_idx != -1) { WCHAR *ptr; @@ -2510,8 +2456,8 @@ static void create_cache_entry(http_request_t *req) if(!end) end = ptr + lstrlenW(ptr); - if(!wcsnicmp(ptr, no_cacheW, ARRAY_SIZE(no_cacheW)-1) - || !wcsnicmp(ptr, no_storeW, ARRAY_SIZE(no_storeW)-1)) { + if(!wcsnicmp(ptr, L"no-cache", ARRAY_SIZE(L"no-cache")-1) + || !wcsnicmp(ptr, L"no-store", ARRAY_SIZE(L"no-store")-1)) { b = FALSE; break; } @@ -2968,13 +2914,11 @@ static const data_stream_vtbl_t chunked_stream_vtbl = { /* set the request content length based on the headers */ static DWORD set_content_length(http_request_t *request) { - static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; - static const WCHAR headW[] = {'H','E','A','D',0}; WCHAR contentLength[32]; WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, headW)) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } @@ -2991,7 +2935,7 @@ static DWORD set_content_length(http_request_t *request) size = sizeof(encoding); if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_TRANSFER_ENCODING, encoding, &size, NULL) == ERROR_SUCCESS && - !wcsicmp(encoding, szChunked)) + !wcsicmp(encoding, L"chunked")) { chunked_stream_t *chunked_stream; @@ -3017,19 +2961,16 @@ static DWORD set_content_length(http_request_t *request) if(request->hdr.decoding) { int encoding_idx; - static const WCHAR deflateW[] = {'d','e','f','l','a','t','e',0}; - static const WCHAR gzipW[] = {'g','z','i','p',0}; - EnterCriticalSection( &request->headers_section ); - encoding_idx = HTTP_GetCustomHeaderIndex(request, szContent_Encoding, 0, FALSE); + encoding_idx = HTTP_GetCustomHeaderIndex(request, L"Content-Encoding", 0, FALSE); if(encoding_idx != -1) { - if(!wcsicmp(request->custHeaders[encoding_idx].lpszValue, gzipW)) { + if(!wcsicmp(request->custHeaders[encoding_idx].lpszValue, L"gzip")) { HTTP_DeleteCustomHeader(request, encoding_idx); LeaveCriticalSection( &request->headers_section ); return init_gzip_stream(request, TRUE); } - if(!wcsicmp(request->custHeaders[encoding_idx].lpszValue, deflateW)) { + if(!wcsicmp(request->custHeaders[encoding_idx].lpszValue, L"deflate")) { HTTP_DeleteCustomHeader(request, encoding_idx); LeaveCriticalSection( &request->headers_section ); return init_gzip_stream(request, FALSE); @@ -3128,7 +3069,7 @@ static DWORD drain_content(http_request_t *req, BOOL blocking) if(!is_valid_netconn(req->netconn)) return ERROR_NO_DATA; - if(!wcscmp(req->verb, szHEAD)) + if(!wcscmp(req->verb, L"HEAD")) return ERROR_SUCCESS; EnterCriticalSection( &req->read_section ); @@ -3452,13 +3393,11 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, lstrcpyW(request->path,lpszObjectName); } }else { - static const WCHAR slashW[] = {'/',0}; - - request->path = heap_strdupW(slashW); + request->path = heap_strdupW(L"/"); } if (lpszReferrer && *lpszReferrer) - HTTP_ProcessHeader(request, HTTP_REFERER, lpszReferrer, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(request, L"Referer", lpszReferrer, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (lpszAcceptTypes) { @@ -3466,15 +3405,15 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, for (i = 0; lpszAcceptTypes[i]; i++) { if (!*lpszAcceptTypes[i]) continue; - HTTP_ProcessHeader(request, HTTP_ACCEPT, lpszAcceptTypes[i], + HTTP_ProcessHeader(request, L"Accept", lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | HTTP_ADDHDR_FLAG_REQ | (i == 0 ? (HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD) : 0)); } } - request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); - request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1); + request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : L"GET"); + request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : L"HTTP/1.1"); if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request ); @@ -3787,9 +3726,8 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, }else { WCHAR buf[12]; DWORD size; - static const WCHAR formatW[] = {'%','u',0}; - size = swprintf(buf, ARRAY_SIZE(buf), formatW, request->status_code) * sizeof(WCHAR); + size = swprintf(buf, ARRAY_SIZE(buf), L"%u", request->status_code) * sizeof(WCHAR); if(size <= *lpdwBufferLength) { memcpy(lpBuffer, buf, size+sizeof(WCHAR)); @@ -4109,8 +4047,8 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, static WCHAR *get_redirect_url(http_request_t *request) { - static WCHAR szHttp[] = {'h','t','t','p',0}; - static WCHAR szHttps[] = {'h','t','t','p','s',0}; + static WCHAR szHttp[] = L"http"; + static WCHAR szHttps[] = L"https"; http_session_t *session = request->session; URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; WCHAR *orig_url = NULL, *redirect_url = NULL, *combined_url = NULL; @@ -4247,9 +4185,11 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) } if (custom_port) - HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(request, L"Host", request->server->host_port, + HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); else - HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + HTTP_ProcessHeader(request, L"Host", request->server->name, + HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); } heap_free(request->path); @@ -4258,11 +4198,11 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) { DWORD needed = 1; HRESULT rc; - WCHAR dummy = 0; + WCHAR dummy[] = L""; WCHAR *path; path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); - rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); + rc = UrlEscapeW(path, dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); @@ -4277,8 +4217,8 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) } /* Remove custom content-type/length headers on redirects. */ - remove_header(request, szContent_Type, TRUE); - remove_header(request, szContent_Length, TRUE); + remove_header(request, L"Content-Type", TRUE); + remove_header(request, L"Content-Length", TRUE); return ERROR_SUCCESS; } @@ -4414,7 +4354,6 @@ static BOOL HTTP_ParseTime(SYSTEMTIME *st, LPCWSTR *str) static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) { - static const WCHAR gmt[]= { 'G','M','T',0 }; WCHAR day[4], *dayPtr, month[4], *monthPtr, *nextPtr; LPCWSTR ptr; SYSTEMTIME st = { 0 }; @@ -4481,7 +4420,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) /* asctime() doesn't report a timezone, but some web servers do, so accept * with or without GMT. */ - if (*ptr && wcscmp(ptr, gmt)) + if (*ptr && wcscmp(ptr, L"GMT")) { ERR("unexpected timezone %s\n", debugstr_w(ptr)); return FALSE; @@ -4491,7 +4430,6 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) { - static const WCHAR gmt[]= { 'G','M','T',0 }; WCHAR *nextPtr, day[4], month[4], *monthPtr; LPCWSTR ptr; unsigned long num; @@ -4559,7 +4497,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) while (iswspace(*ptr)) ptr++; - if (wcscmp(ptr, gmt)) + if (wcscmp(ptr, L"GMT")) { ERR("unexpected time zone %s\n", debugstr_w(ptr)); return FALSE; @@ -4587,7 +4525,6 @@ static WORD HTTP_ParseWeekday(LPCWSTR day) static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) { - static const WCHAR gmt[]= { 'G','M','T',0 }; WCHAR *nextPtr, day[10], month[4], *monthPtr; LPCWSTR ptr; unsigned long num; @@ -4677,7 +4614,7 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) while (iswspace(*ptr)) ptr++; - if (wcscmp(ptr, gmt)) + if (wcscmp(ptr, L"GMT")) { ERR("unexpected time zone %s\n", debugstr_w(ptr)); return FALSE; @@ -4687,10 +4624,9 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) { - static const WCHAR zero[] = { '0',0 }; BOOL ret; - if (!wcscmp(value, zero)) + if (!wcscmp(value, L"0")) { ft->dwLowDateTime = ft->dwHighDateTime = 0; ret = TRUE; @@ -4724,7 +4660,7 @@ static void HTTP_ProcessExpires(http_request_t *request) /* Look for a Cache-Control header with a max-age directive, as it takes * precedence over the Expires header. */ - headerIndex = HTTP_GetCustomHeaderIndex(request, szCache_Control, 0, FALSE); + headerIndex = HTTP_GetCustomHeaderIndex(request, L"Cache-Control", 0, FALSE); if (headerIndex != -1) { LPHTTPHEADERW ccHeader = &request->custHeaders[headerIndex]; @@ -4742,10 +4678,7 @@ static void HTTP_ProcessExpires(http_request_t *request) ; if (*equal == '=') { - static const WCHAR max_age[] = { - 'm','a','x','-','a','g','e',0 }; - - if (!wcsnicmp(ptr, max_age, equal - ptr - 1)) + if (!wcsnicmp(ptr, L"max-age", equal - ptr - 1)) { LPWSTR nextPtr; unsigned long age; @@ -4778,7 +4711,7 @@ static void HTTP_ProcessExpires(http_request_t *request) } if (!expirationFound) { - headerIndex = HTTP_GetCustomHeaderIndex(request, szExpires, 0, FALSE); + headerIndex = HTTP_GetCustomHeaderIndex(request, L"Expires", 0, FALSE); if (headerIndex != -1) { LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; @@ -4811,7 +4744,7 @@ static void HTTP_ProcessLastModified(http_request_t *request) EnterCriticalSection( &request->headers_section ); - headerIndex = HTTP_GetCustomHeaderIndex(request, szLast_Modified, 0, FALSE); + headerIndex = HTTP_GetCustomHeaderIndex(request, L"Last-Modified", 0, FALSE); if (headerIndex != -1) { LPHTTPHEADERW expiresHeader = &request->custHeaders[headerIndex]; @@ -4830,12 +4763,12 @@ static void http_process_keep_alive(http_request_t *req) EnterCriticalSection( &req->headers_section ); - if ((index = HTTP_GetCustomHeaderIndex(req, szConnection, 0, FALSE)) != -1) - req->netconn->keep_alive = !wcsicmp(req->custHeaders[index].lpszValue, szKeepAlive); - else if ((index = HTTP_GetCustomHeaderIndex(req, szProxy_Connection, 0, FALSE)) != -1) - req->netconn->keep_alive = !wcsicmp(req->custHeaders[index].lpszValue, szKeepAlive); + if ((index = HTTP_GetCustomHeaderIndex(req, L"Connection", 0, FALSE)) != -1) + req->netconn->keep_alive = !wcsicmp(req->custHeaders[index].lpszValue, L"Keep-Alive"); + else if ((index = HTTP_GetCustomHeaderIndex(req, L"Proxy-Connection", 0, FALSE)) != -1) + req->netconn->keep_alive = !wcsicmp(req->custHeaders[index].lpszValue, L"Keep-Alive"); else - req->netconn->keep_alive = !wcsicmp(req->version, g_szHttp1_1); + req->netconn->keep_alive = !wcsicmp(req->version, L"HTTP/1.1"); LeaveCriticalSection( &req->headers_section ); } @@ -4930,11 +4863,9 @@ static char *build_ascii_request( const WCHAR *str, void *data, DWORD data_len, static void set_content_length_header( http_request_t *request, DWORD len, DWORD flags ) { - static const WCHAR fmtW[] = - {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; - WCHAR buf[ARRAY_SIZE(fmtW) + 10]; + WCHAR buf[ARRAY_SIZE(L"Content-Length: %u\r\n") + 10]; - swprintf( buf, ARRAY_SIZE(buf), fmtW, len ); + swprintf( buf, ARRAY_SIZE(buf), L"Content-Length: %u\r\n", len ); HTTP_HttpAddRequestHeadersW( request, buf, ~0u, flags ); } @@ -4963,12 +4894,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, /* if the verb is NULL default to GET */ if (!request->verb) - request->verb = heap_strdupW(szGET); + request->verb = heap_strdupW(L"GET"); - HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, + HTTP_ProcessHeader(request, L"Host", request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD_IF_NEW | HTTP_ADDHDR_FLAG_REQ); - if (dwContentLength || wcscmp(request->verb, szGET)) + if (dwContentLength || wcscmp(request->verb, L"GET")) { set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_ADD_IF_NEW); request->bytesToWrite = dwContentLength; @@ -4976,26 +4907,24 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (request->session->appInfo->agent) { WCHAR *agent_header; - static const WCHAR user_agent[] = {'U','s','e','r','-','A','g','e','n','t',':',' ','%','s','\r','\n',0}; int len; - len = lstrlenW(request->session->appInfo->agent) + lstrlenW(user_agent); + len = lstrlenW(request->session->appInfo->agent) + lstrlenW(L"User-Agent: %s\r\n"); agent_header = heap_alloc(len * sizeof(WCHAR)); - swprintf(agent_header, len, user_agent, request->session->appInfo->agent); + swprintf(agent_header, len, L"User-Agent: %s\r\n", request->session->appInfo->agent); HTTP_HttpAddRequestHeadersW(request, agent_header, lstrlenW(agent_header), HTTP_ADDREQ_FLAG_ADD_IF_NEW); heap_free(agent_header); } if (request->hdr.dwFlags & INTERNET_FLAG_PRAGMA_NOCACHE) { - static const WCHAR pragma_nocache[] = {'P','r','a','g','m','a',':',' ','n','o','-','c','a','c','h','e','\r','\n',0}; - HTTP_HttpAddRequestHeadersW(request, pragma_nocache, lstrlenW(pragma_nocache), HTTP_ADDREQ_FLAG_ADD_IF_NEW); + HTTP_HttpAddRequestHeadersW(request, L"Pragma: no-cache\r\n", + lstrlenW(L"Pragma: no-cache\r\n"), HTTP_ADDREQ_FLAG_ADD_IF_NEW); } - if ((request->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) && wcscmp(request->verb, szGET)) + if ((request->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) && wcscmp(request->verb, L"GET")) { - static const WCHAR cache_control[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l',':', - ' ','n','o','-','c','a','c','h','e','\r','\n',0}; - HTTP_HttpAddRequestHeadersW(request, cache_control, lstrlenW(cache_control), HTTP_ADDREQ_FLAG_ADD_IF_NEW); + HTTP_HttpAddRequestHeadersW(request, L"Cache-Control: no-cache\r\n", + lstrlenW(L"Cache-Control: no-cache\r\n"), HTTP_ADDREQ_FLAG_ADD_IF_NEW); } /* add the headers the caller supplied */ @@ -5020,7 +4949,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTPHEADERW *host; EnterCriticalSection( &request->headers_section ); - host = HTTP_GetHeader( request, hostW ); + host = HTTP_GetHeader(request, L"Host"); TRACE("Going to url %s %s\n", debugstr_w(host->lpszValue), debugstr_w(request->path)); LeaveCriticalSection( &request->headers_section ); } @@ -5028,11 +4957,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_FixURL(request); if (request->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION) { - HTTP_ProcessHeader(request, szConnection, szKeepAlive, + HTTP_ProcessHeader(request, L"Connection", L"Keep-Alive", HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); } - HTTP_InsertAuthorization(request, request->authInfo, szAuthorization); - HTTP_InsertAuthorization(request, request->proxyAuthInfo, szProxy_Authorization); + HTTP_InsertAuthorization(request, request->authInfo, L"Authorization"); + HTTP_InsertAuthorization(request, request->proxyAuthInfo, L"Proxy-Authorization"); if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) HTTP_InsertCookies(request); @@ -5057,13 +4986,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } if (secure_proxy_connect) { - static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; const WCHAR *target = request->server->host_port; - if (HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) + if (HTTP_GetCustomHeaderIndex(request, L"Content-Length", 0, TRUE) >= 0) set_content_length_header(request, 0, HTTP_ADDREQ_FLAG_REPLACE); - request_header = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); + request_header = build_request_header(request, L"CONNECT", target, L"HTTP/1.1", TRUE); } else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { @@ -5073,7 +5001,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } else { - if (request->proxy && HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) + if (request->proxy && HTTP_GetCustomHeaderIndex(request, L"Content-Length", 0, TRUE) >= 0) set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_REPLACE); request_header = build_request_header(request, request->verb, request->path, request->version, TRUE); @@ -5160,11 +5088,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if(!new_url) break; - if (wcscmp(request->verb, szGET) && wcscmp(request->verb, szHEAD) && + if (wcscmp(request->verb, L"GET") && wcscmp(request->verb, L"HEAD") && request->status_code != HTTP_STATUS_REDIRECT_KEEP_VERB) { heap_free(request->verb); - request->verb = heap_strdupW(szGET); + request->verb = heap_strdupW(L"GET"); } http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); @@ -5243,7 +5171,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, http_release_netconn( request, FALSE ); break; } - remove_header(request, szProxy_Authorization, TRUE); + remove_header(request, L"Proxy-Authorization", TRUE); destroy_authinfo(request->proxyAuthInfo); request->proxyAuthInfo = NULL; request->contentLength = 0; @@ -5354,11 +5282,11 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ if(!new_url) break; - if (wcscmp(request->verb, szGET) && wcscmp(request->verb, szHEAD) && + if (wcscmp(request->verb, L"GET") && wcscmp(request->verb, L"HEAD") && request->status_code != HTTP_STATUS_REDIRECT_KEEP_VERB) { heap_free(request->verb); - request->verb = heap_strdupW(szGET); + request->verb = heap_strdupW(L"GET"); } http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); @@ -6006,7 +5934,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* check is this a status code line? */ - if (!wcsncmp(buffer, g_szHttp1_0, 4)) + if (!wcsncmp(buffer, L"HTTP/1.0", 4)) { /* split the version from the status code */ status_code = wcschr( buffer, ' ' ); @@ -6034,22 +5962,22 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) heap_free(request->statusText); request->status_code = HTTP_STATUS_OK; - request->version = heap_strdupW(g_szHttp1_0); - request->statusText = heap_strdupW(szOK); + request->version = heap_strdupW(L"HTTP/1.0"); + request->statusText = heap_strdupW(L"OK"); goto lend; } } while (codeHundred); /* Add status code */ - HTTP_ProcessHeader(request, szStatus, status_code, + HTTP_ProcessHeader(request, L"Status", status_code, HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_ADD); heap_free(request->version); heap_free(request->statusText); request->version = heap_strdupW(buffer); - request->statusText = heap_strdupW(status_text ? status_text : emptyW); + request->statusText = heap_strdupW(status_text ? status_text : L""); /* Restore the spaces */ *(status_code-1) = ' '; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b26a1b912ee..de56e3f3146 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -94,12 +94,7 @@ static ULONG max_conns = 2, max_1_0_conns = 4; static ULONG connect_timeout = 60000; static const WCHAR szInternetSettings[] = - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 }; -static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 }; -static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 }; -static const WCHAR szProxyOverride[] = { 'P','r','o','x','y','O','v','e','r','r','i','d','e', 0 }; + L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size) { @@ -337,7 +332,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; - if ((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE*)&lpwpi->proxyEnabled, sizeof(DWORD)))) + if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&lpwpi->proxyEnabled, sizeof(DWORD)))) { RegCloseKey( key ); return ret; @@ -345,7 +340,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) if (lpwpi->proxy) { - if ((ret = RegSetValueExW( key, szProxyServer, 0, REG_SZ, (BYTE*)lpwpi->proxy, sizeof(WCHAR) * (lstrlenW(lpwpi->proxy) + 1)))) + if ((ret = RegSetValueExW( key, L"ProxyServer", 0, REG_SZ, (BYTE*)lpwpi->proxy, sizeof(WCHAR) * (lstrlenW(lpwpi->proxy) + 1)))) { RegCloseKey( key ); return ret; @@ -353,7 +348,7 @@ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) } else { - if ((ret = RegDeleteValueW( key, szProxyServer )) && ret != ERROR_FILE_NOT_FOUND) + if ((ret = RegDeleteValueW( key, L"ProxyServer" )) && ret != ERROR_FILE_NOT_FOUND) { RegCloseKey( key ); return ret; @@ -491,7 +486,6 @@ static void free_global_proxy( void ) static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) { - static const WCHAR fmt[] = {'%','.','*','s',':','%','u',0}; URL_COMPONENTSW uc = {sizeof(uc)}; uc.dwHostNameLength = 1; @@ -507,7 +501,7 @@ static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) return TRUE; } if (!(info->proxy = heap_alloc( (uc.dwHostNameLength + 12) * sizeof(WCHAR) ))) return FALSE; - swprintf( info->proxy, uc.dwHostNameLength + 12, fmt, uc.dwHostNameLength, uc.lpszHostName, uc.nPort ); + swprintf( info->proxy, uc.dwHostNameLength + 12, L"%.*s:%u", uc.dwHostNameLength, uc.lpszHostName, uc.nPort ); if (!uc.dwUserNameLength) info->proxyUsername = NULL; else if (!(info->proxyUsername = heap_strndupW( uc.lpszUserName, uc.dwUserNameLength ))) @@ -562,10 +556,10 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } len = sizeof(DWORD); - if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) + if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) { lpwpi->proxyEnabled = 0; - if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) + if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) { FreeProxyInfo( lpwpi ); RegCloseKey( key ); @@ -576,10 +570,9 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(envproxy = _wgetenv( L"http_proxy" )) || lpwpi->proxyEnabled) { /* figure out how much memory the proxy setting takes */ - if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) + if (!RegQueryValueExW( key, L"ProxyServer", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { LPWSTR szProxy, p; - static const WCHAR szHttp[] = {'h','t','t','p','=',0}; if (!(szProxy = heap_alloc(len))) { @@ -587,13 +580,13 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } - RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); + RegQueryValueExW( key, L"ProxyServer", NULL, &type, (BYTE*)szProxy, &len ); /* find the http proxy, and strip away everything else */ - p = wcsstr( szProxy, szHttp ); + p = wcsstr( szProxy, L"http=" ); if (p) { - p += lstrlenW( szHttp ); + p += lstrlenW( L"http=" ); lstrcpyW( szProxy, p ); } p = wcschr( szProxy, ';' ); @@ -638,7 +631,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(envproxy = _wgetenv( L"no_proxy" ))) { /* figure out how much memory the proxy setting takes */ - if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) + if (!RegQueryValueExW( key, L"ProxyOverride", NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { LPWSTR szProxy; @@ -647,7 +640,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) RegCloseKey( key ); return ERROR_OUTOFMEMORY; } - RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len ); + RegQueryValueExW( key, L"ProxyOverride", NULL, &type, (BYTE*)szProxy, &len ); heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = szProxy; @@ -2384,8 +2377,6 @@ static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) { - static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; - static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; char name[NI_MAXHOST]; WCHAR *ret, *p; int len; @@ -2395,12 +2386,12 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; - len = lstrlenW( httpW ) + strlen( hostname ) + lstrlenW( wpadW ); + len = lstrlenW( L"http://" ) + strlen( hostname ) + lstrlenW( L"/wpad.dat" ); if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; - lstrcpyW( p, httpW ); - p += lstrlenW( httpW ); + lstrcpyW( p, L"http://" ); + p += lstrlenW( L"http://" ); while (*hostname) { *p++ = *hostname++; } - lstrcpyW( p, wpadW ); + lstrcpyW( p, L"/wpad.dat" ); return ret; } @@ -3319,10 +3310,6 @@ BOOL WINAPI InternetTimeFromSystemTimeA( const SYSTEMTIME* time, DWORD format, L */ BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, LPWSTR string, DWORD size ) { - static const WCHAR date[] = - { '%','s',',',' ','%','0','2','d',' ','%','s',' ','%','4','d',' ','%','0', - '2','d',':','%','0','2','d',':','%','0','2','d',' ','G','M','T', 0 }; - TRACE( "%p 0x%08x %p 0x%08x\n", time, format, string, size ); if (!time || !string || format != INTERNET_RFC1123_FORMAT) @@ -3337,7 +3324,7 @@ BOOL WINAPI InternetTimeFromSystemTimeW( const SYSTEMTIME* time, DWORD format, L return FALSE; } - swprintf( string, size, date, + swprintf( string, size, L"%s, %02d %s %4d %02d:%02d:%02d GMT", WININET_wkday[time->wDayOfWeek], time->wDay, WININET_month[time->wMonth - 1], @@ -3644,8 +3631,7 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, case INTERNET_SCHEME_HTTP: case INTERNET_SCHEME_HTTPS: { - static const WCHAR szStars[] = { '*','/','*', 0 }; - LPCWSTR accept[2] = { szStars, NULL }; + LPCWSTR accept[2] = { L"*/*", NULL }; if (urlComponents.nScheme == INTERNET_SCHEME_HTTPS) dwFlags |= INTERNET_FLAG_SECURE; diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cc12ef9e76e..c4ca54ac87c 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -394,12 +394,10 @@ static void cache_container_create_object_name(LPWSTR lpszPath, WCHAR replace) /* Caller must hold container lock */ static HANDLE cache_container_map_index(HANDLE file, const WCHAR *path, DWORD size, BOOL *validate) { - static const WCHAR mapping_name_format[] - = {'%','s','i','n','d','e','x','.','d','a','t','_','%','l','u',0}; WCHAR mapping_name[MAX_PATH]; HANDLE mapping; - wsprintfW(mapping_name, mapping_name_format, path, size); + wsprintfW(mapping_name, L"%sindex.dat_%lu", path, size); cache_container_create_object_name(mapping_name, '_'); mapping = OpenFileMappingW(FILE_MAP_WRITE, FALSE, mapping_name); @@ -415,13 +413,6 @@ static HANDLE cache_container_map_index(HANDLE file, const WCHAR *path, DWORD si /* Caller must hold container lock */ static DWORD cache_container_set_size(cache_container *container, HANDLE file, DWORD blocks_no) { - static const WCHAR cache_content_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', - 'C','a','c','h','e','\\','C','o','n','t','e','n','t',0}; - static const WCHAR cache_limit[] = {'C','a','c','h','e','L','i','m','i','t',0}; - DWORD file_size = FILE_SIZE(blocks_no); WCHAR dir_path[MAX_PATH], *dir_name; entry_hash_table *hashtable_entry; @@ -472,10 +463,11 @@ static DWORD cache_container_set_size(cache_container *container, HANDLE file, D header->dirs_no = container->default_entry_type==NORMAL_CACHE_ENTRY ? 4 : 0; /* If the registry has a cache size set, use the registry value */ - if(RegOpenKeyW(HKEY_CURRENT_USER, cache_content_key, &key) == ERROR_SUCCESS) { + if(RegOpenKeyW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\Cache\\Content", &key) == ERROR_SUCCESS) { DWORD dw, len = sizeof(dw), keytype; - if(RegQueryValueExW(key, cache_limit, NULL, &keytype, (BYTE*)&dw, &len) == ERROR_SUCCESS && + if(RegQueryValueExW(key, L"CacheLimit", NULL, &keytype, (BYTE*)&dw, &len) == ERROR_SUCCESS && keytype == REG_DWORD) header->cache_limit.QuadPart = (ULONGLONG)dw * 1024; RegCloseKey(key); @@ -595,8 +587,6 @@ static BOOL cache_container_is_valid(urlcache_header *header, DWORD file_size) */ static DWORD cache_container_open_index(cache_container *container, DWORD blocks_no) { - static const WCHAR index_dat[] = {'i','n','d','e','x','.','d','a','t',0}; - HANDLE file; WCHAR index_path[MAX_PATH]; DWORD file_size; @@ -610,7 +600,7 @@ static DWORD cache_container_open_index(cache_container *container, DWORD blocks } lstrcpyW(index_path, container->path); - lstrcatW(index_path, index_dat); + lstrcatW(index_path, L"index.dat"); file = CreateFileW(index_path, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, 0, NULL); if(file == INVALID_HANDLE_VALUE) { @@ -2725,9 +2715,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ } for(i=0; i<255 && !generate_name; i++) { - static const WCHAR format[] = {'[','%','u',']','%','s',0}; - - wsprintfW(full_path+full_path_len, format, i, extW); + wsprintfW(full_path+full_path_len, L"[%u]%s", i, extW); TRACE("Trying: %s\n", debugstr_w(full_path)); file = CreateFileW(full_path, GENERIC_READ, 0, NULL, CREATE_NEW, 0, NULL); -- 2.26.2

2 1

[PATCH v2] winegcc: Implement -Wl,--out-implib
by Kevin Puetz 26 Nov '20

26 Nov '20

This allows a CMake toolchain (or other caller) to treat winegcc like MinGW, specifying that it produce a separate file for imports, e.g. set(CMAKE_IMPORT_LIBRARY_PREFIX lib) set(CMAKE_IMPORT_LIBRARY_SUFFIX .a) string(APPEND CMAKE_C_CREATE_SHARED_LIBRARY " -Wl,--out-implib,<TARGET_IMPLIB>") Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- Marvin tested it, but it's not showing at https://source.winehq.org/patches/ Resending after a pass through git format-patch just in case that's why. Sorry for the mix-up, I thought I'd sent quilt patches before. -- makedep.c isn't changed to use use this because the few cases in which wine currently uses #pragma implib (and thus winebuild --implib) involve putting some (but not all) of the object files into the libfoo.a as well. The motive is to fix our CMake toolchain for wineg++ to support using target_link_libraries to link other SHARED_LIBRARY targets in the project. This broke when wine-5.7 removed __wine_spec_init from winecrt0; the issue is that CMake links to with an absolute path to the .so (i.e. foo.dll.so). So we had been (unnnoticed until it quit working) getting an ELF DT_NEEDED instead of a PE import. This "worked" before, since __wine_spec_init would still register the builtin dll loaded in such a fashion. Now the dependency's own dllimports (from kernel32, etc) don't get loaded anymore. And I'm pretty sure it only worked before by happy accident. CMake supports windows-style DLL/implib separation, but it really wants the link rule to produce both artifacts (as MSVC/MinGW do) and the implib needs to be a file that can be passed to linking as an absolute path. And (for least surprise) it seems like that filename should work with -lfoo too, even though CMake will always pass a full path. libfoo.def doesn't, because winegcc sees libfoo.def as the spec_file (i.e. --export). The only way I could find to pass a libfoo.def file and have it be imports (besides having winegcc find it via -lfoo) was to conceal it in -Wb,libfoo.def, which feels rather hacky. Just forwarding the mingw-style -Wl,--out-implib to winebuild --implib seemed easy and MinGW-like (which winegcc often seems to aim for). add_undef_import is subtle, but it's already there (for #pragma implib) so I didn't see any a reason to prefer a libfoo.def over a libfoo.a, when the latter already works as a filename and as -lfoo. If I've overlooked some reason it's preferable to use .def files, perhaps there could be a distinct extension (.impdef, .a.def, or .lib ala MSVC?) which get_file_type treats as file_dll and guess_lib_type (also?) searches. Then --out-implib could check the extension and use winebuild --def vs winebuild --implib accordingly (like how winegcc already reacts to the extension of -o to decide between generate_app_loader, --fake, etc). Signed-off-by in the sense that I think this is correct and adequate, but I'm happy to take feedback if there's other use-cases an upstream submission should try to address... --- tools/winegcc/winegcc.c | 28 +++++++++++++++++++++++++++- tools/winegcc/winegcc.man.in | 3 +++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9268a5dfd1d..887f58a6dc3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -231,6 +231,7 @@ struct options const char* entry_point; const char* prelink; const char* debug_file; + const char* out_implib; strarray* prefix; strarray* lib_dirs; strarray* args; @@ -1085,7 +1086,7 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args, *tool; + strarray *spec_args, *link_args, *implib_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1460,6 +1461,26 @@ static void build(struct options* opts) strarray_free(tool); } + if(opts->out_implib) + { + if (!spec_file) + error("--out-implib requires a .spec or .def file\n"); + + implib_args = get_winebuild_args( opts ); + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( implib_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if ((tool = build_tool_name( opts, TOOL_LD ))) strarray_add( implib_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + + strarray_add(implib_args, "--implib"); + strarray_add(implib_args, "-o"); + strarray_add(implib_args, opts->out_implib); + strarray_add(implib_args, "--export"); + strarray_add(implib_args, spec_file); + strarray_addall(implib_args, opts->winebuild_args); + + spawn(opts->prefix, implib_args, 0); + strarray_free (implib_args); + } + /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1972,6 +1993,11 @@ int main(int argc, char **argv) strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); continue; } + if (!strcmp(Wl->base[j], "--out-implib")) + { + opts.out_implib = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); } diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 8a14dd59fd1..5364e177c7d 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -72,6 +72,9 @@ Do not add the winecrt0 library when linking. .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.IP "\fB-b,--target \fItarget\fR" +.IP "\fB-Wl,--out-implib,\fIlib.a\fR" +This option should be used while linking a dll, and is implemented for compatibility with MinGW-gcc. A \fIlib.spec\fR or \fIlib.def\fR must also be provided. Despite the name, it is actually forwarded to \fBwinebuild --implib -o \fIlib.a\fR rather than to the linker. .SH ENVIRONMENT .TP .B WINEBUILD

2 3

[PATCH] mp3dmod/tests: Add more tests for GetInputSizeInfo() and GetOutputSizeInfo().
by Zebediah Figura 26 Nov '20

26 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/tests/mp3dmod.c | 72 ++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 61002d59661..7bc691e2aa4 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -377,9 +377,8 @@ static void test_aggregation(void) static void test_stream_info(void) { - static const MPEGLAYER3WAVEFORMAT input_format = + MPEGLAYER3WAVEFORMAT input_format = { - .wfx.nChannels = 2, .wfx.nSamplesPerSec = 48000, }; DMO_MEDIA_TYPE input_mt = @@ -391,13 +390,9 @@ static void test_stream_info(void) .pbFormat = (BYTE *)&input_format, }; - static const WAVEFORMATEX output_format = + WAVEFORMATEX output_format = { - .nChannels = 1, .nSamplesPerSec = 48000, - .nAvgBytesPerSec = 2 * 48000, - .nBlockAlign = 2, - .wBitsPerSample = 16, }; DMO_MEDIA_TYPE output_mt = { @@ -407,6 +402,7 @@ static void test_stream_info(void) }; DWORD input_count, output_count, flags, size, lookahead, alignment; + WORD channels, depth; IMediaObject *dmo; HRESULT hr; @@ -434,29 +430,49 @@ static void test_stream_info(void) hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); - hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); - - hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); - hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); - - hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + for (channels = 1; channels <= 2; ++channels) + { + input_format.wfx.nChannels = channels; + output_format.nChannels = channels; - size = lookahead = alignment = 0xdeadbeef; - hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!size, "Got size %u.\n", size); - ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); - ok(alignment == 1, "Got alignment %u.\n", alignment); + hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); - size = alignment = 0xdeadbeef; - hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size == 1152 * 4, "Got size %u.\n", size); - ok(alignment == 1, "Got alignment %u.\n", alignment); + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + + for (depth = 8; depth <= 16; depth += 8) + { + output_format.wBitsPerSample = depth; + output_format.nBlockAlign = channels * depth / 8; + output_format.nAvgBytesPerSec = 48000 * output_format.nBlockAlign; + + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + size = lookahead = alignment = 0xdeadbeef; + hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!size || broken(size == output_format.nBlockAlign) /* Vista */, + "Got size %u for %u channels, depth %u.\n", size, channels, depth); + ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); + ok(alignment == 1, "Got alignment %u.\n", alignment); + + size = alignment = 0xdeadbeef; + hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Vista returns the expected size; all later versions act as if + * channels == 2 for some reason. */ + ok(size >= channels * 1152 * depth / 8, + "Got size %u for %u channels, depth %u.\n", size, channels, depth); + ok(alignment == 1, "Got alignment %u.\n", alignment); + } + + hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_CLEAR); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } IMediaObject_Release(dmo); } -- 2.29.2

1 0

RFC mp3dmod/tests: Fix a couple failures on Vista.
by Francois Gouget 26 Nov '20

26 Nov '20

diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 61002d59661..b1604c0fbd3 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -448,14 +448,15 @@ static void test_stream_info(void) size = lookahead = alignment = 0xdeadbeef; hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!size, "Got size %u.\n", size); + ok(size == 0 || broken(size == 2) /* Vista */, "Got size %u.\n", size); ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); ok(alignment == 1, "Got alignment %u.\n", alignment); size = alignment = 0xdeadbeef; hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size == 1152 * 4, "Got size %u.\n", size); + ok(size == 1152 * 4 || broken(size == 1152 * 2) /* Vista */, + "Got size %u.\n", size); ok(alignment == 1, "Got alignment %u.\n", alignment); IMediaObject_Release(dmo); I'm a bit puzzled by the second chunk because the Vista result looks good to me. The output format is: static const WAVEFORMATEX output_format = { .nChannels = 1, .nSamplesPerSec = 48000, .nAvgBytesPerSec = 2 * 48000, .nBlockAlign = 2, .wBitsPerSample = 16, }; .wFormatTag is not set but presumably it defaults to something sensible. But there's only one channel of 16 bit so that would make it 2 bytes per sample. Multiply by 1152, the number of samples in an MP3 frame, and I'd expect to get 1152 * 2. But all Windows versions except Vista return 1152 * 4, so a minimum of 2 MP3 frames? -- Francois Gouget <fgouget(a)codeweavers.com>

2 1

[PATCH 5/5] include: Add D3D11_FORMAT_SUPPORT2 enumeration in d3d11.idl.
by Biswapriyo Nath 26 Nov '20

26 Nov '20

2 1

[PATCH 4/5] include: Add D3D11_RAISE_FLAG enumeration in d3d11.idl.
by Biswapriyo Nath 26 Nov '20

26 Nov '20

2 1

[PATCH 3/5] include: Add D3D11_FEATURE_DATA_D3D11_OPTIONS5 structure in d3d11.idl.
by Biswapriyo Nath 26 Nov '20

26 Nov '20

2 1

[PATCH 2/5] include: Add D3D11_FENCE_FLAG_NON_MONITORED name in d3d11_3.idl.
by Biswapriyo Nath 26 Nov '20

26 Nov '20

2 1

[PATCH 1/5] include: Add D3D10_RAISE_FLAG structure in d3d10.idl.
by Biswapriyo Nath 26 Nov '20

26 Nov '20

2 1

[PATCH 1/5] wined3d: Ignore WINED3DFMT_NULL rendertarget in D/S size checks.
by Matteo Bruni 26 Nov '20

26 Nov '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 73d520e5709..1f9003ed16e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -627,7 +627,8 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex struct fbo_entry *entry; if (depth_stencil->resource && depth_stencil->resource->type != WINED3D_RTYPE_BUFFER - && render_targets[0].resource && render_targets[0].resource->type != WINED3D_RTYPE_BUFFER) + && render_targets[0].resource && render_targets[0].resource->type != WINED3D_RTYPE_BUFFER + && render_targets[0].resource->format->id != WINED3DFMT_NULL) { rt_texture = wined3d_texture_from_resource(render_targets[0].resource); rt_level = render_targets[0].sub_resource_idx % rt_texture->level_count; -- 2.26.2

2 9

[PATCH] msvcrt: Fix signature of _mbscmp.
by Gabriel Ivăncescu 26 Nov '20

26 Nov '20

This function doesn't take a locale argument. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msvcrt/mbcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d443420..f360b80 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -931,7 +931,7 @@ int CDECL _mbscmp_l(const unsigned char* str, const unsigned char* cmp, MSVCRT__ /********************************************************************* * _mbscmp(MSVCRT.@) */ -int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp, MSVCRT__locale_t locale) +int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) { return _mbscmp_l(str, cmp, NULL); } -- 2.21.0

2 1

[PATCH] jscript: Set error location when handling errors directly in parser.
by Jacek Caban 26 Nov '20

26 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2 v2] msvcrt: Implement opening Unicode files with no BOM in _wsopen_dispatch.
by Piotr Caban 26 Nov '20

26 Nov '20

Spotted by Alistair Leslie-Hughes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 8 ++----- dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH] mshtml: Normalize bool values before passing them to Gecko.
by Jacek Caban 26 Nov '20

26 Nov '20

Fixes events.js tests with llvm-mingw Gecko build. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 2/2] msvcrt: Implement opening Unicode files with no BOM in _wsopen_dispatch.
by Piotr Caban 26 Nov '20

26 Nov '20

Spotted by Alistair Leslie-Hughes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 8 ++----- dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 6 deletions(-)

2 1

[PATCH 1/2] msvcrt: Don't write Unicode BOM if file is not empty in _wsopen_dispatch.
by Piotr Caban 26 Nov '20

26 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH resend 1/2] comctl32: Set the selection if it's currently invalid in HandleTimer.
by Gabriel Ivăncescu 26 Nov '20

26 Nov '20

Don't skip MoveCaret if it would actually change the selection when it is invalid. This can happen, for example, in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox, when the listbox has nothing selected. In this case, the item with the index zero would not be selected the first time the mouse moves over it, since the focus_item would be zero, despite the fact the item is not selected. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index b905bee..299c414 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2333,7 +2333,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.21.0

1 1

[PATCH resend 1/2] comctl32: Don't redraw the Combo Box when dropped down if it has an editbox.
by Gabriel Ivăncescu 26 Nov '20

26 Nov '20

Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child. There's no reason to redraw it in this case since the editbox is supposed to cover it, anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 572740b..007325d 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1000,7 +1000,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) SWP_NOACTIVATE | SWP_SHOWWINDOW ); - if( !(lphc->wState & CBF_NOREDRAW) ) + if( !(lphc->wState & (CBF_NOREDRAW | CBF_EDIT)) ) RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); -- 2.21.0

1 1

[PATCH] mf/session: Propagate allocator initialization failure code (Coverity).
by Nikolay Sivov 26 Nov '20

26 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6d4b58289d8..1a7439a13c3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -794,6 +794,7 @@ static void session_shutdown_current_topology(struct media_session *session) IMFMediaSink *sink; IUnknown *object; WORD idx = 0; + HRESULT hr; topology = session->presentation.current_topology; force_shutdown = session->state == SESSION_STATE_SHUT_DOWN; @@ -813,7 +814,8 @@ static void session_shutdown_current_topology(struct media_session *session) if (SUCCEEDED(IMFTopologyNode_GetUnknown(node, &_MF_TOPONODE_IMFActivate, &IID_IMFActivate, (void **)&activate))) { - IMFActivate_ShutdownObject(activate); + if (FAILED(hr = IMFActivate_ShutdownObject(activate))) + WARN("Failed to shut down activation object for the sink, hr %#x.\n", hr); IMFActivate_Release(activate); } else if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) @@ -1392,7 +1394,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (SUCCEEDED(MFGetService(topo_node->object.object, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&topo_node->u.sink.allocator))) { - IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, 2, media_type); + if (FAILED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, + 2, media_type))) + { + WARN("Failed to initialize sample allocator for the stream, hr %#x.\n", hr); + } IMFVideoSampleAllocator_QueryInterface(topo_node->u.sink.allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&topo_node->u.sink.allocator_cb); IMFVideoSampleAllocatorCallback_SetCallback(topo_node->u.sink.allocator_cb, -- 2.29.2

1 0

[PATCH] winegstreamer: Fix possible leak on error path (Coverity).
by Nikolay Sivov 26 Nov '20

26 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 83424719d54..5c502cf3ed5 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1235,17 +1235,14 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + struct media_source *object; gint64 total_pres_time = 0; DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; - if (!object) - return E_OUTOFMEMORY; - if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) return hr; @@ -1255,6 +1252,9 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; -- 2.29.2

1 0

[PATCH 1/3] ntdll/tests: Add tests for NtOpenProcess return status.
by Rémi Bernon 26 Nov '20

26 Nov '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d3b932bec1d..6687b8b6767 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -73,6 +73,7 @@ static NTSTATUS (WINAPI *pNtQuerySystemTime)( LARGE_INTEGER * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); +static NTSTATUS (WINAPI *pNtOpenProcess)( HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID * ); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -2034,6 +2035,56 @@ static void test_wait_on_address(void) ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); } +static void test_process(void) +{ + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + NTSTATUS status; + HANDLE process; + + if (!pNtOpenProcess) + { + win_skip( "NtOpenProcess not supported, skipping test\n" ); + return; + } + + InitializeObjectAttributes( &attr, NULL, 0, 0, NULL ); + + cid.UniqueProcess = 0; + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, NULL, &cid ); + todo_wine ok( status == STATUS_ACCESS_VIOLATION, "NtOpenProcess returned %x\n", status ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, NULL ); + todo_wine ok( status == STATUS_INVALID_PARAMETER_MIX, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = 0; + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( 0xdeadbeef ); + cid.UniqueThread = ULongToHandle( 0xdeadbeef ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( GetCurrentThreadId() ); + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + todo_wine ok( status == STATUS_INVALID_CID, "NtOpenProcess returned %x\n", status ); + + cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); + cid.UniqueThread = 0; + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( !status, "NtOpenProcess returned %x\n", status ); + pNtClose( process ); + + cid.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); + cid.UniqueThread = ULongToHandle( GetCurrentThreadId() ); + status = pNtOpenProcess( &process, PROCESS_QUERY_LIMITED_INFORMATION, &attr, &cid ); + ok( !status, "NtOpenProcess returned %x\n", status ); + pNtClose( process ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2082,6 +2133,7 @@ START_TEST(om) pRtlWaitOnAddress = (void *)GetProcAddress(hntdll, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(hntdll, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(hntdll, "RtlWakeAddressSingle"); + pNtOpenProcess = (void *)GetProcAddress(hntdll, "NtOpenProcess"); test_case_sensitive(); test_namespace_pipe(); @@ -2096,4 +2148,5 @@ START_TEST(om) test_keyed_events(); test_null_device(); test_wait_on_address(); + test_process(); } -- 2.29.2

2 5

[v2 PATCH] mf/samplegrabber: Evaluate type compatibility by comparison to the initial type.
by Nikolay Sivov 26 Nov '20

26 Nov '20

From: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: still keep a reference to the original type. dlls/mf/samplegrabber.c | 17 ++++--- dlls/mf/tests/mf.c | 104 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 54e28b466c5..f60ce2a8433 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -72,6 +72,7 @@ struct sample_grabber IMFSampleGrabberSinkCallback *callback; IMFSampleGrabberSinkCallback2 *callback2; IMFMediaType *media_type; + IMFMediaType *current_media_type; BOOL is_shut_down; IMFMediaEventQueue *event_queue; IMFMediaEventQueue *stream_event_queue; @@ -572,7 +573,8 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber *grabber, IMFMediaType *in_type) { - const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | + MF_MEDIATYPE_EQUAL_FORMAT_DATA; DWORD flags; if (grabber->is_shut_down) @@ -631,9 +633,9 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMF if (FAILED(hr = sample_grabber_stream_is_media_type_supported(grabber, media_type))) return hr; - IMFMediaType_Release(grabber->media_type); - grabber->media_type = media_type; - IMFMediaType_AddRef(grabber->media_type); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = media_type; + IMFMediaType_AddRef(grabber->current_media_type); return S_OK; } @@ -651,7 +653,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - *media_type = grabber->media_type; + *media_type = grabber->current_media_type; IMFMediaType_AddRef(*media_type); return S_OK; @@ -669,7 +671,7 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTy if (grabber->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaType_GetMajorType(grabber->media_type, type); + return IMFMediaType_GetMajorType(grabber->current_media_type, type); } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -840,6 +842,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1411,6 +1414,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use } object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); + object->current_media_type = context->media_type; + IMFMediaType_AddRef(object->current_media_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); list_init(&object->items); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 41ca385cc2b..fda80974724 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2562,6 +2562,109 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_sample_grabber_is_mediatype_supported(void) +{ + IMFMediaType *media_type, *media_type2, *media_type3; + IMFMediaTypeHandler *handler; + IMFActivate *activate; + IMFStreamSink *stream; + IMFMediaSink *sink; + ULONG refcount; + HRESULT hr; + GUID guid; + + /* IsMediaTypeSupported checks are done against the creation type, and check format data */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); + ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + IMFStreamSink_Release(stream); + + IMFMediaSink_Release(sink); + + /* On Win8+ this initialization happens automatically. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to set media type, hr %#x.\n", hr); + + /* Make it match grabber type sample rate. */ + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type3); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + ok(media_type3 == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type3); + + /* Change original type. */ + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type2, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n"); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + + IMFMediaTypeHandler_Release(handler); + + refcount = IMFActivate_Release(activate); + ok(!refcount, "Unexpected refcount %u.\n", refcount); +} + static BOOL is_supported_video_type(const GUID *guid) { return IsEqualGUID(guid, &MFVideoFormat_L8) @@ -4263,6 +4366,7 @@ START_TEST(mf) test_MFShutdownObject(); test_presentation_clock(); test_sample_grabber(); + test_sample_grabber_is_mediatype_supported(); test_video_processor(); test_quality_manager(); test_sar(); -- 2.29.2

2 1

[PATCH 1/2] gdi32/tests: Add locale-dependent face matching test.
by Rémi Bernon 26 Nov '20

26 Nov '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This brings another ~200ms prefix startup time improvement, from ~1.2s to ~1s for "wine cmd /c exit" execution time on average, as well as a ~50ms process startup time improvement, from ~0.25s to ~0.2s execution time when prefix is already started. The test shows that using wcsicmp is incorrect for face name comparison, or at least that we should not rely on the current locale, and perf also reports a high number of CPU cache miss coming from the locale refcounting, which is the main source of improvement here. IIUC RtlDowncaseUnicodeChar also does locale dependent case folding, but I'm not sure to see how it's controlled (it's the system default locale that defines the loaded tables right?), and we should probably check if case matching depends on it. If not, is there any canonical normalized unicode case folding that should be used instead? dlls/gdi32/tests/font.c | 19 ++++++++++++++----- dlls/gdi32/tests/wine_langnames3.sfd | 4 ++-- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2048 -> 2076 bytes 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d3ec971dce0..3bcbebaf91a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7269,12 +7269,21 @@ static void test_lang_names(void) /* either because it's the primary language, or because it's a secondary */ ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - strcpy( font.lfFaceName, "Wine Lang Cond (fr)" ); - memset( &efnd, 0, sizeof(efnd) ); - EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); + wcscpy( font_w.lfFaceName, L"Wine Police d'écriture (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); /* as wine_langnames3.sfd does not specify (en) name, (fr) is preferred */ - if (i == 2) ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); - else ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + if (i == 2) ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + else ok( efnd_w.total == 0, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + + /* case matching should not depend on the current locale */ + if (i == 2) + { + wcscpy( font_w.lfFaceName, L"Wine POLICE D'ÉCRITURE (fr)" ); + memset( &efnd_w, 0, sizeof(efnd_w) ); + EnumFontFamiliesExW( dc, &font_w, enum_fullname_data_proc_w, (LPARAM)&efnd_w, 0 ); + todo_wine ok( efnd_w.total == 1, "%d: EnumFontFamiliesExW unexpected count %u.\n", i, efnd_w.total ); + } strcpy( font.lfFaceName, "Wine Lang Cond (ko)" ); memset( &efnd, 0, sizeof(efnd) ); diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index ea0dbff57d9..55536fa58c1 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -39,8 +39,8 @@ MarkAttachClasses: 1 DEI: 91125 LangName: 1036 \ "" \ - "Wine Lang Cond (fr)" \ - "Reg (fr)" \ + "Wine Police d'+AOkA-criture (fr)" \ + "R+AOkA-guli+AOgA-re (fr)" \ "" \ "Wine Lang Cond Reg (fr)" LangName: 1042 \ diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index dd76bd478bbb2546cfbbb7e9184cc7f602c59303..408d127fb1ef2a1d74977aecfb6d70a4ae03d838 100644 GIT binary patch delta 236 zcmZn=m?JPjOo)R42xQz{T-_K%8AKQu*q=<)uxGq8F(X4`#|$<b1_tIi3=AwH1^LA# z|L-xF0TpZjYS3a}1d>4PxX7<-<Bw=&dow0I24)6E79IvB1{tO_D4T^rkEsRB76PhP zW7+~`GcgD--GQ<}YTj+0#G=c{ZpNU?V8~!N`53Dii<z#W;Uu=x_5lp}3^@#$49N_s w3<?Y>4C)Lof$SonNC`tJkOqlrFr)!lnm{K70cF#H;vgL_K(d?Pu?aB(09p|&jsO4v delta 192 zcmbOu&>%2DOo;sn0|SGMyNjzEgD8Ut0|Wbsi5m8d2PS4@Xsl=c_lALic@7Z&D9A4^ z`G1eW45(lVP=gi&Baj5*kW;bSHvWiawpU})V_;@rWZ_|8Vh~^ogR)r|^q4ZhY$2d( zHKrL*Hb~6@C>x~a(&kAlx{U0G3<eCk43?9Rv6`_M8t7V1Vmm##n_YxogCUKfh(Qx* PWe`IuL;7Yeb|FRpHXtN( -- 2.29.2

3 7

[PATCH] oleaut32: Use wide-char string literals.
by Nikolay Sivov 26 Nov '20

26 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/oleaut.c | 41 +++++--------- dlls/oleaut32/olefont.c | 50 ++++++----------- dlls/oleaut32/olepicture.c | 6 +- dlls/oleaut32/olepropframe.c | 4 +- dlls/oleaut32/typelib.c | 105 ++++++++++++----------------------- dlls/oleaut32/vartype.c | 17 ++---- 6 files changed, 73 insertions(+), 150 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 9417969465e..a026c2bc374 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -505,9 +505,6 @@ void WINAPI SetOaNoCache(void) bstr_cache_enabled = FALSE; } -static const WCHAR _delimiter[] = {'!',0}; /* default delimiter apparently */ -static const WCHAR *pdelimiter = &_delimiter[0]; - /*********************************************************************** * RegisterActiveObject (OLEAUT32.33) * @@ -533,7 +530,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH RegisterActiveObject( DWORD rot_flags = ROTFLAGS_REGISTRATIONKEEPSALIVE; /* default registration is strong */ StringFromGUID2(rcid,guidbuf,39); - ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker); + ret = CreateItemMoniker(L"!", guidbuf, &moniker); if (FAILED(ret)) return ret; ret = GetRunningObjectTable(0,&runobtable); @@ -597,7 +594,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH GetActiveObject(REFCLSID rcid,LPVOID preserved, LPMONIKER moniker; StringFromGUID2(rcid,guidbuf,39); - ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker); + ret = CreateItemMoniker(L"!", guidbuf, &moniker); if (FAILED(ret)) return ret; ret = GetRunningObjectTable(0,&runobtable); @@ -1104,10 +1101,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { - static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; - if(fdwReason == DLL_PROCESS_ATTACH) - bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + bstr_cache_enabled = !GetEnvironmentVariableW(L"oanocache", NULL, 0); return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); } @@ -1173,33 +1168,23 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) NULL }; - static const WCHAR pl_month1W[] = {'s','t','y','c','z','n','i','a',0}; - static const WCHAR pl_month2W[] = {'l','u','t','e','g','o',0}; - static const WCHAR pl_month3W[] = {'m','a','r','c','a',0}; - static const WCHAR pl_month4W[] = {'k','w','i','e','t','n','i','a',0}; - static const WCHAR pl_month5W[] = {'m','a','j','a',0}; - static const WCHAR pl_month6W[] = {'c','z','e','r','w','c','a',0}; - static const WCHAR pl_month7W[] = {'l','i','p','c','a',0}; - static const WCHAR pl_month8W[] = {'s','i','e','r','p','n','i','a',0}; static const WCHAR pl_month9W[] = {'w','r','z','e',0x15b,'n','i','a',0}; static const WCHAR pl_month10W[] = {'p','a',0x17a,'d','z','i','e','r','n','i','k','a',0}; - static const WCHAR pl_month11W[] = {'l','i','s','t','o','p','a','d','a',0}; - static const WCHAR pl_month12W[] = {'g','r','u','d','n','i','a',0}; static const WCHAR *polish_genitive_names[] = { - pl_month1W, - pl_month2W, - pl_month3W, - pl_month4W, - pl_month5W, - pl_month6W, - pl_month7W, - pl_month8W, + L"stycznia", + L"lutego", + L"marca", + L"kwietnia", + L"maja", + L"czerwca", + L"lipca", + L"sierpnia", pl_month9W, pl_month10W, - pl_month11W, - pl_month12W, + L"listopada", + L"grudnia", NULL }; diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index a08994e65e5..1fd67f9b1b7 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -374,25 +374,17 @@ HRESULT WINAPI OleCreateFontIndirect( */ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) { - static const WCHAR wszName[] = {'N','a','m','e',0}; - static const WCHAR wszSize[] = {'S','i','z','e',0}; - static const WCHAR wszBold[] = {'B','o','l','d',0}; - static const WCHAR wszItalic[] = {'I','t','a','l','i','c',0}; - static const WCHAR wszUnder[] = {'U','n','d','e','r','l','i','n','e',0}; - static const WCHAR wszStrike[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; - static const WCHAR wszWeight[] = {'W','e','i','g','h','t',0}; - static const WCHAR wszCharset[] = {'C','h','a','r','s','e','t',0}; static const LPCWSTR dispid_mapping[] = { - wszName, - NULL, - wszSize, - wszBold, - wszItalic, - wszUnder, - wszStrike, - wszWeight, - wszCharset + L"Name", + NULL, + L"Size", + L"Bold", + L"Italic", + L"Underline", + L"Strikethrough", + L"Weight", + L"Charset" }; IEnumConnections *pEnum; @@ -1237,7 +1229,6 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo) { - static const WCHAR stdole2tlb[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; ITypeLib *tl; HRESULT hres; @@ -1245,7 +1236,7 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( TRACE("(%p, iTInfo=%d, lcid=%04x, %p)\n", this, iTInfo, (int)lcid, ppTInfo); if (iTInfo != 0) return E_FAIL; - hres = LoadTypeLib(stdole2tlb, &tl); + hres = LoadTypeLib(L"stdole2.tlb", &tl); if (FAILED(hres)) { ERR("Could not load the stdole2.tlb?\n"); return hres; @@ -1912,20 +1903,13 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( Italic = 0 'False Strikethrough = 0 'False */ - static const WCHAR sAttrName[] = {'N','a','m','e',0}; - static const WCHAR sAttrSize[] = {'S','i','z','e',0}; - static const WCHAR sAttrCharset[] = {'C','h','a','r','s','e','t',0}; - static const WCHAR sAttrWeight[] = {'W','e','i','g','h','t',0}; - static const WCHAR sAttrUnderline[] = {'U','n','d','e','r','l','i','n','e',0}; - static const WCHAR sAttrItalic[] = {'I','t','a','l','i','c',0}; - static const WCHAR sAttrStrikethrough[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; OLEFontImpl *this = impl_from_IPersistPropertyBag(iface); VARIANT value; HRESULT iRes; VariantInit(&value); - iRes = IPropertyBag_Read(pPropBag, sAttrName, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Name", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BSTR); @@ -1938,7 +1922,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( VariantClear(&value); if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrSize, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Size", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_CY); @@ -1952,7 +1936,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrCharset, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Charset", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_I2); @@ -1966,7 +1950,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrWeight, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Weight", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_I2); @@ -1980,7 +1964,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrUnderline, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Underline", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BOOL); @@ -1994,7 +1978,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrItalic, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Italic", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BOOL); @@ -2008,7 +1992,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (iRes == S_OK) { - iRes = IPropertyBag_Read(pPropBag, sAttrStrikethrough, &value, pErrorLog); + iRes = IPropertyBag_Read(pPropBag, L"Strikethrough", &value, pErrorLog); if (iRes == S_OK) { iRes = VariantChangeType(&value, &value, 0, VT_BOOL); diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 43a92ca58f4..5dac8e4ee61 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1947,7 +1947,6 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( LCID lcid, ITypeInfo** ppTInfo) { - static const WCHAR stdole2tlb[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; ITypeLib *tl; HRESULT hres; @@ -1956,7 +1955,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( if (iTInfo != 0) return E_FAIL; - hres = LoadTypeLib(stdole2tlb, &tl); + hres = LoadTypeLib(L"stdole2.tlb", &tl); if (FAILED(hres)) { ERR("Could not load stdole2.tlb\n"); @@ -2353,7 +2352,6 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ) { - static const WCHAR file[] = { 'f','i','l','e',':',0 }; IPicture *ipicture; HANDLE hFile; DWORD dwFileSize; @@ -2377,7 +2375,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, *ppvRet = NULL; /* Convert file URLs to DOS paths. */ - if (wcsncmp(szURLorPath, file, 5) == 0) { + if (wcsncmp(szURLorPath, L"file:", 5) == 0) { DWORD size; hRes = CoInternetParseUrl(szURLorPath, PARSE_PATH_FROM_URL, 0, path_buf, ARRAY_SIZE(path_buf), &size, 0); diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index ecffdc9218a..a351d73d468 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -154,8 +154,6 @@ static IPropertyPageSiteVtbl PropertyPageSiteVtbl = { */ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) { - static const WCHAR comctlW[] = { 'c','o','m','c','t','l','3','2','.','d','l','l',0 }; - PROPSHEETHEADERW property_sheet; PROPSHEETPAGEW property_sheet_page; struct { @@ -198,7 +196,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) FIXME("dispidInitialProperty not yet implemented\n"); hdc = GetDC(NULL); - hcomctl = LoadLibraryW(comctlW); + hcomctl = LoadLibraryW(L"comctl32.dll"); if(hcomctl) property_sheet_dialog_find = FindResourceW(hcomctl, MAKEINTRESOURCEW(1006 /*IDD_PROPSHEET*/), (LPWSTR)RT_DIALOG); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bef4f93748b..65d29734800 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -171,14 +171,13 @@ static void FromLEDWords(void *p_Val, int p_iSize) */ static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) { - static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; WCHAR buffer[60]; char key_name[16]; DWORD len, i; INT best_maj = -1, best_min = -1; HKEY hkey; - memcpy( buffer, typelibW, sizeof(typelibW) ); + lstrcpyW( buffer, L"Typelib\\" ); StringFromGUID2( guid, buffer + lstrlenW(buffer), 40 ); if (RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey ) != ERROR_SUCCESS) @@ -239,12 +238,9 @@ static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) /* buffer must be at least 60 characters long */ static WCHAR *get_typelib_key( REFGUID guid, WORD wMaj, WORD wMin, WCHAR *buffer ) { - static const WCHAR TypelibW[] = {'T','y','p','e','l','i','b','\\',0}; - static const WCHAR VersionFormatW[] = {'\\','%','x','.','%','x',0}; - - memcpy( buffer, TypelibW, sizeof(TypelibW) ); + lstrcpyW( buffer, L"Typelib\\" ); StringFromGUID2( guid, buffer + lstrlenW(buffer), 40 ); - swprintf( buffer + lstrlenW(buffer), 20, VersionFormatW, wMaj, wMin ); + swprintf( buffer + lstrlenW(buffer), 20, L"\\%x.%x", wMaj, wMin ); return buffer; } @@ -252,9 +248,7 @@ static WCHAR *get_typelib_key( REFGUID guid, WORD wMaj, WORD wMin, WCHAR *buffer /* buffer must be at least 50 characters long */ static WCHAR *get_interface_key( REFGUID guid, WCHAR *buffer ) { - static const WCHAR InterfaceW[] = {'I','n','t','e','r','f','a','c','e','\\',0}; - - memcpy( buffer, InterfaceW, sizeof(InterfaceW) ); + lstrcpyW( buffer, L"Interface\\" ); StringFromGUID2( guid, buffer + lstrlenW(buffer), 40 ); return buffer; } @@ -263,17 +257,12 @@ static WCHAR *get_interface_key( REFGUID guid, WCHAR *buffer ) /* buffer must be at least 16 characters long */ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) { - static const WCHAR LcidFormatW[] = {'%','l','x','\\',0}; - static const WCHAR win16W[] = {'w','i','n','1','6',0}; - static const WCHAR win32W[] = {'w','i','n','3','2',0}; - static const WCHAR win64W[] = {'w','i','n','6','4',0}; - - swprintf( buffer, 16, LcidFormatW, lcid ); + swprintf( buffer, 16, L"%lx\\", lcid ); switch(syskind) { - case SYS_WIN16: lstrcatW( buffer, win16W ); break; - case SYS_WIN32: lstrcatW( buffer, win32W ); break; - case SYS_WIN64: lstrcatW( buffer, win64W ); break; + case SYS_WIN16: lstrcatW( buffer, L"win16" ); break; + case SYS_WIN32: lstrcatW( buffer, L"win32" ); break; + case SYS_WIN64: lstrcatW( buffer, L"win64" ); break; default: TRACE("Typelib is for unsupported syskind %i\n", syskind); return NULL; @@ -562,26 +551,11 @@ HRESULT WINAPI LoadRegTypeLib( return res; } - -/* some string constants shared between RegisterTypeLib and UnRegisterTypeLib */ -static const WCHAR TypeLibW[] = {'T','y','p','e','L','i','b',0}; -static const WCHAR FLAGSW[] = {'F','L','A','G','S',0}; -static const WCHAR HELPDIRW[] = {'H','E','L','P','D','I','R',0}; -static const WCHAR ProxyStubClsidW[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d',0}; -static const WCHAR ProxyStubClsid32W[] = {'P','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; - static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *tattr, DWORD flag) { WCHAR keyName[60]; HKEY key, subKey; - static const WCHAR typelib_proxy_clsid[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; - static const WCHAR dispatch_proxy_clsid[] = {'{','0','0','0','2','0','4','2','0','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; - get_interface_key( &tattr->guid, keyName ); if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) @@ -589,41 +563,36 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t const WCHAR *proxy_clsid; if (tattr->typekind == TKIND_INTERFACE || (tattr->wTypeFlags & TYPEFLAG_FDUAL)) - proxy_clsid = typelib_proxy_clsid; + proxy_clsid = L"{00020424-0000-0000-C000-000000000046}"; else - proxy_clsid = dispatch_proxy_clsid; + proxy_clsid = L"{00020420-0000-0000-C000-000000000046}"; if (name) RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)name, (lstrlenW(name)+1) * sizeof(OLECHAR)); - if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, - KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); + if (!RegCreateKeyExW(key, L"ProxyStubClsid", 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL)) + { + RegSetValueExW(subKey, NULL, 0, REG_SZ, (const BYTE *)proxy_clsid, (lstrlenW(proxy_clsid) + 1) * sizeof(WCHAR)); RegCloseKey(subKey); } - if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, - KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { - RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); + if (!RegCreateKeyExW(key, L"ProxyStubClsid32", 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL)) + { + RegSetValueExW(subKey, NULL, 0, REG_SZ, (const BYTE *)proxy_clsid, (lstrlenW(proxy_clsid) + 1) * sizeof(WCHAR)); RegCloseKey(subKey); } - if (RegCreateKeyExW(key, TypeLibW, 0, NULL, 0, + if (RegCreateKeyExW(key, L"TypeLib", 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { WCHAR buffer[40]; - static const WCHAR fmtver[] = {'%','x','.','%','x',0 }; - static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; StringFromGUID2(&libattr->guid, buffer, 40); RegSetValueExW(subKey, NULL, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer)+1) * sizeof(WCHAR)); - swprintf(buffer, ARRAY_SIZE(buffer), fmtver, libattr->wMajorVerNum, libattr->wMinorVerNum); - RegSetValueExW(subKey, VersionW, 0, REG_SZ, - (BYTE*)buffer, (lstrlenW(buffer)+1) * sizeof(WCHAR)); + swprintf(buffer, ARRAY_SIZE(buffer), L"%x.%x", libattr->wMajorVerNum, libattr->wMinorVerNum); + RegSetValueExW(subKey, L"Version", 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer)+1) * sizeof(WCHAR)); RegCloseKey(subKey); } @@ -701,13 +670,13 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W res = E_FAIL; /* Create the flags subkey */ - if (res == S_OK && RegCreateKeyExW(key, FLAGSW, 0, NULL, 0, + if (res == S_OK && RegCreateKeyExW(key, L"FLAGS", 0, NULL, 0, KEY_WRITE, NULL, &subKey, NULL) == ERROR_SUCCESS) { - /* FIXME: is %u correct? */ - static const WCHAR formatW[] = {'%','u',0}; WCHAR buf[20]; - swprintf(buf, ARRAY_SIZE(buf), formatW, attr->wLibFlags); + + /* FIXME: is %u correct? */ + swprintf(buf, ARRAY_SIZE(buf), L"%u", attr->wLibFlags); if (RegSetValueExW(subKey, NULL, 0, REG_SZ, (BYTE *)buf, (lstrlenW(buf) + 1)*sizeof(WCHAR) ) != ERROR_SUCCESS) res = E_FAIL; @@ -718,7 +687,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W res = E_FAIL; /* create the helpdir subkey */ - if (res == S_OK && RegCreateKeyExW(key, HELPDIRW, 0, NULL, 0, + if (res == S_OK && RegCreateKeyExW(key, L"HELPDIR", 0, NULL, 0, KEY_WRITE, NULL, &subKey, &disposition) == ERROR_SUCCESS) { BSTR freeHelpDir = NULL; @@ -862,9 +831,9 @@ static void TLB_unregister_interface(GUID *guid, REGSAM flag) if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE | flag, &subKey) != ERROR_SUCCESS) return; - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); + RegDeleteKeyW(subKey, L"ProxyStubClsid"); + RegDeleteKeyW(subKey, L"ProxyStubClsid32"); + RegDeleteKeyW(subKey, L"TypeLib"); RegCloseKey(subKey); RegDeleteKeyExW(HKEY_CLASSES_ROOT, subKeyName, flag, 0); } @@ -985,16 +954,16 @@ enddeleteloop: tmpLength = ARRAY_SIZE(subKeyName); /* if its not FLAGS or HELPDIR, then we must keep the rest of the key */ - if (!wcscmp(subKeyName, FLAGSW)) continue; - if (!wcscmp(subKeyName, HELPDIRW)) continue; + if (!wcscmp(subKeyName, L"FLAGS")) continue; + if (!wcscmp(subKeyName, L"HELPDIR")) continue; deleteOtherStuff = FALSE; break; } /* only delete the other parts of the key if we're absolutely sure */ if (deleteOtherStuff) { - RegDeleteKeyW(key, FLAGSW); - RegDeleteKeyW(key, HELPDIRW); + RegDeleteKeyW(key, L"FLAGS"); + RegDeleteKeyW(key, L"HELPDIR"); RegCloseKey(key); key = NULL; @@ -2970,8 +2939,7 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p if (This->dll) { - static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; - This->typelib_resource = FindResourceW(This->dll, MAKEINTRESOURCEW(index), TYPELIBW); + This->typelib_resource = FindResourceW(This->dll, MAKEINTRESOURCEW(index), L"TYPELIB"); if (This->typelib_resource) { This->typelib_global = LoadResource(This->dll, This->typelib_resource); @@ -7919,7 +7887,6 @@ struct search_res_tlb_params static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) { struct search_res_tlb_params *params = (LPVOID)lParam; - static const WCHAR formatW[] = {'\\','%','d',0}; WCHAR szPath[MAX_PATH+1]; ITypeLib *pTLib = NULL; HRESULT ret; @@ -7931,7 +7898,7 @@ static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lp if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) return TRUE; - if (swprintf(szPath + len, ARRAY_SIZE(szPath) - len, formatW, LOWORD(lpszName)) < 0) + if (swprintf(szPath + len, ARRAY_SIZE(szPath) - len, L"\\%d", LOWORD(lpszName)) < 0) return TRUE; ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); @@ -8068,7 +8035,6 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if (!pTLib) { - static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; struct search_res_tlb_params params; TRACE("typeinfo in imported typelib that isn't already loaded\n"); @@ -8076,7 +8042,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( /* Search in resource table */ params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); params.pTLib = NULL; - EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); + EnumResourceNamesW(NULL, L"TYPELIB", search_res_tlb, (LONG_PTR)&params); if(params.pTLib) { pTLib = params.pTLib; @@ -10624,13 +10590,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, TRACE("%p %x\n", This, typeFlags); if (typeFlags & TYPEFLAG_FDUAL) { - static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; ITypeLib *stdole; ITypeInfo *dispatch; HREFTYPE hreftype; HRESULT hres; - hres = LoadTypeLib(stdole2tlb, &stdole); + hres = LoadTypeLib(L"stdole2.tlb", &stdole); if(FAILED(hres)) return hres; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 8b4060318f5..98b9762d896 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -38,9 +38,6 @@ extern HMODULE hProxyDll DECLSPEC_HIDDEN; #define CY_HALF (CY_MULTIPLIER/2) /* 0.5 */ #define CY_HALF_F (CY_MULTIPLIER_F/2.0) -static const WCHAR szFloatFormatW[] = { '%','.','7','G','\0' }; -static const WCHAR szDoubleFormatW[] = { '%','.','1','5','G','\0' }; - /* Copy data from one variant to another. */ static inline void VARIANT_CopyData(const VARIANT *srcVar, VARTYPE vt, void *pOut) { @@ -6111,9 +6108,6 @@ static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) */ HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL *pBoolOut) { - /* Any VB/VBA programmers out there should recognise these strings... */ - static const WCHAR szFalse[] = { '#','F','A','L','S','E','#','\0' }; - static const WCHAR szTrue[] = { '#','T','R','U','E','#','\0' }; WCHAR szBuff[64]; LANGID langId = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); HRESULT hRes = S_OK; @@ -6170,9 +6164,9 @@ VarBoolFromStr_CheckLocalised: } /* All checks against localised text have failed, try #TRUE#/#FALSE# */ - if (!wcscmp(strIn, szFalse)) + if (!wcscmp(strIn, L"#FALSE#")) *pBoolOut = VARIANT_FALSE; - else if (!wcscmp(strIn, szTrue)) + else if (!wcscmp(strIn, L"#TRUE#")) *pBoolOut = VARIANT_TRUE; else { @@ -6521,8 +6515,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ if (buff[0] == '-') { - static const WCHAR szAccept[] = {'0', '.', '\0'}; - if (lstrlenW(buff + 1) == wcsspn(buff + 1, szAccept)) + if (lstrlenW(buff + 1) == wcsspn(buff + 1, L"0.")) { buff[0] = '0'; buff[1] = '\0'; } } @@ -6563,7 +6556,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, */ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, szFloatFormatW); + return VARIANT_BstrFromReal(fltIn, lcid, dwFlags, pbstrOut, L"%.7G"); } /****************************************************************************** @@ -6584,7 +6577,7 @@ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO */ HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { - return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, szDoubleFormatW); + return VARIANT_BstrFromReal(dblIn, lcid, dwFlags, pbstrOut, L"%.15G"); } /****************************************************************************** -- 2.29.2

1 0

[PATCH] kernelbase: Use wide-char string literals.
by Michael Stefaniuc 26 Nov '20

26 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/locale.c | 70 ++++++++++++++++++------------------ dlls/kernelbase/path.c | 2 +- dlls/kernelbase/registry.c | 3 +- dlls/kernelbase/tests/path.c | 12 +++---- dlls/kernelbase/volume.c | 10 +++--- 5 files changed, 47 insertions(+), 50 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7218a159844..b60bd0dbd98 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -184,41 +184,41 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = /* Unicode expanded ligatures */ static const WCHAR ligatures[][5] = { - { 0x00c6, 'A','E',0 }, - { 0x00de, 'T','H',0 }, - { 0x00df, 's','s',0 }, - { 0x00e6, 'a','e',0 }, - { 0x00fe, 't','h',0 }, - { 0x0132, 'I','J',0 }, - { 0x0133, 'i','j',0 }, - { 0x0152, 'O','E',0 }, - { 0x0153, 'o','e',0 }, - { 0x01c4, 'D',0x017d,0 }, - { 0x01c5, 'D',0x017e,0 }, - { 0x01c6, 'd',0x017e,0 }, - { 0x01c7, 'L','J',0 }, - { 0x01c8, 'L','j',0 }, - { 0x01c9, 'l','j',0 }, - { 0x01ca, 'N','J',0 }, - { 0x01cb, 'N','j',0 }, - { 0x01cc, 'n','j',0 }, - { 0x01e2, 0x0100,0x0112,0 }, - { 0x01e3, 0x0101,0x0113,0 }, - { 0x01f1, 'D','Z',0 }, - { 0x01f2, 'D','z',0 }, - { 0x01f3, 'd','z',0 }, - { 0x01fc, 0x00c1,0x00c9,0 }, - { 0x01fd, 0x00e1,0x00e9,0 }, - { 0x05f0, 0x05d5,0x05d5,0 }, - { 0x05f1, 0x05d5,0x05d9,0 }, - { 0x05f2, 0x05d9,0x05d9,0 }, - { 0xfb00, 'f','f',0 }, - { 0xfb01, 'f','i',0 }, - { 0xfb02, 'f','l',0 }, - { 0xfb03, 'f','f','i',0 }, - { 0xfb04, 'f','f','l',0 }, - { 0xfb05, 0x017f,'t',0 }, - { 0xfb06, 's','t',0 }, + L"\x00c6" "AE", + L"\x00deTH", + L"\x00dfss", + L"\x00e6" "ae", + L"\x00feth", + L"\x0132IJ", + L"\x0133ij", + L"\x0152OE", + L"\x0153oe", + L"\x01c4" "D\x017d", + L"\x01c5" "D\x017e", + L"\x01c6" "d\x017e", + L"\x01c7LJ", + L"\x01c8Lj", + L"\x01c9lj", + L"\x01caNJ", + L"\x01cbNj", + L"\x01ccnj", + L"\x01e2\x0100\x0112", + L"\x01e3\x0101\x0113", + L"\x01f1" "DZ", + L"\x01f2" "Dz", + L"\x01f3" "dz", + L"\x01fc\x00c1\x00c9", + L"\x01fd\x00e1\x00e9", + L"\x05f0\x05d5\x05d5", + L"\x05f1\x05d5\x05d9", + L"\x05f2\x05d9\x05d9", + L"\xfb00" "ff", + L"\xfb01" "fi", + L"\xfb02" "fl", + L"\xfb03" "ffi", + L"\xfb04" "ffl", + L"\xfb05\x017ft", + L"\xfb06st", }; enum locationkind { LOCATION_NATION = 0, LOCATION_REGION, LOCATION_BOTH }; diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d7e2f0a2347..f0c79bcc94c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2944,7 +2944,7 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, else if (*src == '%' && isxdigit(*(src + 1)) && isxdigit(*(src + 2)) && !stop_unescaping) { INT ih; - WCHAR buf[5] = {'0','x',0}; + WCHAR buf[5] = L"0x"; memcpy(buf + 2, src + 1, 2*sizeof(WCHAR)); buf[4] = 0; StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index d1588d0b265..574bf2f56b7 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2775,7 +2775,6 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Parse the value and load the string. */ { WCHAR *pComma = wcsrchr(pwszExpandedBuffer, ','), *pNewBuffer; - const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; DWORD baseDirLen; int reqChars; @@ -2802,7 +2801,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer if (baseDirLen) { lstrcpyW(pwszTempBuffer, pwszBaseDir); if (pwszBaseDir[baseDirLen - 1] != '\\') - lstrcatW(pwszTempBuffer, backslashW); + lstrcatW(pwszTempBuffer, L"\\"); } lstrcatW(pwszTempBuffer, pwszExpandedBuffer + 1); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 2ee7b512b31..8d85542612f 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -546,9 +546,9 @@ static void test_PathAllocCombine(void) static void test_PathCchCombine(void) { - WCHAR expected[PATHCCH_MAX_CCH] = {'C', ':', '\\', 'a', 0}; - WCHAR p1[PATHCCH_MAX_CCH] = {'C', ':', '\\', 0}; - WCHAR p2[PATHCCH_MAX_CCH] = {'a', 0}; + WCHAR expected[PATHCCH_MAX_CCH] = L"C:\\a"; + WCHAR p1[PATHCCH_MAX_CCH] = L"C:\\"; + WCHAR p2[PATHCCH_MAX_CCH] = L"a"; WCHAR output[PATHCCH_MAX_CCH]; HRESULT hr; INT i; @@ -607,9 +607,9 @@ static void test_PathCchCombine(void) static void test_PathCchCombineEx(void) { - WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; - WCHAR p1[MAX_PATH] = {'C',':','\\',0}; - WCHAR p2[MAX_PATH] = {'a',0}; + WCHAR expected[MAX_PATH] = L"C:\\a"; + WCHAR p1[MAX_PATH] = L"C:\\"; + WCHAR p2[MAX_PATH] = L"a"; WCHAR output[MAX_PATH]; HRESULT hr; int i; diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 53cc0d49b65..7daf9c98823 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -152,7 +152,6 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) /* get the label by reading it from a file at the root of the filesystem */ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DWORD len ) { - static const WCHAR labelW[] = {'.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; HANDLE handle; UNICODE_STRING name; IO_STATUS_BLOCK io; @@ -167,12 +166,12 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - name.MaximumLength = device->Length + sizeof(labelW); + name.MaximumLength = device->Length + sizeof(L".windows-label"); name.Length = name.MaximumLength - sizeof(WCHAR); if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return; memcpy( name.Buffer, device->Buffer, device->Length ); - memcpy( name.Buffer + device->Length / sizeof(WCHAR), labelW, sizeof(labelW) ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), L".windows-label", sizeof(L".windows-label") ); if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { @@ -193,7 +192,6 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW /* get the serial number by reading it from a file at the root of the filesystem */ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) { - static const WCHAR serialW[] = {'.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; HANDLE handle; UNICODE_STRING name; IO_STATUS_BLOCK io; @@ -207,12 +205,12 @@ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - name.MaximumLength = device->Length + sizeof(serialW); + name.MaximumLength = device->Length + sizeof(L".windows-serial"); name.Length = name.MaximumLength - sizeof(WCHAR); if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return 0; memcpy( name.Buffer, device->Buffer, device->Length ); - memcpy( name.Buffer + device->Length / sizeof(WCHAR), serialW, sizeof(serialW) ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), L".windows-serial", sizeof(L".windows-serial") ); if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) { -- 2.26.2

2 1

[PATCH] mountmgr.sys: Add a comment advertising the HKLM\Software\Wine\Ports registry key.
by Zebediah Figura 26 Nov '20

26 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mountmgr.sys/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6db088f11ee..ed345d110a4 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -2067,6 +2067,8 @@ static void create_port_devices( DRIVER_OBJECT *driver ) } p += 3; + /* @@ Wine registry key: HKLM\Software\Wine\Ports */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &wine_ports_key, NULL ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, NULL, REG_OPTION_VOLATILE, -- 2.29.2

1 0

[PATCH 1/6] qcap/tests: Add some tests for pin connection.
by Zebediah Figura 25 Nov '20

25 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/videocapture.c | 207 +++++++++++++++++++++++++++++++-- 1 file changed, 198 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index e8175f5df9a..fafd18009f4 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -296,6 +296,191 @@ static void test_misc_flags(IBaseFilter *filter) IAMFilterMiscFlags_Release(misc_flags); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_sink sink; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->sink.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + return S_OK; +} + +static const struct strmbase_sink_ops testsink_ops = +{ + .base.pin_query_interface = testsink_query_interface, + .pfnReceive = testsink_Receive, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + memset(filter, 0, sizeof(*filter)); + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); +} + +static void test_connect_pin(IBaseFilter *filter, IPin *source) +{ + AM_MEDIA_TYPE req_mt, default_mt, mt, *mts[2]; + IAMStreamConfig *stream_config; + struct testfilter testsink; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + ULONG count, ref; + HRESULT hr; + IPin *peer; + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + testfilter_init(&testsink); + IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); + IFilterGraph2_AddFilter(graph, filter, L"source"); + hr = IPin_QueryInterface(source, &IID_IAMStreamConfig, (void **)&stream_config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(source, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_EnumMediaTypes(source, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enummt, 2, mts, &count); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + CopyMediaType(&req_mt, mts[count - 1]); + CopyMediaType(&default_mt, mts[0]); + DeleteMediaType(mts[0]); + if (count > 1) + DeleteMediaType(mts[1]); + IEnumMediaTypes_Release(enummt); + + hr = IAMStreamConfig_GetFormat(stream_config, &mts[0]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &default_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink.sink.pin.IPin_iface, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(source, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &testsink.sink.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(source, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); + + hr = IAMStreamConfig_GetFormat(stream_config, &mts[0]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &req_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + + hr = IPin_EnumMediaTypes(source, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumMediaTypes_Next(enummt, 1, mts, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &default_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + IEnumMediaTypes_Release(enummt); + + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, source); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(testsink.sink.pin.peer == source, "Got peer %p.\n", testsink.sink.pin.peer); + IFilterGraph2_Disconnect(graph, &testsink.sink.pin.IPin_iface); + + hr = IAMStreamConfig_GetFormat(stream_config, &mts[0]); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(mts[0], &default_mt), "Media types didn't match.\n"); + DeleteMediaType(mts[0]); + + FreeMediaType(&req_mt); + FreeMediaType(&default_mt); + IAMStreamConfig_Release(stream_config); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_connection(IMoniker *moniker) +{ + IEnumPins *enum_pins; + IBaseFilter *filter; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumPins_Next(enum_pins, 1, &pin, NULL) == S_OK) + { + PIN_DIRECTION dir; + IPin_QueryDirection(pin, &dir); + if (dir == PINDIR_OUTPUT) + { + test_connect_pin(filter, pin); + } + IPin_Release(pin); + } + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(videocapture) { ICreateDevEnum *dev_enum; @@ -329,17 +514,21 @@ START_TEST(videocapture) trace("Testing device %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); - hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void**)&filter); - if (hr == S_OK) + if (FAILED(hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void **)&filter))) { - test_filter_interfaces(filter); - test_pins(filter); - test_misc_flags(filter); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); + skip("Failed to open device %s, hr %#x.\n", debugstr_w(name), hr); + IMoniker_Release(moniker); + continue; } - else - skip("Failed to open capture device, hr=%#x.\n", hr); + + test_filter_interfaces(filter); + test_pins(filter); + test_misc_flags(filter); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + test_connection(moniker); IMoniker_Release(moniker); } -- 2.29.2

1 5

[PATCH] include: Add more enum values and defines for dbghelp.h
by Vijay Kiran Kamuju 25 Nov '20

25 Nov '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 7/7] msvcrt: Simplify get_current_locale_noalloc implementation.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)

1 0

[PATCH 6/7] msvcrt: Make old locale access thread-safe in setlocale.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-)

1 0

[PATCH 5/7] msvcrt: Reimplement _configthreadlocale function.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-)

1 0

[PATCH 4/7] msvcrt: Return thread locale copy in get_locinfo and get_mbcinfo.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 4 +- dlls/msvcrt/locale.c | 107 ++++++++++++++++++++++------------- 2 files changed, 70 insertions(+), 41 deletions(-)

1 0

[PATCH 3/7] msvcrt: Lock _MB_CP_LOCK lock in setmbcp.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 12 ++++-------- dlls/msvcrt/mbcs.c | 28 ++++++++++++++++++---------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 22 insertions(+), 19 deletions(-)

1 0

[PATCH 2/7] msvcrt: Introduce flags field to describe locale stored in thread data.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 4 ++-- dlls/msvcrt/locale.c | 44 ++++++++++++++++-------------------- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +++- 4 files changed, 27 insertions(+), 28 deletions(-)

1 0

[PATCH 1/7] msvcrt: Fix C locale lc_time_curr refconting.
by Piotr Caban 25 Nov '20

25 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] dxgi/tests: Fix the grammar in a comment.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e6c8e0eb8c4..3c3a57806a4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4534,7 +4534,7 @@ static void test_swapchain_parameters(void) * the draw on the screen right away (Aero on or off doesn't matter), but * Present with DXGI_PRESENT_DO_NOT_SEQUENCE will show the modifications. * - * Note that if the application doesn't have focused creating a fullscreen + * Note that if the application doesn't have focus creating a fullscreen * swapchain returns DXGI_STATUS_OCCLUDED and we get a windowed swapchain, * so use the Windowed property of the swapchain that was actually created. */ expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_READ_ONLY; -- 2.20.1

2 1

[PATCH] gdi32/tests: Fix the spelling of an ok() message.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d3ec971dce0..94910ff60fc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5862,7 +5862,7 @@ static void test_GetGlyphOutline_character(void) ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n"); ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); - ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n"); + ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeeded\n"); ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n"); -- 2.20.1

2 1

[PATCH] user32/tests: Fix the spelling of a win_skip() message.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ce272ed73f4..1249f8cf5a1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1771,7 +1771,7 @@ static void test_GetMouseMovePointsEx_process(void) if (winstation1 == NULL && GetLastError() == ERROR_ACCESS_DENIED) { - win_skip("not enough priviledges for CreateWindowStation\n"); + win_skip("not enough privileges for CreateWindowStation\n"); CloseDesktop( desk0 ); CloseWindowStation( winstation0 ); return; -- 2.20.1

2 1

[PATCH] qmgr/tests: Fix the spelling of an ok() message.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/qmgr/tests/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 71da89facad..edf1ef7e592 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -888,7 +888,7 @@ START_TEST(job) */ hres = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (FAILED(hres)) { - ok(0, "CoInitializeEx faied: %0x\n", hres); + ok(0, "CoInitializeEx failed: %0x\n", hres); return; } -- 2.20.1

1 0

[PATCH] dssenh/tests: Fix the spelling of a skip() message.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dssenh/tests/dssenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index e9c62cb99de..4d33fc86cd8 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -702,7 +702,7 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &pKey); if (!result) { - skip("skipping ciper modes tests\n"); + skip("skipping cipher mode tests\n"); return; } ok(result, "Expected a derived key.\n"); -- 2.20.1

1 0

[PATCH] xactengine3_7/tests: Fix the spelling of a couple of comments.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/xactengine3_7/tests/xact3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 9b0d3defb09..6b04c36a9f0 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -51,13 +51,13 @@ struct xact_interfaces {&CLSID_XACTEngine30, &IID_IXACT3Engine31, E_NOINTERFACE}, {&CLSID_XACTEngine30, &IID_IXACT3Engine, E_NOINTERFACE }, - /* Version 3.1 to 3.4 use the same inteface */ + /* Version 3.1 to 3.4 use the same interface */ {&CLSID_XACTEngine31, &IID_IXACT3Engine31, S_OK }, {&CLSID_XACTEngine32, &IID_IXACT3Engine31, S_OK }, {&CLSID_XACTEngine33, &IID_IXACT3Engine31, S_OK }, {&CLSID_XACTEngine34, &IID_IXACT3Engine31, S_OK }, - /* Version 3.5 to 3.7 use the same inteface */ + /* Version 3.5 to 3.7 use the same interface */ {&CLSID_XACTEngine35, &IID_IXACT3Engine31, E_NOINTERFACE }, {&CLSID_XACTEngine35, &IID_IXACT3Engine, S_OK }, -- 2.20.1

1 0

[PATCH] ws2_32: Fix the spelling of a comment.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7d810c6d7b2..6cb35bcd135 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7646,7 +7646,7 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int aliases_size * First set the pointer for aliases, second set the pointers for addresses. * Third fill the addresses indexes, fourth jump aliases names size. * Fifth fill the hostname. - * NOTE: This method is valid for OS version's >= XP. + * NOTE: This method is valid for OS versions >= XP. */ p = (char *)(p_to + 1); p_to->h_aliases = (char **)p; -- 2.20.1

1 0

[PATCH 1/5] server: Do not dereference symlinks specified as root directory.
by Paul Gofman 25 Nov '20

25 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 196150 - 196153. dlls/ntdll/tests/om.c | 64 ++++++++++++++++++++++++++++++++++++++++++- server/console.c | 24 ++++++++++------ server/directory.c | 4 +-- server/file.c | 6 ++-- server/mailslot.c | 4 +-- server/named_pipe.c | 4 +-- server/object.c | 5 ++-- server/object.h | 5 ++-- server/sock.c | 6 ++-- server/symlink.c | 5 ++-- server/winstation.c | 4 +-- 11 files changed, 104 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d3b932bec1d..99c77839b7c 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1081,7 +1081,7 @@ static void test_symboliclink(void) NTSTATUS status; UNICODE_STRING str, target; OBJECT_ATTRIBUTES attr; - HANDLE dir, link, h; + HANDLE dir, link, h, h2; IO_STATUS_BLOCK iosb; /* No name and/or no attributes */ @@ -1178,6 +1178,68 @@ static void test_symboliclink(void) pNtClose(h); pNtClose(link); pNtClose(dir); + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\om.c-test"); + status = pNtCreateDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + RtlInitUnicodeString(&str, L"\\DosDevices\\test_link"); + RtlInitUnicodeString(&target, L"\\BaseNamedObjects"); + status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); + ok(status == STATUS_SUCCESS && !!link, "Got unexpected status %#x.\n", status); + + status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + + status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + pNtClose(h); + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" ); + status = NtCreateFile(&h, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); + ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); + + InitializeObjectAttributes(&attr, &str, 0, link, NULL); + RtlInitUnicodeString( &str, L"om.c-test\\test_object" ); + status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE ); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + RtlInitUnicodeString( &str, L"\\DosDevices\\test_link\\om.c-test\\test_object" ); + status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE ); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + status = pNtOpenMutant( &h2, GENERIC_ALL, &attr ); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + pNtClose(h2); + RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\test_object" ); + status = pNtCreateMutant( &h2, GENERIC_ALL, &attr, FALSE ); + ok(status == STATUS_OBJECT_NAME_COLLISION, "Got unexpected status %#x.\n", status); + + InitializeObjectAttributes(&attr, &str, 0, link, NULL); + RtlInitUnicodeString( &str, L"om.c-test\\test_object" ); + status = pNtOpenMutant( &h2, GENERIC_ALL, &attr ); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + + pNtClose(h); + + status = pNtOpenMutant( &h, GENERIC_ALL, &attr ); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#x.\n", status); + + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + RtlInitUnicodeString( &str, L"test_object" ); + status = pNtCreateMutant( &h, GENERIC_ALL, &attr, FALSE ); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + status = pNtOpenMutant( &h2, GENERIC_ALL, &attr ); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + pNtClose(h); + pNtClose(h2); + + pNtClose(link); + pNtClose(dir); } #define test_file_info(a) _test_file_info(__LINE__,a) diff --git a/server/console.c b/server/console.c index 9190dcc02dd..eeb2a21fffb 100644 --- a/server/console.c +++ b/server/console.c @@ -69,7 +69,8 @@ static void console_input_dump( struct object *obj, int verbose ); static void console_input_destroy( struct object *obj ); static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_get_fd( struct object *obj ); -static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); static struct object *console_input_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -143,7 +144,8 @@ static void console_server_dump( struct object *obj, int verbose ); static void console_server_destroy( struct object *obj ); static int console_server_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_server_get_fd( struct object *obj ); -static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); static struct object *console_server_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -259,7 +261,8 @@ static const struct fd_ops screen_buffer_fd_ops = static struct object_type *console_device_get_type( struct object *obj ); static void console_device_dump( struct object *obj, int verbose ); -static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); static struct object *console_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -355,7 +358,8 @@ struct console_connection static void console_connection_dump( struct object *obj, int verbose ); static struct fd *console_connection_get_fd( struct object *obj ); -static struct object *console_connection_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *console_connection_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); static struct object *console_connection_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); @@ -709,7 +713,8 @@ static struct object *create_console_connection( struct console_input *console ) return &connection->obj; } -static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) { struct console_input *console = (struct console_input *)obj; static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n'}; @@ -793,7 +798,8 @@ static void console_server_destroy( struct object *obj ) if (server->fd) release_object( server->fd ); } -static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +static struct object *console_server_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) { struct console_server *server = (struct console_server*)obj; static const WCHAR referenceW[] = {'R','e','f','e','r','e','n','c','e'}; @@ -1117,7 +1123,8 @@ static struct fd *console_connection_get_fd( struct object *obj ) return (struct fd *)grab_object( connection->fd ); } -static struct object *console_connection_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +static struct object *console_connection_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) { static const WCHAR referenceW[] = {'R','e','f','e','r','e','n','c','e'}; @@ -1165,7 +1172,8 @@ static void console_device_dump( struct object *obj, int verbose ) fputs( "Console device\n", stderr ); } -static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) { static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n'}; static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; diff --git a/server/directory.c b/server/directory.c index 6f8fb179808..cd9afb3c457 100644 --- a/server/directory.c +++ b/server/directory.c @@ -83,7 +83,7 @@ struct directory static void directory_dump( struct object *obj, int verbose ); static struct object_type *directory_get_type( struct object *obj ); static struct object *directory_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ); + unsigned int attr, struct object *root ); static void directory_destroy( struct object *obj ); static const struct object_ops directory_ops = @@ -139,7 +139,7 @@ static struct object_type *directory_get_type( struct object *obj ) } static struct object *directory_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ) + unsigned int attr, struct object *root ) { struct directory *dir = (struct directory *)obj; struct object *found; diff --git a/server/file.c b/server/file.c index 4690af2424e..2cc4a9d978c 100644 --- a/server/file.c +++ b/server/file.c @@ -68,7 +68,8 @@ static void file_dump( struct object *obj, int verbose ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); -static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); static struct object *file_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static struct list *file_get_kernel_obj_list( struct object *obj ); @@ -603,7 +604,8 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd return 1; } -static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) { if (!name || !name->len) return NULL; /* open the file itself */ diff --git a/server/mailslot.c b/server/mailslot.c index e0294d946e4..5d26c606080 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -186,7 +186,7 @@ struct mailslot_device_file static void mailslot_device_dump( struct object *obj, int verbose ); static struct object_type *mailslot_device_get_type( struct object *obj ); static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ); + unsigned int attr, struct object *root ); static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static void mailslot_device_destroy( struct object *obj ); @@ -395,7 +395,7 @@ static struct object_type *mailslot_device_get_type( struct object *obj ) } static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ) + unsigned int attr, struct object *root ) { struct mailslot_device *device = (struct mailslot_device*)obj; struct object *found; diff --git a/server/named_pipe.c b/server/named_pipe.c index 60bd059d93d..14868fad63a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -239,7 +239,7 @@ static const struct fd_ops pipe_client_fd_ops = static void named_pipe_device_dump( struct object *obj, int verbose ); static struct object_type *named_pipe_device_get_type( struct object *obj ); static struct object *named_pipe_device_lookup_name( struct object *obj, - struct unicode_str *name, unsigned int attr ); + struct unicode_str *name, unsigned int attr, struct object *root ); static struct object *named_pipe_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static void named_pipe_device_destroy( struct object *obj ); @@ -468,7 +468,7 @@ static struct object_type *named_pipe_device_get_type( struct object *obj ) } static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ) + unsigned int attr, struct object *root ) { struct named_pipe_device *device = (struct named_pipe_device*)obj; struct object *found; diff --git a/server/object.c b/server/object.c index 9f26a6fea36..c4772a57823 100644 --- a/server/object.c +++ b/server/object.c @@ -248,7 +248,8 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st clear_error(); - while ((obj = parent->ops->lookup_name( parent, ptr, attr ))) + root = parent; + while ((obj = parent->ops->lookup_name( parent, ptr, attr, root ))) { /* move to the next element */ release_object ( parent ); @@ -670,7 +671,7 @@ WCHAR *no_get_full_name( struct object *obj, data_size_t *ret_len ) } struct object *no_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ) + unsigned int attr, struct object *root ) { if (!name) set_error( STATUS_OBJECT_TYPE_MISMATCH ); return NULL; diff --git a/server/object.h b/server/object.h index 394a4aac463..3b3e9084798 100644 --- a/server/object.h +++ b/server/object.h @@ -83,7 +83,7 @@ struct object_ops /* get the object full name */ WCHAR *(*get_full_name)(struct object *, data_size_t *); /* lookup a name if an object has a namespace */ - struct object *(*lookup_name)(struct object *, struct unicode_str *,unsigned int); + struct object *(*lookup_name)(struct object *, struct unicode_str *,unsigned int,struct object *); /* link an object's name into a parent object */ int (*link_name)(struct object *, struct object_name *, struct object *); /* unlink an object's name from its parent */ @@ -165,7 +165,8 @@ extern int default_set_sd( struct object *obj, const struct security_descriptor extern int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, unsigned int set_info, struct token *token ); extern WCHAR *no_get_full_name( struct object *obj, data_size_t *ret_len ); -extern struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attributes ); +extern struct object *no_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attributes, struct object *root ); extern int no_link_name( struct object *obj, struct object_name *name, struct object *parent ); extern void default_unlink_name( struct object *obj, struct object_name *name ); extern struct object *no_open_file( struct object *obj, unsigned int access, unsigned int sharing, diff --git a/server/sock.c b/server/sock.c index 8f500adc68b..1ff56f7bbe5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1735,7 +1735,8 @@ static void sock_release_ifchange( struct sock *sock ) static struct object_type *socket_device_get_type( struct object *obj ); static void socket_device_dump( struct object *obj, int verbose ); -static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ); static struct object *socket_device_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -1775,7 +1776,8 @@ static void socket_device_dump( struct object *obj, int verbose ) fputs( "Socket device\n", stderr ); } -static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, + unsigned int attr, struct object *root ) { return NULL; } diff --git a/server/symlink.c b/server/symlink.c index b620f2accb9..0b85350e1a5 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -49,7 +49,7 @@ static void symlink_dump( struct object *obj, int verbose ); static struct object_type *symlink_get_type( struct object *obj ); static unsigned int symlink_map_access( struct object *obj, unsigned int access ); static struct object *symlink_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ); + unsigned int attr, struct object *root ); static void symlink_destroy( struct object *obj ); static const struct object_ops symlink_ops = @@ -94,7 +94,7 @@ static struct object_type *symlink_get_type( struct object *obj ) } static struct object *symlink_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ) + unsigned int attr, struct object *root ) { struct symlink *symlink = (struct symlink *)obj; struct unicode_str target_str, name_left; @@ -104,6 +104,7 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st if (!name) return NULL; if (!name->len && (attr & OBJ_OPENLINK)) return NULL; + if (obj == root) return NULL; target_str.str = symlink->target; target_str.len = symlink->len; diff --git a/server/winstation.c b/server/winstation.c index c9c85e50fff..95e5c0c7d0d 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -46,7 +46,7 @@ static void winstation_dump( struct object *obj, int verbose ); static struct object_type *winstation_get_type( struct object *obj ); static int winstation_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static struct object *winstation_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ); + unsigned int attr, struct object *root ); static void winstation_destroy( struct object *obj ); static unsigned int winstation_map_access( struct object *obj, unsigned int access ); static void desktop_dump( struct object *obj, int verbose ); @@ -155,7 +155,7 @@ static int winstation_close_handle( struct object *obj, struct process *process, } static struct object *winstation_lookup_name( struct object *obj, struct unicode_str *name, - unsigned int attr ) + unsigned int attr, struct object *root ) { struct winstation *winstation = (struct winstation *)obj; struct object *found; -- 2.28.0

1 4

[PATCH] ole32/tests: Add a trailing linefeed to an ok() message.
by Francois Gouget 25 Nov '20

25 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 5d44cd5a0ba..2e5006463da 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2775,7 +2775,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); hr = CoWaitForMultipleHandles(0, 200, 1, &thread, &index); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish"); + ok(index == WAIT_OBJECT_0, "cowait_unmarshal_thread didn't finish\n"); CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL); -- 2.20.1

1 0

[PATCH] mshtml: Use wide-char string literals.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/dispex.c | 7 ++-- dlls/mshtml/editor.c | 53 +++++++++++------------------- dlls/mshtml/main.c | 21 +++--------- dlls/mshtml/mutation.c | 4 +-- dlls/mshtml/navigate.c | 28 +++++----------- dlls/mshtml/nsembed.c | 62 +++++++++++------------------------- dlls/mshtml/nsio.c | 3 +- dlls/mshtml/oleobj.c | 11 ++----- dlls/mshtml/omnavigator.c | 40 +++++++---------------- dlls/mshtml/persist.c | 9 ++---- dlls/mshtml/protocol.c | 15 +++------ dlls/mshtml/range.c | 48 +++++++++------------------- dlls/mshtml/script.c | 40 +++++++---------------- dlls/mshtml/secmgr.c | 6 ++-- dlls/mshtml/selection.c | 9 ++---- dlls/mshtml/svg.c | 10 ++---- dlls/mshtml/task.c | 6 ++-- dlls/mshtml/view.c | 22 ++++--------- dlls/mshtml/xmlhttprequest.c | 19 +++-------- 19 files changed, 122 insertions(+), 291 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f4cc2b76f2a..626c3671f75 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -45,9 +45,6 @@ static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = }; static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1, 0, 0, 0, 0 }; - -static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; - typedef struct { IID iid; VARIANT default_value; @@ -700,7 +697,7 @@ static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS switch(flags) { case DISPATCH_PROPERTYGET: V_VT(res) = VT_BSTR; - V_BSTR(res) = SysAllocString(objectW); + V_BSTR(res) = SysAllocString(L"[object]"); if(!V_BSTR(res)) return E_OUTOFMEMORY; break; @@ -1283,7 +1280,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, if(func->id == DISPID_VALUE) { BSTR ret; - ret = SysAllocString(objectW); + ret = SysAllocString(L"[object]"); if(!ret) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 28c4eceff8e..0f63ce20131 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -92,9 +92,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOM_VK_HOME VK_HOME #define DOM_VK_END VK_END -static const WCHAR fontW[] = {'f','o','n','t',0}; -static const WCHAR sizeW[] = {'s','i','z','e',0}; - void set_dirty(GeckoBrowser *browser, VARIANT_BOOL dirty) { nsresult nsres; @@ -286,13 +283,13 @@ static void get_font_size(HTMLDocumentNode *doc, WCHAR *ret) nsIDOMElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); - if(!wcsicmp(tag, fontW)) { + if(!wcsicmp(tag, L"font")) { nsAString val_str; const PRUnichar *val; TRACE("found font tag %p\n", elem); - get_elem_attr_value(elem, sizeW, &val_str, &val); + get_elem_attr_value(elem, L"size", &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); lstrcpyW(ret, val); @@ -340,9 +337,9 @@ static void set_font_size(HTMLDocumentNode *doc, LPCWSTR size) } } - create_nselem(doc, fontW, &elem); + create_nselem(doc, L"font", &elem); - nsAString_InitDepend(&size_str, sizeW); + nsAString_InitDepend(&size_str, L"size"); nsAString_InitDepend(&val_str, size); nsIDOMElement_SetAttribute(elem, &size_str, &val_str); @@ -358,7 +355,7 @@ static void set_font_size(HTMLDocumentNode *doc, LPCWSTR size) nsISelection_Collapse(nsselection, (nsIDOMNode*)elem, 0); }else { /* Remove all size attributes from the range */ - remove_child_attr(elem, fontW, &size_str); + remove_child_attr(elem, L"font", &size_str); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem); } @@ -606,8 +603,7 @@ static HRESULT exec_fontsize(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *i switch(V_VT(in)) { case VT_I4: { WCHAR size[10]; - static const WCHAR format[] = {'%','d',0}; - wsprintfW(size, format, V_I4(in)); + wsprintfW(size, L"%d", V_I4(in)); set_font_size(doc, size); break; } @@ -956,14 +952,6 @@ static HRESULT query_edit_status(HTMLDocumentNode *doc, OLECMD *cmd) static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - static const WCHAR wszOther[] = {'(','o','t','h','e','r',')',0}; - static const WCHAR wszFile[] = {'f','i','l','e',':',0}; - static const WCHAR wszFtp[] = {'f','t','p',':',0}; - static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; - static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; - static const WCHAR wszNews[] = {'n','e','w','s',':',0}; - switch (msg) { case WM_INITDIALOG: @@ -975,13 +963,13 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP SetWindowLongPtrW(hwnd, DWLP_USER, lparam); - SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszOther); - SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszFile); - SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszFtp); - def_idx = SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszHttp); - SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszHttps); - SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszMailto); - SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)wszNews); + SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"(other)"); + SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"file:"); + SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"ftp:"); + def_idx = SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"http:"); + SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"https:"); + SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"mailto:"); + SendMessageW(hwndCB, CB_INSERTSTRING, -1, (LPARAM)L"news:"); SendMessageW(hwndCB, CB_SETCURSEL, def_idx, 0); /* force the updating of the URL edit box */ @@ -1025,7 +1013,7 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP type = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); SendMessageW((HWND)lparam, CB_GETLBTEXT, item, (LPARAM)type); - if (!wcscmp(type, wszOther)) + if (!wcscmp(type, L"(other)")) *type = '\0'; /* get current URL */ @@ -1044,7 +1032,7 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP if (*type != '\0') { memcpy(url, type, (lstrlenW(type) + 1) * sizeof(WCHAR)); - if (wcscmp(type, wszMailto) && wcscmp(type, wszNews)) + if (wcscmp(type, L"mailto:") && wcscmp(type, L"news:")) memcpy(url + lstrlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); } @@ -1075,9 +1063,6 @@ static HRESULT exec_hyperlink(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT * INT ret; HRESULT hres = E_FAIL; - static const WCHAR aW[] = {'a',0}; - static const WCHAR hrefW[] = {'h','r','e','f',0}; - TRACE("%p, 0x%x, %p, %p\n", doc, cmdexecopt, in, out); if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER) @@ -1106,9 +1091,9 @@ static HRESULT exec_hyperlink(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT * return E_FAIL; /* create an element for the link */ - create_nselem(doc, aW, &anchor_elem); + create_nselem(doc, L"a", &anchor_elem); - nsAString_InitDepend(&href_str, hrefW); + nsAString_InitDepend(&href_str, L"href"); nsAString_InitDepend(&ns_url, url); nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); nsAString_Finish(&href_str); @@ -1257,9 +1242,7 @@ HRESULT setup_edit_mode(HTMLDocumentObj *doc) mon = doc->basedoc.window->mon; IMoniker_AddRef(mon); }else { - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - - hres = CreateURLMoniker(NULL, about_blankW, &mon); + hres = CreateURLMoniker(NULL, L"about:blank", &mon); if(FAILED(hres)) { FIXME("CreateURLMoniker failed: %08x\n", hres); return hres; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index e2c927c5f9d..642e2fdbffd 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -149,10 +149,8 @@ static BOOL read_compat_mode(HKEY key, compat_mode_t *r) DWORD type, size; LSTATUS status; - static const WCHAR max_compat_modeW[] = {'M','a','x','C','o','m','p','a','t','M','o','d','e',0}; - size = sizeof(version); - status = RegQueryValueExW(key, max_compat_modeW, NULL, &type, (BYTE*)version, &size); + status = RegQueryValueExW(key, L"MaxCompatMode", NULL, &type, (BYTE*)version, &size); if(status != ERROR_SUCCESS || type != REG_SZ) return FALSE; @@ -168,14 +166,8 @@ static BOOL WINAPI load_compat_settings(INIT_ONCE *once, void *param, void **con HKEY key, host_key; DWORD res; - static const WCHAR key_nameW[] = { - 'S','o','f','t','w','a','r','e', - '\\','W','i','n','e', - '\\','M','S','H','T','M','L', - '\\','C','o','m','p','a','t','M','o','d','e',0}; - /* @@ Wine registry key: HKCU\Software\Wine\MSHTML\CompatMode */ - res = RegOpenKeyW(HKEY_CURRENT_USER, key_nameW, &key); + res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Wine\\MSHTML\\CompatMode", &key); if(res != ERROR_SUCCESS) return TRUE; @@ -350,13 +342,10 @@ HRESULT do_query_service(IUnknown *unk, REFGUID guid_service, REFIID riid, void HINSTANCE get_shdoclc(void) { - static const WCHAR wszShdoclc[] = - {'s','h','d','o','c','l','c','.','d','l','l',0}; - if(shdoclc) return shdoclc; - return shdoclc = LoadLibraryExW(wszShdoclc, NULL, LOAD_LIBRARY_AS_DATAFILE); + return shdoclc = LoadLibraryExW(L"shdoclc.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); } BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) @@ -602,8 +591,6 @@ static HRESULT register_server(BOOL do_register) static CLSID const *clsids[35]; unsigned int i = 0; - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - TRACE("(%x)\n", do_register); INF_SET_CLSID(AboutProtocol); @@ -653,7 +640,7 @@ static HRESULT register_server(BOOL do_register) strtable.cEntries = ARRAY_SIZE(pse); strtable.pse = pse; - hAdvpack = LoadLibraryW(wszAdvpack); + hAdvpack = LoadLibraryW(L"advpack.dll"); pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 96490f9abd9..247a3277927 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -491,8 +491,6 @@ static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *m nsAString http_equiv_str, content_str; nsresult nsres; - static const WCHAR x_ua_compatibleW[] = {'x','-','u','a','-','c','o','m','p','a','t','i','b','l','e',0}; - nsAString_Init(&http_equiv_str, NULL); nsAString_Init(&content_str, NULL); nsres = nsIDOMHTMLMetaElement_GetHttpEquiv(meta_element, &http_equiv_str); @@ -507,7 +505,7 @@ static void process_meta_element(HTMLDocumentNode *doc, nsIDOMHTMLMetaElement *m TRACE("%s: %s\n", debugstr_w(http_equiv), debugstr_w(content)); - if(!wcsicmp(http_equiv, x_ua_compatibleW)) { + if(!wcsicmp(http_equiv, L"x-ua-compatible")) { compat_mode_t document_mode; if(parse_ua_compatible(content, &document_mode)) set_document_mode(doc, document_mode, TRUE); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 744db468d83..233f58c89fd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -46,9 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define UTF8_STR "utf-8" #define UTF16_STR "utf-16" -static const WCHAR emptyW[] = {0}; -static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; - struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -799,14 +796,12 @@ static HRESULT process_response_headers(nsChannelBSC *This, const WCHAR *headers http_header_t *iter; HRESULT hres; - static const WCHAR content_typeW[] = {'c','o','n','t','e','n','t','-','t','y','p','e',0}; - hres = parse_headers(headers, &This->nschannel->response_headers); if(FAILED(hres)) return hres; LIST_FOR_EACH_ENTRY(iter, &This->nschannel->response_headers, http_header_t, entry) { - if(!wcsicmp(iter->header, content_typeW)) + if(!wcsicmp(iter->header, L"content-type")) parse_content_type(This, iter->data); } @@ -1116,7 +1111,7 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) WCHAR *mime; hres = FindMimeFromData(NULL, NULL, This->nsstream->buf, This->nsstream->buf_size, - This->is_doc_channel ? text_htmlW : NULL, 0, &mime, 0); + This->is_doc_channel ? L"text/html" : NULL, 0, &mime, 0); if(FAILED(hres)) return hres; @@ -1750,14 +1745,11 @@ static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **addit DWORD len = 0; WCHAR *ptr; - static const WCHAR content_lengthW[] = - {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; - if(!This->nschannel) return S_FALSE; LIST_FOR_EACH_ENTRY(iter, &This->nschannel->request_headers, http_header_t, entry) { - if(wcscmp(iter->header, content_lengthW)) + if(wcscmp(iter->header, L"Content-Length")) len += lstrlenW(iter->header) + 2 /* ": " */ + lstrlenW(iter->data) + 2 /* "\r\n" */; } @@ -1769,7 +1761,7 @@ static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **addit return E_OUTOFMEMORY; LIST_FOR_EACH_ENTRY(iter, &This->nschannel->request_headers, http_header_t, entry) { - if(!wcscmp(iter->header, content_lengthW)) + if(!wcscmp(iter->header, L"Content-Length")) continue; len = lstrlenW(iter->header); @@ -1986,8 +1978,6 @@ static void navigate_javascript_proc(task_t *_task) BSTR code; HRESULT hres; - static const WCHAR jscriptW[] = {'j','s','c','r','i','p','t',0}; - task->window->readystate = READYSTATE_COMPLETE; hres = IUri_GetPath(task->uri, &code); @@ -2003,7 +1993,7 @@ static void navigate_javascript_proc(task_t *_task) set_download_state(window->browser->doc, 1); V_VT(&v) = VT_EMPTY; - hres = exec_script(window->base.inner_window, code, jscriptW, &v); + hres = exec_script(window->base.inner_window, code, L"jscript", &v); SysFreeString(code); if(SUCCEEDED(hres) && V_VT(&v) != VT_EMPTY) { FIXME("javascirpt URL returned %s\n", debugstr_variant(&v)); @@ -2064,8 +2054,7 @@ static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) BSTR frag; nsresult nsres; HRESULT hres; - - static const WCHAR selector_formatW[] = {'a','[','i','d','=','"','%','s','"',']',0}; + static const WCHAR selector_formatW[] = L"a[id=\"%s\"]"; set_current_uri(window, uri); @@ -2310,7 +2299,7 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam if(SUCCEEDED(hres)) { hres = ITargetFramePriv2_AggregatedNavigation2(target_frame_priv, HLNF_DISABLEWINDOWRESTRICTIONS|HLNF_OPENINNEWWINDOW, bind_ctx, &bsc->bsc.IBindStatusCallback_iface, - name, uri, emptyW); + name, uri, L""); ITargetFramePriv2_Release(target_frame_priv); if(SUCCEEDED(hres)) @@ -2377,8 +2366,7 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschanne IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, mon, NULL); if(hlnf & HLNF_OPENINNEWWINDOW) { - static const WCHAR wszBlank[] = {'_','b','l','a','n','k',0}; - IHlink_SetTargetFrameName(hlink, wszBlank); /* FIXME */ + IHlink_SetTargetFrameName(hlink, L"_blank"); /* FIXME */ } hres = IHlinkFrame_Navigate(hlink_frame, hlnf, bindctx, diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9a23785ca67..750f5cfd5e0 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -89,8 +89,6 @@ static nsIComponentManager *pCompMgr = NULL; static nsICategoryManager *cat_mgr; static nsIFile *profile_directory, *plugin_directory; -static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; - static ATOM browser_class; static WCHAR gecko_path[MAX_PATH]; static unsigned gecko_path_len; @@ -249,9 +247,7 @@ static nsrefcnt NSAPI nsDirectoryServiceProvider2_Release(nsIDirectoryServicePro static nsresult create_profile_directory(void) { - static const WCHAR wine_geckoW[] = {'\\','w','i','n','e','_','g','e','c','k','o',0}; - - WCHAR path[MAX_PATH + ARRAY_SIZE(wine_geckoW)]; + WCHAR path[MAX_PATH + ARRAY_SIZE(L"\\wine_gecko")]; cpp_bool exists; nsresult nsres; HRESULT hres; @@ -262,7 +258,7 @@ static nsresult create_profile_directory(void) return NS_ERROR_FAILURE; } - lstrcatW(path, wine_geckoW); + lstrcatW(path, L"\\wine_gecko"); nsres = create_nsfile(path, &profile_directory); if(NS_FAILED(nsres)) return nsres; @@ -316,13 +312,11 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFiles(nsIDirectoryServicePr nsresult nsres; if(!plugin_directory) { - static const WCHAR gecko_pluginW[] = {'\\','g','e','c','k','o','\\','p','l','u','g','i','n',0}; - - len = GetSystemDirectoryW(plugin_path, ARRAY_SIZE(plugin_path)-ARRAY_SIZE(gecko_pluginW)+1); + len = GetSystemDirectoryW(plugin_path, ARRAY_SIZE(plugin_path)-ARRAY_SIZE(L"\\gecko\\plugin")+1); if(!len) return NS_ERROR_UNEXPECTED; - lstrcpyW(plugin_path+len, gecko_pluginW); + lstrcpyW(plugin_path+len, L"\\gecko\\plugin"); nsres = create_nsfile(plugin_path, &plugin_directory); if(NS_FAILED(nsres)) { *_retval = NULL; @@ -362,13 +356,11 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP GeckoBrowser *This; nsresult nsres; - static const WCHAR wszTHIS[] = {'T','H','I','S',0}; - if(msg == WM_CREATE) { This = *(GeckoBrowser**)lParam; - SetPropW(hwnd, wszTHIS, This); + SetPropW(hwnd, L"THIS", This); }else { - This = GetPropW(hwnd, wszTHIS); + This = GetPropW(hwnd, L"THIS"); } switch(msg) { @@ -402,7 +394,7 @@ static void register_browser_class(void) CS_DBLCLKS, nsembed_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszNsContainer, + L"NsContainer", NULL, }; wndclass.hInstance = hInst; @@ -418,9 +410,8 @@ static BOOL install_wine_gecko(void) LONG len; BOOL ret; - static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; - static const WCHAR argsW[] = - {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','g','e','c','k','o',0}; + static const WCHAR controlW[] = L"\\control.exe"; + static const WCHAR argsW[] = L" appwiz.cpl install_gecko"; len = GetSystemDirectoryW(app, MAX_PATH-ARRAY_SIZE(controlW)); memcpy(app+len, controlW, sizeof(controlW)); @@ -456,15 +447,7 @@ static void set_environment(LPCWSTR gre_path) WCHAR *path, buf[20]; const WCHAR *ptr; - static const WCHAR pathW[] = {'P','A','T','H',0}; - static const WCHAR warnW[] = {'w','a','r','n',0}; - static const WCHAR xpcom_debug_breakW[] = - {'X','P','C','O','M','_','D','E','B','U','G','_','B','R','E','A','K',0}; - static const WCHAR nspr_log_modulesW[] = - {'N','S','P','R','_','L','O','G','_','M','O','D','U','L','E','S',0}; - static const WCHAR debug_formatW[] = {'a','l','l',':','%','d',0}; - - SetEnvironmentVariableW(xpcom_debug_breakW, warnW); + SetEnvironmentVariableW(L"XPCOM_DEBUG_BREAK", L"warn"); if(TRACE_ON(gecko)) debug_level = 5; @@ -473,15 +456,15 @@ static void set_environment(LPCWSTR gre_path) else if(ERR_ON(gecko)) debug_level = 1; - swprintf(buf, ARRAY_SIZE(buf), debug_formatW, debug_level); - SetEnvironmentVariableW(nspr_log_modulesW, buf); + swprintf(buf, ARRAY_SIZE(buf), L"all:%d", debug_level); + SetEnvironmentVariableW(L"NSPR_LOG_MODULES", buf); - len = GetEnvironmentVariableW(pathW, NULL, 0); + len = GetEnvironmentVariableW(L"PATH", NULL, 0); gre_path_len = lstrlenW(gre_path); path = heap_alloc((len+gre_path_len+1)*sizeof(WCHAR)); if(!path) return; - GetEnvironmentVariableW(pathW, path, len); + GetEnvironmentVariableW(L"PATH", path, len); /* We have to modify PATH as xul.dll loads other DLLs from this directory. */ if(!(ptr = wcsstr(path, gre_path)) @@ -490,7 +473,7 @@ static void set_environment(LPCWSTR gre_path) if(len) path[len-1] = ';'; lstrcpyW(path+len, gre_path); - SetEnvironmentVariableW(pathW, path); + SetEnvironmentVariableW(L"PATH", path); } heap_free(path); } @@ -528,13 +511,7 @@ static void set_lang(nsIPrefBranch *pref) DWORD res, size, type; HKEY hkey; - static const WCHAR international_keyW[] = - {'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t', - '\\','I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r', - '\\','I','n','t','e','r','n','a','t','i','o','n','a','l',0}; - - res = RegOpenKeyW(HKEY_CURRENT_USER, international_keyW, &hkey); + res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Internet Explorer\\International", &hkey); if(res != ERROR_SUCCESS) return; @@ -1019,9 +996,6 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) { WCHAR buf[32]; - static const WCHAR d_formatW[] = {'%','d',0}; - static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; - switch(V_VT(v)) { case VT_NULL: nsAString_InitDepend(nsstr, NULL); @@ -1036,7 +1010,7 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) break; case VT_I4: - wsprintfW(buf, hex_int ? hex_formatW : d_formatW, V_I4(v)); + wsprintfW(buf, hex_int ? L"#%06x" : L"%d", V_I4(v)); nsAString_Init(nsstr, buf); break; @@ -2251,7 +2225,7 @@ static HRESULT init_browser(GeckoBrowser *browser) return E_FAIL; } - browser->hwnd = CreateWindowExW(0, wszNsContainer, NULL, + browser->hwnd = CreateWindowExW(0, L"NsContainer", NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, GetDesktopWindow(), NULL, hInst, browser); if(!browser->hwnd) { diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7c8f029b4a5..ee709645873 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1488,12 +1488,11 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo http_header_t *header; static const WCHAR cache_controlW[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l'}; - static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; TRACE("(%p)->(%p)\n", This, _retval); header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); - *_retval = header && !wcsicmp(header->data, no_storeW); + *_retval = header && !wcsicmp(header->data, L"no-store"); return NS_OK; } diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 00e937223a0..fb3ff8a8b73 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -231,19 +231,12 @@ static void load_settings(HTMLDocumentObj *doc) DWORD val, size; LONG res; - static const WCHAR ie_keyW[] = { - 'S','O','F','T','W','A','R','E','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',0}; - static const WCHAR zoomW[] = {'Z','o','o','m',0}; - static const WCHAR zoom_factorW[] = {'Z','o','o','m','F','a','c','t','o','r',0}; - - res = RegOpenKeyW(HKEY_CURRENT_USER, ie_keyW, &settings_key); + res = RegOpenKeyW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Internet Explorer", &settings_key); if(res != ERROR_SUCCESS) return; size = sizeof(val); - res = RegGetValueW(settings_key, zoomW, zoom_factorW, RRF_RT_REG_DWORD, NULL, &val, &size); + res = RegGetValueW(settings_key, L"Zoom", L"ZoomFactor", RRF_RT_REG_DWORD, NULL, &val, &size); RegCloseKey(settings_key); if(res == ERROR_SUCCESS) set_viewer_zoom(doc->nscontainer, (float)val/100000); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 721a336a853..f09b796e423 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1137,11 +1137,9 @@ static HRESULT WINAPI OmNavigator_get_appCodeName(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - static const WCHAR mozillaW[] = {'M','o','z','i','l','l','a',0}; - TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(mozillaW); + *p = SysAllocString(L"Mozilla"); return S_OK; } @@ -1149,14 +1147,9 @@ static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - static const WCHAR app_nameW[] = - {'M','i','c','r','o','s','o','f','t',' ', - 'I','n','t','e','r','n','e','t',' ', - 'E','x','p','l','o','r','e','r',0}; - TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(app_nameW); + *p = SysAllocString(L"Microsoft Internet Explorer"); if(!*p) return E_OUTOFMEMORY; @@ -1294,14 +1287,12 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) { OmNavigator *This = impl_from_IOmNavigator(iface); - static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; - TRACE("(%p)->(%p)\n", This, String); if(!String) return E_INVALIDARG; - *String = SysAllocString(objectW); + *String = SysAllocString(L"[object]"); return *String ? S_OK : E_OUTOFMEMORY; } @@ -1309,16 +1300,13 @@ static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - static const WCHAR cpu_classW[] = + TRACE("(%p)->(%p)\n", This, p); + #ifdef _WIN64 - {'x','6','4',0}; + *p = SysAllocString(L"x64"); #else - {'x','8','6',0}; + *p = SysAllocString(L"x86"); #endif - - TRACE("(%p)->(%p)\n", This, p); - - *p = SysAllocString(cpu_classW); return *p ? S_OK : E_OUTOFMEMORY; } @@ -1379,15 +1367,13 @@ static HRESULT WINAPI OmNavigator_get_platform(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); + TRACE("(%p)->(%p)\n", This, p); + #ifdef _WIN64 - static const WCHAR platformW[] = {'W','i','n','6','4',0}; + *p = SysAllocString(L"Win64"); #else - static const WCHAR platformW[] = {'W','i','n','3','2',0}; + *p = SysAllocString(L"Win32"); #endif - - TRACE("(%p)->(%p)\n", This, p); - - *p = SysAllocString(platformW); return S_OK; } @@ -1395,12 +1381,10 @@ static HRESULT WINAPI OmNavigator_get_appMinorVersion(IOmNavigator *iface, BSTR { OmNavigator *This = impl_from_IOmNavigator(iface); - static const WCHAR zeroW[] = {'0',0}; - TRACE("(%p)->(%p)\n", This, p); /* NOTE: MSIE returns "0" or values like ";SP2;". Returning "0" should be enough. */ - *p = SysAllocString(zeroW); + *p = SysAllocString(L"0"); return S_OK; } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index e87ca47c390..f6bb1887aca 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* Undocumented notification, see tests */ #define CMDID_EXPLORER_UPDATEHISTORY 38 -static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - typedef struct { task_t header; HTMLDocumentObj *doc; @@ -893,7 +891,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream TRACE("(%p)->(%p)\n", This, pStm); - hres = CreateURLMoniker(NULL, about_blankW, &mon); + hres = CreateURLMoniker(NULL, L"about:blank", &mon); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08x\n", hres); return hres; @@ -950,7 +948,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) TRACE("(%p)\n", This); - hres = CreateURLMoniker(NULL, about_blankW, &mon); + hres = CreateURLMoniker(NULL, L"about:blank", &mon); if(FAILED(hres)) { WARN("CreateURLMoniker failed: %08x\n", hres); return hres; @@ -1171,7 +1169,6 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L FIXME("JumpLocation not supported\n"); if(!This->doc_obj->client) { - static const WCHAR szOpen[] = {'o','p','e','n',0}; HRESULT hres; BSTR uri; @@ -1179,7 +1176,7 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if (FAILED(hres)) return hres; - ShellExecuteW(NULL, szOpen, uri, NULL, NULL, SW_SHOW); + ShellExecuteW(NULL, L"open", uri, NULL, NULL, SW_SHOW); SysFreeString(uri); return S_OK; } diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index a311d648f29..d11c0132cf5 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -342,12 +342,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr DWORD data_len; BYTE *data; HRESULT hres; - - static const WCHAR html_begin[] = {0xfeff,'<','H','T','M','L','>',0}; - static const WCHAR html_end[] = {'<','/','H','T','M','L','>',0}; - static const WCHAR wszBlank[] = {'b','l','a','n','k',0}; static const WCHAR wszAbout[] = {'a','b','o','u','t',':'}; - static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; /* NOTE: * the about protocol seems not to work as I would expect. It creates html document @@ -370,11 +365,11 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr if(lstrlenW(szUrl) >= ARRAY_SIZE(wszAbout) && !memcmp(wszAbout, szUrl, sizeof(wszAbout))) { text = szUrl + ARRAY_SIZE(wszAbout); - if(!wcscmp(wszBlank, text)) + if(!wcscmp(L"blank", text)) text = NULL; } - data_len = sizeof(html_begin)+sizeof(html_end)-sizeof(WCHAR) + data_len = sizeof(L"\xfeff<HTML>")+sizeof(L"</HTML>")-sizeof(WCHAR) + (text ? lstrlenW(text)*sizeof(WCHAR) : 0); data = heap_alloc(data_len); if(!data) @@ -384,14 +379,14 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr This->data = data; This->data_len = data_len; - memcpy(This->data, html_begin, sizeof(html_begin)); + lstrcpyW((LPWSTR)This->data, L"\xfeff<HTML>"); if(text) lstrcatW((LPWSTR)This->data, text); - lstrcatW((LPWSTR)This->data, html_end); + lstrcatW((LPWSTR)This->data, L"</HTML>"); This->cur = 0; - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, L"text/html"); IInternetProtocolSink_ReportData(pOIProtSink, BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE, diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index d38d64b4151..aa8e8942a87 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static const WCHAR brW[] = {'b','r',0}; -static const WCHAR hrW[] = {'h','r',0}; - typedef struct { DispatchEx dispex; IHTMLTxtRange IHTMLTxtRange_iface; @@ -93,34 +90,20 @@ static HTMLTxtRange *get_range_object(HTMLDocumentNode *doc, IHTMLTxtRange *ifac static range_unit_t string_to_unit(LPCWSTR str) { - static const WCHAR characterW[] = - {'c','h','a','r','a','c','t','e','r',0}; - static const WCHAR wordW[] = - {'w','o','r','d',0}; - static const WCHAR sentenceW[] = - {'s','e','n','t','e','n','c','e',0}; - static const WCHAR texteditW[] = - {'t','e','x','t','e','d','i','t',0}; - - if(!wcsicmp(str, characterW)) return RU_CHAR; - if(!wcsicmp(str, wordW)) return RU_WORD; - if(!wcsicmp(str, sentenceW)) return RU_SENTENCE; - if(!wcsicmp(str, texteditW)) return RU_TEXTEDIT; + if(!wcsicmp(str, L"character")) return RU_CHAR; + if(!wcsicmp(str, L"word")) return RU_WORD; + if(!wcsicmp(str, L"sentence")) return RU_SENTENCE; + if(!wcsicmp(str, L"textedit")) return RU_TEXTEDIT; return RU_UNKNOWN; } static int string_to_nscmptype(LPCWSTR str) { - static const WCHAR seW[] = {'S','t','a','r','t','T','o','E','n','d',0}; - static const WCHAR ssW[] = {'S','t','a','r','t','T','o','S','t','a','r','t',0}; - static const WCHAR esW[] = {'E','n','d','T','o','S','t','a','r','t',0}; - static const WCHAR eeW[] = {'E','n','d','T','o','E','n','d',0}; - - if(!wcsicmp(str, seW)) return NS_START_TO_END; - if(!wcsicmp(str, ssW)) return NS_START_TO_START; - if(!wcsicmp(str, esW)) return NS_END_TO_START; - if(!wcsicmp(str, eeW)) return NS_END_TO_END; + if(!wcsicmp(str, L"StartToEnd")) return NS_START_TO_END; + if(!wcsicmp(str, L"StartToStart")) return NS_START_TO_START; + if(!wcsicmp(str, L"EndToStart")) return NS_END_TO_START; + if(!wcsicmp(str, L"EndToEnd")) return NS_END_TO_END; return -1; } @@ -450,10 +433,10 @@ static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node, BOOL ignore_te break; } case ELEMENT_NODE: - if(is_elem_tag(node, brW)) { + if(is_elem_tag(node, L"br")) { static const WCHAR endlW[] = {'\r','\n'}; wstrbuf_append_len(buf, endlW, 2); - }else if(is_elem_tag(node, hrW)) { + }else if(is_elem_tag(node, L"hr")) { static const WCHAR endl2W[] = {'\r','\n','\r','\n'}; wstrbuf_append_len(buf, endl2W, 4); } @@ -617,7 +600,7 @@ static WCHAR move_next_char(rangepoint_t *iter) if(!node) break; - if(is_elem_tag(node, brW)) { + if(is_elem_tag(node, L"br")) { if(cspace) { nsIDOMNode_Release(node); free_rangepoint(iter); @@ -627,7 +610,7 @@ static WCHAR move_next_char(rangepoint_t *iter) cspace = '\n'; init_rangepoint(&last_space, iter->node, iter->off+1); - }else if(is_elem_tag(node, hrW)) { + }else if(is_elem_tag(node, L"hr")) { nsIDOMNode_Release(node); if(cspace) { free_rangepoint(iter); @@ -707,12 +690,12 @@ static WCHAR move_prev_char(rangepoint_t *iter) if(!node) break; - if(is_elem_tag(node, brW)) { + if(is_elem_tag(node, L"br")) { if(cspace) free_rangepoint(&last_space); cspace = '\n'; init_rangepoint(&last_space, iter->node, iter->off-1); - }else if(is_elem_tag(node, hrW)) { + }else if(is_elem_tag(node, L"hr")) { nsIDOMNode_Release(node); if(cspace) { free_rangepoint(iter); @@ -947,8 +930,7 @@ static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) } if(!*p) { - static const WCHAR emptyW[] = {0}; - *p = SysAllocString(emptyW); + *p = SysAllocString(L""); } TRACE("return %s\n", debugstr_w(*p)); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index bb097081c5e..8f2c7f598ea 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -67,11 +67,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define SCRIPTLANGUAGEVERSION_HTML 0x400 #define SCRIPTLANGUAGEVERSION_ES5 0x102 -static const WCHAR documentW[] = {'d','o','c','u','m','e','n','t',0}; -static const WCHAR windowW[] = {'w','i','n','d','o','w',0}; -static const WCHAR script_endW[] = {'<','/','S','C','R','I','P','T','>',0}; -static const WCHAR emptyW[] = {0}; - struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll_iface; @@ -201,7 +196,7 @@ static BOOL init_script_engine(ScriptHost *script_host) return FALSE; } - hres = IActiveScript_AddNamedItem(script_host->script, windowW, + hres = IActiveScript_AddNamedItem(script_host->script, L"window", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); if(SUCCEEDED(hres)) { V_VT(&var) = VT_BOOL; @@ -357,7 +352,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC *ppiunkItem = NULL; - if(wcscmp(pstrName, windowW)) + if(wcscmp(pstrName, L"window")) return DISP_E_MEMBERNOTFOUND; if(!This->window) @@ -800,7 +795,7 @@ static void parse_elem_text(ScriptHost *script_host, HTMLScriptElement *script_e VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); - hres = IActiveScriptParse_ParseScriptText(script_host->parse, text, windowW, NULL, script_endW, + hres = IActiveScriptParse_ParseScriptText(script_host->parse, text, L"window", NULL, L"</SCRIPT>", 0, 0, SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE, &var, &excepinfo); if(SUCCEEDED(hres)) @@ -1169,17 +1164,10 @@ static GUID get_default_script_guid(HTMLInnerWindow *window) static BOOL get_guid_from_type(LPCWSTR type, GUID *guid) { - static const WCHAR text_javascriptW[] = - {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; - static const WCHAR text_jscriptW[] = - {'t','e','x','t','/','j','s','c','r','i','p','t',0}; - static const WCHAR text_vbscriptW[] = - {'t','e','x','t','/','v','b','s','c','r','i','p','t',0}; - /* FIXME: Handle more types */ - if(!wcsicmp(type, text_javascriptW) || !wcsicmp(type, text_jscriptW)) { + if(!wcsicmp(type, L"text/javascript") || !wcsicmp(type, L"text/jscript")) { *guid = CLSID_JScript; - }else if(!wcsicmp(type, text_vbscriptW)) { + }else if(!wcsicmp(type, L"text/vbscript")) { *guid = CLSID_VBScript; }else { FIXME("Unknown type %s\n", debugstr_w(type)); @@ -1306,8 +1294,6 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) IDispatch *disp; HRESULT hres; - static const WCHAR delimiterW[] = {'\"',0}; - TRACE("%s\n", debugstr_w(text)); for(ptr = text; iswalnum(*ptr); ptr++); @@ -1347,8 +1333,8 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) if(!script_host || !script_host->parse_proc) return NULL; - hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW, - NULL, NULL, delimiterW, 0 /* FIXME */, 0, + hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, ptr, NULL, L"", + NULL, NULL, L"\"", 0 /* FIXME */, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); if(FAILED(hres)) { WARN("ParseProcedureText failed: %08x\n", hres); @@ -1366,8 +1352,6 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan GUID guid; HRESULT hres; - static const WCHAR delimW[] = {'"',0}; - if(!get_guid_from_language(lang, &guid)) { WARN("Could not find script GUID\n"); return CO_E_CLASSSTRING; @@ -1386,7 +1370,7 @@ HRESULT exec_script(HTMLInnerWindow *window, const WCHAR *code, const WCHAR *lan memset(&ei, 0, sizeof(ei)); TRACE(">>>\n"); - hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei); + hres = IActiveScriptParse_ParseScriptText(script_host->parse, code, NULL, NULL, L"\"", 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei); if(SUCCEEDED(hres)) TRACE("<<<\n"); else @@ -1403,7 +1387,7 @@ IDispatch *get_script_disp(ScriptHost *script_host) if(!script_host->script) return NULL; - hres = IActiveScript_GetScriptDispatch(script_host->script, windowW, &disp); + hres = IActiveScript_GetScriptDispatch(script_host->script, L"window", &disp); if(FAILED(hres)) return NULL; @@ -1429,10 +1413,10 @@ static EventTarget *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement * nsAString_GetData(&target_id_str, &target_id); if(!*target_id) { FIXME("Empty for attribute\n"); - }else if(!wcscmp(target_id, documentW)) { + }else if(!wcscmp(target_id, L"document")) { event_target = &doc->node.event_target; htmldoc_addref(&doc->basedoc); - }else if(!wcscmp(target_id, windowW)) { + }else if(!wcscmp(target_id, L"window")) { if(doc->window) { event_target = &doc->window->event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); @@ -1519,7 +1503,7 @@ static IDispatch *parse_event_elem(HTMLDocumentNode *doc, HTMLScriptElement *scr nsAString_GetData(&nsstr, &text); hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, text, args, - emptyW, NULL, NULL, script_endW, 0, 0, + L"", NULL, NULL, L"</SCRIPT>", 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); if(FAILED(hres)) disp = NULL; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index f112119e80c..019327caa47 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ DECLSPEC_HIDDEN const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; @@ -82,7 +80,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost if(!This->basedoc.window) return E_UNEXPECTED; - url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; + url = This->basedoc.window->url ? This->basedoc.window->url : L"about:blank"; return IInternetSecurityManager_ProcessUrlAction(get_security_manager(), url, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); @@ -187,7 +185,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos if(!This->basedoc.window) return E_UNEXPECTED; - url = This->basedoc.window->url ? This->basedoc.window->url : about_blankW; + url = This->basedoc.window->url ? This->basedoc.window->url : L"about:blank"; hres = IInternetSecurityManager_QueryCustomPolicy(get_security_manager(), url, guidKey, ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index da8fbfa2e23..4fe9a1708a1 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -210,15 +210,12 @@ static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); cpp_bool collapsed = TRUE; - static const WCHAR wszNone[] = {'N','o','n','e',0}; - static const WCHAR wszText[] = {'T','e','x','t',0}; - TRACE("(%p)->(%p)\n", This, p); if(This->nsselection) nsISelection_GetIsCollapsed(This->nsselection, &collapsed); - *p = SysAllocString(collapsed ? wszNone : wszText); /* FIXME: control */ + *p = SysAllocString(collapsed ? L"None" : L"Text"); /* FIXME: control */ TRACE("ret %s\n", debugstr_w(*p)); return S_OK; } @@ -308,12 +305,10 @@ static HRESULT WINAPI HTMLSelectionObject2_get_typeDetail(IHTMLSelectionObject2 { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - FIXME("(%p)->(%p) semi-stub\n", This, p); /* FIXME: We should try to use ISelectionServicesListener::GetTypeDetail here. */ - *p = SysAllocString(undefinedW); + *p = SysAllocString(L"undefined"); return *p ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index 6fc77fde011..e1de57fc4b1 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -1173,21 +1173,17 @@ static HRESULT create_tspan_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nse return S_OK; } -static const WCHAR circleW[] = {'c','i','r','c','l','e',0}; -static const WCHAR svgW[] = {'s','v','g',0}; -static const WCHAR tspanW[] = {'t','s','p','a','n',0}; - HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, const WCHAR *tag_name, HTMLElement **elem) { SVGElement *svg_element; TRACE("%s\n", debugstr_w(tag_name)); - if(!wcscmp(tag_name, svgW)) + if(!wcscmp(tag_name, L"svg")) return create_viewport_element(doc, dom_element, elem); - if(!wcscmp(tag_name, circleW)) + if(!wcscmp(tag_name, L"circle")) return create_circle_element(doc, dom_element, elem); - if(!wcscmp(tag_name, tspanW)) + if(!wcscmp(tag_name, L"tspan")) return create_tspan_element(doc, dom_element, elem); svg_element = heap_alloc_zero(sizeof(*svg_element)); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 4cfa83cd566..f9d06407fb3 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -315,22 +315,20 @@ static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa static HWND create_thread_hwnd(void) { static ATOM hidden_wnd_class = 0; - static const WCHAR wszInternetExplorer_Hidden[] = {'I','n','t','e','r','n','e','t', - ' ','E','x','p','l','o','r','e','r','_','H','i','d','d','e','n',0}; if(!hidden_wnd_class) { WNDCLASSEXW wndclass = { sizeof(WNDCLASSEXW), 0, hidden_proc, 0, 0, hInst, NULL, NULL, NULL, NULL, - wszInternetExplorer_Hidden, + L"Internet Explorer_Hidden", NULL }; hidden_wnd_class = RegisterClassExW(&wndclass); } - return CreateWindowExW(0, wszInternetExplorer_Hidden, NULL, WS_POPUP, + return CreateWindowExW(0, L"Internet Explorer_Hidden", NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, hInst, NULL); } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index bb24335cdc6..0f3371c069f 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -36,11 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define TIMER_ID 0x1000 -static const WCHAR wszInternetExplorer_Server[] = - {'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','_','S','e','r','v','e','r',0}; - -static const WCHAR wszTooltipData[] = {'t','o','o','l','t','i','p','_','d','a','t','a',0}; - static ATOM serverwnd_class = 0; typedef struct { @@ -98,11 +93,10 @@ void update_title(HTMLDocumentObj *This) hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); if(SUCCEEDED(hres)) { - static const WCHAR empty[] = {0}; VARIANT title; V_VT(&title) = VT_BSTR; - V_BSTR(&title) = SysAllocString(empty); + V_BSTR(&title) = SysAllocString(L""); IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER, &title, NULL); SysFreeString(V_BSTR(&title)); @@ -163,13 +157,11 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM { HTMLDocumentObj *This; - static const WCHAR wszTHIS[] = {'T','H','I','S',0}; - if(msg == WM_CREATE) { This = *(HTMLDocumentObj**)lParam; - SetPropW(hwnd, wszTHIS, This); + SetPropW(hwnd, L"THIS", This); }else { - This = GetPropW(hwnd, wszTHIS); + This = GetPropW(hwnd, L"THIS"); } switch(msg) { @@ -214,7 +206,7 @@ static void register_serverwnd_class(void) CS_DBLCLKS, serverwnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszInternetExplorer_Server, + L"Internet Explorer_Server", NULL, }; wndclass.hInstance = hInst; @@ -267,7 +259,7 @@ static HRESULT activate_window(HTMLDocumentObj *This) posrect.left, posrect.top, posrect.right-posrect.left, posrect.bottom-posrect.top, SWP_NOACTIVATE | SWP_SHOWWINDOW); }else { - CreateWindowExW(0, wszInternetExplorer_Server, NULL, + CreateWindowExW(0, L"Internet Explorer_Server", NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, posrect.left, posrect.top, posrect.right-posrect.left, posrect.bottom-posrect.top, parent_hwnd, NULL, hInst, This); @@ -336,7 +328,7 @@ static HRESULT activate_window(HTMLDocumentObj *This) static LRESULT WINAPI tooltips_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - tooltip_data *data = GetPropW(hwnd, wszTooltipData); + tooltip_data *data = GetPropW(hwnd, L"tooltip_data"); TRACE("%d %p\n", msg, data); @@ -366,7 +358,7 @@ static void create_tooltips_window(HTMLDocumentObj *This) data->doc = This; data->proc = (WNDPROC)GetWindowLongPtrW(This->tooltips_hwnd, GWLP_WNDPROC); - SetPropW(This->tooltips_hwnd, wszTooltipData, data); + SetPropW(This->tooltips_hwnd, L"tooltip_data", data); SetWindowLongPtrW(This->tooltips_hwnd, GWLP_WNDPROC, (LONG_PTR)tooltips_proc); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 80d09d9632c..c05d5871286 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -117,22 +117,18 @@ static void detach_xhr_event_listener(XMLHttpReqEventListener *event_listener) nsAString str; nsresult nsres; - static const WCHAR loadW[] = {'l','o','a','d',0}; - static const WCHAR readystatechangeW[] = - {'o','n','r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; - nsres = nsIXMLHttpRequest_QueryInterface(event_listener->xhr->nsxhr, &IID_nsIDOMEventTarget, (void**)&event_target); assert(nsres == NS_OK); if(event_listener->readystatechange_event) { - nsAString_InitDepend(&str, readystatechangeW); + nsAString_InitDepend(&str, L"onreadystatechange"); nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); nsAString_Finish(&str); assert(nsres == NS_OK); } if(event_listener->load_event) { - nsAString_InitDepend(&str, loadW); + nsAString_InitDepend(&str, L"load"); nsres = nsIDOMEventTarget_RemoveEventListener(event_target, &str, &event_listener->nsIDOMEventListener_iface, FALSE); nsAString_Finish(&str); assert(nsres == NS_OK); @@ -756,10 +752,8 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) static HRESULT HTMLXMLHttpRequest_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { - static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; - /* onload event handler property is supported, but not exposed by any interface. We implement as a custom property. */ - if(!wcscmp(onloadW, name)) { + if(!wcscmp(L"onload", name)) { *dispid = MSHTML_DISPID_HTMLXMLHTTPREQUEST_ONLOAD; return S_OK; } @@ -811,17 +805,14 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) nsAString type_str; nsresult nsres; - static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; - static const WCHAR loadW[] = {'l','o','a','d',0}; - TRACE("(%p)\n", This); switch(eid) { case EVENTID_READYSTATECHANGE: - type_name = readystatechangeW; + type_name = L"readystatechange"; break; case EVENTID_LOAD: - type_name = loadW; + type_name = L"load"; break; default: return; -- 2.26.2

2 1

[PATCH 2/2] msacm32: Use wide-char string literals.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/driver.c | 6 ++---- dlls/msacm32/format.c | 15 +++++---------- dlls/msacm32/internal.c | 36 ++++++++++++++---------------------- 3 files changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index f0d003f648b..a8d6f3cf6d7 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -434,12 +434,10 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA if (!pConfigInfo) { ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); } else { - static const WCHAR drivers32[] = {'D','r','i','v','e','r','s','3','2','\0'}; - pConfigInfo->dwDCISize = iStructSize; - section_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(drivers32) + 1) * sizeof(WCHAR)); - if (section_name) lstrcpyW(section_name, drivers32); + section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); + if (section_name) lstrcpyW(section_name, L"Drivers32"); pConfigInfo->lpszDCISectionName = section_name; alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 284633ccefe..536fa42e767 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -93,7 +93,6 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) { - static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; int j, index; afd.dwFormatIndex = i; @@ -105,7 +104,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, for (j = len; j < ACMFORMATTAGDETAILS_FORMATTAG_CHARS; j++) buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, - fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); + L"%d Ko/s", (afd.pwfx->nAvgBytesPerSec + 512) / 1024); index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); @@ -213,19 +212,17 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEW afc) return affd.ret; } -static const WCHAR fmt_prop[] = {'a','c','m','p','r','o','p','\0'}; - static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - PACMFORMATCHOOSEW afc = (PACMFORMATCHOOSEW)GetPropW(hWnd, fmt_prop); + ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop"); TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; - SetPropW(hWnd, fmt_prop, (HANDLE)afc); + SetPropW(hWnd, L"acmprop", (HANDLE)afc); MSACM_FillFormatTags(hWnd, afc); MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| @@ -431,8 +428,6 @@ MMRESULT WINAPI acmFormatDetailsA(HACMDRIVER had, PACMFORMATDETAILSA pafd, MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD fdwDetails) { MMRESULT mmr; - static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; - static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); @@ -497,9 +492,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD } if (mmr == MMSYSERR_NOERROR && pafd->szFormat[0] == 0) { - wsprintfW(pafd->szFormat, fmt1, pafd->pwfx->nSamplesPerSec); + wsprintfW(pafd->szFormat, L"%d Hz", pafd->pwfx->nSamplesPerSec); if (pafd->pwfx->wBitsPerSample) { - wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, + wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), L"; %d bits", pafd->pwfx->wBitsPerSample); } MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index cccf5014fcf..e83f1f5c215 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -347,10 +347,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileNa */ void MSACM_RegisterAllDrivers(void) { - static const WCHAR msacm32[] = {'m','s','a','c','m','3','2','.','d','l','l','\0'}; static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; - static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -384,7 +381,7 @@ void MSACM_RegisterAllDrivers(void) RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) + if (GetPrivateProfileSectionW(L"drivers32", buf, ARRAY_SIZE(buf), L"system.ini")) { for(s = buf; *s; s += lstrlenW(s) + 1) { @@ -396,7 +393,7 @@ void MSACM_RegisterAllDrivers(void) } } MSACM_ReorderDriversByPriority(); - MSACM_RegisterDriver(msacm32, msacm32, 0); + MSACM_RegisterDriver(L"msacm32.dll", L"msacm32.dll", 0); } /*********************************************************************** @@ -590,15 +587,13 @@ static void MSACM_ReorderDriversByPriority(void) */ for (i = 0; i < iNumDrivers; i++) { - static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; WCHAR szSubKey[17]; unsigned int iTargetPosition; unsigned int iCurrentPosition; WCHAR * pAlias; - static const WCHAR sPrefix[] = {'m','s','a','c','m','.','\0'}; - + /* Build expected entry name */ - swprintf(szSubKey, 17, priorityTmpl, i + 1); + swprintf(szSubKey, 17, L"Priority%ld", i + 1); lBufferLength = sizeof(szBuffer); lError = RegQueryValueExW(hPriorityKey, szSubKey, NULL, NULL, (LPBYTE)szBuffer, (LPDWORD)&lBufferLength); if (lError != ERROR_SUCCESS) continue; @@ -607,7 +602,7 @@ static void MSACM_ReorderDriversByPriority(void) iTargetPosition = i; /* Locate driver alias in driver list */ - pAlias = wcsstr(szBuffer, sPrefix); + pAlias = wcsstr(szBuffer, L"msacm."); if (pAlias == NULL) continue; for (iCurrentPosition = 0; iCurrentPosition < iNumDrivers; iCurrentPosition++) { @@ -653,9 +648,6 @@ void MSACM_WriteCurrentPriorities(void) HKEY hPriorityKey; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; - static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; - static const WCHAR valueTmpl[] = {'%','c',',',' ','%','s','\0'}; - static const WCHAR converterAlias[] = {'I','n','t','e','r','n','a','l',' ','P','C','M',' ','C','o','n','v','e','r','t','e','r','\0'}; WCHAR szSubKey[17]; WCHAR szBuffer[256]; @@ -680,10 +672,10 @@ void MSACM_WriteCurrentPriorities(void) /* Build required value name */ dwPriorityCounter++; - swprintf(szSubKey, 17, priorityTmpl, dwPriorityCounter); - + swprintf(szSubKey, 17, L"Priority%ld", dwPriorityCounter); + /* Value has a 1 in front for enabled drivers and 0 for disabled drivers */ - swprintf(szBuffer, 256, valueTmpl, (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ? '0' : '1', padid->pszDriverAlias); + swprintf(szBuffer, 256, L"%c, %s", (padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) ? '0' : '1', padid->pszDriverAlias); wcslwr(szBuffer); lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); @@ -695,15 +687,15 @@ void MSACM_WriteCurrentPriorities(void) /* Build required value name */ dwPriorityCounter++; - swprintf(szSubKey, 17, priorityTmpl, dwPriorityCounter); - + swprintf(szSubKey, 17, L"Priority%ld", dwPriorityCounter); + /* Value has a 1 in front for enabled drivers and 0 for disabled drivers */ - swprintf(szBuffer, 256, valueTmpl, '1', converterAlias); - + swprintf(szBuffer, 256, L"%c, %s", '1', L"Internal PCM Converter"); + lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for %s under key %s (0x%08x)\n", - debugstr_w(converterAlias), debugstr_w(basePriorityKey), lError); + ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n", + debugstr_w(basePriorityKey), lError); } RegCloseKey(hPriorityKey); } -- 2.26.2

2 1

[PATCH 1/2] msacm32: Make the registry key variables global.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Deduplicates two of them. dlls/msacm32/internal.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 9c4d1a75f3b..cccf5014fcf 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -52,17 +52,17 @@ static PWINE_ACMNOTIFYWND MSACM_pLastACMNotifyWnd = NULL; static void MSACM_ReorderDriversByPriority(void); +static const WCHAR drvkey[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"; +static const WCHAR baseKey[] = L"Software\\Microsoft\\AudioCompressionManager\\DriverCache\\"; +static const WCHAR basePriorityKey[] = + L"Software\\Microsoft\\Multimedia\\Audio Compression Manager\\Priority v4.00"; + /*********************************************************************** * MSACM_RegisterDriverFromRegistry() */ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) { static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; WCHAR buf[2048]; DWORD bufLen, lRet; HKEY hKey; @@ -181,9 +181,6 @@ errCleanUp: */ static LPWSTR MSACM_GetRegistryKey(const WINE_ACMDRIVERID* padid) { - static const WCHAR baseKey[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'A','u','d','i','o','C','o','m','p','r','e','s','s','i','o','n','M','a','n','a','g','e','r','\\', - 'D','r','i','v','e','r','C','a','c','h','e','\\','\0'}; LPWSTR ret; int len; @@ -354,11 +351,6 @@ void MSACM_RegisterAllDrivers(void) static const WCHAR msacmW[] = {'M','S','A','C','M','.'}; static const WCHAR drv32[] = {'d','r','i','v','e','r','s','3','2','\0'}; static const WCHAR sys[] = {'s','y','s','t','e','m','.','i','n','i','\0'}; - static const WCHAR drvkey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'D','r','i','v','e','r','s','3','2','\0'}; DWORD i, cnt, bufLen, lRet, type; WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; @@ -565,13 +557,6 @@ static void MSACM_ReorderDriversByPriority(void) if (iNumDrivers > 1) { LONG lError; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; unsigned int i; LONG lBufferLength; WCHAR szBuffer[256]; @@ -666,13 +651,6 @@ void MSACM_WriteCurrentPriorities(void) { LONG lError; HKEY hPriorityKey; - static const WCHAR basePriorityKey[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'M','u','l','t','i','m','e','d','i','a','\\', - 'A','u','d','i','o',' ','C','o','m','p','r','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', - 'P','r','i','o','r','i','t','y',' ','v','4','.','0','0','\0' - }; PWINE_ACMDRIVERID padid; DWORD dwPriorityCounter; static const WCHAR priorityTmpl[] = {'P','r','i','o','r','i','t','y','%','l','d','\0'}; -- 2.26.2

2 1

[PATCH] mmdevapi: Use wide-char string literals.
by Michael Stefaniuc 25 Nov '20

25 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mmdevapi/devenum.c | 95 +++++++++++---------------------- dlls/mmdevapi/main.c | 18 ++----- dlls/mmdevapi/tests/mmdevenum.c | 6 +-- dlls/mmdevapi/tests/propstore.c | 13 ++--- 4 files changed, 40 insertions(+), 92 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 999ec2b0e78..9e4a29816ce 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -41,27 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -static const WCHAR software_mmdevapi[] = - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'M','M','D','e','v','i','c','e','s','\\', - 'A','u','d','i','o',0}; -static const WCHAR reg_render[] = - { 'R','e','n','d','e','r',0 }; -static const WCHAR reg_capture[] = - { 'C','a','p','t','u','r','e',0 }; -static const WCHAR reg_devicestate[] = - { 'D','e','v','i','c','e','S','t','a','t','e',0 }; -static const WCHAR reg_properties[] = - { 'P','r','o','p','e','r','t','i','e','s',0 }; -static const WCHAR slashW[] = {'\\',0}; -static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; -static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; -static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; -static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; - static HKEY key_render; static HKEY key_capture; @@ -128,11 +107,7 @@ static inline IPropertyBagImpl *impl_from_IPropertyBag(IPropertyBag *iface) return CONTAINING_RECORD(iface, IPropertyBagImpl, IPropertyBag_iface); } -static const WCHAR propkey_formatW[] = { - '{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','}',',','%','d',0 }; +static const WCHAR propkey_formatW[] = L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X},%d"; static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *propkey) { @@ -145,11 +120,11 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr WARN("Opening key %s failed with %u\n", debugstr_w(buffer), ret); return E_FAIL; } - ret = RegOpenKeyExW(key, reg_properties, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); + ret = RegOpenKeyExW(key, L"Properties", 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); RegCloseKey(key); if (ret != ERROR_SUCCESS) { - WARN("Opening key %s failed with %u\n", debugstr_w(reg_properties), ret); + WARN("Opening key Properties failed with %u\n", ret); return E_FAIL; } return S_OK; @@ -345,8 +320,8 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (RegCreateKeyExW(root, guidstr, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &key, NULL) == ERROR_SUCCESS) { HKEY keyprop; - RegSetValueExW(key, reg_devicestate, 0, REG_DWORD, (const BYTE*)&state, sizeof(DWORD)); - if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) + RegSetValueExW(key, L"DeviceState", 0, REG_DWORD, (const BYTE*)&state, sizeof(DWORD)); + if (!RegCreateKeyExW(key, L"Properties", 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) { PROPVARIANT pv; @@ -404,11 +379,13 @@ static HRESULT load_devices_from_reg(void) LONG ret; DWORD curflow; - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &root, NULL); + ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\MMDevices\\Audio", 0, NULL, 0, + KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &root, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_capture, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_capture, NULL); + ret = RegCreateKeyExW(root, L"Capture", 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_capture, NULL); if (ret == ERROR_SUCCESS) - ret = RegCreateKeyExW(root, reg_render, 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_render, NULL); + ret = RegCreateKeyExW(root, L"Render", 0, NULL, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, NULL, &key_render, NULL); RegCloseKey(root); cur = key_capture; curflow = eCapture; @@ -683,11 +660,6 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) MMDevice *This = impl_from_IMMDevice(iface); WCHAR *str; GUID *id = &This->devguid; - static const WCHAR formatW[] = { '{','0','.','0','.','%','u','.','0','0','0','0','0','0','0','0','}','.', - '{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','}',0 }; TRACE("(%p)->(%p)\n", This, itemid); if (!itemid) @@ -695,9 +667,10 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) *itemid = str = CoTaskMemAlloc(56 * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; - wsprintfW( str, formatW, This->flow, id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + wsprintfW(str, L"{0.0.%u.00000000}.{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + This->flow, id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7]); TRACE("returning %s\n", wine_dbgstr_w(str)); return S_OK; } @@ -986,7 +959,7 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa return E_NOTFOUND; lstrcpyW(reg_key, drv_keyW); - lstrcatW(reg_key, slashW); + lstrcatW(reg_key, L"\\"); lstrcatW(reg_key, drvs.module_name); if(RegOpenKeyW(HKEY_CURRENT_USER, reg_key, &key) == ERROR_SUCCESS){ @@ -995,11 +968,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa DWORD size = sizeof(def_id), state; if(flow == eRender){ - reg_x_name = reg_out_nameW; - reg_vx_name = reg_vout_nameW; + reg_x_name = L"DefaultOutput"; + reg_vx_name = L"DefaultVoiceOutput"; }else{ - reg_x_name = reg_in_nameW; - reg_vx_name = reg_vin_nameW; + reg_x_name = L"DefaultInput"; + reg_vx_name = L"DefaultVoiceInput"; } if(role == eCommunications && @@ -1051,15 +1024,12 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA DWORD i=0; IMMDevice *dev = NULL; - static const WCHAR wine_info_deviceW[] = {'W','i','n','e',' ', - 'i','n','f','o',' ','d','e','v','i','c','e',0}; - TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); if(!name || !device) return E_POINTER; - if(!lstrcmpW(name, wine_info_deviceW)){ + if(!lstrcmpW(name, L"Wine info device")){ *device = &info_device; return S_OK; } @@ -1188,7 +1158,7 @@ static DWORD WINAPI notif_thread_proc(void *user) DWORD size; lstrcpyW(reg_key, drv_keyW); - lstrcatW(reg_key, slashW); + lstrcatW(reg_key, L"\\"); lstrcatW(reg_key, drvs.module_name); if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, @@ -1198,23 +1168,19 @@ static DWORD WINAPI notif_thread_proc(void *user) } size = sizeof(out_name); - if(RegQueryValueExW(key, reg_out_nameW, 0, NULL, - (BYTE*)out_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultOutput", 0, NULL, (BYTE*)out_name, &size) != ERROR_SUCCESS) out_name[0] = 0; size = sizeof(vout_name); - if(RegQueryValueExW(key, reg_vout_nameW, 0, NULL, - (BYTE*)vout_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultVoiceOutput", 0, NULL, (BYTE*)vout_name, &size) != ERROR_SUCCESS) vout_name[0] = 0; size = sizeof(in_name); - if(RegQueryValueExW(key, reg_in_nameW, 0, NULL, - (BYTE*)in_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultInput", 0, NULL, (BYTE*)in_name, &size) != ERROR_SUCCESS) in_name[0] = 0; size = sizeof(vin_name); - if(RegQueryValueExW(key, reg_vin_nameW, 0, NULL, - (BYTE*)vin_name, &size) != ERROR_SUCCESS) + if(RegQueryValueExW(key, L"DefaultVoiceInput", 0, NULL, (BYTE*)vin_name, &size) != ERROR_SUCCESS) vin_name[0] = 0; while(1){ @@ -1228,13 +1194,13 @@ static DWORD WINAPI notif_thread_proc(void *user) EnterCriticalSection(&g_notif_lock); - notify_if_changed(eRender, eConsole, key, reg_out_nameW, + notify_if_changed(eRender, eConsole, key, L"DefaultOutput", out_name, &MMDevice_def_play->IMMDevice_iface); - notify_if_changed(eRender, eCommunications, key, reg_vout_nameW, + notify_if_changed(eRender, eCommunications, key, L"DefaultVoiceOutput", vout_name, &MMDevice_def_play->IMMDevice_iface); - notify_if_changed(eCapture, eConsole, key, reg_in_nameW, + notify_if_changed(eCapture, eConsole, key, L"DefaultInput", in_name, &MMDevice_def_rec->IMMDevice_iface); - notify_if_changed(eCapture, eCommunications, key, reg_vin_nameW, + notify_if_changed(eCapture, eCommunications, key, L"DefaultVoiceInput", vin_name, &MMDevice_def_rec->IMMDevice_iface); LeaveCriticalSection(&g_notif_lock); @@ -1523,10 +1489,9 @@ static ULONG WINAPI PB_Release(IPropertyBag *iface) static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) { - static const WCHAR dsguid[] = { 'D','S','G','u','i','d', 0 }; IPropertyBagImpl *This = impl_from_IPropertyBag(iface); TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->n1.n2.vt); - if (!lstrcmpW(name, dsguid)) + if (!lstrcmpW(name, L"DSGuid")) { WCHAR guidstr[39]; StringFromGUID2(&This->devguid, guidstr,ARRAY_SIZE(guidstr)); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 8e9127a7507..247ebc3b001 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -47,8 +47,7 @@ static HINSTANCE instance; DriverFuncs drvs; -const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; +const WCHAR drv_keyW[] = L"Software\\Wine\\Drivers"; static const char *get_priority_string(int prio) { @@ -68,12 +67,10 @@ static const char *get_priority_string(int prio) static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) { WCHAR driver_module[264]; - static const WCHAR wineW[] = {'w','i','n','e',0}; - static const WCHAR dotdrvW[] = {'.','d','r','v',0}; - lstrcpyW(driver_module, wineW); + lstrcpyW(driver_module, L"wine"); lstrcatW(driver_module, name); - lstrcatW(driver_module, dotdrvW); + lstrcatW(driver_module, L".drv"); TRACE("Attempting to load %s\n", wine_dbgstr_w(driver_module)); @@ -106,11 +103,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) { - static const WCHAR drv_value[] = {'A','u','d','i','o',0}; - - static WCHAR default_list[] = {'p','u','l','s','e',',','a','l','s','a',',','o','s','s',',', - 'c','o','r','e','a','u','d','i','o',',','a','n','d','r','o','i','d',0}; - + static WCHAR default_list[] = L"pulse,alsa,oss,coreaudio,android"; DriverFuncs driver; HKEY key; WCHAR reg_list[256], *p, *next, *driver_list = default_list; @@ -118,8 +111,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ DWORD size = sizeof(reg_list); - if(RegQueryValueExW(key, drv_value, 0, NULL, (BYTE*)reg_list, - &size) == ERROR_SUCCESS){ + if(RegQueryValueExW(key, L"Audio", 0, NULL, (BYTE*)reg_list, &size) == ERROR_SUCCESS){ if(reg_list[0] == '\0'){ TRACE("User explicitly chose no driver\n"); RegCloseKey(key); diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 4708c2fef84..350d6474a46 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -384,8 +384,6 @@ static IMMNotificationClient notif = { &notif_vtbl }; /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { - static const WCHAR not_a_deviceW[] = {'n','o','t','a','d','e','v','i','c','e',0}; - HRESULT hr; IUnknown *unk = NULL; IMMDeviceEnumerator *mme, *mme2; @@ -426,13 +424,13 @@ START_TEST(mmdevenum) ok(!unk, "Unk not reset to null after invalid QI\n"); ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); - hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, NULL); + hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", NULL); ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); hr = IMMDeviceEnumerator_GetDevice(mme, NULL, &dev); ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); - hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, &dev); + hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", &dev); ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); col = (void*)(LONG_PTR)0x12345678; diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index bdba19d158c..e5071e67e52 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -33,14 +33,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static const WCHAR software_renderW[] = - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'M','M','D','e','v','i','c','e','s','\\', - 'A','u','d','i','o','\\', - 'R','e','n','d','e','r',0 }; -static const WCHAR propertiesW[] = {'P','r','o','p','e','r','t','i','e','s',0}; + L"Software\\Microsoft\\Windows\\CurrentVersion\\MMDevices\\Audio\\Render"; static void test_propertystore(IPropertyStore *store) @@ -138,7 +131,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) static const PROPERTYKEY PKEY_Bogus = { {0x1da5d803, 0xd492, 0x4edd, {0x8c, 0x23, 0xe0, 0xc0, 0xff, 0xee, 0x7f, 0x00}}, 0x7f }; - static const WCHAR bogusW[] = {'{','1','D','A','5','D','8','0','3','-','D','4','9','2','-','4','E','D','D','-','8','C','2','3','-','E','0','C','0','F','F','E','E','7','F','0','0','}',',','1','2','7',0}; + static const WCHAR bogusW[] = L"{1DA5D803-D492-4EDD-8C23-E0C0FFEE7F00},127"; PropVariantInit(&pv); @@ -172,7 +165,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) ret = RegOpenKeyExW(root, guidW, 0, KEY_READ|KEY_WOW64_64KEY, &devkey); ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %u\n", ret); - ret = RegOpenKeyExW(devkey, propertiesW, 0, KEY_READ|KEY_WOW64_64KEY, &props); + ret = RegOpenKeyExW(devkey, L"Properties", 0, KEY_READ|KEY_WOW64_64KEY, &props); ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %u\n", ret); /* Note: the registry key exists even without calling IPropStore::Commit */ -- 2.26.2

2 1

[PATCH] winegstreamer: Initialise type_handler to NULL in media_stream_init_desc().
by Gijs Vermeulen 25 Nov '20

25 Nov '20

Otherwise it is used uninitialised if a failure occurs. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 66bdf64a669..83424719d54 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -858,7 +858,7 @@ fail: static HRESULT media_stream_init_desc(struct media_stream *stream) { GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src); - IMFMediaTypeHandler *type_handler; + IMFMediaTypeHandler *type_handler = NULL; IMFMediaType **stream_types = NULL; IMFMediaType *stream_type = NULL; DWORD type_count = 0; -- 2.29.2

2 1

[PATCH 1/4] mf/topoloader: Add partial topology resolution tests.
by Derek Lesho 25 Nov '20

25 Nov '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- I'm not sure if this is too many of too few tests, and if the kinds of tests I have here are wanted. I was going to add tests for MF_ENUMERATE_SOURCE_TYPES and MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES, but they got really large, and didn't really prove much beyond what is already documented in the MSDN. Another test I chose to leave out is for what happens on topologies with sources without a currently selected media type, since Microsoft is pretty clear that will never happen. Also note that these tests aren't un-todo'd in this patchset. The first test requires 1) the more correct sample grabber IsMediaTypeSupportedImplementation and 2) the audio resampler MFT. The second tests requires the media source to output compressed MPEG streams and for a MPEG decoder to be present. --- dlls/mf/tests/mf.c | 200 +++++++++++++++++++++++++++++++++++++- dlls/mf/tests/resource.rc | 3 + dlls/mf/tests/test.mp3 | Bin 0 -> 2551 bytes 3 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 dlls/mf/tests/test.mp3 diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 43dc9a49ee7..4c70f7ee857 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1418,22 +1418,27 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; + IMFTopologyNode *src_node, *sink_node, *src_node2, *mft_node; IMFTopology *topology, *topology2, *full_topology; - IMFTopologyNode *src_node, *sink_node; + unsigned int count, value, index; IMFPresentationDescriptor *pd; IMFSourceResolver *resolver; IMFActivate *sink_activate; IMFStreamSink *stream_sink; - unsigned int count, value; + MF_TOPOLOGY_TYPE node_type; IMFMediaType *media_type; IMFStreamDescriptor *sd; MF_OBJECT_TYPE obj_type; + IMFTransform *transform; IMFMediaSource *source; IMFTopoLoader *loader; IMFByteStream *stream; + IUnknown *node_object; IMFAttributes *attr; IMFMediaSink *sink; + WORD node_count; WCHAR *filename; + TOPOID node_id; BOOL selected; HRESULT hr; GUID guid; @@ -1581,9 +1586,200 @@ todo_wine { IMFTopology_Release(topology2); IMFTopology_Release(full_topology); + /* Partial topology (requires converter) */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + /* resample from 44100hz to 48000hz */ + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_CONVERTER); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count %u\n", node_count); + if (node_count != 3) + { + IMFMediaSource_Release(source); + IMFSourceResolver_Release(resolver); + IMFByteStream_Release(stream); + + IMFTopoLoader_Release(loader); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); + return; + } + + hr = IMFTopologyNode_GetTopoNodeID(src_node, &node_id); + ok(hr == S_OK, "Failed to get source node id, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeByID(full_topology, node_id, &src_node2); + ok(hr == S_OK, "Failed to get source in resolved topology, hr %#x.\n", hr); + + hr = IMFTopologyNode_GetOutput(src_node2, 0, &mft_node, &index); + ok(hr == S_OK, "Failed to get transform node in resolved topology, hr %#x.\n", hr); + ok(index == 0, "Unexpected stream index %u.\n", index); + + hr = IMFTopologyNode_GetNodeType(mft_node, &node_type); + ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#x.\n", hr); + ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u, expected MF_TOPOLOGY_TRANSFORM_NODE.\n", node_type); + + hr = IMFTopologyNode_GetObject(mft_node, &node_object); + ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); + + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void**) &transform); + ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); + IUnknown_Release(node_object); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform input type, hr %#x.\n", hr); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value); + ok(hr == S_OK, "Failed to get MF_MT_AUDIO_SAMPLES_PER_SECOND on transform input type, hr %#x.\n", hr); + ok(value == 44100, "Unexpected sample rate of transform input type %u, expected 44100\n", value); + + IMFMediaType_Release(media_type); + + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform output type, hr %#x.\n", hr); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &value); + ok(hr == S_OK, "Failed to get MF_MT_AUDIO_SAMPLES_PER_SECOND on transform output type, hr %#x.\n", hr); + ok(value == 48000, "Unexpected sample rate of transform input type %u, expected 48000\n", value); + + IMFMediaType_Release(media_type); + IMFTransform_Release(transform); + IMFTopology_Release(full_topology); + IMFMediaSource_Release(source); IMFSourceResolver_Release(resolver); IMFByteStream_Release(stream); + + /* Test MF_TOPONODE_CONNECT_METHOD: + - 0x1 (MF_CONNECT_ALLOW_CONVERTER) allows converters + - 0x3 (MF_CONNECT_ALLOW_DECODER) allows converters and decoders + - 0x2 allows neither */ + + hr = MFCreateSourceResolver(&resolver); + ok(hr == S_OK, "Failed to create source resolver, hr %#x.\n", hr); + + filename = load_resource(L"test.mp3"); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attr); + IMFAttributes_SetString(attr, &MF_BYTESTREAM_CONTENT_TYPE, L"audio/mpeg"); + IMFAttributes_Release(attr); + + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&source); + ok(hr == S_OK || broken(FAILED(hr)) /* Vista */, "Failed to create source, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); + ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + ok(hr == S_OK, "Failed to set node pd, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + IMFStreamSink_Release(stream_sink); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_DIRECT); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_CONVERTER); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, 2); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(sink_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_ALLOW_DECODER); + ok(hr == S_OK, "Failed to set connect method, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); + ok(node_count == 3, "Unexpected node count %u\n", node_count); + + IMFTopology_Release(full_topology); + IMFMediaSource_Release(source); + IMFSourceResolver_Release(resolver); + IMFByteStream_Release(stream); + IMFTopoLoader_Release(loader); hr = MFShutdown(); diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index f54212a8c8f..5e847cd0b3b 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -20,3 +20,6 @@ /* @makedep: test.wav */ test.wav RCDATA test.wav + +/* @makedep: test.mp3 */ +test.mp3 RCDATA test.mp3 diff --git a/dlls/mf/tests/test.mp3 b/dlls/mf/tests/test.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..8b66f19da24624d58beda20187e1f6f85bdc4f44 GIT binary patch literal 2551 zcmeH}iBr=_7RP@%xN!*g6(n*=fo4evhp=cE2!{lTLQq&?fRG>o0|Lr$SQ82N5s(nM zWC(IB1mzSL&;bEqHrx)EAi4yQ(~%KHM3n50v8HOOhQDBIztz?6b-${v_xjUS{haMh z;lRFhJ>1<1pp^pv7}5V4&CC*wGecucOn#4kokY7ie_9>vIx}ctU<5n{5CZ_Iet`T} z{cwQz2Wa8|i4M?yCScAKFy|AP{ly>BgNc82rTT*$W-b5N{-3oVpg@oxQl6MZMS)cw zLh%5I=H)`iok#mM<5=KiVux|Wx?l$|J@~kj0Fr@^e-k?s(G-;K)50E}ZH*@xN<#sr zA1OgI(jluYWjvxG+yn&|Pk^L%J;o#8`Y@!n#D63{<{;n@py$cl$5WuSo13GEx?rW? zn3Q7)H?aU*@2W+x>FGs=g<@zf0V<2cJCTggIH-rTMh`~8?pu~A{-zi{vMo75&C)I= zbrk1;A59gMJ>2jTtljlpa?#DIn+WlhYhG7R7wCWQ)9Gf7PWjPr{b~w*)WP?4mF~#m z2~T&-ZAOvn=kf~XM##0wx6eNq=qjw6Q@+%S`47MBD>@%nR8+vL9lSh~ye=}_t^3?N z%b$HU6me=qlr}v)tkEYrv040KWBY<|WQV=|kEzWLQL$+1l<dZfPu#7+&OOn(wX)fF z$cNb?;imzO>xlEBa?#?XBvY9$CFi}?ivYa3ZrCO(8fxA(kEPUP4dLbSe$E_A6C*9X zoVPl#D7Li=4=WX9DP!Br$@C5n>@e3g5bfp$YQx^|gbp3O!UJI(Ld^jXrQ^-V*urW& z2#5&)@H}h<T|2ekzt6nf_Fa+Syti(benFa!+jYA;h6QPT4}NVEGYYCz2^o&04Ze3s zETO*XNU}R?R(t$((~#Tk*sSd1@^hi-0x{~ZRCL|+Swi#lS$eMeef#l$IXA9cE*q$k z1|NZQs#k@&>#HR!6o5Ayh~Aw~#*kWt%=CLfOBW4R&H&D8e)#uKO0TrNvK?vti1iLI zrdVK=O9070e#O$jst3w7Me~f9oS`)*S<6Km(mz)J+*p;X(-IJCaet^*tv=sOOirb~ znC{RRD7Rs(%lEXRx)o~Q^(rTMWGQv~J`?)>EpldP6ZLM~E3^BH?Z>7?-pybeuEN4} z=i%NN6f6-iI6{?`{V7!f4sno7Tk?*t>djtK%m`Y}I8yxYqhsXGTPB)QH{^K+(@zCw z|9-46MVQYKL(<}ZG*&NyNF(Wm51d*8zIm1tGwR-=zT_XcuJSF7KM?ae-O7j%o6wNN z@hvOQ-%6e=yER=^z7vmd(<yCK%Ho>u6S84#DTfZ&wbD`hga81dOlUU#X0;lm^E)9o z7sJvLNwZl$ZKQXy+&_ozCq>`3$?V=cmg4B71RF5;$@U9!immV)6Q>VfT&T-Qoz#QF zlET;F8;HE_U-BSu4~56==W-EB?IeVKgWR@EUHG-d(OGAX?1&0<N>y$i>1mY)*O)ok zagr|2+DhUOfv6VhQotn!ZdN8}^JSc>BLRbZz`KGtOpK3wKpK}qH+I!%(IzB*YdT}f z@3CCvWK&kx5+iEFcrBMQXno4HibM4A;OzORcUc(;jz=X^NSet6yLlITqO?~WTgMXt z$S@TV3V9zc5Go9z1>(Bu<hPnoG(y5)FVPF>9c7gs#{E>*bLX}6Ls^wZE(bdQ#xy(h zqMLd~_@4Pa6P$$Ng}v)<^I~~Rs|k5Klr~a9Q_|Dqi^4Ci85LB_4Ti}=`C#$k`qH@; zy4It;=F_Z|JTw8<FzhhfOqnKbC5&IHlr>%`T+@zu6LQm;xUgW-$?2`kuxAMdt0S_h z@!`2$0CXIS+P0}8?Gy5ZZ7GHh=(f_q@98U{tIb&MBnSw=B`^Uv3VN)J1vKV0H*&kW zqBAuiGPg=XJD5mluds0i;2Q+^G8Fnae(&&4%DA!*xS5FvZOP#N^x&#vLu#|A99wpz z7Nol<m`%fvTDp(@qWRJjDW0l!q^2f&xmwKzbC?~?;TDZEBi*9}j1(Jgx;UpQ73GE- z90~0Ed19X4PH7XzbH@(9*y?C}%8yOy)(FlDgexK<%xITMlk7-hu9+eLxLcCjBi(OR zKWAW{5fl{dM`bb_rlo4a!*EqZkEqAVISP~@GPB3nQjiFPXkVQvu@fH@AS5kgwlD$H zhI;D4b5~T=E1dYVIb7thD>_h`t)AHVRCVi1whgA${4=5bk<rD^_GN296E7xLRs-`Z z<*hfyOI}w_ZQd(6jk4Bm_i^^qI6+e&M!d1=FP6Dqz!>pgYYe*@Z9!Y8J$Da%f||dM z{(<_vFitBd--5I2M(gl-y}Y;i@>KR7*>pKZv^)7Qc6fD7bU9?#b^B=T&+IdkykJ7U zXrB-RkbwG<_QLQWl0&G+U@I_p3htB0M1X`?AfZK7(K1uHh0N4}NyTB6$YJhIO#|e4 zpW&@msvz2bqMHZD4(ZUzdgtP|#XO~-IJO!!j3v6UNMyfy-PAVsJEU<9lG)C8R{GI< c(xM&8<FQwKqOB{zbiZdgpqKdn)}L?Szh6E_`Tzg` literal 0 HcmV?d00001 -- 2.29.2

2 4

Re: wine-devel Digest, Vol 184, Issue 284
by Steve Lhomme 25 Nov '20

25 Nov '20

> Date: Wed, 25 Nov 2020 08:51:43 +0300 > From: Nikolay Sivov <nsivov(a)codeweavers.com> > To: wine-devel(a)winehq.org > Subject: Re: [PATCH] include: add AV1 support to dxva.h > Message-ID: <aa27d182-49e8-d3ec-eef1-15d4aeaf02b9(a)codeweavers.com> > Content-Type: text/plain; charset=utf-8 > > On 11/20/20 3:37 PM, Steve Lhomme wrote: >> Based on the DXVA AV1 specs >> https://www.microsoft.com/en-us/download/details.aspx?id=101577 >> >> The structures and the associated define are available in Windows SDK >> since at least 10.0.20231.0. > > Is this something pre-released? Latest one I see is 10.0.19041.0, > corresponding to Windows 10 2004. > It does not have the types. Yes, it's Windows Insider SDKs that can be found here: https://docs.microsoft.com/en-us/windows-insider/flight-hub/ >> >> The GUIDs were present in previous SDKs as well. >> --- >> include/dxva.h | 279 +++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 279 insertions(+) >> >> diff --git a/include/dxva.h b/include/dxva.h >> index 4f18f2e60da..b474bd87111 100644 >> --- a/include/dxva.h >> +++ b/include/dxva.h >> @@ -563,6 +563,285 @@ typedef struct _DXVA_Status_VPx >> USHORT wNumMbsAffected; >> } DXVA_Status_VPx, *LPDXVA_Status_VPx; >> >> + >> +#define _DIRECTX_AV1_VA_ >> + >> +/* AV1 decoder GUIDs */ >> +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile0, 0xb8be4ccb, 0xcf53, 0x46ba, 0x8d, 0x59, 0xd6, 0xb8, 0xa6, 0xda, 0x5d, 0x2a); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile1, 0x6936ff0f, 0x45b1, 0x4163, 0x9c, 0xc1, 0x64, 0x6e, 0xf6, 0x94, 0x61, 0x08); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_Profile2, 0x0c5f2aa1, 0xe541, 0x4089, 0xbb, 0x7b, 0x98, 0x11, 0x0a, 0x19, 0xd7, 0xc8); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2, 0x17127009, 0xa00f, 0x4ce1, 0x99, 0x4e, 0xbf, 0x40, 0x81, 0xf6, 0xf3, 0xf0); >> +DEFINE_GUID(DXVA_ModeAV1_VLD_12bit_Profile2_420, 0x2d80bed6, 0x9cac, 0x4835, 0x9e, 0x91, 0x32, 0x7b, 0xbc, 0x4f, 0x9e, 0xe8); > Adding GUIDs is fine, since they are indeed present in current versions. >> + >> +/* AV1 picture entry data structure */ >> +typedef struct _DXVA_PicEntry_AV1 { >> + UINT width; >> + UINT height; >> + >> + // Global motion parameters >> + INT wmmat[6]; >> + union { >> + struct { >> + UCHAR wminvalid : 1; >> + UCHAR wmtype : 2; >> + UCHAR Reserved : 5; >> + }; >> + UCHAR GlobalMotionFlags; >> + }; >> + UCHAR Index; >> + USHORT Reserved16Bits; >> +} DXVA_PicEntry_AV1, *LPDXVA_PicEntry_AV1; > For that I think we should wait for released SDK. OK. It may not even be in 20H2 though. Drivers from Intel, NVIDIA and AMD can all understand those structures, even on Windows 20H1.

2 1

[PATCH 1/2] shcore: Return ISequentialStream interface for memory stream.
by Daniel Lehman 25 Nov '20

25 Nov '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/shcore/main.c | 4 +++- dlls/shlwapi/tests/istream.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index f9722135fce..d5fce76eade 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -555,7 +555,9 @@ static HRESULT WINAPI shstream_QueryInterface(IStream *iface, REFIID riid, void TRACE("(%p)->(%s, %p)\n", stream, debugstr_guid(riid), out); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IStream) || + IsEqualIID(riid, &IID_ISequentialStream)) { *out = iface; IStream_AddRef(iface); diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 0888e7eb3a7..bbd198c8fde 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -270,7 +270,6 @@ static void test_stream_qi(IStream *stream) unk = NULL; hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); -todo_wine ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get ISequentialStream interface, hr %#x.\n", hr); if (unk) IUnknown_Release(unk); @@ -755,7 +754,6 @@ static void test_SHCreateMemStream(void) ok(stream != NULL, "Failed to create a stream.\n"); hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* WinXP */, "Failed to QI, hr %#x.\n", hr); if (unk) IUnknown_Release(unk); -- 2.25.1

2 3

mmdevapi:render test failures
by Francois Gouget 25 Nov '20

25 Nov '20

So mmdevapi:render keeps failing randomly due to timing issues. All the random failures seem to follow this model: render.c:1091: Test failed: Position 50880 too far after playing 100ms 1077 hr = IAudioClient_Start(ac); /* #1 */ 1080 Sleep(100); 1081 slept += 100; 1087 hr = IAudioClock_GetPosition(acl, &pos, NULL); 1090 /* in rare cases is slept*1.1 not enough with dmix */ 1091 ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); There are a number of issues with that test: * Sleep(100) never sleeps for 100 ms! It either sleeps for 93.6, 109.2 or even 124.8 ms depending on the Sleep() history. In any case it's always a multiple of 15.6 ms. So line 1081 is wrong. * IAudioClient_Start() takes between 1.5 and 3 ms. There is no telling when the audio actually starts during that interval. So that adds up to 3 ms to the play time. * In turn that means the 1.4 factor on line 1091 does not provide a 'safety margin' but really only compensates for the bug on line 1081. * And in any case, given the very short duration, I feel this is going to test how the driver / hardware deals with buffering and latency more than anything else. (even if the driver claims the latency is 0) So what is the goal of that test? I mean besides "Perform renderer padding & position tests". Is the goal to check that an 8-bit stereo stream is not being played as a 16-bit stereo stream, i.e. twice as fast as it should? Then, assuming we find a suitable duration for that test, wouldn't it make more sense to set the leeway factor to something between 1.5 (an even split between expected (1) and too fast (2)) and 1.8 (i.e. biased to account for buffering & co). And we should be measuring how much time elapsed between just before the Start() call and right after the GetPosition() one to set our expectations. Or... scrap the test? -- Francois Gouget <fgouget(a)codeweavers.com>

3 7

[PATCH 1/4] qcap: Move the image buffer back into the video_capture_device structure.
by Zebediah Figura 25 Nov '20

25 Nov '20

This undoes 7aa9a04f26. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/v4l.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b1d7e68d426..cfae2b1d1ec 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -97,6 +97,7 @@ struct v4l_device LONG caps_count; int image_size, image_pitch; + BYTE *image_data; struct strmbase_source *pin; int fd, mmap; @@ -133,6 +134,7 @@ static void v4l_device_destroy(struct video_capture_device *iface) video_close(device->fd); if (device->caps_count) heap_free(device->caps); + heap_free(device->image_data); heap_free(device); } @@ -174,13 +176,21 @@ static HRESULT v4l_device_check_format(struct video_capture_device *iface, const return E_FAIL; } -static BOOL set_caps(struct v4l_device *device, const struct caps *caps) +static HRESULT set_caps(struct v4l_device *device, const struct caps *caps) { struct v4l2_format format = {0}; - LONG width, height; + LONG width, height, image_size; + BYTE *image_data; width = caps->video_info.bmiHeader.biWidth; height = caps->video_info.bmiHeader.biHeight; + image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + + if (!(image_data = heap_alloc(image_size))) + { + ERR("Failed to allocate memory.\n"); + return E_OUTOFMEMORY; + } format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; format.fmt.pix.pixelformat = caps->pixelformat; @@ -192,14 +202,16 @@ static BOOL set_caps(struct v4l_device *device, const struct caps *caps) || format.fmt.pix.height != height) { ERR("Failed to set pixel format: %s.\n", strerror(errno)); - return FALSE; + heap_free(image_data); + return VFW_E_TYPE_NOT_ACCEPTED; } device->current_caps = caps; - device->image_size = width * height * caps->video_info.bmiHeader.biBitCount / 8; + device->image_size = image_size; device->image_pitch = width * caps->video_info.bmiHeader.biBitCount / 8; - - return TRUE; + heap_free(device->image_data); + device->image_data = image_data; + return S_OK; } static HRESULT v4l_device_set_format(struct video_capture_device *iface, const AM_MEDIA_TYPE *mt) @@ -214,10 +226,7 @@ static HRESULT v4l_device_set_format(struct video_capture_device *iface, const A if (device->current_caps == caps) return S_OK; - if (!set_caps(device, caps)) - return VFW_E_TYPE_NOT_ACCEPTED; - - return S_OK; + return set_caps(device, caps); } static HRESULT v4l_device_get_format(struct video_capture_device *iface, AM_MEDIA_TYPE *mt) @@ -344,13 +353,7 @@ static DWORD WINAPI ReadThread(void *arg) struct v4l_device *device = arg; HRESULT hr; IMediaSample *pSample = NULL; - unsigned char *pTarget, *image_data; - - if (!(image_data = heap_alloc(device->image_size))) - { - ERR("Failed to allocate memory.\n"); - return 0; - } + unsigned char *pTarget; for (;;) { @@ -379,7 +382,7 @@ static DWORD WINAPI ReadThread(void *arg) IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(device->fd, image_data, device->image_size) == -1) + while (video_read(device->fd, device->image_data, device->image_size) == -1) { if (errno != EAGAIN) { @@ -388,7 +391,7 @@ static DWORD WINAPI ReadThread(void *arg) } } - reverse_image(device, pTarget, image_data); + reverse_image(device, pTarget, device->image_data); hr = IMemInputPin_Receive(device->pin->pMemInputPin, pSample); IMediaSample_Release(pSample); } @@ -400,7 +403,6 @@ static DWORD WINAPI ReadThread(void *arg) } } - heap_free(image_data); return 0; } @@ -550,6 +552,7 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO struct v4l_device *device; BOOL have_libv4l2; char path[20]; + HRESULT hr; int fd, i; have_libv4l2 = video_init(); @@ -671,10 +674,9 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO for (i = 0; i < device->caps_count; ++i) device->caps[i].media_type.pbFormat = (BYTE *)&device->caps[i].video_info; - if (!set_caps(device, &device->caps[0])) + if (FAILED(hr = set_caps(device, &device->caps[0]))) { - ERR("Failed to set pixel format: %s\n", strerror(errno)); - if (!have_libv4l2) + if (hr == VFW_E_TYPE_NOT_ACCEPTED && !have_libv4l2) ERR_(winediag)("You may need libv4l2 to use this device.\n"); goto error; } -- 2.29.2

1 3

[PATCH vkd3d 1/5] tests: Add some tests for #if expression evaluation.
by Zebediah Figura 24 Nov '20

24 Nov '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 + tests/preproc-if-expr.shader_test | 261 ++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+) create mode 100644 tests/preproc-if-expr.shader_test diff --git a/Makefile.am b/Makefile.am index 0ee7eda7..2cb1567a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ vkd3d_shader_tests = \ tests/math.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ + tests/preproc-if-expr.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -210,6 +211,7 @@ XFAIL_TESTS = \ tests/math.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ + tests/preproc-if-expr.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-if-expr.shader_test b/tests/preproc-if-expr.shader_test new file mode 100644 index 00000000..61c5a397 --- /dev/null +++ b/tests/preproc-if-expr.shader_test @@ -0,0 +1,261 @@ +[preproc] +#if 1 == 1 +pass +#endif + +[preproc] +#if 1 == 0 +fail +#endif +pass + +[preproc] +#if 2 +pass +#endif + +[preproc] +#if -1 +pass +#endif + +[preproc] +#if-1 +pass +#endif + +[preproc] +#if 1 + 1 == 2 +pass +#endif + +[preproc] +#if 1 + 1 == 3 +fail +#endif +pass + +[preproc] +#if 8 - 3 == 5 +pass +#endif + +[preproc] +#if 2 * 2 == 4 +pass +#endif + +[preproc] +#if 2 * 2 == 4 +pass +#endif + +[preproc] +#if 8 / 3 == 2 +pass +#endif + +[preproc] +#if 0x12 == 18 +pass +#endif + +[preproc] +#if 012 == 10 +pass +#endif + +[preproc] +#if -1 == 0xfffffff +fail +#elif -1 == 0xffffffff +pass +#endif + +[preproc] +#if -1 == 0xefffffffel +fail +#elif -1 == 0xeffffffffl +pass +#endif + +[preproc] +#if (-1 == 4294967295l) && (-1 == 8589934591l) && (1 == 4294967297l) +pass +#endif + +[preproc] +#if (-1ul == 4294967295ul) && (-1ul == 8589934591ul) && (1ul == 4294967297ul) +pass +#endif + +[preproc] +#if (-1lu == 4294967295lu) && (-1lu == 8589934591lu) && (1lu == 4294967297lu) +pass +#endif + +[preproc] +#if 36893488147419103233 == 1 +pass +#endif + +[preproc] +/* All math is done using unsigned 32-bit integers. */ +#if 8 / -3 == 2 +fail +#elif 8 / -3 == 3 +fail +#elif 8 / -3 == -2 +fail +#elif 8 / -3 == -3 +fail +#elif 8 / -3 == 0 +pass +#endif + +[preproc] +#if -8 / 3 == 2 +fail +#elif -8 / 3 == 3 +fail +#elif -8 / 3 == -2 +fail +#elif -8 / 3 == -3 +fail +#elif -8 / 3 == 1431655762 +pass +#endif + +[preproc] +#if 1 && 0 +fail +#endif +pass + +[preproc] +#if 0 && 1 +fail +#endif +pass + +[preproc] +#if 1 && 1 +pass +#endif + +[preproc] +#if 1 || 0 +pass +#endif + +[preproc] +#if 0 || 1 +pass +#endif + +[preproc] +#if 0 || 0 +fail +#endif +pass + +[preproc] +#if 1 != 1 +fail +#elif 1 != 0 +pass +#endif + +[preproc] +#if 2 < 1 +fail +#elif 2 < 2 +fail +#elif 1 < 2 +pass +#endif + +[preproc] +#if 2 <= 1 +fail +#elif (1 <= 1) && (1 <= 2) +pass +#endif + +[preproc] +#if 1 > 2 +fail +#elif 2 > 2 +fail +#elif 2 > 1 +pass +#endif + +[preproc] +#if 1 >= 2 +fail +#elif (1 >= 1) && (2 >= 1) +pass +#endif + +[preproc] +#if (2 == 2) == 1 +pass +#endif + +[preproc] +#if ((!0) == 1) && ((!1) == 0) && ((!2) == 0) +pass +#endif + +[preproc] +#if (0 ? 2 : 3) == 3 +pass +#endif + +[preproc] +#if (1 ? 2 : 3) == 2 +pass +#endif + +[preproc] +#if (6 & 3) == 2 +pass +#endif + +[preproc] +#if (6 | 3) == 7 +pass +#endif + +[preproc] +#if (6 ^ 3) == 5 +pass +#endif + +[preproc] +#if +1 == 1 +pass +#endif + +[preproc] +#if -(-1) == 1 +pass +#endif + +[preproc] +#if 2 + 3 * 5 == 17 +pass +#endif + +[preproc] +#if (2 + 3) * 5 == 25 +pass +#endif + +[preproc] +#if 0 \ +< \ +1 +pass +#endif -- 2.29.2

4 16

Re: [PATCH] combase: CoMsgWaitForMultipleHandles message pump.
by Puetz Kevin A 24 Nov '20

24 Nov '20

Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Missed the signoff, and the subject should have been combase, not oleaut32 I’ll see if there are any other substantive comments before I resend a v2. It’s kind of a nasty diff, but I couldn’t find a way to break it into a series where each step was functionally correct without introducing (and later fixing) a bunch of code duplication, which really didn’t make it more readable. The nested loop(s) were just fundamentally the wrong shape should seemingly just be one loop, which checks for alertable wakeup/handle completion/message/sleep inside. it's not too hard to read side-by-side if you use a tool like meld that can ignore leading whitespace and lets you add synchronization points that force it to line up the various almost-common hunks that were moved around.

1 0

[PATCH v2 1/2] winebrowser: Prefix an invalid URL with 'http://' before opening with a browser.
by Brendan Shanks 24 Nov '20

24 Nov '20

Fixes usage like 'winebrowser winehq.org' when xdg-open or macOS 'open' is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50094 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Split invalid URL handling into separate function. programs/winebrowser/main.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 9cd6812d032..c70457e50b3 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -184,6 +184,29 @@ static int open_mailto_url( const WCHAR *url ) return launch_app( mailers, url ); } +static int open_invalid_url( const WCHAR *url ) +{ + static const WCHAR httpW[] = + {'h','t','t','p',':','/','/',0}; + + WCHAR *url_prefixed; + int ret; + + url_prefixed = HeapAlloc( GetProcessHeap(), 0, (ARRAY_SIZE(httpW) + strlenW( url )) * sizeof(WCHAR) ); + if (!url_prefixed) + { + WINE_ERR("Out of memory\n"); + return 1; + } + + strcpyW( url_prefixed, httpW ); + strcatW( url_prefixed, url ); + + ret = open_http_url( url_prefixed ); + HeapFree( GetProcessHeap(), 0, url_prefixed ); + return ret; +} + /***************************************************************************** * DDE helper functions. */ @@ -448,8 +471,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) hres = CreateUri(url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME|Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); if(FAILED(hres)) { - WINE_ERR("Failed to parse URL\n"); - ret = open_http_url(url); + WINE_ERR("Failed to parse URL %s, treating as HTTP\n", wine_dbgstr_w(url)); + ret = open_invalid_url(url); HeapFree(GetProcessHeap(), 0, ddeString); return ret; } -- 2.26.2

1 1

[PATCH] advapi32: Initialize luid in test_CreateRestrictedToken
by Gerald Pfeifer 24 Nov '20

24 Nov '20

We have the following loop in test_CreateRestrictedToken which can leave luid uninitialized: for (i = 0; i < privs->PrivilegeCount; i++) { if (privs->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) { luid = privs->Privileges[i].Luid; break; } } So let's play it safely and initialize this upon declaration. This is being diagnosed by clang 10.0.1, which is not the compiler I ever use for production code, but that occasionally "sneaks" in. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eaaa29866bb..020e69277e0 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5195,7 +5195,7 @@ static void test_CreateRestrictedToken(void) TOKEN_TYPE type; BOOL is_member; DWORD size; - LUID luid; + LUID luid = { 0, 0 }; BOOL ret; DWORD i; -- 2.28.0

1 0

[PATCH] windowscodecs: Move jpeg encoding to the unix lib.
by Esme Povirk 24 Nov '20

24 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/encoder.c | 14 +- dlls/windowscodecs/jpegformat.c | 920 ------------------------- dlls/windowscodecs/libjpeg.c | 313 +++++++++ dlls/windowscodecs/main.c | 28 + dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 7 + 7 files changed, 364 insertions(+), 922 deletions(-) delete mode 100644 dlls/windowscodecs/jpegformat.c diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index d7f9336916b..2ab89eac84c 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -22,7 +22,6 @@ C_SRCS = \ icoformat.c \ imgfactory.c \ info.c \ - jpegformat.c \ libjpeg.c \ libpng.c \ libtiff.c \ diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index bb673b13076..b17895a6c9c 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -38,12 +38,24 @@ static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; +static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; +static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; +static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; +static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; +static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; +static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; static const PROPBAG2 encoder_option_properties[ENCODER_OPTION_END] = { { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality } + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszImageQuality }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszBitmapTransform }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszLuminance }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszChrominance }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszJpegYCrCbSubsampling }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszSuppressApp0 } }; typedef struct CommonEncoder { diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c deleted file mode 100644 index 5be35a1ccb4..00000000000 --- a/dlls/windowscodecs/jpegformat.c +++ /dev/null @@ -1,920 +0,0 @@ -/* - * Copyright 2009 Vincent Povirk for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <setjmp.h> - -#ifdef SONAME_LIBJPEG -/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ -#define XMD_H -#define UINT8 JPEG_UINT8 -#define UINT16 JPEG_UINT16 -#define boolean jpeg_boolean -#undef HAVE_STDLIB_H -# include <jpeglib.h> -#undef HAVE_STDLIB_H -#define HAVE_STDLIB_H 1 -#undef UINT8 -#undef UINT16 -#undef boolean -#endif - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" - -#include "wincodecs_private.h" - -#include "wine/heap.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); - -#ifdef SONAME_LIBJPEG -WINE_DECLARE_DEBUG_CHANNEL(jpeg); - -static void *libjpeg_handle; - -static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; -static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; -static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; -static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; -static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; -static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; - -#define MAKE_FUNCPTR(f) static typeof(f) * p##f -MAKE_FUNCPTR(jpeg_CreateCompress); -MAKE_FUNCPTR(jpeg_CreateDecompress); -MAKE_FUNCPTR(jpeg_destroy_compress); -MAKE_FUNCPTR(jpeg_destroy_decompress); -MAKE_FUNCPTR(jpeg_finish_compress); -MAKE_FUNCPTR(jpeg_read_header); -MAKE_FUNCPTR(jpeg_read_scanlines); -MAKE_FUNCPTR(jpeg_resync_to_restart); -MAKE_FUNCPTR(jpeg_set_defaults); -MAKE_FUNCPTR(jpeg_start_compress); -MAKE_FUNCPTR(jpeg_start_decompress); -MAKE_FUNCPTR(jpeg_std_error); -MAKE_FUNCPTR(jpeg_write_scanlines); -#undef MAKE_FUNCPTR - -static void *load_libjpeg(void) -{ - if((libjpeg_handle = dlopen(SONAME_LIBJPEG, RTLD_NOW)) != NULL) { - -#define LOAD_FUNCPTR(f) \ - if((p##f = dlsym(libjpeg_handle, #f)) == NULL) { \ - libjpeg_handle = NULL; \ - return NULL; \ - } - - LOAD_FUNCPTR(jpeg_CreateCompress); - LOAD_FUNCPTR(jpeg_CreateDecompress); - LOAD_FUNCPTR(jpeg_destroy_compress); - LOAD_FUNCPTR(jpeg_destroy_decompress); - LOAD_FUNCPTR(jpeg_finish_compress); - LOAD_FUNCPTR(jpeg_read_header); - LOAD_FUNCPTR(jpeg_read_scanlines); - LOAD_FUNCPTR(jpeg_resync_to_restart); - LOAD_FUNCPTR(jpeg_set_defaults); - LOAD_FUNCPTR(jpeg_start_compress); - LOAD_FUNCPTR(jpeg_start_decompress); - LOAD_FUNCPTR(jpeg_std_error); - LOAD_FUNCPTR(jpeg_write_scanlines); -#undef LOAD_FUNCPTR - } - return libjpeg_handle; -} - -static void error_exit_fn(j_common_ptr cinfo) -{ - char message[JMSG_LENGTH_MAX]; - if (ERR_ON(jpeg)) - { - cinfo->err->format_message(cinfo, message); - ERR_(jpeg)("%s\n", message); - } - longjmp(*(jmp_buf*)cinfo->client_data, 1); -} - -static void emit_message_fn(j_common_ptr cinfo, int msg_level) -{ - char message[JMSG_LENGTH_MAX]; - - if (msg_level < 0 && ERR_ON(jpeg)) - { - cinfo->err->format_message(cinfo, message); - ERR_(jpeg)("%s\n", message); - } - else if (msg_level == 0 && WARN_ON(jpeg)) - { - cinfo->err->format_message(cinfo, message); - WARN_(jpeg)("%s\n", message); - } - else if (msg_level > 0 && TRACE_ON(jpeg)) - { - cinfo->err->format_message(cinfo, message); - TRACE_(jpeg)("%s\n", message); - } -} - -typedef struct jpeg_compress_format { - const WICPixelFormatGUID *guid; - int bpp; - int num_components; - J_COLOR_SPACE color_space; - int swap_rgb; -} jpeg_compress_format; - -static const jpeg_compress_format compress_formats[] = { - { &GUID_WICPixelFormat24bppBGR, 24, 3, JCS_RGB, 1 }, - { &GUID_WICPixelFormat32bppCMYK, 32, 4, JCS_CMYK }, - { &GUID_WICPixelFormat8bppGray, 8, 1, JCS_GRAYSCALE }, - { 0 } -}; - -typedef struct JpegEncoder { - IWICBitmapEncoder IWICBitmapEncoder_iface; - IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; - LONG ref; - struct jpeg_compress_struct cinfo; - struct jpeg_error_mgr jerr; - struct jpeg_destination_mgr dest_mgr; - BOOL initialized; - int frame_count; - BOOL frame_initialized; - BOOL started_compress; - int lines_written; - BOOL frame_committed; - BOOL committed; - UINT width, height; - double xres, yres; - const jpeg_compress_format *format; - IStream *stream; - WICColor palette[256]; - UINT colors; - CRITICAL_SECTION lock; - BYTE dest_buffer[1024]; -} JpegEncoder; - -static inline JpegEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) -{ - return CONTAINING_RECORD(iface, JpegEncoder, IWICBitmapEncoder_iface); -} - -static inline JpegEncoder *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) -{ - return CONTAINING_RECORD(iface, JpegEncoder, IWICBitmapFrameEncode_iface); -} - -static inline JpegEncoder *encoder_from_compress(j_compress_ptr compress) -{ - return CONTAINING_RECORD(compress, JpegEncoder, cinfo); -} - -static void dest_mgr_init_destination(j_compress_ptr cinfo) -{ - JpegEncoder *This = encoder_from_compress(cinfo); - - This->dest_mgr.next_output_byte = This->dest_buffer; - This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); -} - -static jpeg_boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo) -{ - JpegEncoder *This = encoder_from_compress(cinfo); - HRESULT hr; - ULONG byteswritten; - - hr = IStream_Write(This->stream, This->dest_buffer, - sizeof(This->dest_buffer), &byteswritten); - - if (hr != S_OK || byteswritten == 0) - { - ERR("Failed writing data, hr=%x\n", hr); - return FALSE; - } - - This->dest_mgr.next_output_byte = This->dest_buffer; - This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); - return TRUE; -} - -static void dest_mgr_term_destination(j_compress_ptr cinfo) -{ - JpegEncoder *This = encoder_from_compress(cinfo); - ULONG byteswritten; - HRESULT hr; - - if (This->dest_mgr.free_in_buffer != sizeof(This->dest_buffer)) - { - hr = IStream_Write(This->stream, This->dest_buffer, - sizeof(This->dest_buffer) - This->dest_mgr.free_in_buffer, &byteswritten); - - if (hr != S_OK || byteswritten == 0) - ERR("Failed writing data, hr=%x\n", hr); - } -} - -static HRESULT WINAPI JpegEncoder_Frame_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, - void **ppv) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || - IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) - { - *ppv = &This->IWICBitmapFrameEncode_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI JpegEncoder_Frame_AddRef(IWICBitmapFrameEncode *iface) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - return IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); -} - -static ULONG WINAPI JpegEncoder_Frame_Release(IWICBitmapFrameEncode *iface) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - return IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); -} - -static HRESULT WINAPI JpegEncoder_Frame_Initialize(IWICBitmapFrameEncode *iface, - IPropertyBag2 *pIEncoderOptions) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%p)\n", iface, pIEncoderOptions); - - EnterCriticalSection(&This->lock); - - if (This->frame_initialized) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->frame_initialized = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, - UINT uiWidth, UINT uiHeight) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); - - EnterCriticalSection(&This->lock); - - if (!This->frame_initialized || This->started_compress) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->width = uiWidth; - This->height = uiHeight; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *iface, - double dpiX, double dpiY) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); - - EnterCriticalSection(&This->lock); - - if (!This->frame_initialized || This->started_compress) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->xres = dpiX; - This->yres = dpiY; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, - WICPixelFormatGUID *pPixelFormat) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - int i; - TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); - - EnterCriticalSection(&This->lock); - - if (!This->frame_initialized || This->started_compress) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - for (i=0; compress_formats[i].guid; i++) - { - if (memcmp(compress_formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) - break; - } - - if (!compress_formats[i].guid) i = 0; - - This->format = &compress_formats[i]; - memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode *iface, - UINT cCount, IWICColorContext **ppIColorContext) -{ - FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); - return E_NOTIMPL; -} - -static HRESULT WINAPI JpegEncoder_Frame_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *palette) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - HRESULT hr; - - TRACE("(%p,%p)\n", iface, palette); - - if (!palette) return E_INVALIDARG; - - EnterCriticalSection(&This->lock); - - if (This->frame_initialized) - hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); - else - hr = WINCODEC_ERR_NOTINITIALIZED; - - LeaveCriticalSection(&This->lock); - return hr; -} - -static HRESULT WINAPI JpegEncoder_Frame_SetThumbnail(IWICBitmapFrameEncode *iface, - IWICBitmapSource *pIThumbnail) -{ - FIXME("(%p,%p): stub\n", iface, pIThumbnail); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface, - UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - jmp_buf jmpbuf; - BYTE *swapped_data = NULL, *current_row; - UINT line; - int row_size; - TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - - EnterCriticalSection(&This->lock); - - if (!This->frame_initialized || !This->width || !This->height || !This->format) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - if (lineCount == 0 || lineCount + This->lines_written > This->height) - { - LeaveCriticalSection(&This->lock); - return E_INVALIDARG; - } - - /* set up setjmp/longjmp error handling */ - if (setjmp(jmpbuf)) - { - LeaveCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, swapped_data); - return E_FAIL; - } - This->cinfo.client_data = jmpbuf; - - if (!This->started_compress) - { - This->cinfo.image_width = This->width; - This->cinfo.image_height = This->height; - This->cinfo.input_components = This->format->num_components; - This->cinfo.in_color_space = This->format->color_space; - - pjpeg_set_defaults(&This->cinfo); - - if (This->xres != 0.0 && This->yres != 0.0) - { - This->cinfo.density_unit = 1; /* dots per inch */ - This->cinfo.X_density = This->xres; - This->cinfo.Y_density = This->yres; - } - - pjpeg_start_compress(&This->cinfo, TRUE); - - This->started_compress = TRUE; - } - - row_size = This->format->bpp / 8 * This->width; - - if (This->format->swap_rgb) - { - swapped_data = HeapAlloc(GetProcessHeap(), 0, row_size); - if (!swapped_data) - { - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - } - - for (line=0; line < lineCount; line++) - { - if (This->format->swap_rgb) - { - UINT x; - - memcpy(swapped_data, pbPixels + (cbStride * line), row_size); - - for (x=0; x < This->width; x++) - { - BYTE b; - - b = swapped_data[x*3]; - swapped_data[x*3] = swapped_data[x*3+2]; - swapped_data[x*3+2] = b; - } - - current_row = swapped_data; - } - else - current_row = pbPixels + (cbStride * line); - - if (!pjpeg_write_scanlines(&This->cinfo, &current_row, 1)) - { - ERR("failed writing scanlines\n"); - LeaveCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, swapped_data); - return E_FAIL; - } - - This->lines_written++; - } - - LeaveCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, swapped_data); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, - IWICBitmapSource *pIBitmapSource, WICRect *prc) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - HRESULT hr; - TRACE("(%p,%p,%s)\n", iface, pIBitmapSource, debug_wic_rect(prc)); - - if (!This->frame_initialized) - return WINCODEC_ERR_WRONGSTATE; - - hr = configure_write_source(iface, pIBitmapSource, prc, - This->format ? This->format->guid : NULL, This->width, This->height, - This->xres, This->yres); - - if (SUCCEEDED(hr)) - { - hr = write_source(iface, pIBitmapSource, prc, - This->format->guid, This->format->bpp, FALSE, - This->width, This->height); - } - - return hr; -} - -static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) -{ - JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); - jmp_buf jmpbuf; - TRACE("(%p)\n", iface); - - EnterCriticalSection(&This->lock); - - if (!This->started_compress || This->lines_written != This->height || This->frame_committed) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - /* set up setjmp/longjmp error handling */ - if (setjmp(jmpbuf)) - { - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - This->cinfo.client_data = jmpbuf; - - pjpeg_finish_compress(&This->cinfo); - - This->frame_committed = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Frame_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, - IWICMetadataQueryWriter **ppIMetadataQueryWriter) -{ - FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); - return E_NOTIMPL; -} - -static const IWICBitmapFrameEncodeVtbl JpegEncoder_FrameVtbl = { - JpegEncoder_Frame_QueryInterface, - JpegEncoder_Frame_AddRef, - JpegEncoder_Frame_Release, - JpegEncoder_Frame_Initialize, - JpegEncoder_Frame_SetSize, - JpegEncoder_Frame_SetResolution, - JpegEncoder_Frame_SetPixelFormat, - JpegEncoder_Frame_SetColorContexts, - JpegEncoder_Frame_SetPalette, - JpegEncoder_Frame_SetThumbnail, - JpegEncoder_Frame_WritePixels, - JpegEncoder_Frame_WriteSource, - JpegEncoder_Frame_Commit, - JpegEncoder_Frame_GetMetadataQueryWriter -}; - -static HRESULT WINAPI JpegEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, - void **ppv) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || - IsEqualIID(&IID_IWICBitmapEncoder, iid)) - { - *ppv = &This->IWICBitmapEncoder_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI JpegEncoder_AddRef(IWICBitmapEncoder *iface) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - return ref; -} - -static ULONG WINAPI JpegEncoder_Release(IWICBitmapEncoder *iface) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - if (ref == 0) - { - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); - if (This->initialized) pjpeg_destroy_compress(&This->cinfo); - if (This->stream) IStream_Release(This->stream); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, - IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - jmp_buf jmpbuf; - - TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); - - EnterCriticalSection(&This->lock); - - if (This->initialized) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - pjpeg_std_error(&This->jerr); - - This->jerr.error_exit = error_exit_fn; - This->jerr.emit_message = emit_message_fn; - - This->cinfo.err = &This->jerr; - - This->cinfo.client_data = jmpbuf; - - if (setjmp(jmpbuf)) - { - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - pjpeg_CreateCompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_compress_struct)); - - This->stream = pIStream; - IStream_AddRef(pIStream); - - This->dest_mgr.next_output_byte = This->dest_buffer; - This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); - - This->dest_mgr.init_destination = dest_mgr_init_destination; - This->dest_mgr.empty_output_buffer = dest_mgr_empty_output_buffer; - This->dest_mgr.term_destination = dest_mgr_term_destination; - - This->cinfo.dest = &This->dest_mgr; - - This->initialized = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GUID *format) -{ - TRACE("(%p,%p)\n", iface, format); - - if (!format) - return E_INVALIDARG; - - memcpy(format, &GUID_ContainerFormatJpeg, sizeof(*format)); - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) -{ - IWICComponentInfo *comp_info; - HRESULT hr; - - TRACE("%p,%p\n", iface, info); - - if (!info) return E_INVALIDARG; - - hr = CreateComponentInfo(&CLSID_WICJpegEncoder, &comp_info); - if (hr == S_OK) - { - hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); - IWICComponentInfo_Release(comp_info); - } - return hr; -} - -static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface, - UINT cCount, IWICColorContext **ppIColorContext) -{ - FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); - return E_NOTIMPL; -} - -static HRESULT WINAPI JpegEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - HRESULT hr; - - TRACE("(%p,%p)\n", iface, pIPalette); - - EnterCriticalSection(&This->lock); - - hr = This->initialized ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; - - LeaveCriticalSection(&This->lock); - - return hr; -} - -static HRESULT WINAPI JpegEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) -{ - TRACE("(%p,%p)\n", iface, pIThumbnail); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI JpegEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) -{ - TRACE("(%p,%p)\n", iface, pIPreview); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, - IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - HRESULT hr; - static const PROPBAG2 opts[6] = - { - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszImageQuality }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszBitmapTransform }, - { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszLuminance }, - { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszChrominance }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszJpegYCrCbSubsampling }, - { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszSuppressApp0 }, - }; - - TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); - - EnterCriticalSection(&This->lock); - - if (This->frame_count != 0) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; - } - - if (!This->initialized) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_NOTINITIALIZED; - } - - if (ppIEncoderOptions) - { - hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); - if (FAILED(hr)) - { - LeaveCriticalSection(&This->lock); - return hr; - } - } - - This->frame_count = 1; - - LeaveCriticalSection(&This->lock); - - IWICBitmapEncoder_AddRef(iface); - *ppIFrameEncode = &This->IWICBitmapFrameEncode_iface; - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_Commit(IWICBitmapEncoder *iface) -{ - JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); - TRACE("(%p)\n", iface); - - EnterCriticalSection(&This->lock); - - if (!This->frame_committed || This->committed) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->committed = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI JpegEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, - IWICMetadataQueryWriter **ppIMetadataQueryWriter) -{ - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); - return E_NOTIMPL; -} - -static const IWICBitmapEncoderVtbl JpegEncoder_Vtbl = { - JpegEncoder_QueryInterface, - JpegEncoder_AddRef, - JpegEncoder_Release, - JpegEncoder_Initialize, - JpegEncoder_GetContainerFormat, - JpegEncoder_GetEncoderInfo, - JpegEncoder_SetColorContexts, - JpegEncoder_SetPalette, - JpegEncoder_SetThumbnail, - JpegEncoder_SetPreview, - JpegEncoder_CreateNewFrame, - JpegEncoder_Commit, - JpegEncoder_GetMetadataQueryWriter -}; - -HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) -{ - JpegEncoder *This; - HRESULT ret; - - TRACE("(%s,%p)\n", debugstr_guid(iid), ppv); - - *ppv = NULL; - - if (!libjpeg_handle && !load_libjpeg()) - { - ERR("Failed writing JPEG because unable to find %s\n",SONAME_LIBJPEG); - return E_FAIL; - } - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegEncoder)); - if (!This) return E_OUTOFMEMORY; - - This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl; - This->IWICBitmapFrameEncode_iface.lpVtbl = &JpegEncoder_FrameVtbl; - This->ref = 1; - This->initialized = FALSE; - This->frame_count = 0; - This->frame_initialized = FALSE; - This->started_compress = FALSE; - This->lines_written = 0; - This->frame_committed = FALSE; - This->committed = FALSE; - This->width = This->height = 0; - This->xres = This->yres = 0.0; - This->format = NULL; - This->stream = NULL; - This->colors = 0; - InitializeCriticalSection(&This->lock); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock"); - - ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); - IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); - - return ret; -} - -#else /* !defined(SONAME_LIBJPEG) */ - -HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) -{ - ERR("Trying to save JPEG picture, but JPEG support is not compiled in.\n"); - return E_FAIL; -} - -#endif - -HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) -{ - HRESULT hr; - struct decoder *decoder; - struct decoder_info decoder_info; - - hr = get_unix_decoder(&CLSID_WICJpegDecoder, &decoder_info, &decoder); - - if (SUCCEEDED(hr)) - hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, ppv); - - return hr; -} diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 58ca58e93b4..84e4df5e007 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -453,6 +453,313 @@ HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **re return S_OK; } +typedef struct jpeg_compress_format { + const WICPixelFormatGUID *guid; + int bpp; + int num_components; + J_COLOR_SPACE color_space; + int swap_rgb; +} jpeg_compress_format; + +static const jpeg_compress_format compress_formats[] = { + { &GUID_WICPixelFormat24bppBGR, 24, 3, JCS_RGB, 1 }, + { &GUID_WICPixelFormat32bppCMYK, 32, 4, JCS_CMYK }, + { &GUID_WICPixelFormat8bppGray, 8, 1, JCS_GRAYSCALE }, + { 0 } +}; + +struct jpeg_encoder +{ + struct encoder encoder; + IStream *stream; + BOOL cinfo_initialized; + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_destination_mgr dest_mgr; + struct encoder_frame encoder_frame; + const jpeg_compress_format *format; + BYTE dest_buffer[1024]; +}; + +static inline struct jpeg_encoder *impl_from_encoder(struct encoder* iface) +{ + return CONTAINING_RECORD(iface, struct jpeg_encoder, encoder); +} + +static inline struct jpeg_encoder *encoder_from_compress(j_compress_ptr compress) +{ + return CONTAINING_RECORD(compress, struct jpeg_encoder, cinfo); +} + +static void dest_mgr_init_destination(j_compress_ptr cinfo) +{ + struct jpeg_encoder *This = encoder_from_compress(cinfo); + + This->dest_mgr.next_output_byte = This->dest_buffer; + This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); +} + +static jpeg_boolean dest_mgr_empty_output_buffer(j_compress_ptr cinfo) +{ + struct jpeg_encoder *This = encoder_from_compress(cinfo); + HRESULT hr; + ULONG byteswritten; + + hr = stream_write(This->stream, This->dest_buffer, + sizeof(This->dest_buffer), &byteswritten); + + if (hr != S_OK || byteswritten == 0) + { + ERR("Failed writing data, hr=%x\n", hr); + return FALSE; + } + + This->dest_mgr.next_output_byte = This->dest_buffer; + This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); + return TRUE; +} + +static void dest_mgr_term_destination(j_compress_ptr cinfo) +{ + struct jpeg_encoder *This = encoder_from_compress(cinfo); + ULONG byteswritten; + HRESULT hr; + + if (This->dest_mgr.free_in_buffer != sizeof(This->dest_buffer)) + { + hr = stream_write(This->stream, This->dest_buffer, + sizeof(This->dest_buffer) - This->dest_mgr.free_in_buffer, &byteswritten); + + if (hr != S_OK || byteswritten == 0) + ERR("Failed writing data, hr=%x\n", hr); + } +} + +HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) +{ + struct jpeg_encoder *This = impl_from_encoder(iface); + jmp_buf jmpbuf; + + pjpeg_std_error(&This->jerr); + + This->jerr.error_exit = error_exit_fn; + This->jerr.emit_message = emit_message_fn; + + This->cinfo.err = &This->jerr; + + This->cinfo.client_data = jmpbuf; + + if (setjmp(jmpbuf)) + return E_FAIL; + + pjpeg_CreateCompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_compress_struct)); + + This->stream = stream; + + This->dest_mgr.next_output_byte = This->dest_buffer; + This->dest_mgr.free_in_buffer = sizeof(This->dest_buffer); + + This->dest_mgr.init_destination = dest_mgr_init_destination; + This->dest_mgr.empty_output_buffer = dest_mgr_empty_output_buffer; + This->dest_mgr.term_destination = dest_mgr_term_destination; + + This->cinfo.dest = &This->dest_mgr; + + This->cinfo_initialized = TRUE; + + return S_OK; +} + +HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, + DWORD *bpp, BOOL *indexed) +{ + int i; + + for (i=0; compress_formats[i].guid; i++) + { + if (memcmp(compress_formats[i].guid, pixel_format, sizeof(GUID)) == 0) + break; + } + + if (!compress_formats[i].guid) i = 0; + + *pixel_format = *compress_formats[i].guid; + *bpp = compress_formats[i].bpp; + *indexed = FALSE; + + return S_OK; +} + +HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) +{ + struct jpeg_encoder *This = impl_from_encoder(iface); + jmp_buf jmpbuf; + int i; + + This->encoder_frame = *frame; + + if (setjmp(jmpbuf)) + return E_FAIL; + + This->cinfo.client_data = jmpbuf; + + for (i=0; compress_formats[i].guid; i++) + { + if (memcmp(compress_formats[i].guid, &frame->pixel_format, sizeof(GUID)) == 0) + break; + } + This->format = &compress_formats[i]; + + This->cinfo.image_width = frame->width; + This->cinfo.image_height = frame->height; + This->cinfo.input_components = This->format->num_components; + This->cinfo.in_color_space = This->format->color_space; + + pjpeg_set_defaults(&This->cinfo); + + if (frame->dpix != 0.0 && frame->dpiy != 0.0) + { + This->cinfo.density_unit = 1; /* dots per inch */ + This->cinfo.X_density = frame->dpix; + This->cinfo.Y_density = frame->dpiy; + } + + pjpeg_start_compress(&This->cinfo, TRUE); + + return S_OK; +} + +HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, + DWORD line_count, DWORD stride) +{ + struct jpeg_encoder *This = impl_from_encoder(iface); + jmp_buf jmpbuf; + BYTE *swapped_data = NULL, *current_row; + UINT line; + int row_size; + + if (setjmp(jmpbuf)) + { + free(swapped_data); + return E_FAIL; + } + + This->cinfo.client_data = jmpbuf; + + row_size = This->format->bpp / 8 * This->encoder_frame.width; + + if (This->format->swap_rgb) + { + swapped_data = malloc(row_size); + if (!swapped_data) + return E_OUTOFMEMORY; + } + + for (line=0; line < line_count; line++) + { + if (This->format->swap_rgb) + { + UINT x; + + memcpy(swapped_data, data + (stride * line), row_size); + + for (x=0; x < This->encoder_frame.width; x++) + { + BYTE b; + + b = swapped_data[x*3]; + swapped_data[x*3] = swapped_data[x*3+2]; + swapped_data[x*3+2] = b; + } + + current_row = swapped_data; + } + else + current_row = data + (stride * line); + + if (!pjpeg_write_scanlines(&This->cinfo, &current_row, 1)) + { + ERR("failed writing scanlines\n"); + free(swapped_data); + return E_FAIL; + } + } + + free(swapped_data); + + return S_OK; +} + +HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) +{ + struct jpeg_encoder *This = impl_from_encoder(iface); + jmp_buf jmpbuf; + + if (setjmp(jmpbuf)) + return E_FAIL; + + This->cinfo.client_data = jmpbuf; + + pjpeg_finish_compress(&This->cinfo); + + return S_OK; +} + +HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) +{ + return S_OK; +} + +void CDECL jpeg_encoder_destroy(struct encoder* iface) +{ + struct jpeg_encoder *This = impl_from_encoder(iface); + if (This->cinfo_initialized) + pjpeg_destroy_compress(&This->cinfo); + RtlFreeHeap(GetProcessHeap(), 0, This); +}; + +static const struct encoder_funcs jpeg_encoder_vtable = { + jpeg_encoder_initialize, + jpeg_encoder_get_supported_format, + jpeg_encoder_create_frame, + jpeg_encoder_write_lines, + jpeg_encoder_commit_frame, + jpeg_encoder_commit_file, + jpeg_encoder_destroy +}; + +HRESULT CDECL jpeg_encoder_create(struct encoder_info *info, struct encoder **result) +{ + struct jpeg_encoder *This; + + if (!load_libjpeg()) + { + ERR("Failed writing JPEG because unable to find %s\n", SONAME_LIBJPEG); + return E_FAIL; + } + + This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(struct jpeg_encoder)); + if (!This) return E_OUTOFMEMORY; + + This->encoder.vtable = &jpeg_encoder_vtable; + This->stream = NULL; + This->cinfo_initialized = FALSE; + *result = &This->encoder; + + info->flags = 0; + info->container_format = GUID_ContainerFormatJpeg; + info->clsid = CLSID_WICJpegEncoder; + info->encoder_options[0] = ENCODER_OPTION_IMAGE_QUALITY; + info->encoder_options[1] = ENCODER_OPTION_BITMAP_TRANSFORM; + info->encoder_options[2] = ENCODER_OPTION_LUMINANCE; + info->encoder_options[3] = ENCODER_OPTION_CHROMINANCE; + info->encoder_options[4] = ENCODER_OPTION_YCRCB_SUBSAMPLING; + info->encoder_options[5] = ENCODER_OPTION_SUPPRESS_APP0; + info->encoder_options[6] = ENCODER_OPTION_END; + + return S_OK; +} + #else /* !defined(SONAME_LIBJPEG) */ HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **result) @@ -461,4 +768,10 @@ HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **re return E_FAIL; } +HRESULT CDECL jpeg_encoder_create(struct encoder_info *info, struct encoder **result) +{ + ERR("Trying to save JPEG picture, but JPEG support is not compiled in.\n"); + return E_FAIL; +} + #endif diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index bc12eb2fda1..b8ffb216186 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -279,3 +279,31 @@ HRESULT TiffEncoder_CreateInstance(REFIID iid, void** ppv) return hr; } + +HRESULT JpegDecoder_CreateInstance(REFIID iid, void** ppv) +{ + HRESULT hr; + struct decoder *decoder; + struct decoder_info decoder_info; + + hr = get_unix_decoder(&CLSID_WICJpegDecoder, &decoder_info, &decoder); + + if (SUCCEEDED(hr)) + hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, ppv); + + return hr; +} + +HRESULT JpegEncoder_CreateInstance(REFIID iid, void** ppv) +{ + HRESULT hr; + struct encoder *encoder; + struct encoder_info encoder_info; + + hr = get_unix_encoder(&CLSID_WICJpegEncoder, &encoder_info, &encoder); + + if (SUCCEEDED(hr)) + hr = CommonEncoder_CreateInstance(encoder, &encoder_info, iid, ppv); + + return hr; +} diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 7101880b93c..f94340fc971 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -89,6 +89,9 @@ HRESULT CDECL encoder_create(const CLSID *encoder_clsid, struct encoder_info *in if (IsEqualGUID(encoder_clsid, &CLSID_WICTiffEncoder)) return tiff_encoder_create(info, result); + if (IsEqualGUID(encoder_clsid, &CLSID_WICJpegEncoder)) + return jpeg_encoder_create(info, result); + return E_NOTIMPL; } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index ab0329b8bb3..3814edb32bb 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -343,6 +343,12 @@ enum encoder_option ENCODER_OPTION_FILTER, ENCODER_OPTION_COMPRESSION_METHOD, ENCODER_OPTION_COMPRESSION_QUALITY, + ENCODER_OPTION_IMAGE_QUALITY, + ENCODER_OPTION_BITMAP_TRANSFORM, + ENCODER_OPTION_LUMINANCE, + ENCODER_OPTION_CHROMINANCE, + ENCODER_OPTION_YCRCB_SUBSAMPLING, + ENCODER_OPTION_SUPPRESS_APP0, ENCODER_OPTION_END }; @@ -400,6 +406,7 @@ HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **re HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **result); HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **result); +HRESULT CDECL jpeg_encoder_create(struct encoder_info *info, struct encoder **result); struct unix_funcs { -- 2.17.1

1 0

[PATCH] ntdll/unix: do not access nonexistent IMAGE_FILE_IMPORT_DIRECTORY
by Kevin Puetz 24 Nov '20

24 Nov '20

If there are no imports at all, winebuild will omit __wine_spec_imports, so both VirtualAddress and Size will be 0. However, get_rva(module, 0) does not point to a valid IMAGE_IMPORT_DESCRIPTOR. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- My aarch64 builds would "work" on real hardware, but crash in wineboot (or pretty much anything else non-trivial) if run in qemu-user 5.1.0. The first crash would occur while loading gdi32.dll.so/gdi32.so. wine 5.0.x worked, so it seems like there was enough hope to keep digging and this seems to be the culprit. I see desc->Name == 0xffff (actually reinterpreted bytes from the ELF header) and on real aarch64 hardware the resulting bad pointer seems to avoid disaster, (char*)get_rva(module,0xFFFF) == '\0'. I assume something just zero filled betwen the ELF header and the __wine_spec_nt_header. It does, however, hit the ERR trace with it's, printing: "err:module:fixup_ntdll_imports module "/usr/lib/wine/gdi32.so" is importing " (note empty %s) In qemu-user, get_rva(module,0xFFFF) is unmapped so it just segfaults. (probably just finer-grained tracking of sections and less zero-filling, since qemu needs to move things around for the dynamic recompilation). I fixed it to check DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].Size before dereferencing the table, as map_so_dll does, so it doesn't access a nonexistant imports section. This seems right, but I certainly won't claim to understand all the machinery in here... --- Patch below is mostly just indentation changing, diff -w looks like: static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module ) { const IMAGE_NT_HEADERS *nt; - const IMAGE_IMPORT_DESCRIPTOR *descr; + const IMAGE_DATA_DIRECTORY *dir; const IMAGE_THUNK_DATA *import_list; IMAGE_THUNK_DATA *thunk_list; nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew ); - descr = get_rva( module, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress ); + + dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY]; + if (dir->Size) + { + const IMAGE_IMPORT_DESCRIPTOR *descr= get_rva( module, dir->VirtualAddress ); + for (; descr->Name && descr->FirstThunk; descr++) { ... } + } return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2b6ea603e3..5d81e26cc5b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -809,43 +809,49 @@ static inline void *get_rva( void *module, ULONG_PTR addr ) static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module ) { const IMAGE_NT_HEADERS *nt; - const IMAGE_IMPORT_DESCRIPTOR *descr; + const IMAGE_DATA_DIRECTORY *dir; const IMAGE_THUNK_DATA *import_list; IMAGE_THUNK_DATA *thunk_list; nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew ); - descr = get_rva( module, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress ); - for (; descr->Name && descr->FirstThunk; descr++) + + dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY]; + if (dir->Size) { - thunk_list = get_rva( module, descr->FirstThunk ); + const IMAGE_IMPORT_DESCRIPTOR *descr= get_rva( module, dir->VirtualAddress ); - /* ntdll must be the only import */ - if (strcmp( get_rva( module, descr->Name ), "ntdll.dll" )) + for (; descr->Name && descr->FirstThunk; descr++) { - ERR( "module %s is importing %s\n", debugstr_a(name), (char *)get_rva( module, descr->Name )); - return STATUS_PROCEDURE_NOT_FOUND; - } - if (descr->u.OriginalFirstThunk) - import_list = get_rva( module, descr->u.OriginalFirstThunk ); - else - import_list = thunk_list; + thunk_list = get_rva( module, descr->FirstThunk ); - while (import_list->u1.Ordinal) - { - if (IMAGE_SNAP_BY_ORDINAL( import_list->u1.Ordinal )) + /* ntdll must be the only import */ + if (strcmp( get_rva( module, descr->Name ), "ntdll.dll" )) { - int ordinal = IMAGE_ORDINAL( import_list->u1.Ordinal ) - ntdll_exports->Base; - thunk_list->u1.Function = find_ordinal_export( ntdll_module, ntdll_exports, ordinal ); - if (!thunk_list->u1.Function) ERR( "%s: ntdll.%u not found\n", debugstr_a(name), ordinal ); + ERR( "module %s is importing %s\n", debugstr_a(name), (char *)get_rva( module, descr->Name )); + return STATUS_PROCEDURE_NOT_FOUND; } - else /* import by name */ + if (descr->u.OriginalFirstThunk) + import_list = get_rva( module, descr->u.OriginalFirstThunk ); + else + import_list = thunk_list; + + while (import_list->u1.Ordinal) { - IMAGE_IMPORT_BY_NAME *pe_name = get_rva( module, import_list->u1.AddressOfData ); - thunk_list->u1.Function = find_pe_export( ntdll_module, ntdll_exports, pe_name ); - if (!thunk_list->u1.Function) ERR( "%s: ntdll.%s not found\n", debugstr_a(name), pe_name->Name ); + if (IMAGE_SNAP_BY_ORDINAL( import_list->u1.Ordinal )) + { + int ordinal = IMAGE_ORDINAL( import_list->u1.Ordinal ) - ntdll_exports->Base; + thunk_list->u1.Function = find_ordinal_export( ntdll_module, ntdll_exports, ordinal ); + if (!thunk_list->u1.Function) ERR( "%s: ntdll.%u not found\n", debugstr_a(name), ordinal ); + } + else /* import by name */ + { + IMAGE_IMPORT_BY_NAME *pe_name = get_rva( module, import_list->u1.AddressOfData ); + thunk_list->u1.Function = find_pe_export( ntdll_module, ntdll_exports, pe_name ); + if (!thunk_list->u1.Function) ERR( "%s: ntdll.%s not found\n", debugstr_a(name), pe_name->Name ); + } + import_list++; + thunk_list++; } - import_list++; - thunk_list++; } } return STATUS_SUCCESS;

2 2

[PATCH] conhost: Signal console in process_console_input if needed.
by Jacek Caban 24 Nov '20

24 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50037 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 7 ++++++- programs/conhost/conhost.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH] mfreadwrite/reader: Implement GetServiceForStream() for stream objects.
by Nikolay Sivov 24 Nov '20

24 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 52 ++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 7aa8f65df7a..85aec9aaedc 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1906,36 +1906,60 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO { struct source_reader *reader = impl_from_IMFSourceReader(iface); IUnknown *obj = NULL; - HRESULT hr; + HRESULT hr = S_OK; TRACE("%p, %#x, %s, %s, %p\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + EnterCriticalSection(&reader->cs); + switch (index) { case MF_SOURCE_READER_MEDIASOURCE: obj = (IUnknown *)reader->source; break; default: - FIXME("Unsupported index %#x.\n", index); - return E_NOTIMPL; - } + if (index == MF_SOURCE_READER_FIRST_VIDEO_STREAM) + index = reader->first_video_stream_index; + else if (index == MF_SOURCE_READER_FIRST_AUDIO_STREAM) + index = reader->first_audio_stream_index; - if (IsEqualGUID(service, &GUID_NULL)) - { - hr = IUnknown_QueryInterface(obj, riid, object); + if (index >= reader->stream_count) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + obj = (IUnknown *)reader->streams[index].decoder; + if (!obj) hr = E_NOINTERFACE; + } + break; } - else - { - IMFGetService *gs; - hr = IUnknown_QueryInterface(obj, &IID_IMFGetService, (void **)&gs); - if (SUCCEEDED(hr)) + if (obj) + IUnknown_AddRef(obj); + + LeaveCriticalSection(&reader->cs); + + if (obj) + { + if (IsEqualGUID(service, &GUID_NULL)) { - hr = IMFGetService_GetService(gs, service, riid, object); - IMFGetService_Release(gs); + hr = IUnknown_QueryInterface(obj, riid, object); + } + else + { + IMFGetService *gs; + + hr = IUnknown_QueryInterface(obj, &IID_IMFGetService, (void **)&gs); + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, service, riid, object); + IMFGetService_Release(gs); + } } } + if (obj) + IUnknown_Release(obj); + return hr; } -- 2.29.2

1 0

[PATCH 1/2] evr/presenter: Set frame size and aperture attributes for mixer output type.
by Nikolay Sivov 24 Nov '20

24 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 36 ++++++++++-- dlls/evr/tests/evr.c | 132 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index f0733f6f060..5701eb17bd3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -306,17 +306,43 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { - IMFMediaType *media_type; + IMFMediaType *media_type, *candidate_type; unsigned int idx = 0; + UINT64 frame_size; + MFVideoArea aperture; + RECT rect; HRESULT hr; + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + video_presenter_get_native_video_size(presenter); - while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &media_type))) + rect = presenter->dst_rect; + if (rect.left == 0 && rect.right == 0 && rect.bottom == 0 && rect.top == 0) + { + rect.right = presenter->native_size.cx; + rect.bottom = presenter->native_size.cy; + } + + aperture.Area.cx = rect.right - rect.left; + aperture.Area.cy = rect.bottom - rect.top; + aperture.OffsetX.value = 0; + aperture.OffsetX.fract = 0; + aperture.OffsetY.value = 0; + aperture.OffsetY.fract = 0; + frame_size = (UINT64)aperture.Area.cx << 32 | aperture.Area.cy; + + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &candidate_type))) { /* FIXME: check that d3d device supports this format */ - /* FIXME: potentially adjust frame size */ + if (FAILED(hr = IMFMediaType_CopyAllItems(candidate_type, (IMFAttributes *)media_type))) + WARN("Failed to clone a media type, hr %#x.\n", hr); + IMFMediaType_Release(candidate_type); + + IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, frame_size); + IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); @@ -326,12 +352,12 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); - IMFMediaType_Release(media_type); - if (SUCCEEDED(hr)) break; } + IMFMediaType_Release(media_type); + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 2740f2263f0..31434bde43a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2072,6 +2072,137 @@ todo_wine { IMFVideoPresenter_Release(presenter); } +static void get_output_aperture(IMFTransform *mixer, SIZE *frame_size, MFVideoArea *aperture) +{ + IMFMediaType *media_type; + UINT64 size; + HRESULT hr; + + memset(frame_size, 0xcc, sizeof(*frame_size)); + memset(aperture, 0xcc, sizeof(*aperture)); + + hr = IMFTransform_GetOutputCurrentType(mixer, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + frame_size->cx = size >> 32; + frame_size->cy = size; + + hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)aperture, sizeof(*aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); +} + +static void test_presenter_media_type(void) +{ + IMFTopologyServiceLookupClient *lookup_client; + IMFVideoPresenter *presenter; + struct test_host host; + IMFMediaType *input_type; + IDirect3DDeviceManager9 *manager; + HRESULT hr; + IMFTransform *mixer; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + unsigned int token; + SIZE frame_size; + HWND window; + MFVideoArea aperture; + IMFVideoDisplayControl *display_control; + RECT dst; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); + ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + + input_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, (UINT64)100 << 32 | 50); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(input_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, input_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + init_test_host(&host, mixer, presenter); + + hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + get_output_aperture(mixer, &frame_size, &aperture); + ok(frame_size.cx == 100 && frame_size.cy == 50, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 50, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); + ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, + "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); + + SetRect(&dst, 1, 2, 200, 300); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + get_output_aperture(mixer, &frame_size, &aperture); +todo_wine { + ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); +} + ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, + "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); + + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_None); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + get_output_aperture(mixer, &frame_size, &aperture); +todo_wine { + ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); +} + ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, + "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); + + IMFVideoDisplayControl_Release(display_control); + IMFVideoPresenter_Release(presenter); + IMFTransform_Release(mixer); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2574,6 +2705,7 @@ START_TEST(evr) test_presenter_ar_mode(); test_presenter_video_window(); test_presenter_quality_control(); + test_presenter_media_type(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); -- 2.29.2

1 1

[PATCH] wininet: Use wide-char string literals in struct initialization.
by Michael Stefaniuc 24 Nov '20

24 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- I know the months name to number is not in a struct but it fit in visualy. dlls/wininet/http.c | 249 ++++++++++++++++------------------------ dlls/wininet/internet.c | 10 +- dlls/wininet/urlcache.c | 9 +- 3 files changed, 105 insertions(+), 163 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 97e6ffaabc1..8701e32067b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -72,58 +72,16 @@ static const WCHAR szGET[] = { 'G','E','T', 0 }; static const WCHAR szHEAD[] = { 'H','E','A','D', 0 }; static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; -static const WCHAR szAccept_Charset[] = { 'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0 }; -static const WCHAR szAccept_Encoding[] = { 'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',0 }; -static const WCHAR szAccept_Language[] = { 'A','c','c','e','p','t','-','L','a','n','g','u','a','g','e',0 }; -static const WCHAR szAccept_Ranges[] = { 'A','c','c','e','p','t','-','R','a','n','g','e','s',0 }; -static const WCHAR szAge[] = { 'A','g','e',0 }; -static const WCHAR szAllow[] = { 'A','l','l','o','w',0 }; static const WCHAR szCache_Control[] = { 'C','a','c','h','e','-','C','o','n','t','r','o','l',0 }; static const WCHAR szConnection[] = { 'C','o','n','n','e','c','t','i','o','n',0 }; -static const WCHAR szContent_Base[] = { 'C','o','n','t','e','n','t','-','B','a','s','e',0 }; -static const WCHAR szContent_Disposition[] = { 'C','o','n','t','e','n','t','-','D','i','s','p','o','s','i','t','i','o','n',0 }; static const WCHAR szContent_Encoding[] = { 'C','o','n','t','e','n','t','-','E','n','c','o','d','i','n','g',0 }; -static const WCHAR szContent_ID[] = { 'C','o','n','t','e','n','t','-','I','D',0 }; -static const WCHAR szContent_Language[] = { 'C','o','n','t','e','n','t','-','L','a','n','g','u','a','g','e',0 }; static const WCHAR szContent_Length[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0 }; -static const WCHAR szContent_Location[] = { 'C','o','n','t','e','n','t','-','L','o','c','a','t','i','o','n',0 }; -static const WCHAR szContent_MD5[] = { 'C','o','n','t','e','n','t','-','M','D','5',0 }; -static const WCHAR szContent_Range[] = { 'C','o','n','t','e','n','t','-','R','a','n','g','e',0 }; -static const WCHAR szContent_Transfer_Encoding[] = { 'C','o','n','t','e','n','t','-','T','r','a','n','s','f','e','r','-','E','n','c','o','d','i','n','g',0 }; static const WCHAR szContent_Type[] = { 'C','o','n','t','e','n','t','-','T','y','p','e',0 }; -static const WCHAR szCookie[] = { 'C','o','o','k','i','e',0 }; -static const WCHAR szDate[] = { 'D','a','t','e',0 }; -static const WCHAR szFrom[] = { 'F','r','o','m',0 }; -static const WCHAR szETag[] = { 'E','T','a','g',0 }; -static const WCHAR szExpect[] = { 'E','x','p','e','c','t',0 }; static const WCHAR szExpires[] = { 'E','x','p','i','r','e','s',0 }; -static const WCHAR szIf_Match[] = { 'I','f','-','M','a','t','c','h',0 }; -static const WCHAR szIf_Modified_Since[] = { 'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0 }; -static const WCHAR szIf_None_Match[] = { 'I','f','-','N','o','n','e','-','M','a','t','c','h',0 }; -static const WCHAR szIf_Range[] = { 'I','f','-','R','a','n','g','e',0 }; -static const WCHAR szIf_Unmodified_Since[] = { 'I','f','-','U','n','m','o','d','i','f','i','e','d','-','S','i','n','c','e',0 }; static const WCHAR szLast_Modified[] = { 'L','a','s','t','-','M','o','d','i','f','i','e','d',0 }; -static const WCHAR szLocation[] = { 'L','o','c','a','t','i','o','n',0 }; -static const WCHAR szMax_Forwards[] = { 'M','a','x','-','F','o','r','w','a','r','d','s',0 }; -static const WCHAR szMime_Version[] = { 'M','i','m','e','-','V','e','r','s','i','o','n',0 }; -static const WCHAR szPragma[] = { 'P','r','a','g','m','a',0 }; -static const WCHAR szProxy_Authenticate[] = { 'P','r','o','x','y','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; static const WCHAR szProxy_Connection[] = { 'P','r','o','x','y','-','C','o','n','n','e','c','t','i','o','n',0 }; -static const WCHAR szPublic[] = { 'P','u','b','l','i','c',0 }; -static const WCHAR szRange[] = { 'R','a','n','g','e',0 }; static const WCHAR szReferer[] = { 'R','e','f','e','r','e','r',0 }; -static const WCHAR szRetry_After[] = { 'R','e','t','r','y','-','A','f','t','e','r',0 }; -static const WCHAR szServer[] = { 'S','e','r','v','e','r',0 }; static const WCHAR szSet_Cookie[] = { 'S','e','t','-','C','o','o','k','i','e',0 }; -static const WCHAR szTransfer_Encoding[] = { 'T','r','a','n','s','f','e','r','-','E','n','c','o','d','i','n','g',0 }; -static const WCHAR szUnless_Modified_Since[] = { 'U','n','l','e','s','s','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0 }; -static const WCHAR szUpgrade[] = { 'U','p','g','r','a','d','e',0 }; -static const WCHAR szURI[] = { 'U','R','I',0 }; -static const WCHAR szUser_Agent[] = { 'U','s','e','r','-','A','g','e','n','t',0 }; -static const WCHAR szVary[] = { 'V','a','r','y',0 }; -static const WCHAR szVia[] = { 'V','i','a',0 }; -static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; -static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; static const WCHAR emptyW[] = {0}; @@ -3588,77 +3546,77 @@ lend: } static const LPCWSTR header_lookup[] = { - szMime_Version, /* HTTP_QUERY_MIME_VERSION = 0 */ - szContent_Type, /* HTTP_QUERY_CONTENT_TYPE = 1 */ - szContent_Transfer_Encoding,/* HTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */ - szContent_ID, /* HTTP_QUERY_CONTENT_ID = 3 */ - NULL, /* HTTP_QUERY_CONTENT_DESCRIPTION = 4 */ - szContent_Length, /* HTTP_QUERY_CONTENT_LENGTH = 5 */ - szContent_Language, /* HTTP_QUERY_CONTENT_LANGUAGE = 6 */ - szAllow, /* HTTP_QUERY_ALLOW = 7 */ - szPublic, /* HTTP_QUERY_PUBLIC = 8 */ - szDate, /* HTTP_QUERY_DATE = 9 */ - szExpires, /* HTTP_QUERY_EXPIRES = 10 */ - szLast_Modified, /* HTTP_QUERY_LAST_MODIFIED = 11 */ - NULL, /* HTTP_QUERY_MESSAGE_ID = 12 */ - szURI, /* HTTP_QUERY_URI = 13 */ - szFrom, /* HTTP_QUERY_DERIVED_FROM = 14 */ - NULL, /* HTTP_QUERY_COST = 15 */ - NULL, /* HTTP_QUERY_LINK = 16 */ - szPragma, /* HTTP_QUERY_PRAGMA = 17 */ - NULL, /* HTTP_QUERY_VERSION = 18 */ - szStatus, /* HTTP_QUERY_STATUS_CODE = 19 */ - NULL, /* HTTP_QUERY_STATUS_TEXT = 20 */ - NULL, /* HTTP_QUERY_RAW_HEADERS = 21 */ - NULL, /* HTTP_QUERY_RAW_HEADERS_CRLF = 22 */ - szConnection, /* HTTP_QUERY_CONNECTION = 23 */ - szAccept, /* HTTP_QUERY_ACCEPT = 24 */ - szAccept_Charset, /* HTTP_QUERY_ACCEPT_CHARSET = 25 */ - szAccept_Encoding, /* HTTP_QUERY_ACCEPT_ENCODING = 26 */ - szAccept_Language, /* HTTP_QUERY_ACCEPT_LANGUAGE = 27 */ - szAuthorization, /* HTTP_QUERY_AUTHORIZATION = 28 */ - szContent_Encoding, /* HTTP_QUERY_CONTENT_ENCODING = 29 */ - NULL, /* HTTP_QUERY_FORWARDED = 30 */ - NULL, /* HTTP_QUERY_FROM = 31 */ - szIf_Modified_Since, /* HTTP_QUERY_IF_MODIFIED_SINCE = 32 */ - szLocation, /* HTTP_QUERY_LOCATION = 33 */ - NULL, /* HTTP_QUERY_ORIG_URI = 34 */ - szReferer, /* HTTP_QUERY_REFERER = 35 */ - szRetry_After, /* HTTP_QUERY_RETRY_AFTER = 36 */ - szServer, /* HTTP_QUERY_SERVER = 37 */ - NULL, /* HTTP_TITLE = 38 */ - szUser_Agent, /* HTTP_QUERY_USER_AGENT = 39 */ - szWWW_Authenticate, /* HTTP_QUERY_WWW_AUTHENTICATE = 40 */ - szProxy_Authenticate, /* HTTP_QUERY_PROXY_AUTHENTICATE = 41 */ - szAccept_Ranges, /* HTTP_QUERY_ACCEPT_RANGES = 42 */ - szSet_Cookie, /* HTTP_QUERY_SET_COOKIE = 43 */ - szCookie, /* HTTP_QUERY_COOKIE = 44 */ - NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */ - NULL, /* HTTP_QUERY_REFRESH = 46 */ - szContent_Disposition, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ - szAge, /* HTTP_QUERY_AGE = 48 */ - szCache_Control, /* HTTP_QUERY_CACHE_CONTROL = 49 */ - szContent_Base, /* HTTP_QUERY_CONTENT_BASE = 50 */ - szContent_Location, /* HTTP_QUERY_CONTENT_LOCATION = 51 */ - szContent_MD5, /* HTTP_QUERY_CONTENT_MD5 = 52 */ - szContent_Range, /* HTTP_QUERY_CONTENT_RANGE = 53 */ - szETag, /* HTTP_QUERY_ETAG = 54 */ - hostW, /* HTTP_QUERY_HOST = 55 */ - szIf_Match, /* HTTP_QUERY_IF_MATCH = 56 */ - szIf_None_Match, /* HTTP_QUERY_IF_NONE_MATCH = 57 */ - szIf_Range, /* HTTP_QUERY_IF_RANGE = 58 */ - szIf_Unmodified_Since, /* HTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */ - szMax_Forwards, /* HTTP_QUERY_MAX_FORWARDS = 60 */ - szProxy_Authorization, /* HTTP_QUERY_PROXY_AUTHORIZATION = 61 */ - szRange, /* HTTP_QUERY_RANGE = 62 */ - szTransfer_Encoding, /* HTTP_QUERY_TRANSFER_ENCODING = 63 */ - szUpgrade, /* HTTP_QUERY_UPGRADE = 64 */ - szVary, /* HTTP_QUERY_VARY = 65 */ - szVia, /* HTTP_QUERY_VIA = 66 */ - szWarning, /* HTTP_QUERY_WARNING = 67 */ - szExpect, /* HTTP_QUERY_EXPECT = 68 */ - szProxy_Connection, /* HTTP_QUERY_PROXY_CONNECTION = 69 */ - szUnless_Modified_Since, /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ + L"Mime-Version", /* HTTP_QUERY_MIME_VERSION = 0 */ + L"Content-Type", /* HTTP_QUERY_CONTENT_TYPE = 1 */ + L"Content-Transfer-Encoding", /* HTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */ + L"Content-ID", /* HTTP_QUERY_CONTENT_ID = 3 */ + NULL, /* HTTP_QUERY_CONTENT_DESCRIPTION = 4 */ + L"Content-Length", /* HTTP_QUERY_CONTENT_LENGTH = 5 */ + L"Content-Language", /* HTTP_QUERY_CONTENT_LANGUAGE = 6 */ + L"Allow", /* HTTP_QUERY_ALLOW = 7 */ + L"Public", /* HTTP_QUERY_PUBLIC = 8 */ + L"Date", /* HTTP_QUERY_DATE = 9 */ + L"Expires", /* HTTP_QUERY_EXPIRES = 10 */ + L"Last-Modified", /* HTTP_QUERY_LAST_MODIFIED = 11 */ + NULL, /* HTTP_QUERY_MESSAGE_ID = 12 */ + L"URI", /* HTTP_QUERY_URI = 13 */ + L"From", /* HTTP_QUERY_DERIVED_FROM = 14 */ + NULL, /* HTTP_QUERY_COST = 15 */ + NULL, /* HTTP_QUERY_LINK = 16 */ + L"Pragma", /* HTTP_QUERY_PRAGMA = 17 */ + NULL, /* HTTP_QUERY_VERSION = 18 */ + L"Status", /* HTTP_QUERY_STATUS_CODE = 19 */ + NULL, /* HTTP_QUERY_STATUS_TEXT = 20 */ + NULL, /* HTTP_QUERY_RAW_HEADERS = 21 */ + NULL, /* HTTP_QUERY_RAW_HEADERS_CRLF = 22 */ + L"Connection", /* HTTP_QUERY_CONNECTION = 23 */ + L"Accept", /* HTTP_QUERY_ACCEPT = 24 */ + L"Accept-Charset", /* HTTP_QUERY_ACCEPT_CHARSET = 25 */ + L"Accept-Encoding", /* HTTP_QUERY_ACCEPT_ENCODING = 26 */ + L"Accept-Language", /* HTTP_QUERY_ACCEPT_LANGUAGE = 27 */ + L"Authorization", /* HTTP_QUERY_AUTHORIZATION = 28 */ + L"Content-Encoding", /* HTTP_QUERY_CONTENT_ENCODING = 29 */ + NULL, /* HTTP_QUERY_FORWARDED = 30 */ + NULL, /* HTTP_QUERY_FROM = 31 */ + L"If-Modified-Since", /* HTTP_QUERY_IF_MODIFIED_SINCE = 32 */ + L"Location", /* HTTP_QUERY_LOCATION = 33 */ + NULL, /* HTTP_QUERY_ORIG_URI = 34 */ + L"Referer", /* HTTP_QUERY_REFERER = 35 */ + L"Retry-After", /* HTTP_QUERY_RETRY_AFTER = 36 */ + L"Server", /* HTTP_QUERY_SERVER = 37 */ + NULL, /* HTTP_TITLE = 38 */ + L"User-Agent", /* HTTP_QUERY_USER_AGENT = 39 */ + L"WWW-Authenticate", /* HTTP_QUERY_WWW_AUTHENTICATE = 40 */ + L"Proxy-Authenticate", /* HTTP_QUERY_PROXY_AUTHENTICATE = 41 */ + L"Accept-Ranges", /* HTTP_QUERY_ACCEPT_RANGES = 42 */ + L"Set-Cookie", /* HTTP_QUERY_SET_COOKIE = 43 */ + L"Cookie", /* HTTP_QUERY_COOKIE = 44 */ + NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */ + NULL, /* HTTP_QUERY_REFRESH = 46 */ + L"Content-Disposition", /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ + L"Age", /* HTTP_QUERY_AGE = 48 */ + L"Cache-Control", /* HTTP_QUERY_CACHE_CONTROL = 49 */ + L"Content-Base", /* HTTP_QUERY_CONTENT_BASE = 50 */ + L"Content-Location", /* HTTP_QUERY_CONTENT_LOCATION = 51 */ + L"Content-MD5", /* HTTP_QUERY_CONTENT_MD5 = 52 */ + L"Content-Range", /* HTTP_QUERY_CONTENT_RANGE = 53 */ + L"ETag", /* HTTP_QUERY_ETAG = 54 */ + L"Host", /* HTTP_QUERY_HOST = 55 */ + L"If-Match", /* HTTP_QUERY_IF_MATCH = 56 */ + L"If-None-Match", /* HTTP_QUERY_IF_NONE_MATCH = 57 */ + L"If-Range", /* HTTP_QUERY_IF_RANGE = 58 */ + L"If-Unmodified-Since", /* HTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */ + L"Max-Forwards", /* HTTP_QUERY_MAX_FORWARDS = 60 */ + L"Proxy-Authorization", /* HTTP_QUERY_PROXY_AUTHORIZATION = 61 */ + L"Range", /* HTTP_QUERY_RANGE = 62 */ + L"Transfer-Encoding", /* HTTP_QUERY_TRANSFER_ENCODING = 63 */ + L"Upgrade", /* HTTP_QUERY_UPGRADE = 64 */ + L"Vary", /* HTTP_QUERY_VARY = 65 */ + L"Via", /* HTTP_QUERY_VIA = 66 */ + L"Warning", /* HTTP_QUERY_WARNING = 67 */ + L"Expect", /* HTTP_QUERY_EXPECT = 68 */ + L"Proxy-Connection", /* HTTP_QUERY_PROXY_CONNECTION = 69 */ + L"Unless-Modified-Since", /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ }; /*********************************************************************** @@ -4364,13 +4322,13 @@ static void HTTP_InsertCookies(http_request_t *request) static WORD HTTP_ParseWkday(LPCWSTR day) { - static const WCHAR days[7][4] = {{ 's','u','n',0 }, - { 'm','o','n',0 }, - { 't','u','e',0 }, - { 'w','e','d',0 }, - { 't','h','u',0 }, - { 'f','r','i',0 }, - { 's','a','t',0 }}; + static const WCHAR days[7][4] = {L"sun", + L"mon", + L"tue", + L"wed", + L"thu", + L"fri", + L"sat"}; unsigned int i; for (i = 0; i < ARRAY_SIZE(days); i++) if (!wcsicmp(day, days[i])) @@ -4382,31 +4340,18 @@ static WORD HTTP_ParseWkday(LPCWSTR day) static WORD HTTP_ParseMonth(LPCWSTR month) { - static const WCHAR jan[] = { 'j','a','n',0 }; - static const WCHAR feb[] = { 'f','e','b',0 }; - static const WCHAR mar[] = { 'm','a','r',0 }; - static const WCHAR apr[] = { 'a','p','r',0 }; - static const WCHAR may[] = { 'm','a','y',0 }; - static const WCHAR jun[] = { 'j','u','n',0 }; - static const WCHAR jul[] = { 'j','u','l',0 }; - static const WCHAR aug[] = { 'a','u','g',0 }; - static const WCHAR sep[] = { 's','e','p',0 }; - static const WCHAR oct[] = { 'o','c','t',0 }; - static const WCHAR nov[] = { 'n','o','v',0 }; - static const WCHAR dec[] = { 'd','e','c',0 }; - - if (!wcsicmp(month, jan)) return 1; - if (!wcsicmp(month, feb)) return 2; - if (!wcsicmp(month, mar)) return 3; - if (!wcsicmp(month, apr)) return 4; - if (!wcsicmp(month, may)) return 5; - if (!wcsicmp(month, jun)) return 6; - if (!wcsicmp(month, jul)) return 7; - if (!wcsicmp(month, aug)) return 8; - if (!wcsicmp(month, sep)) return 9; - if (!wcsicmp(month, oct)) return 10; - if (!wcsicmp(month, nov)) return 11; - if (!wcsicmp(month, dec)) return 12; + if (!wcsicmp(month, L"jan")) return 1; + if (!wcsicmp(month, L"feb")) return 2; + if (!wcsicmp(month, L"mar")) return 3; + if (!wcsicmp(month, L"apr")) return 4; + if (!wcsicmp(month, L"may")) return 5; + if (!wcsicmp(month, L"jun")) return 6; + if (!wcsicmp(month, L"jul")) return 7; + if (!wcsicmp(month, L"aug")) return 8; + if (!wcsicmp(month, L"sep")) return 9; + if (!wcsicmp(month, L"oct")) return 10; + if (!wcsicmp(month, L"nov")) return 11; + if (!wcsicmp(month, L"dec")) return 12; /* Invalid */ return 0; } @@ -4624,13 +4569,13 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) static WORD HTTP_ParseWeekday(LPCWSTR day) { - static const WCHAR days[7][10] = {{ 's','u','n','d','a','y',0 }, - { 'm','o','n','d','a','y',0 }, - { 't','u','e','s','d','a','y',0 }, - { 'w','e','d','n','e','s','d','a','y',0 }, - { 't','h','u','r','s','d','a','y',0 }, - { 'f','r','i','d','a','y',0 }, - { 's','a','t','u','r','d','a','y',0 }}; + static const WCHAR days[7][10] = {L"sunday", + L"monday", + L"tuesday", + L"wednesday", + L"thursday", + L"friday", + L"saturday"}; unsigned int i; for (i = 0; i < ARRAY_SIZE(days); i++) if (!wcsicmp(day, days[i])) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 91bff2ece93..b26a1b912ee 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3279,12 +3279,12 @@ BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption, } static const WCHAR WININET_wkday[7][4] = - { { 'S','u','n', 0 }, { 'M','o','n', 0 }, { 'T','u','e', 0 }, { 'W','e','d', 0 }, - { 'T','h','u', 0 }, { 'F','r','i', 0 }, { 'S','a','t', 0 } }; + { L"Sun", L"Mon", L"Tue", L"Wed", + L"Thu", L"Fri", L"Sat"}; static const WCHAR WININET_month[12][4] = - { { 'J','a','n', 0 }, { 'F','e','b', 0 }, { 'M','a','r', 0 }, { 'A','p','r', 0 }, - { 'M','a','y', 0 }, { 'J','u','n', 0 }, { 'J','u','l', 0 }, { 'A','u','g', 0 }, - { 'S','e','p', 0 }, { 'O','c','t', 0 }, { 'N','o','v', 0 }, { 'D','e','c', 0 } }; + { L"Jan", L"Feb", L"Mar", L"Apr", + L"May", L"Jun", L"Jul", L"Aug", + L"Sep", L"Oct", L"Nov", L"Dec"}; /*********************************************************************** * InternetTimeFromSystemTimeA (WININET.@) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4a397b6b4de..cc12ef9e76e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -748,9 +748,6 @@ static void cache_container_delete_container(cache_container *pContainer) static void cache_containers_init(void) { - static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0}; - static const WCHAR HistorySuffix[] = {'H','i','s','t','o','r','y','.','I','E','5',0}; - static const WCHAR CookieSuffix[] = {0}; static const struct { int nFolder; /* CSIDL_* constant */ @@ -759,9 +756,9 @@ static void cache_containers_init(void) DWORD default_entry_type; } DefaultContainerData[] = { - { CSIDL_INTERNET_CACHE, UrlSuffix, "", NORMAL_CACHE_ENTRY }, - { CSIDL_HISTORY, HistorySuffix, "Visited:", URLHISTORY_CACHE_ENTRY }, - { CSIDL_COOKIES, CookieSuffix, "Cookie:", COOKIE_CACHE_ENTRY }, + { CSIDL_INTERNET_CACHE, L"Content.IE5", "", NORMAL_CACHE_ENTRY }, + { CSIDL_HISTORY, L"History.IE5", "Visited:", URLHISTORY_CACHE_ENTRY }, + { CSIDL_COOKIES, L"", "Cookie:", COOKIE_CACHE_ENTRY }, }; DWORD i; -- 2.26.2

2 1

[PATCH 2/2] mshtml: Use wide-char string literals for PRUnichar strings.
by Michael Stefaniuc 24 Nov '20

24 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/editor.c | 7 ++----- dlls/mshtml/htmldoc.c | 4 +--- dlls/mshtml/htmlelemcol.c | 4 +--- dlls/mshtml/htmlform.c | 8 ++------ dlls/mshtml/htmlhead.c | 9 +++------ dlls/mshtml/htmlimg.c | 4 +--- dlls/mshtml/htmlselect.c | 4 +--- dlls/mshtml/nsevents.c | 21 ++++++++------------- dlls/mshtml/nsservice.c | 8 +++----- dlls/mshtml/olecmd.c | 14 ++++++-------- dlls/mshtml/pluginhost.c | 18 +++++------------- dlls/mshtml/range.c | 7 ++----- dlls/mshtml/script.c | 8 ++------ 13 files changed, 37 insertions(+), 79 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 0a1b4879bde..28c4eceff8e 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -657,13 +657,10 @@ static HRESULT exec_italic(HTMLDocumentNode *doc, DWORD cmdexecopt, VARIANT *in, static HRESULT query_justify(HTMLDocumentNode *doc, OLECMD *cmd) { - static const PRUnichar justifycenterW[] = {'j','u','s','t','i','f','y','c','e','n','t','e','r',0}; - static const PRUnichar justifyrightW[] = {'j','u','s','t','i','f','y','r','i','g','h','t',0}; - switch(cmd->cmdID) { case IDM_JUSTIFYCENTER: TRACE("(%p) IDM_JUSTIFYCENTER\n", doc); - cmd->cmdf = query_align_status(doc, justifycenterW); + cmd->cmdf = query_align_status(doc, L"justifycenter"); break; case IDM_JUSTIFYLEFT: TRACE("(%p) IDM_JUSTIFYLEFT\n", doc); @@ -675,7 +672,7 @@ static HRESULT query_justify(HTMLDocumentNode *doc, OLECMD *cmd) break; case IDM_JUSTIFYRIGHT: TRACE("(%p) IDM_JUSTIFYRIGHT\n", doc); - cmd->cmdf = query_align_status(doc, justifyrightW); + cmd->cmdf = query_align_status(doc, L"justifyright"); break; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 767b46a7050..344079ba36e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5720,9 +5720,7 @@ HRESULT create_document_node(nsIDOMHTMLDocument *nsdoc, GeckoBrowser *browser, H nsAString mode_str; nsresult nsres; - static const PRUnichar onW[] = {'o','n',0}; - - nsAString_InitDepend(&mode_str, onW); + nsAString_InitDepend(&mode_str, L"on"); nsres = nsIDOMHTMLDocument_SetDesignMode(doc->nsdoc, &mode_str); nsAString_Finish(&mode_str); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 51cc90110f6..67bef804fbc 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -375,8 +375,6 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) BOOL ret = FALSE; nsresult nsres; - static const PRUnichar nameW[] = {'n','a','m','e',0}; - if(!elem->dom_element) return FALSE; @@ -388,7 +386,7 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return TRUE; } - nsres = get_elem_attr_value(elem->dom_element, nameW, &nsstr, &str); + nsres = get_elem_attr_value(elem->dom_element, L"name", &nsstr, &str); if(NS_SUCCEEDED(nsres)) { ret = !wcsicmp(str, name); nsAString_Finish(&nsstr); diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b4715298a1b..5906202f1c7 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -456,11 +456,9 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) if(NS_SUCCEEDED(nsres)) { const PRUnichar *method; - static const PRUnichar postW[] = {'p','o','s','t',0}; - nsAString_GetData(&method_str, &method); TRACE("method is %s\n", debugstr_w(method)); - is_post_submit = !wcsicmp(method, postW); + is_post_submit = !wcsicmp(method, L"post"); } nsAString_Finish(&method_str); @@ -661,8 +659,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; - static const PRUnichar nameW[] = {'n','a','m','e',0}; - TRACE("(%p)->(%s %x %p)\n", This, wine_dbgstr_w(name), grfdex, pid); nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); @@ -731,7 +727,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } /* compare by name attr */ - nsres = get_elem_attr_value(elem, nameW, &name_str, &str); + nsres = get_elem_attr_value(elem, L"name", &name_str, &str); nsIDOMElement_Release(elem); if(NS_SUCCEEDED(nsres)) { if(!wcsicmp(str, name)) { diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 92eda92fbad..879eca424ae 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -448,11 +448,10 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0}; TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, httpEquivW, TRUE, p); + return elem_string_attr_getter(&This->element, L"http-equiv", TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -465,11 +464,10 @@ static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - static const PRUnichar contentW[] = {'c','o','n','t','e','n','t',0}; TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, contentW, TRUE, p); + return elem_string_attr_getter(&This->element, L"content", TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -482,11 +480,10 @@ static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - static const PRUnichar nameW[] = {'n','a','m','e',0}; TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, nameW, TRUE, p); + return elem_string_attr_getter(&This->element, L"name", TRUE, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 7dc32cd654d..aa4129e760e 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -876,8 +876,6 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i LONG l; HRESULT hres; - static const PRUnichar imgW[] = {'I','M','G',0}; - TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), debugstr_variant(&height), img_elem); @@ -890,7 +888,7 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i *img_elem = NULL; - hres = create_nselem(doc, imgW, &nselem); + hres = create_nselem(doc, L"IMG", &nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 739da9bf0ff..13a2f8b3f6a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -538,8 +538,6 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory HTMLDOMNode *node; HRESULT hres; - static const PRUnichar optionW[] = {'O','P','T','I','O','N',0}; - TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); @@ -550,7 +548,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory *optelem = NULL; - hres = create_nselem(This->window->doc, optionW, &nselem); + hres = create_nselem(This->window->doc, L"OPTION", &nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index f232a25ba33..21b59cf6e1d 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -38,11 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static const PRUnichar blurW[] = {'b','l','u','r',0}; -static const PRUnichar focusW[] = {'f','o','c','u','s',0}; -static const PRUnichar keypressW[] = {'k','e','y','p','r','e','s','s',0}; -static const PRUnichar loadW[] = {'l','o','a','d',0}; - typedef struct { nsIDOMEventListener nsIDOMEventListener_iface; nsDocumentEventListener *This; @@ -446,10 +441,10 @@ void release_nsevents(HTMLDocumentNode *doc) if(!listener) return; - detach_nslistener(doc, blurW, &listener->blur_listener, TRUE); - detach_nslistener(doc, focusW, &listener->focus_listener, TRUE); - detach_nslistener(doc, keypressW, &listener->keypress_listener, FALSE); - detach_nslistener(doc, loadW, &listener->load_listener, TRUE); + detach_nslistener(doc, L"blur", &listener->blur_listener, TRUE); + detach_nslistener(doc, L"focus", &listener->focus_listener, TRUE); + detach_nslistener(doc, L"keypress", &listener->keypress_listener, FALSE); + detach_nslistener(doc, L"load", &listener->load_listener, TRUE); listener->doc = NULL; release_listener(listener); @@ -482,10 +477,10 @@ void init_nsevents(HTMLDocumentNode *doc) if(!target) return; - init_event(target, blurW, &listener->blur_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, focusW, &listener->focus_listener.nsIDOMEventListener_iface, TRUE); - init_event(target, keypressW, &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); - init_event(target, loadW, &listener->load_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, L"blur", &listener->blur_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, L"focus", &listener->focus_listener.nsIDOMEventListener_iface, TRUE); + init_event(target, L"keypress", &listener->keypress_listener.nsIDOMEventListener_iface, FALSE); + init_event(target, L"load", &listener->load_listener.nsIDOMEventListener_iface, TRUE); nsIDOMEventTarget_Release(target); } diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 2eb838b2f54..55a65cfeae6 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -126,8 +126,6 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface, const PRUnichar *aButton1Title, const PRUnichar *aButton2Title, const PRUnichar *aCheckMsg, cpp_bool *aCheckState, LONG *_retval) { - static const PRUnichar wszContinue[] = {'C','o','n','t','i','n','u','e',0}; - FIXME("(%p %s %s %08x %s %s %s %s %p %p) hack!\n", aParent, debugstr_w(aDialogTitle), debugstr_w(aText), aButtonFlags, debugstr_w(aButton0Title), debugstr_w(aButton1Title), debugstr_w(aButton2Title), debugstr_w(aCheckMsg), @@ -138,11 +136,11 @@ static nsresult NSAPI nsPromptService_ConfirmEx(nsIPromptService *iface, * This is really very very ugly hack!!! */ - if(aButton0Title && !memcmp(aButton0Title, wszContinue, sizeof(wszContinue))) + if(aButton0Title && !memcmp(aButton0Title, L"Continue", sizeof(L"Continue"))) *_retval = 0; - else if(aButton1Title && !memcmp(aButton1Title, wszContinue, sizeof(wszContinue))) + else if(aButton1Title && !memcmp(aButton1Title, L"Continue", sizeof(L"Continue"))) *_retval = 1; - else if(aButton2Title && !memcmp(aButton2Title, wszContinue, sizeof(wszContinue))) + else if(aButton2Title && !memcmp(aButton2Title, L"Continue", sizeof(L"Continue"))) *_retval = 2; /* else * let's hope that _retval is set to the default value */ diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a79f2d000ef..22d350bedd8 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -219,14 +219,12 @@ static void set_default_templates(nsIPrintSettings *settings) { WCHAR buf[64]; - static const PRUnichar empty[] = {0}; - - nsIPrintSettings_SetHeaderStrLeft(settings, empty); - nsIPrintSettings_SetHeaderStrRight(settings, empty); - nsIPrintSettings_SetHeaderStrCenter(settings, empty); - nsIPrintSettings_SetFooterStrLeft(settings, empty); - nsIPrintSettings_SetFooterStrRight(settings, empty); - nsIPrintSettings_SetFooterStrCenter(settings, empty); + nsIPrintSettings_SetHeaderStrLeft(settings, L""); + nsIPrintSettings_SetHeaderStrRight(settings, L""); + nsIPrintSettings_SetHeaderStrCenter(settings, L""); + nsIPrintSettings_SetFooterStrLeft(settings, L""); + nsIPrintSettings_SetFooterStrRight(settings, L""); + nsIPrintSettings_SetFooterStrCenter(settings, L""); if(LoadStringW(get_shdoclc(), IDS_PRINT_HEADER_TEMPLATE, buf, ARRAY_SIZE(buf))) set_print_template(settings, buf, TRUE); diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index b47d06f1d5b..d880cc89a9d 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -279,11 +279,7 @@ static HRESULT fill_props(nsIDOMElement *nselem, PropertyBag *prop_bag) nsresult nsres; HRESULT hres = S_OK; - static const PRUnichar nameW[] = {'n','a','m','e',0}; - static const PRUnichar paramW[] = {'p','a','r','a','m',0}; - static const PRUnichar valueW[] = {'v','a','l','u','e',0}; - - nsAString_InitDepend(&name_str, paramW); + nsAString_InitDepend(&name_str, L"param"); nsres = nsIDOMElement_GetElementsByTagName(nselem, &name_str, &params); nsAString_Finish(&name_str); if(NS_FAILED(nsres)) @@ -307,9 +303,9 @@ static HRESULT fill_props(nsIDOMElement *nselem, PropertyBag *prop_bag) break; } - nsres = get_elem_attr_value(param_elem, nameW, &name_str, &name); + nsres = get_elem_attr_value(param_elem, L"name", &name_str, &name); if(NS_SUCCEEDED(nsres)) { - nsres = get_elem_attr_value(param_elem, valueW, &value_str, &value); + nsres = get_elem_attr_value(param_elem, L"value", &value_str, &value); if(NS_SUCCEEDED(nsres)) { hres = add_prop(prop_bag, name, value); nsAString_Finish(&value_str); @@ -2297,9 +2293,7 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) nsresult nsres; BOOL ret = FALSE; - static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - - nsres = get_elem_attr_value(elem, classidW, &val_str, &val); + nsres = get_elem_attr_value(elem, L"classid", &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) ret = parse_classid(val, clsid); @@ -2535,9 +2529,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) nsresult nsres; HRESULT hres; - static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - - nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); + nsres = get_elem_attr_value(nselem, L"codebase", &val_str, &val); if(NS_SUCCEEDED(nsres)) { if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 7db62f49a12..d38d64b4151 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1674,9 +1674,6 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) nsIDOMDocumentFragment *fragment; nsIDOMNode *tmp; - static const PRUnichar blockquoteW[] = {'B','L','O','C','K','Q','U','O','T','E',0}; - static const PRUnichar pW[] = {'P',0}; - TRACE("(%p)->(%p %p)\n", This, in, out); if(!This->doc->nsdoc) { @@ -1684,8 +1681,8 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) return E_NOTIMPL; } - create_nselem(This->doc, blockquoteW, &blockquote_elem); - create_nselem(This->doc, pW, &p_elem); + create_nselem(This->doc, L"BLOCKQUOTE", &blockquote_elem); + create_nselem(This->doc, L"P", &p_elem); nsIDOMRange_ExtractContents(This->nsrange, &fragment); nsIDOMElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6f06d3b0919..bb097081c5e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1210,8 +1210,6 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns BOOL ret = FALSE; nsresult nsres; - static const PRUnichar languageW[] = {'l','a','n','g','u','a','g','e',0}; - nsAString_Init(&val_str, NULL); nsres = nsIDOMHTMLScriptElement_GetType(nsscript, &val_str); @@ -1231,7 +1229,7 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMElement, (void**)&nselem); assert(nsres == NS_OK); - nsres = get_elem_attr_value(nselem, languageW, &val_str, &language); + nsres = get_elem_attr_value(nselem, L"language", &val_str, &language); nsIDOMElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { if(*language) { @@ -1554,14 +1552,12 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsresult nsres; HRESULT hres; - static const PRUnichar selectorW[] = {'s','c','r','i','p','t','[','e','v','e','n','t',']',0}; - TRACE("%p\n", doc); if(!doc->nsdoc) return; - nsAString_InitDepend(&selector_str, selectorW); + nsAString_InitDepend(&selector_str, L"script[event]"); nsres = nsIDOMHTMLDocument_QuerySelectorAll(doc->nsdoc, &selector_str, &node_list); nsAString_Finish(&selector_str); if(NS_FAILED(nsres)) { -- 2.26.2

2 1

[PATCH 1/2] mshtml: Use wide-char string literals in html*.c.
by Michael Stefaniuc 24 Nov '20

24 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 10 ++-- dlls/mshtml/htmlbody.c | 38 ++++++--------- dlls/mshtml/htmldoc.c | 32 ++++--------- dlls/mshtml/htmlelem.c | 49 ++++++-------------- dlls/mshtml/htmlform.c | 14 ++---- dlls/mshtml/htmlframe.c | 13 ++---- dlls/mshtml/htmlhead.c | 6 +-- dlls/mshtml/htmlimg.c | 6 +-- dlls/mshtml/htmlinput.c | 21 ++------- dlls/mshtml/htmllocation.c | 6 +-- dlls/mshtml/htmlobject.c | 10 ++-- dlls/mshtml/htmlstyle.c | 94 +++++++++++++------------------------- dlls/mshtml/htmltable.c | 3 +- dlls/mshtml/htmltextarea.c | 4 +- dlls/mshtml/htmlwindow.c | 8 +--- 15 files changed, 97 insertions(+), 217 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 64cc6db8755..a0e96af822e 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -65,27 +65,23 @@ HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_st const PRUnichar *target; HRESULT hres; - static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0}; - static const WCHAR _selfW[] = {'_','s','e','l','f',0}; - static const WCHAR _topW[] = {'_','t','o','p',0}; - *use_new_window = FALSE; nsAString_GetData(target_str, &target); TRACE("%s\n", debugstr_w(target)); - if(!*target || !wcsicmp(target, _selfW)) { + if(!*target || !wcsicmp(target, L"_self")) { IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); return window; } - if(!wcsicmp(target, _topW)) { + if(!wcsicmp(target, L"_top")) { get_top_window(window, &top_window); IHTMLWindow2_AddRef(&top_window->base.IHTMLWindow2_iface); return top_window; } - if(!wcsicmp(target, _parentW)) { + if(!wcsicmp(target, L"_parent")) { if(!window->parent) { WARN("Window has no parent, treat as self\n"); IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 4209fd2cc2e..9955a8e6498 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -115,8 +115,6 @@ HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) unsigned int i; int rgb = -1; - static const WCHAR formatW[] = {'#','%','0','2','x','%','0','2','x','%','0','2','x',0}; - if(!color || !*color) { *ret = NULL; return S_OK; @@ -135,7 +133,7 @@ HRESULT nscolor_to_str(LPCWSTR color, BSTR *ret) if(!*ret) return E_OUTOFMEMORY; - swprintf(*ret, 8, formatW, rgb>>16, (rgb>>8)&0xff, rgb&0xff); + swprintf(*ret, 8, L"#%02x%02x%02x", rgb>>16, (rgb>>8)&0xff, rgb&0xff); TRACE("%s -> %s\n", debugstr_w(color), debugstr_w(*ret)); return S_OK; @@ -150,9 +148,8 @@ BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) case VT_I4: { PRUnichar buf[10]; - static const WCHAR formatW[] = {'#','%','x',0}; - wsprintfW(buf, formatW, V_I4(v)); + wsprintfW(buf, L"#%x", V_I4(v)); nsAString_Init(nsstr, buf); return TRUE; } @@ -576,13 +573,6 @@ static HRESULT WINAPI HTMLBodyElement_get_onunload(IHTMLBodyElement *iface, VARI return E_NOTIMPL; } -static const WCHAR autoW[] = {'a','u','t','o',0}; -static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0}; -static const WCHAR scrollW[] = {'s','c','r','o','l','l',0}; -static const WCHAR visibleW[] = {'v','i','s','i','b','l','e',0}; -static const WCHAR yesW[] = {'y','e','s',0}; -static const WCHAR noW[] = {'n','o',0}; - static HRESULT WINAPI HTMLBodyElement_put_scroll(IHTMLBodyElement *iface, BSTR v) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); @@ -591,12 +581,12 @@ static HRESULT WINAPI HTMLBodyElement_put_scroll(IHTMLBodyElement *iface, BSTR v TRACE("(%p)->(%s)\n", This, debugstr_w(v)); /* Emulate with CSS visibility attribute */ - if(!wcscmp(v, yesW)) { - val = scrollW; - }else if(!wcscmp(v, autoW)) { - val = visibleW; - }else if(!wcscmp(v, noW)) { - val = hiddenW; + if(!wcscmp(v, L"yes")) { + val = L"scroll"; + }else if(!wcscmp(v, L"auto")) { + val = L"visible"; + }else if(!wcscmp(v, L"no")) { + val = L"hidden"; }else { WARN("Invalid argument %s\n", debugstr_w(v)); return E_INVALIDARG; @@ -622,12 +612,12 @@ static HRESULT WINAPI HTMLBodyElement_get_scroll(IHTMLBodyElement *iface, BSTR * if(!overflow || !*overflow) { *p = NULL; hres = S_OK; - }else if(!wcscmp(overflow, visibleW) || !wcscmp(overflow, autoW)) { - ret = autoW; - }else if(!wcscmp(overflow, scrollW)) { - ret = yesW; - }else if(!wcscmp(overflow, hiddenW)) { - ret = noW; + }else if(!wcscmp(overflow, L"visible") || !wcscmp(overflow, L"auto")) { + ret = L"auto"; + }else if(!wcscmp(overflow, L"scroll")) { + ret = L"yes"; + }else if(!wcscmp(overflow, L"hidden")) { + ret = L"no"; }else { TRACE("Defaulting %s to NULL\n", debugstr_w(overflow)); *p = NULL; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5644d92dbe5..767b46a7050 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -577,11 +577,9 @@ static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) HTMLDocument *This = impl_from_IHTMLDocument2(iface); HRESULT hres; - static const WCHAR onW[] = {'o','n',0}; - TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(wcsicmp(v, onW)) { + if(wcsicmp(v, L"on")) { FIXME("Unsupported arg %s\n", debugstr_w(v)); return E_NOTIMPL; } @@ -597,13 +595,12 @@ static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_designMode(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static const WCHAR szOff[] = {'O','f','f',0}; FIXME("(%p)->(%p) always returning Off\n", This, p); if(!p) return E_INVALIDARG; - *p = SysAllocString(szOff); + *p = SysAllocString(L"Off"); return S_OK; } @@ -824,12 +821,9 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static const WCHAR about_blank_url[] = - {'a','b','o','u','t',':','b','l','a','n','k',0}; - TRACE("(%p)->(%p)\n", iface, p); - *p = SysAllocString(This->window->url ? This->window->url : about_blank_url); + *p = SysAllocString(This->window->url ? This->window->url : L"about:blank"); return *p ? S_OK : E_OUTOFMEMORY; } @@ -1119,8 +1113,6 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT nsISupports *tmp; nsresult nsres; - static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; - TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_w(url), debugstr_variant(&name), debugstr_variant(&features), debugstr_variant(&replace), pomWindowResult); @@ -1129,7 +1121,7 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT return E_NOTIMPL; } - if(!url || wcscmp(url, text_htmlW) || V_VT(&name) != VT_ERROR + if(!url || wcscmp(url, L"text/html") || V_VT(&name) != VT_ERROR || V_VT(&features) != VT_ERROR || V_VT(&replace) != VT_ERROR) FIXME("unsupported args\n"); @@ -1709,14 +1701,12 @@ static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; - TRACE("(%p)->(%p)\n", This, String); if(!String) return E_INVALIDARG; - *String = SysAllocString(objectW); + *String = SysAllocString(L"[object]"); return *String ? S_OK : E_OUTOFMEMORY; } @@ -1731,8 +1721,6 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR nsresult nsres; HRESULT hres; - static const WCHAR styleW[] = {'s','t','y','l','e',0}; - TRACE("(%p)->(%s %d %p)\n", This, debugstr_w(bstrHref), lIndex, ppnewStyleSheet); if(!This->doc_node->nsdoc) { @@ -1749,7 +1737,7 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR return S_OK; } - hres = create_element(This->doc_node, styleW, &elem); + hres = create_element(This->doc_node, L"style", &elem); if(FAILED(hres)) return hres; @@ -2362,8 +2350,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST nsAString selector_str; WCHAR *selector; nsresult nsres; - - static const WCHAR formatW[] = {'*','[','i','d','=','%','s',']',',','*','[','n','a','m','e','=','%','s',']',0}; + static const WCHAR formatW[] = L"*[id=%s],*[name=%s]"; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), ppelColl); @@ -3006,12 +2993,9 @@ static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR * { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - static const WCHAR BackCompatW[] = {'B','a','c','k','C','o','m','p','a','t',0}; - static const WCHAR CSS1CompatW[] = {'C','S','S','1','C','o','m','p','a','t',0}; - TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(This->doc_node->document_mode <= COMPAT_MODE_IE5 ? BackCompatW : CSS1CompatW); + *p = SysAllocString(This->doc_node->document_mode <= COMPAT_MODE_IE5 ? L"BackCompat" : L"CSS1Compat"); return *p ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1dcddbaa672..732db50a78c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -860,13 +860,11 @@ HRESULT attr_value_to_string(VARIANT *v) { HRESULT hres; - static const WCHAR nullW[] = {'n','u','l','l',0}; - switch(V_VT(v)) { case VT_BSTR: break; case VT_NULL: - V_BSTR(v) = SysAllocString(nullW); + V_BSTR(v) = SysAllocString(L"null"); if(!V_BSTR(v)) return E_OUTOFMEMORY; V_VT(v) = VT_BSTR; @@ -1043,10 +1041,8 @@ static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); if(!This->dom_element) { - static const WCHAR comment_tagW[] = {'!',0}; - TRACE("comment element\n"); - *p = SysAllocString(comment_tagW); + *p = SysAllocString(L"!"); return *p ? S_OK : E_OUTOFMEMORY; } @@ -1314,8 +1310,6 @@ static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch ** return S_OK; } -static const WCHAR titleW[] = {'t','i','t','l','e',0}; - static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); @@ -1328,7 +1322,7 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) VARIANT *var; HRESULT hres; - hres = dispex_get_dprop_ref(&This->node.event_target.dispex, titleW, TRUE, &var); + hres = dispex_get_dprop_ref(&This->node.event_target.dispex, L"title", TRUE, &var); if(FAILED(hres)) return hres; @@ -1359,7 +1353,7 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) VARIANT *var; HRESULT hres; - hres = dispex_get_dprop_ref(&This->node.event_target.dispex, titleW, FALSE, &var); + hres = dispex_get_dprop_ref(&This->node.event_target.dispex, L"title", FALSE, &var); if(hres == DISP_E_UNKNOWNNAME) { *p = NULL; }else if(V_VT(var) != VT_BSTR) { @@ -1377,15 +1371,13 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) return return_nsstr(nsres, &title_str, p); } -static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; - static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return elem_string_attr_setter(This, languageW, v); + return elem_string_attr_setter(This, L"language", v); } static HRESULT WINAPI HTMLElement_get_language(IHTMLElement *iface, BSTR *p) @@ -1394,7 +1386,7 @@ static HRESULT WINAPI HTMLElement_get_language(IHTMLElement *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(This, languageW, TRUE, p); + return elem_string_attr_getter(This, L"language", TRUE, p); } static HRESULT WINAPI HTMLElement_put_onselectstart(IHTMLElement *iface, VARIANT v) @@ -1845,12 +1837,7 @@ static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDO nsresult nsres; HRESULT hres = S_OK; - static const WCHAR beforebeginW[] = {'b','e','f','o','r','e','b','e','g','i','n',0}; - static const WCHAR afterbeginW[] = {'a','f','t','e','r','b','e','g','i','n',0}; - static const WCHAR beforeendW[] = {'b','e','f','o','r','e','e','n','d',0}; - static const WCHAR afterendW[] = {'a','f','t','e','r','e','n','d',0}; - - if (!wcsicmp(where, beforebeginW)) { + if (!wcsicmp(where, L"beforebegin")) { nsIDOMNode *parent; nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); @@ -1862,7 +1849,7 @@ static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDO nsres = nsIDOMNode_InsertBefore(parent, nsnode, This->node.nsnode, &ret_nsnode); nsIDOMNode_Release(parent); - }else if(!wcsicmp(where, afterbeginW)) { + }else if(!wcsicmp(where, L"afterbegin")) { nsIDOMNode *first_child; nsres = nsIDOMNode_GetFirstChild(This->node.nsnode, &first_child); @@ -1875,9 +1862,9 @@ static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDO if (first_child) nsIDOMNode_Release(first_child); - }else if (!wcsicmp(where, beforeendW)) { + }else if (!wcsicmp(where, L"beforeend")) { nsres = nsIDOMNode_AppendChild(This->node.nsnode, nsnode, &ret_nsnode); - }else if (!wcsicmp(where, afterendW)) { + }else if (!wcsicmp(where, L"afterend")) { nsIDOMNode *next_sibling, *parent; nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &parent); @@ -2806,7 +2793,7 @@ static HRESULT WINAPI HTMLElement2_put_accessKey(IHTMLElement2 *iface, BSTR v) HTMLElement *This = impl_from_IHTMLElement2(iface); VARIANT var; - static WCHAR accessKeyW[] = {'a','c','c','e','s','s','K','e','y',0}; + static WCHAR accessKeyW[] = L"accessKey"; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); @@ -3016,9 +3003,7 @@ static HRESULT WINAPI HTMLElement2_get_readyState(IHTMLElement2 *iface, VARIANT if(FAILED(hres)) return hres; }else { - static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; - - str = SysAllocString(completeW); + str = SysAllocString(L"complete"); if(!str) return E_OUTOFMEMORY; } @@ -3750,8 +3735,6 @@ static HRESULT WINAPI HTMLElement3_get_hideFocus(IHTMLElement3 *iface, VARIANT_B return E_NOTIMPL; } -static const WCHAR disabledW[] = {'d','i','s','a','b','l','e','d',0}; - static HRESULT WINAPI HTMLElement3_put_disabled(IHTMLElement3 *iface, VARIANT_BOOL v) { HTMLElement *This = impl_from_IHTMLElement3(iface); @@ -3763,7 +3746,7 @@ static HRESULT WINAPI HTMLElement3_put_disabled(IHTMLElement3 *iface, VARIANT_BO if(This->node.vtbl->put_disabled) return This->node.vtbl->put_disabled(&This->node, v); - hres = dispex_get_dprop_ref(&This->node.event_target.dispex, disabledW, TRUE, &var); + hres = dispex_get_dprop_ref(&This->node.event_target.dispex, L"disabled", TRUE, &var); if(FAILED(hres)) return hres; @@ -3784,7 +3767,7 @@ static HRESULT WINAPI HTMLElement3_get_disabled(IHTMLElement3 *iface, VARIANT_BO if(This->node.vtbl->get_disabled) return This->node.vtbl->get_disabled(&This->node, p); - hres = dispex_get_dprop_ref(&This->node.event_target.dispex, disabledW, FALSE, &var); + hres = dispex_get_dprop_ref(&This->node.event_target.dispex, L"disabled", FALSE, &var); if(hres == DISP_E_UNKNOWNNAME) { *p = VARIANT_FALSE; return S_OK; @@ -5095,9 +5078,7 @@ HRESULT elem_unique_id(unsigned id, BSTR *p) { WCHAR buf[32]; - static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; - - swprintf(buf, ARRAY_SIZE(buf), formatW, id); + swprintf(buf, ARRAY_SIZE(buf), L"ms__id%u", id); *p = SysAllocString(buf); return *p ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 63e8f1bb2d0..b4715298a1b 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -227,19 +227,14 @@ static HRESULT WINAPI HTMLFormElement_get_dir(IHTMLFormElement *iface, BSTR *p) static HRESULT WINAPI HTMLFormElement_put_encoding(IHTMLFormElement *iface, BSTR v) { - static const WCHAR urlencodedW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; - static const WCHAR dataW[] = {'m','u','l','t','i','p','a','r','t','/', - 'f','o','r','m','-','d','a','t','a',0}; - static const WCHAR plainW[] = {'t','e','x','t','/','p','l','a','i','n',0}; - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); nsAString encoding_str; nsresult nsres; TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - if(lstrcmpiW(v, urlencodedW) && lstrcmpiW(v, dataW) && lstrcmpiW(v, plainW)) { + if(lstrcmpiW(v, L"application/x-www-form-urlencoded") && lstrcmpiW(v, L"multipart/form-data") + && lstrcmpiW(v, L"text/plain")) { WARN("incorrect enctype\n"); return E_INVALIDARG; } @@ -268,16 +263,13 @@ static HRESULT WINAPI HTMLFormElement_get_encoding(IHTMLFormElement *iface, BSTR static HRESULT WINAPI HTMLFormElement_put_method(IHTMLFormElement *iface, BSTR v) { - static const WCHAR postW[] = {'P','O','S','T',0}; - static const WCHAR getW[] = {'G','E','T',0}; - HTMLFormElement *This = impl_from_IHTMLFormElement(iface); nsAString method_str; nsresult nsres; TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - if(lstrcmpiW(v, postW) && lstrcmpiW(v, getW)) { + if(lstrcmpiW(v, L"POST") && lstrcmpiW(v, L"GET")) { WARN("unrecognized method\n"); return E_INVALIDARG; } diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index e451f030453..972ddc80a50 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -34,11 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static const WCHAR autoW[] = {'a','u','t','o',0}; -static const WCHAR yesW[] = {'y','e','s',0}; -static const WCHAR noW[] = {'n','o',0}; -static const WCHAR pxW[] = {'p','x',0}; - static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { mozIDOMWindowProxy *mozwindow; @@ -343,7 +338,7 @@ static HRESULT WINAPI HTMLFrameBase_get_marginWidth(IHTMLFrameBase *iface, VARIA if(*str) { BSTR ret; - end = wcsstr(str, pxW); + end = wcsstr(str, L"px"); if(!end) end = str+lstrlenW(str); ret = SysAllocStringLen(str, end-str); @@ -410,7 +405,7 @@ static HRESULT WINAPI HTMLFrameBase_get_marginHeight(IHTMLFrameBase *iface, VARI if(*str) { BSTR ret; - end = wcsstr(str, pxW); + end = wcsstr(str, L"px"); if(!end) end = str+lstrlenW(str); ret = SysAllocStringLen(str, end-str); @@ -455,7 +450,7 @@ static HRESULT WINAPI HTMLFrameBase_put_scrolling(IHTMLFrameBase *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!(!wcsicmp(v, yesW) || !wcsicmp(v, noW) || !wcsicmp(v, autoW))) + if(!(!wcsicmp(v, L"yes") || !wcsicmp(v, L"no") || !wcsicmp(v, L"auto"))) return E_INVALIDARG; if(This->nsframe) { @@ -509,7 +504,7 @@ static HRESULT WINAPI HTMLFrameBase_get_scrolling(IHTMLFrameBase *iface, BSTR *p if(*strdata) *p = SysAllocString(strdata); else - *p = SysAllocString(autoW); + *p = SysAllocString(L"auto"); nsAString_Finish(&nsstr); diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 57bd0e6f968..92eda92fbad 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -503,15 +503,13 @@ static HRESULT WINAPI HTMLMetaElement_get_url(IHTMLMetaElement *iface, BSTR *p) return E_NOTIMPL; } -static const WCHAR charsetW[] = {'c','h','a','r','s','e','t',0}; - static HRESULT WINAPI HTMLMetaElement_put_charset(IHTMLMetaElement *iface, BSTR v) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return elem_string_attr_setter(&This->element, charsetW, v); + return elem_string_attr_setter(&This->element, L"charset", v); } static HRESULT WINAPI HTMLMetaElement_get_charset(IHTMLMetaElement *iface, BSTR *p) @@ -520,7 +518,7 @@ static HRESULT WINAPI HTMLMetaElement_get_charset(IHTMLMetaElement *iface, BSTR TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, charsetW, TRUE, p); + return elem_string_attr_getter(&This->element, L"charset", TRUE, p); } static const IHTMLMetaElementVtbl HTMLMetaElementVtbl = { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 7f1ecd038b0..7dc32cd654d 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -303,8 +303,6 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) nsresult nsres; HRESULT hres = S_OK; - static const WCHAR blockedW[] = {'B','L','O','C','K','E','D',':',':',0}; - TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&src_str, NULL); @@ -312,9 +310,9 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&src_str, &src); - if(!wcsnicmp(src, blockedW, ARRAY_SIZE(blockedW)-1)) { + if(!wcsnicmp(src, L"BLOCKED::", ARRAY_SIZE(L"BLOCKED::")-1)) { TRACE("returning BLOCKED::\n"); - *p = SysAllocString(blockedW); + *p = SysAllocString(L"BLOCKED::"); if(!*p) hres = E_OUTOFMEMORY; }else { diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 765ae79c2b7..2ba5833f3c0 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -44,8 +44,6 @@ struct HTMLInputElement { nsIDOMHTMLInputElement *nsinput; }; -static const WCHAR forW[] = {'f','o','r',0}; - static inline HTMLInputElement *impl_from_IHTMLInputElement(IHTMLInputElement *iface) { return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputElement_iface); @@ -1302,11 +1300,9 @@ static HRESULT WINAPI HTMLInputTextElement2_setSelectionRange(IHTMLInputTextElem nsAString none_str; nsresult nsres; - static const WCHAR noneW[] = {'n','o','n','e',0}; - TRACE("(%p)->(%d %d)\n", This, start, end); - nsAString_InitDepend(&none_str, noneW); + nsAString_InitDepend(&none_str, L"none"); nsres = nsIDOMHTMLInputElement_SetSelectionRange(This->nsinput, start, end, &none_str); nsAString_Finish(&none_str); if(NS_FAILED(nsres)) { @@ -1387,19 +1383,12 @@ static BOOL HTMLInputElement_is_text_edit(HTMLDOMNode *iface) nsresult nsres; BOOL ret = FALSE; - static const WCHAR buttonW[] = {'b','u','t','t','o','n',0}; - static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0}; - static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; - static const WCHAR resetW[] = {'r','e','s','e','t',0}; - static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; - static const WCHAR textW[] = {'t','e','x','t',0}; - nsAString_Init(&nsstr, NULL); nsres = nsIDOMHTMLInputElement_GetType(This->nsinput, &nsstr); if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&nsstr, &type); - ret = !wcscmp(type, buttonW) || !wcscmp(type, hiddenW) || !wcscmp(type, passwordW) - || !wcscmp(type, resetW) || !wcscmp(type, submitW) || !wcscmp(type, textW); + ret = !wcscmp(type, L"button") || !wcscmp(type, L"hidden") || !wcscmp(type, L"password") + || !wcscmp(type, L"reset") || !wcscmp(type, L"submit") || !wcscmp(type, L"text"); } nsAString_Finish(&nsstr); return ret; @@ -1557,7 +1546,7 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsAString_InitDepend(&for_str, forW); + nsAString_InitDepend(&for_str, L"for"); nsAString_InitDepend(&val_str, v); nsres = nsIDOMElement_SetAttribute(This->element.dom_element, &for_str, &val_str); nsAString_Finish(&for_str); @@ -1576,7 +1565,7 @@ static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BST TRACE("(%p)->(%p)\n", This, p); - return elem_string_attr_getter(&This->element, forW, FALSE, p); + return elem_string_attr_getter(&This->element, L"for", FALSE, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 7d102044cc2..4e15fb45242 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -350,12 +350,11 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ - static const WCHAR format[] = {'%','u',0}; DWORD len, port_len; WCHAR portW[6]; WCHAR *buf; - port_len = swprintf(portW, ARRAY_SIZE(portW), format, url.nPort); + port_len = swprintf(portW, ARRAY_SIZE(portW), L"%u", url.nPort); len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); @@ -435,10 +434,9 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) return hres; if(hres == S_OK) { - static const WCHAR formatW[] = {'%','u',0}; WCHAR buf[12]; - swprintf(buf, ARRAY_SIZE(buf), formatW, port); + swprintf(buf, ARRAY_SIZE(buf), L"%u", port); *p = SysAllocString(buf); }else { *p = SysAllocStringLen(NULL, 0); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 9505820583f..b71b0e7db6f 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -267,8 +267,7 @@ static HRESULT WINAPI HTMLObjectElement_put_width(IHTMLObjectElement *iface, VAR switch(V_VT(&v)) { case VT_I4: { - static const WCHAR formatW[] = {'%','d',0}; - swprintf(buf, ARRAY_SIZE(buf), formatW, V_I4(&v)); + swprintf(buf, ARRAY_SIZE(buf), L"%d", V_I4(&v)); break; } default: @@ -326,8 +325,7 @@ static HRESULT WINAPI HTMLObjectElement_put_height(IHTMLObjectElement *iface, VA switch(V_VT(&v)) { case VT_I4: { - static const WCHAR formatW[] = {'%','d',0}; - swprintf(buf, ARRAY_SIZE(buf), formatW, V_I4(&v)); + swprintf(buf, ARRAY_SIZE(buf), L"%d", V_I4(&v)); break; } default: @@ -577,11 +575,9 @@ static HRESULT WINAPI HTMLObjectElement2_put_classid(IHTMLObjectElement2 *iface, HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); HRESULT hres; - static const WCHAR classidW[] = {'c','l','a','s','s','i','d',0}; - FIXME("(%p)->(%s) semi-stub\n", This, debugstr_w(v)); - hres = elem_string_attr_setter(&This->plugin_container.element, classidW, v); + hres = elem_string_attr_setter(&This->plugin_container.element, L"classid", v); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ae21c1f7299..43a71d6286c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -35,20 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static const WCHAR blinkW[] = {'b','l','i','n','k',0}; -static const WCHAR dashedW[] = {'d','a','s','h','e','d',0}; -static const WCHAR dottedW[] = {'d','o','t','t','e','d',0}; -static const WCHAR doubleW[] = {'d','o','u','b','l','e',0}; -static const WCHAR grooveW[] = {'g','r','o','o','v','e',0}; -static const WCHAR insetW[] = {'i','n','s','e','t',0}; -static const WCHAR line_throughW[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0}; -static const WCHAR noneW[] = {'n','o','n','e',0}; -static const WCHAR outsetW[] = {'o','u','t','s','e','t',0}; -static const WCHAR overlineW[] = {'o','v','e','r','l','i','n','e',0}; -static const WCHAR ridgeW[] = {'r','i','d','g','e',0}; -static const WCHAR solidW[] = {'s','o','l','i','d',0}; -static const WCHAR underlineW[] = {'u','n','d','e','r','l','i','n','e',0}; - static const WCHAR *font_style_values[] = { L"italic", L"normal", @@ -125,8 +111,6 @@ static const WCHAR *overflow_values[] = { #define ATTR_NO_NULL 0x0020 #define ATTR_COMPAT_IE10 0x0040 -static const WCHAR pxW[] = {'p','x',0}; - typedef struct { const WCHAR *name; DISPID dispid; @@ -708,9 +692,6 @@ static const style_tbl_entry_t style_tbl[] = { C_ASSERT(ARRAY_SIZE(style_tbl) == STYLEID_MAX_VALUE); -static const WCHAR px_formatW[] = {'%','d','p','x',0}; -static const WCHAR emptyW[] = {0}; - static const style_tbl_entry_t *lookup_style_tbl(CSSStyle *style, const WCHAR *name) { int c, i, min = 0, max = ARRAY_SIZE(style_tbl)-1; @@ -798,7 +779,7 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ nsresult nsres; nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsAString_InitDepend(&str_empty, emptyW); + nsAString_InitDepend(&str_empty, L""); nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, value, &str_empty); nsAString_Finish(&str_name); nsAString_Finish(&str_empty); @@ -837,7 +818,7 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W } if(!*iter) { WARN("invalid value %s\n", debugstr_w(value)); - nsAString_InitDepend(&value_str, emptyW); + nsAString_InitDepend(&value_str, L""); set_nsstyle_property(style->nsstyle, sid, &value_str); nsAString_Finish(&value_str); return E_INVALIDARG; @@ -1027,12 +1008,11 @@ static HRESULT check_style_attr_value(HTMLStyle *This, styleid_t sid, LPCWSTR ex static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value) { - static const WCHAR szFormat[] = {'%','.','0','f','p','x',0}; WCHAR szValue[25]; value = floor(value); - swprintf(szValue, ARRAY_SIZE(szValue), szFormat, value); + swprintf(szValue, ARRAY_SIZE(szValue), L"%.0fpx", value); return set_style_property(&This->css_style, sid, szValue); } @@ -1041,7 +1021,7 @@ static HRESULT set_style_pxattr(HTMLStyle *style, styleid_t sid, LONG value) { WCHAR value_str[16]; - swprintf(value_str, ARRAY_SIZE(value_str), px_formatW, value); + swprintf(value_str, ARRAY_SIZE(value_str), L"%dpx", value); return set_style_property(&style->css_style, sid, value_str); } @@ -1068,7 +1048,7 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) { *p = wcstol(value, &ptr, 10); - if(*ptr && wcscmp(ptr, pxW)) + if(*ptr && wcscmp(ptr, L"px")) { nsAString_Finish(&str_value); FIXME("only px values are currently supported\n"); @@ -1108,7 +1088,7 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) } } - if(!ptr || (*ptr && wcscmp(ptr, pxW))) + if(!ptr || (*ptr && wcscmp(ptr, L"px"))) *p = 0; } @@ -1118,11 +1098,11 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) static BOOL is_valid_border_style(BSTR v) { - return !v || wcsicmp(v, noneW) == 0 || wcsicmp(v, dottedW) == 0 || - wcsicmp(v, dashedW) == 0 || wcsicmp(v, solidW) == 0 || - wcsicmp(v, doubleW) == 0 || wcsicmp(v, grooveW) == 0 || - wcsicmp(v, ridgeW) == 0 || wcsicmp(v, insetW) == 0 || - wcsicmp(v, outsetW) == 0; + return !v || wcsicmp(v, L"none") == 0 || wcsicmp(v, L"dotted") == 0 || + wcsicmp(v, L"dashed") == 0 || wcsicmp(v, L"solid") == 0 || + wcsicmp(v, L"double") == 0 || wcsicmp(v, L"groove") == 0 || + wcsicmp(v, L"ridge") == 0 || wcsicmp(v, L"inset") == 0 || + wcsicmp(v, L"outset") == 0; } static void *HTMLStyle_QI(CSSStyle *css_style, REFIID riid) @@ -1514,7 +1494,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIAN TRACE("(%p)->(%x)\n", This, v); - return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? noneW : emptyW); + return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? L"none" : L""); } static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1523,7 +1503,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIAN TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, noneW, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, L"none", p); } static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1532,7 +1512,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, V TRACE("(%p)->(%x)\n", This, v); - return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? underlineW : emptyW); + return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? L"underline" : L""); } static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1541,7 +1521,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, V TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, underlineW, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, L"underline", p); } static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1550,7 +1530,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VA TRACE("(%p)->(%x)\n", This, v); - return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? overlineW : emptyW); + return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? L"overline" : L""); } static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1559,7 +1539,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VA TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, overlineW, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, L"overline", p); } static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1568,7 +1548,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, TRACE("(%p)->(%x)\n", This, v); - return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? line_throughW : emptyW); + return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? L"line-through" : L""); } static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1577,7 +1557,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, line_throughW, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, L"line-through", p); } static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1586,7 +1566,7 @@ static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIA TRACE("(%p)->(%x)\n", This, v); - return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? blinkW : emptyW); + return set_style_property(&This->css_style, STYLEID_TEXT_DECORATION, v ? L"blink" : L""); } static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL *p) @@ -1595,7 +1575,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIA TRACE("(%p)->(%p)\n", This, p); - return check_style_attr_value(This, STYLEID_TEXT_DECORATION, blinkW, p); + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, L"blink", p); } static HRESULT WINAPI HTMLStyle_put_verticalAlign(IHTMLStyle *iface, VARIANT v) @@ -2117,7 +2097,6 @@ static HRESULT WINAPI HTMLStyle_get_borderLeftWidth(IHTMLStyle *iface, VARIANT * static HRESULT WINAPI HTMLStyle_put_borderStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - static const WCHAR styleWindowInset[] = {'w','i','n','d','o','w','-','i','n','s','e','t',0}; HRESULT hres = S_OK; BSTR pstyle; int i=0; @@ -2130,7 +2109,7 @@ static HRESULT WINAPI HTMLStyle_put_borderStyle(IHTMLStyle *iface, BSTR v) if(v[i] == (WCHAR)' ') { pstyle = SysAllocStringLen(&v[last], (i-last)); - if( !(is_valid_border_style(pstyle) || wcsicmp(styleWindowInset, pstyle) == 0)) + if( !(is_valid_border_style(pstyle) || wcsicmp(L"window-inset", pstyle) == 0)) { TRACE("1. Invalid style (%s)\n", debugstr_w(pstyle)); hres = E_INVALIDARG; @@ -2144,7 +2123,7 @@ static HRESULT WINAPI HTMLStyle_put_borderStyle(IHTMLStyle *iface, BSTR v) if(hres == S_OK) { pstyle = SysAllocStringLen(&v[last], i-last); - if( !(is_valid_border_style(pstyle) || wcsicmp(styleWindowInset, pstyle) == 0)) + if( !(is_valid_border_style(pstyle) || wcsicmp(L"window-inset", pstyle) == 0)) { TRACE("2. Invalid style (%s)\n", debugstr_w(pstyle)); hres = E_INVALIDARG; @@ -2755,13 +2734,11 @@ static void set_opacity(HTMLStyle *This, const WCHAR *val) nsAString name_str, val_str, empty_str; nsresult nsres; - static const WCHAR opacityW[] = {'o','p','a','c','i','t','y',0}; - TRACE("%s\n", debugstr_w(val)); - nsAString_InitDepend(&name_str, opacityW); + nsAString_InitDepend(&name_str, L"opacity"); nsAString_InitDepend(&val_str, val); - nsAString_InitDepend(&empty_str, emptyW); + nsAString_InitDepend(&empty_str, L""); nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->css_style.nsstyle, &name_str, &val_str, &empty_str); if(NS_FAILED(nsres)) @@ -2784,7 +2761,7 @@ static void update_filter(HTMLStyle *This) ptr = This->elem->filter; TRACE("%s\n", debugstr_w(ptr)); if(!ptr) { - set_opacity(This, emptyW); + set_opacity(This, L""); return; } @@ -2807,7 +2784,6 @@ static void update_filter(HTMLStyle *This) } if(ptr2 + ARRAY_SIZE(alphaW) == ptr && !memcmp(ptr2, alphaW, sizeof(alphaW))) { - static const WCHAR formatW[] = {'%','f',0}; static const WCHAR opacityW[] = {'o','p','a','c','i','t','y','='}; ptr++; @@ -2839,7 +2815,7 @@ static void update_filter(HTMLStyle *This) } } - swprintf(buf, ARRAY_SIZE(buf), formatW, fval * 0.01f); + swprintf(buf, ARRAY_SIZE(buf), L"%f", fval * 0.01f); set_opacity(This, buf); }else { FIXME("unknown param %s\n", debugstr_wn(ptr2, ptr-ptr2)); @@ -5137,10 +5113,8 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionX(IHTMLCSSSt nsAString_GetData(&pos_str, &pos); posy = wcschr(pos, ' '); if(!posy) { - static const WCHAR zero_pxW[] = {' ','0','p','x',0}; - TRACE("no space in %s\n", debugstr_w(pos)); - posy = zero_pxW; + posy = L" 0px"; } posy_len = lstrlenW(posy); @@ -5234,11 +5208,9 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionY(IHTMLCSSSt if(space) { space++; }else { - static const WCHAR zero_pxW[] = {'0','p','x',' ',0}; - TRACE("no space in %s\n", debugstr_w(pos)); - pos = zero_pxW; - space = pos + ARRAY_SIZE(zero_pxW)-1; + pos = L"0px "; + space = pos + ARRAY_SIZE(L"0px ")-1; } posx_len = space-pos; @@ -6521,8 +6493,6 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_layoutFlow(IHTMLCSSStyleDeclar return E_NOTIMPL; } -static const WCHAR zoomW[] = {'z','o','o','m',0}; - static HRESULT WINAPI HTMLCSSStyleDeclaration_put_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); @@ -6536,7 +6506,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_zoom(IHTMLCSSStyleDeclaration if(V_VT(&v) != VT_I4 || V_I4(&v) != 1) WARN("stub for %s\n", debugstr_variant(&v)); - hres = dispex_get_dprop_ref(&This->dispex, zoomW, TRUE, &var); + hres = dispex_get_dprop_ref(&This->dispex, L"zoom", TRUE, &var); if(FAILED(hres)) return hres; @@ -6551,7 +6521,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_zoom(IHTMLCSSStyleDeclaration TRACE("(%p)->(%p)\n", This, p); - hres = dispex_get_dprop_ref(&This->dispex, zoomW, FALSE, &var); + hres = dispex_get_dprop_ref(&This->dispex, L"zoom", FALSE, &var); if(hres == DISP_E_UNKNOWNNAME) { V_VT(p) = VT_BSTR; V_BSTR(p) = NULL; diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 43a4f6ba08a..ad74ad30966 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -1191,8 +1191,7 @@ static HRESULT WINAPI HTMLTable_put_cellSpacing(IHTMLTable *iface, VARIANT v) nsAString_InitDepend(&nsstr, V_BSTR(&v)); break; case VT_I4: { - static const WCHAR formatW[] = {'%','d',0}; - swprintf(buf, ARRAY_SIZE(buf), formatW, V_I4(&v)); + swprintf(buf, ARRAY_SIZE(buf), L"%d", V_I4(&v)); nsAString_InitDepend(&nsstr, buf); break; } diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index caf5d85f749..fb8c3830862 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -101,13 +101,11 @@ static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DI static HRESULT WINAPI HTMLTextAreaElement_get_type(IHTMLTextAreaElement *iface, BSTR *p) { - static const WCHAR textareaW[] = {'t','e','x','t','a','r','e','a',0}; - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(textareaW); + *p = SysAllocString(L"textarea"); if(!*p) return E_OUTOFMEMORY; return S_OK; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a49cd4bd59d..69717ff7848 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -978,8 +978,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, IUri *uri; HRESULT hres; - static const WCHAR _selfW[] = {'_','s','e','l','f',0}; - TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); if(features) @@ -991,7 +989,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return E_UNEXPECTED; if(name && *name == '_') { - if(!wcscmp(name, _selfW)) { + if(!wcscmp(name, L"_self")) { if((features && *features) || replace) FIXME("Unsupported arguments for _self target\n"); @@ -1440,14 +1438,12 @@ static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; - TRACE("(%p)->(%p)\n", This, String); if(!String) return E_INVALIDARG; - *String = SysAllocString(objectW); + *String = SysAllocString(L"[object]"); return *String ? S_OK : E_OUTOFMEMORY; } -- 2.26.2

2 1

[PATCH] jscript: Use wide-char string literals.
by Michael Stefaniuc 24 Nov '20

24 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/activex.c | 4 +- dlls/jscript/bool.c | 9 +-- dlls/jscript/compile.c | 4 +- dlls/jscript/date.c | 65 +++++----------- dlls/jscript/dispex.c | 15 +--- dlls/jscript/engine.c | 35 +++------ dlls/jscript/enumerator.c | 6 +- dlls/jscript/error.c | 35 +++------ dlls/jscript/function.c | 44 ++++------- dlls/jscript/global.c | 78 ++++++------------- dlls/jscript/json.c | 27 +++---- dlls/jscript/jsregexp.c | 27 ++----- dlls/jscript/jsstr.c | 6 +- dlls/jscript/jsutils.c | 19 ++--- dlls/jscript/lex.c | 4 +- dlls/jscript/number.c | 7 +- dlls/jscript/string.c | 159 ++++++++++++-------------------------- dlls/jscript/vbarray.c | 4 +- 18 files changed, 167 insertions(+), 381 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 9c8c681b5e7..80a89b5ae89 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -190,13 +190,11 @@ HRESULT create_activex_constr(script_ctx_t *ctx, jsdisp_t **ret) jsdisp_t *prototype; HRESULT hres; - static const WCHAR ActiveXObjectW[] = {'A','c','t','i','v','e','X','O','b','j','e','c','t',0}; - hres = create_object(ctx, NULL, &prototype); if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, ActiveXObject_value, ActiveXObjectW, NULL, + hres = create_builtin_function(ctx, ActiveXObject_value, L"ActiveXObject", NULL, PROPF_CONSTR|1, prototype, ret); jsdisp_release(prototype); diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index f31117e2141..44a8b7262de 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -57,9 +57,6 @@ static HRESULT Bool_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns { BoolInstance *bool; - static const WCHAR trueW[] = {'t','r','u','e',0}; - static const WCHAR falseW[] = {'f','a','l','s','e',0}; - TRACE("\n"); if(!(bool = bool_this(jsthis))) @@ -68,7 +65,7 @@ static HRESULT Bool_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns if(r) { jsstr_t *val; - val = jsstr_alloc(bool->val ? trueW : falseW); + val = jsstr_alloc(bool->val ? L"true" : L"false"); if(!val) return E_OUTOFMEMORY; @@ -197,13 +194,11 @@ HRESULT create_bool_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp BoolInstance *bool; HRESULT hres; - static const WCHAR BooleanW[] = {'B','o','o','l','e','a','n',0}; - hres = alloc_bool(ctx, object_prototype, &bool); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, BoolConstr_value, BooleanW, NULL, + hres = create_builtin_constructor(ctx, BoolConstr_value, L"Boolean", NULL, PROPF_CONSTR|1, &bool->dispex, ret); jsdisp_release(&bool->dispex); diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5ac93c9f2ff..a1d1171e2ec 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -719,15 +719,13 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t case EXPR_IDENT: return push_instr_bstr(ctx, OP_delete_ident, ((identifier_expression_t*)expr->expression)->identifier); default: { - static const WCHAR fixmeW[] = {'F','I','X','M','E',0}; - WARN("invalid delete, unimplemented exception message\n"); hres = compile_expression(ctx, expr->expression, TRUE); if(FAILED(hres)) return hres; - return push_instr_uint_str(ctx, OP_throw_type, JS_E_INVALID_DELETE, fixmeW); + return push_instr_uint_str(ctx, OP_throw_type, JS_E_INVALID_DELETE, L"FIXME"); } } diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 4809cc976d8..5ca23f199f3 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -431,18 +431,6 @@ static SYSTEMTIME create_systemtime(DOUBLE time) static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, jsval_t *r) { - static const WCHAR formatW[] = { '%','s',' ','%','s',' ','%','d',' ', - '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', - 'U','T','C','%','c','%','0','2','d','%','0','2','d',' ','%','d','%','s',0 }; - static const WCHAR formatUTCW[] = { '%','s',' ','%','s',' ','%','d',' ', - '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', - 'U','T','C',' ','%','d','%','s',0 }; - static const WCHAR formatNoOffsetW[] = { '%','s',' ','%','s',' ', - '%','d',' ','%','0','2','d',':','%','0','2','d',':', - '%','0','2','d',' ','%','d','%','s',0 }; - static const WCHAR ADW[] = { 0 }; - static const WCHAR BCW[] = { ' ','B','.','C','.',0 }; - static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; @@ -490,18 +478,18 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, } if(!show_offset) - swprintf(buf, ARRAY_SIZE(buf), formatNoOffsetW, week, month, day, + swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?ADW:BCW); + (int)sec_from_time(time), year, formatAD?L"":L" B.C."); else if(offset) - swprintf(buf, ARRAY_SIZE(buf), formatW, week, month, day, + swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC%c%02d%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, - year, formatAD?ADW:BCW); + year, formatAD?L"":L" B.C."); else - swprintf(buf, ARRAY_SIZE(buf), formatUTCW, week, month, day, + swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?ADW:BCW); + (int)sec_from_time(time), year, formatAD?L"":L" B.C."); date_jsstr = jsstr_alloc(buf); if(!date_jsstr) @@ -588,11 +576,6 @@ static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, WCHAR buf[64], *p = buf; double year; - static const WCHAR short_year_formatW[] = {'%','0','4','d',0}; - static const WCHAR long_year_formatW[] = {'%','0','6','d',0}; - static const WCHAR formatW[] = {'-','%','0','2','d','-','%','0','2','d', - 'T','%','0','2','d',':','%','0','2','d',':','%','0','2','d','.','%','0','3','d','Z',0}; - TRACE("\n"); if(!(date = date_this(jsthis))) @@ -606,15 +589,15 @@ static HRESULT Date_toISOString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(year < 0) { *p++ = '-'; - p += swprintf(p, ARRAY_SIZE(buf) - 1, long_year_formatW, -(int)year); + p += swprintf(p, ARRAY_SIZE(buf) - 1, L"%06d", -(int)year); }else if(year > 9999) { *p++ = '+'; - p += swprintf(p, ARRAY_SIZE(buf) - 1, long_year_formatW, (int)year); + p += swprintf(p, ARRAY_SIZE(buf) - 1, L"%06d", (int)year); }else { - p += swprintf(p, ARRAY_SIZE(buf), short_year_formatW, (int)year); + p += swprintf(p, ARRAY_SIZE(buf), L"%04d", (int)year); } - swprintf(p, ARRAY_SIZE(buf) - (p - buf), formatW, + swprintf(p, ARRAY_SIZE(buf) - (p - buf), L"-%02d-%02dT%02d:%02d:%02d.%03dZ", (int)month_from_time(date->time) + 1, (int)date_from_time(date->time), (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time), (int)ms_from_time(date->time)); @@ -645,11 +628,6 @@ static HRESULT Date_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t *r) { - static const WCHAR formatADW[] = { '%','s',',',' ','%','d',' ','%','s',' ','%','d',' ', - '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ','U','T','C',0 }; - static const WCHAR formatBCW[] = { '%','s',',',' ','%','d',' ','%','s',' ','%','d',' ','B','.','C','.',' ', - '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ','U','T','C',0 }; - static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; @@ -694,8 +672,9 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva day = date_from_time(date->time); - swprintf(buf, ARRAY_SIZE(buf), formatAD ? formatADW : formatBCW, week, day, month, year, - (int)hour_from_time(date->time), (int)min_from_time(date->time), + swprintf(buf, ARRAY_SIZE(buf), + formatAD ? L"%s, %d %s %d %02d:%02d:%02d UTC" : L"%s, %d %s %d B.C. %02d:%02d:%02d UTC", + week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); date_str = jsstr_alloc(buf); @@ -725,9 +704,6 @@ static HRESULT Date_toGMTString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, /* ECMA-262 3rd Edition 15.9.5.3 */ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) { - static const WCHAR formatADW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',0 }; - static const WCHAR formatBCW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',' ','B','.','C','.',0 }; - static const DWORD week_ids[] = { LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, LOCALE_SABBREVDAYNAME6 }; @@ -771,7 +747,8 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) day = date_from_time(time); - swprintf(buf, ARRAY_SIZE(buf), formatAD ? formatADW : formatBCW, week, month, day, year); + swprintf(buf, ARRAY_SIZE(buf), formatAD ? L"%s %s %d %d" : L"%s %s %d %d B.C.", week, month, + day, year); date_str = jsstr_alloc(buf); if(!date_str) @@ -797,10 +774,6 @@ static HRESULT Date_toDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR formatW[] = { '%','0','2','d',':','%','0','2','d',':','%','0','2','d', - ' ','U','T','C','%','c','%','0','2','d','%','0','2','d',0 }; - static const WCHAR formatUTCW[] = { '%','0','2','d',':','%','0','2','d', - ':','%','0','2','d',' ','U','T','C',0 }; DateInstance *date; jsstr_t *date_str; WCHAR buf[32]; @@ -832,11 +805,11 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, else sign = '-'; if(offset) - swprintf(buf, ARRAY_SIZE(buf), formatW, (int)hour_from_time(time), + swprintf(buf, ARRAY_SIZE(buf), L"%02d:%02d:%02d UTC%c%02d%02d", (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60); else - swprintf(buf, ARRAY_SIZE(buf), formatUTCW, (int)hour_from_time(time), + swprintf(buf, ARRAY_SIZE(buf), L"%02d:%02d:%02d UTC", (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time)); date_str = jsstr_alloc(buf); @@ -2482,13 +2455,11 @@ HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp jsdisp_t *date; HRESULT hres; - static const WCHAR DateW[] = {'D','a','t','e',0}; - hres = create_date(ctx, object_prototype, 0.0, &date); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, DateConstr_value, DateW, &DateConstr_info, + hres = create_builtin_constructor(ctx, DateConstr_value, L"Date", &DateConstr_info, PROPF_CONSTR|7, date, ret); jsdisp_release(date); diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f49d5da9719..5829cebe55b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1843,9 +1843,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built dispex_prop_t *prop; HRESULT hres; - static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; - - hres = find_prop_name_prot(constr, string_hash(prototypeW), prototypeW, &prop); + hres = find_prop_name_prot(constr, string_hash(L"prototype"), L"prototype", &prop); if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) { jsval_t val; @@ -2148,9 +2146,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) { WCHAR buf[12]; - static const WCHAR formatW[] = {'%','d',0}; - - swprintf(buf, ARRAY_SIZE(buf), formatW, idx); + swprintf(buf, ARRAY_SIZE(buf), L"%d", idx); return jsdisp_propput_name(obj, buf, val); } @@ -2213,9 +2209,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r) dispex_prop_t *prop; HRESULT hres; - static const WCHAR formatW[] = {'%','d',0}; - - swprintf(name, ARRAY_SIZE(name), formatW, idx); + swprintf(name, ARRAY_SIZE(name), L"%d", idx); hres = find_prop_name_prot(obj, string_hash(name), name, &prop); if(FAILED(hres)) @@ -2265,13 +2259,12 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) { - static const WCHAR formatW[] = {'%','d',0}; WCHAR buf[12]; dispex_prop_t *prop; BOOL b; HRESULT hres; - swprintf(buf, ARRAY_SIZE(buf), formatW, idx); + swprintf(buf, ARRAY_SIZE(buf), L"%d", idx); hres = find_prop_name(obj, string_hash(buf), buf, &prop); if(FAILED(hres) || !prop) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bca632129bc..5635e3aa996 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -27,14 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; -static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; -static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; -static const WCHAR objectW[] = {'o','b','j','e','c','t',0}; -static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; -static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; -static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; - struct _except_frame_t { unsigned stack_top; scope_chain_t *scope; @@ -632,7 +624,6 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(scope->frame) { function_code_t *func = scope->frame->function; local_ref_t *ref = lookup_local(func, identifier); - static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; if(ref) { ret->type = EXPRVAL_STACK_REF; @@ -641,7 +632,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } - if(!wcscmp(identifier, argumentsW)) { + if(!wcscmp(identifier, L"arguments")) { hres = detach_variable_object(ctx, scope->frame, FALSE); if(FAILED(hres)) return hres; @@ -1631,8 +1622,6 @@ static HRESULT interp_instanceof(script_ctx_t *ctx) BOOL ret = FALSE; HRESULT hres; - static const WCHAR prototypeW[] = {'p','r','o','t','o','t', 'y', 'p','e',0}; - v = stack_pop(ctx); if(!is_object_instance(v) || !get_object(v)) { jsval_release(v); @@ -1647,7 +1636,7 @@ static HRESULT interp_instanceof(script_ctx_t *ctx) } if(is_class(obj, JSCLASS_FUNCTION)) { - hres = jsdisp_propget_name(obj, prototypeW, &prot); + hres = jsdisp_propget_name(obj, L"prototype", &prot); }else { hres = JS_E_FUNCTION_EXPECTED; } @@ -1945,30 +1934,30 @@ static HRESULT typeof_string(jsval_t v, const WCHAR **ret) { switch(jsval_type(v)) { case JSV_UNDEFINED: - *ret = undefinedW; + *ret = L"undefined"; break; case JSV_NULL: - *ret = objectW; + *ret = L"object"; break; case JSV_OBJECT: { jsdisp_t *dispex; if(get_object(v) && (dispex = iface_to_jsdisp(get_object(v)))) { - *ret = is_class(dispex, JSCLASS_FUNCTION) ? functionW : objectW; + *ret = is_class(dispex, JSCLASS_FUNCTION) ? L"function" : L"object"; jsdisp_release(dispex); }else { - *ret = objectW; + *ret = L"object"; } break; } case JSV_STRING: - *ret = stringW; + *ret = L"string"; break; case JSV_NUMBER: - *ret = numberW; + *ret = L"number"; break; case JSV_BOOL: - *ret = booleanW; + *ret = L"boolean"; break; case JSV_VARIANT: FIXME("unhandled variant %s\n", debugstr_variant(get_variant(v))); @@ -1994,7 +1983,7 @@ static HRESULT interp_typeofid(script_ctx_t *ctx) hres = exprval_propget(ctx, &ref, &v); exprval_release(&ref); if(FAILED(hres)) - return stack_push_string(ctx, unknownW); + return stack_push_string(ctx, L"unknown"); hres = typeof_string(v, &ret); jsval_release(v); @@ -2756,13 +2745,11 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) jsdisp_t *error_obj; jsval_t msg; - static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; - WARN("Exception %08x %s", exception_hres, debugstr_jsval(ei->valid_value ? ei->value : jsval_undefined())); if(ei->valid_value && jsval_type(ei->value) == JSV_OBJECT) { error_obj = to_jsdisp(get_object(ei->value)); if(error_obj) { - hres = jsdisp_propget_name(error_obj, messageW, &msg); + hres = jsdisp_propget_name(error_obj, L"message", &msg); if(SUCCEEDED(hres)) { WARN(" (message %s)", debugstr_jsval(msg)); jsval_release(msg); diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index 6971150bbb4..dea19406695 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -328,15 +328,13 @@ HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, { EnumeratorInstance *enumerator; HRESULT hres; - static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; hres = alloc_enumerator(ctx, object_prototype, &enumerator); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, EnumeratorConstr_value, - EnumeratorW, &EnumeratorConstr_info, - PROPF_CONSTR|7, &enumerator->dispex, ret); + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, L"Enumerator", + &EnumeratorConstr_info, PROPF_CONSTR|7, &enumerator->dispex, ret); jsdisp_release(&enumerator->dispex); return hres; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 07ebc1144eb..38a2485c858 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -28,11 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; -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}; - /* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) @@ -42,8 +37,6 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, jsval_t v; HRESULT hres; - static const WCHAR object_errorW[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; - TRACE("\n"); jsthis = get_jsdisp(vthis); @@ -51,7 +44,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, if(r) { jsstr_t *str; - str = jsstr_alloc(object_errorW); + str = jsstr_alloc(L"[object Error]"); if(!str) return E_OUTOFMEMORY; *r = jsval_string(str); @@ -59,7 +52,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, return S_OK; } - hres = jsdisp_propget_name(jsthis, nameW, &v); + hres = jsdisp_propget_name(jsthis, L"name", &v); if(FAILED(hres)) return hres; @@ -70,7 +63,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, return hres; } - hres = jsdisp_propget_name(jsthis, messageW, &v); + hres = jsdisp_propget_name(jsthis, L"message", &v); if(SUCCEEDED(hres)) { if(!is_undefined(v)) { hres = to_string(ctx, v, &msg); @@ -101,7 +94,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, ret = msg; msg = NULL; }else { - ret = jsstr_alloc(object_errorW); + ret = jsstr_alloc(L"[object Error]"); } } @@ -193,18 +186,18 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(err, numberW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + hres = jsdisp_define_data_property(err, L"number", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_number((INT)number)); if(FAILED(hres)) { jsdisp_release(err); return hres; } - hres = jsdisp_define_data_property(err, messageW, + hres = jsdisp_define_data_property(err, L"message", PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, jsval_string(msg)); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(err, descriptionW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + hres = jsdisp_define_data_property(err, L"description", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_string(msg)); if(FAILED(hres)) { jsdisp_release(err); @@ -325,16 +318,8 @@ static HRESULT URIErrorConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) { - static const WCHAR ErrorW[] = {'E','r','r','o','r',0}; - static const WCHAR EvalErrorW[] = {'E','v','a','l','E','r','r','o','r',0}; - static const WCHAR RangeErrorW[] = {'R','a','n','g','e','E','r','r','o','r',0}; - static const WCHAR ReferenceErrorW[] = {'R','e','f','e','r','e','n','c','e','E','r','r','o','r',0}; - static const WCHAR RegExpErrorW[] = {'R','e','g','E','x','p','E','r','r','o','r',0}; - static const WCHAR SyntaxErrorW[] = {'S','y','n','t','a','x','E','r','r','o','r',0}; - static const WCHAR TypeErrorW[] = {'T','y','p','e','E','r','r','o','r',0}; - static const WCHAR URIErrorW[] = {'U','R','I','E','r','r','o','r',0}; - static const WCHAR *names[] = {ErrorW, EvalErrorW, RangeErrorW, - ReferenceErrorW, RegExpErrorW, SyntaxErrorW, TypeErrorW, URIErrorW}; + static const WCHAR *names[] = {L"Error", L"EvalError", L"RangeError", + L"ReferenceError", L"RegExpError", L"SyntaxError", L"TypeError", L"URIError"}; jsdisp_t **constr_addr[] = {&ctx->error_constr, &ctx->eval_error_constr, &ctx->range_error_constr, &ctx->reference_error_constr, &ctx->regexp_error_constr, &ctx->syntax_error_constr, &ctx->type_error_constr, @@ -359,7 +344,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) return E_OUTOFMEMORY; } - hres = jsdisp_define_data_property(err, nameW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + hres = jsdisp_define_data_property(err, L"name", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_string(str)); jsstr_release(str); if(SUCCEEDED(hres)) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index f0bd20d75a2..9f6aa4b4ec6 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -92,11 +92,6 @@ static inline ArgumentsInstance *arguments_from_jsdisp(jsdisp_t *jsdisp) return CONTAINING_RECORD(jsdisp, ArgumentsInstance, 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 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, jsval_t *r) { @@ -191,8 +186,6 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) ArgumentsInstance *args; HRESULT hres; - static const WCHAR caleeW[] = {'c','a','l','l','e','e',0}; - args = heap_alloc_zero(sizeof(*args)); if(!args) return E_OUTOFMEMORY; @@ -207,13 +200,13 @@ HRESULT setup_arguments_object(script_ctx_t *ctx, call_frame_t *frame) args->argc = frame->argc; args->frame = frame; - hres = jsdisp_define_data_property(&args->jsdisp, lengthW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + hres = jsdisp_define_data_property(&args->jsdisp, L"length", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_number(args->argc)); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(&args->jsdisp, caleeW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + hres = jsdisp_define_data_property(&args->jsdisp, L"callee", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_obj(&args->function->function.dispex)); if(SUCCEEDED(hres)) - hres = jsdisp_propput(frame->base_scope->jsobj, argumentsW, PROPF_WRITABLE, jsval_obj(&args->jsdisp)); + hres = jsdisp_propput(frame->base_scope->jsobj, L"arguments", PROPF_WRITABLE, jsval_obj(&args->jsdisp)); if(FAILED(hres)) { jsdisp_release(&args->jsdisp); return hres; @@ -232,7 +225,7 @@ void detach_arguments_object(jsdisp_t *args_disp) /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have * their own arguments property, it's impossible to use prototype's one during name lookup */ - jsdisp_propput_name(frame->base_scope->jsobj, argumentsW, jsval_undefined()); + jsdisp_propput_name(frame->base_scope->jsobj, L"arguments", jsval_undefined()); arguments->frame = NULL; /* Don't bother coppying arguments if call frame holds the last reference. */ @@ -307,7 +300,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, unsigned *a DWORD length, i; HRESULT hres; - hres = jsdisp_propget_name(arg_array, lengthW, &val); + hres = jsdisp_propget_name(arg_array, L"length", &val); if(FAILED(hres)) return hres; @@ -673,10 +666,10 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, return hres; if(builtin_info) - hres = jsdisp_define_data_property(&function->function.dispex, lengthW, 0, + hres = jsdisp_define_data_property(&function->function.dispex, L"length", 0, jsval_number(function->function.length)); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(&function->function.dispex, prototypeW, 0, jsval_obj(prototype)); + hres = jsdisp_define_data_property(&function->function.dispex, L"prototype", 0, jsval_obj(prototype)); if(FAILED(hres)) { jsdisp_release(&function->function.dispex); return hres; @@ -691,9 +684,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, static HRESULT set_constructor_prop(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_t *prot) { - static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; - - return jsdisp_define_data_property(prot, constructorW, PROPF_WRITABLE | PROPF_CONFIGURABLE, + return jsdisp_define_data_property(prot, L"constructor", PROPF_WRITABLE | PROPF_CONFIGURABLE, jsval_obj(constr)); } @@ -795,7 +786,7 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod hres = create_function(ctx, NULL, &InterpretedFunctionVtbl, sizeof(InterpretedFunction), PROPF_CONSTR, FALSE, NULL, (void**)&function); if(SUCCEEDED(hres)) { - hres = jsdisp_define_data_property(&function->function.dispex, prototypeW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(&function->function.dispex, L"prototype", PROPF_WRITABLE, jsval_obj(prototype)); if(SUCCEEDED(hres)) hres = set_constructor_prop(ctx, &function->function.dispex, prototype); @@ -850,12 +841,7 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDis static HRESULT BindFunction_toString(FunctionInstance *function, jsstr_t **ret) { - static const WCHAR native_functionW[] = - {'\n','f','u','n','c','t','i','o','n','(',')',' ','{','\n', - ' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n', - '}','\n',0}; - - *ret = jsstr_alloc(native_functionW); + *ret = jsstr_alloc(L"\nfunction() {\n [native code]\n}\n"); return *ret ? S_OK : E_OUTOFMEMORY; } @@ -928,7 +914,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('}; static const WCHAR function_beginW[] = {')',' ','{','\n'}; - static const WCHAR function_endW[] = {'\n','}',0}; + static const WCHAR function_endW[] = L"\n}"; if(argc) { params = heap_alloc(argc*sizeof(*params)); @@ -1038,22 +1024,20 @@ HRESULT init_function_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) NativeFunction *prot, *constr; HRESULT hres; - static const WCHAR FunctionW[] = {'F','u','n','c','t','i','o','n',0}; - hres = create_function(ctx, &Function_info, &NativeFunctionVtbl, sizeof(NativeFunction), PROPF_CONSTR, TRUE, object_prototype, (void**)&prot); if(FAILED(hres)) return hres; prot->proc = FunctionProt_value; - prot->name = prototypeW; + prot->name = L"prototype"; hres = create_function(ctx, &FunctionInst_info, &NativeFunctionVtbl, sizeof(NativeFunction), PROPF_CONSTR|1, TRUE, &prot->function.dispex, (void**)&constr); if(SUCCEEDED(hres)) { constr->proc = FunctionConstr_value; - constr->name = FunctionW; - hres = jsdisp_define_data_property(&constr->function.dispex, prototypeW, 0, jsval_obj(&prot->function.dispex)); + constr->name = L"Function"; + hres = jsdisp_define_data_property(&constr->function.dispex, L"prototype", 0, jsval_obj(&prot->function.dispex)); if(SUCCEEDED(hres)) hres = set_constructor_prop(ctx, &constr->function.dispex, &prot->function.dispex); if(FAILED(hres)) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d5aafe65037..735e188e1bd 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -27,32 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR NaNW[] = {'N','a','N',0}; -static const WCHAR InfinityW[] = {'I','n','f','i','n','i','t','y',0}; -static const WCHAR ArrayW[] = {'A','r','r','a','y',0}; -static const WCHAR BooleanW[] = {'B','o','o','l','e','a','n',0}; -static const WCHAR DateW[] = {'D','a','t','e',0}; -static const WCHAR ErrorW[] = {'E','r','r','o','r',0}; -static const WCHAR EvalErrorW[] = {'E','v','a','l','E','r','r','o','r',0}; -static const WCHAR RangeErrorW[] = {'R','a','n','g','e','E','r','r','o','r',0}; -static const WCHAR ReferenceErrorW[] = {'R','e','f','e','r','e','n','c','e','E','r','r','o','r',0}; -static const WCHAR SyntaxErrorW[] = {'S','y','n','t','a','x','E','r','r','o','r',0}; -static const WCHAR TypeErrorW[] = {'T','y','p','e','E','r','r','o','r',0}; -static const WCHAR URIErrorW[] = {'U','R','I','E','r','r','o','r',0}; -static const WCHAR FunctionW[] = {'F','u','n','c','t','i','o','n',0}; -static const WCHAR NumberW[] = {'N','u','m','b','e','r',0}; -static const WCHAR ObjectW[] = {'O','b','j','e','c','t',0}; -static const WCHAR StringW[] = {'S','t','r','i','n','g',0}; -static const WCHAR RegExpW[] = {'R','e','g','E','x','p',0}; -static const WCHAR RegExpErrorW[] = {'R','e','g','E','x','p','E','r','r','o','r',0}; -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 MathW[] = {'M','a','t','h',0}; -static const WCHAR JSONW[] = {'J','S','O','N',0}; - -static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - static int uri_char_table[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 00-0f */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 10-1f */ @@ -527,14 +501,12 @@ static HRESULT JSGlobal_GetObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT JSGlobal_ScriptEngine(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR JScriptW[] = {'J','S','c','r','i','p','t',0}; - TRACE("\n"); if(r) { jsstr_t *ret; - ret = jsstr_alloc(JScriptW); + ret = jsstr_alloc(L"JScript"); if(!ret) return E_OUTOFMEMORY; @@ -947,7 +919,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, FunctionW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Function", PROPF_WRITABLE, jsval_obj(ctx->function_constr)); if(FAILED(hres)) return hres; @@ -956,7 +928,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, ObjectW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Object", PROPF_WRITABLE, jsval_obj(ctx->object_constr)); if(FAILED(hres)) return hres; @@ -965,7 +937,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, ArrayW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Array", PROPF_WRITABLE, jsval_obj(ctx->array_constr)); if(FAILED(hres)) return hres; @@ -974,7 +946,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, BooleanW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Boolean", PROPF_WRITABLE, jsval_obj(ctx->bool_constr)); if(FAILED(hres)) return hres; @@ -983,7 +955,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, DateW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Date", PROPF_WRITABLE, jsval_obj(ctx->date_constr)); if(FAILED(hres)) return hres; @@ -992,7 +964,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Enumerator", PROPF_WRITABLE, jsval_obj(ctx->enumerator_constr)); if(FAILED(hres)) return hres; @@ -1001,42 +973,42 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, ErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Error", PROPF_WRITABLE, jsval_obj(ctx->error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, EvalErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"EvalError", PROPF_WRITABLE, jsval_obj(ctx->eval_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, RangeErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"RangeError", PROPF_WRITABLE, jsval_obj(ctx->range_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, ReferenceErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"ReferenceError", PROPF_WRITABLE, jsval_obj(ctx->reference_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, RegExpErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"RegExpError", PROPF_WRITABLE, jsval_obj(ctx->regexp_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, SyntaxErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"SyntaxError", PROPF_WRITABLE, jsval_obj(ctx->syntax_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, TypeErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"TypeError", PROPF_WRITABLE, jsval_obj(ctx->type_error_constr)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, URIErrorW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"URIError", PROPF_WRITABLE, jsval_obj(ctx->uri_error_constr)); if(FAILED(hres)) return hres; @@ -1045,7 +1017,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, NumberW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"Number", PROPF_WRITABLE, jsval_obj(ctx->number_constr)); if(FAILED(hres)) return hres; @@ -1054,7 +1026,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, RegExpW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"RegExp", PROPF_WRITABLE, jsval_obj(ctx->regexp_constr)); if(FAILED(hres)) return hres; @@ -1063,7 +1035,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, StringW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"String", PROPF_WRITABLE, jsval_obj(ctx->string_constr)); if(FAILED(hres)) return hres; @@ -1072,7 +1044,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, VBArrayW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"VBArray", PROPF_WRITABLE, jsval_obj(ctx->vbarray_constr)); if(FAILED(hres)) return hres; @@ -1106,7 +1078,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, MathW, PROPF_WRITABLE, jsval_obj(math)); + hres = jsdisp_define_data_property(ctx->global, L"Math", PROPF_WRITABLE, jsval_obj(math)); jsdisp_release(math); if(FAILED(hres)) return hres; @@ -1118,7 +1090,7 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, JSONW, PROPF_WRITABLE, jsval_obj(json)); + hres = jsdisp_define_data_property(ctx->global, L"JSON", PROPF_WRITABLE, jsval_obj(json)); jsdisp_release(json); if(FAILED(hres)) return hres; @@ -1128,20 +1100,20 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, ActiveXObjectW, PROPF_WRITABLE, + hres = jsdisp_define_data_property(ctx->global, L"ActiveXObject", PROPF_WRITABLE, jsval_obj(constr)); jsdisp_release(constr); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, undefinedW, const_flags, jsval_undefined()); + hres = jsdisp_define_data_property(ctx->global, L"undefined", const_flags, jsval_undefined()); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, NaNW, const_flags, jsval_number(NAN)); + hres = jsdisp_define_data_property(ctx->global, L"NaN", const_flags, jsval_number(NAN)); if(FAILED(hres)) return hres; - hres = jsdisp_define_data_property(ctx->global, InfinityW, const_flags, jsval_number(INFINITY)); + hres = jsdisp_define_data_property(ctx->global, L"Infinity", const_flags, jsval_number(INFINITY)); return hres; } diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index de10ceadd11..8f16ba22885 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -26,12 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -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}; - -static const WCHAR toJSONW[] = {'t','o','J','S','O','N',0}; - typedef struct { const WCHAR *ptr; const WCHAR *end; @@ -107,19 +101,19 @@ static HRESULT parse_json_value(json_parse_ctx_t *ctx, jsval_t *r) /* JSONNullLiteral */ case 'n': - if(!is_keyword(ctx, nullW)) + if(!is_keyword(ctx, L"null")) break; *r = jsval_null(); return S_OK; /* JSONBooleanLiteral */ case 't': - if(!is_keyword(ctx, trueW)) + if(!is_keyword(ctx, L"true")) break; *r = jsval_bool(TRUE); return S_OK; case 'f': - if(!is_keyword(ctx, falseW)) + if(!is_keyword(ctx, L"false")) break; *r = jsval_bool(FALSE); return S_OK; @@ -476,9 +470,8 @@ static HRESULT json_quote(stringify_ctx_t *ctx, const WCHAR *ptr, size_t len) break; default: if(*ptr < ' ') { - static const WCHAR formatW[] = {'\\','u','%','0','4','x',0}; WCHAR buf[7]; - swprintf(buf, ARRAY_SIZE(buf), formatW, *ptr); + swprintf(buf, ARRAY_SIZE(buf), L"\\u%04x", *ptr); if(!append_string(ctx, buf)) return E_OUTOFMEMORY; }else { @@ -538,10 +531,10 @@ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj) hres = stringify(ctx, val); if(FAILED(hres)) return hres; - if(hres == S_FALSE && !append_string(ctx, nullW)) + if(hres == S_FALSE && !append_string(ctx, L"null")) return E_OUTOFMEMORY; }else if(hres == DISP_E_UNKNOWNNAME) { - if(!append_string(ctx, nullW)) + if(!append_string(ctx, L"null")) return E_OUTOFMEMORY; }else { return hres; @@ -668,7 +661,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) if(!obj) return S_FALSE; - hres = jsdisp_get_id(obj, toJSONW, 0, &id); + hres = jsdisp_get_id(obj, L"toJSON", 0, &id); jsdisp_release(obj); if(hres == S_OK) FIXME("Use toJSON.\n"); @@ -682,11 +675,11 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) switch(jsval_type(value)) { case JSV_NULL: - if(!append_string(ctx, nullW)) + if(!append_string(ctx, L"null")) hres = E_OUTOFMEMORY; break; case JSV_BOOL: - if(!append_string(ctx, get_bool(value) ? trueW : falseW)) + if(!append_string(ctx, get_bool(value) ? L"true" : L"false")) hres = E_OUTOFMEMORY; break; case JSV_STRING: { @@ -714,7 +707,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) hres = ptr && !append_string_len(ctx, ptr, jsstr_length(str)) ? E_OUTOFMEMORY : S_OK; jsstr_release(str); }else { - if(!append_string(ctx, nullW)) + if(!append_string(ctx, L"null")) hres = E_OUTOFMEMORY; } break; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 709f00fa160..f80452d0c0b 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -352,11 +352,6 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, DWORD i; HRESULT hres = S_OK; - static const WCHAR indexW[] = {'i','n','d','e','x',0}; - static const WCHAR inputW[] = {'i','n','p','u','t',0}; - static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; - static const WCHAR zeroW[] = {'0',0}; - input = jsstr_flatten(input_str); if(!input) return E_OUTOFMEMORY; @@ -382,15 +377,15 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, } while(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(array, indexW, jsval_number(result->cp-input-result->match_len)); + hres = jsdisp_propput_name(array, L"index", jsval_number(result->cp-input-result->match_len)); if(FAILED(hres)) break; - hres = jsdisp_propput_name(array, lastIndexW, jsval_number(result->cp-input)); + hres = jsdisp_propput_name(array, L"lastIndex", jsval_number(result->cp-input)); if(FAILED(hres)) break; - hres = jsdisp_propput_name(array, inputW, jsval_string(jsstr_addref(input_str))); + hres = jsdisp_propput_name(array, L"input", jsval_string(jsstr_addref(input_str))); if(FAILED(hres)) break; @@ -399,7 +394,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, hres = E_OUTOFMEMORY; break; } - hres = jsdisp_propput_name(array, zeroW, jsval_string(str)); + hres = jsdisp_propput_name(array, L"0", jsval_string(str)); jsstr_release(str); break; } @@ -698,10 +693,6 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsval_t *r) { - static const WCHAR indexW[] = {'i','n','d','e','x',0}; - static const WCHAR inputW[] = {'i','n','p','u','t',0}; - static const WCHAR lastIndexW[] = {'l','a','s','t','I','n','d','e','x',0}; - RegExpInstance *regexp = regexp_from_jsdisp(re); match_result_t *match_result; unsigned match_cnt, i; @@ -778,16 +769,16 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsv } while(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(array, indexW, jsval_number(match_result[match_cnt-1].index)); + hres = jsdisp_propput_name(array, L"index", jsval_number(match_result[match_cnt-1].index)); if(FAILED(hres)) break; - hres = jsdisp_propput_name(array, lastIndexW, + hres = jsdisp_propput_name(array, L"lastIndex", jsval_number(match_result[match_cnt-1].index + match_result[match_cnt-1].length)); if(FAILED(hres)) break; - hres = jsdisp_propput_name(array, inputW, jsval_string(jsstr)); + hres = jsdisp_propput_name(array, L"input", jsval_string(jsstr)); break; } @@ -973,13 +964,11 @@ HRESULT create_regexp_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi RegExpInstance *regexp; HRESULT hres; - static const WCHAR RegExpW[] = {'R','e','g','E','x','p',0}; - hres = alloc_regexp(ctx, object_prototype, &regexp); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, RegExpConstr_value, RegExpW, &RegExpConstr_info, + hres = create_builtin_constructor(ctx, RegExpConstr_value, L"RegExp", &RegExpConstr_info, PROPF_CONSTR|2, &regexp->dispex, ret); jsdisp_release(&regexp->dispex); diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index abd960a8a02..0d73f4be13a 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -315,15 +315,13 @@ HRESULT jsstr_to_bstr(jsstr_t *str, BSTR *r) BOOL init_strings(void) { - static const WCHAR NaNW[] = { 'N','a','N',0 }; - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; WCHAR *ptr; if(!(empty_str = jsstr_alloc_buf(0, &ptr))) return FALSE; - if(!(nan_str = jsstr_alloc(NaNW))) + if(!(nan_str = jsstr_alloc(L"NaN"))) return FALSE; - if(!(undefined_str = jsstr_alloc(undefinedW))) + if(!(undefined_str = jsstr_alloc(L"undefined"))) return FALSE; if(!(null_bstr_str = jsstr_alloc_buf(0, &ptr))) return FALSE; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index b12addda794..b71a99e372a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -388,9 +388,6 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *ret, hint_t hint) DISPID id; HRESULT hres; - 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}; - if(!get_object(val)) { *ret = jsval_null(); return S_OK; @@ -405,7 +402,7 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *ret, hint_t hint) /* Native implementation doesn't throw TypeErrors, returns strange values */ - hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? toStringW : valueOfW, 0, &id); + hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? L"toString" : L"valueOf", 0, &id); if(SUCCEEDED(hres)) { hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, 0, NULL, &prim); if(FAILED(hres)) { @@ -421,7 +418,7 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsval_t *ret, hint_t hint) } } - hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? valueOfW : toStringW, 0, &id); + hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? L"valueOf" : L"toString", 0, &id); if(SUCCEEDED(hres)) { hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, 0, NULL, &prim); if(FAILED(hres)) { @@ -712,12 +709,10 @@ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) HRESULT double_to_string(double n, jsstr_t **str) { - static const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; - if(isnan(n)) { *str = jsstr_nan(); }else if(isinf(n)) { - *str = jsstr_alloc(n<0 ? InfinityW : InfinityW+1); + *str = jsstr_alloc(n<0 ? L"-Infinity" : L"-Infinity"+1); }else if(is_int32(n)) { WCHAR buf[12]; _ltow_s(n, buf, ARRAY_SIZE(buf), 10); @@ -744,16 +739,12 @@ HRESULT double_to_string(double n, jsstr_t **str) /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) { - 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}; - switch(jsval_type(val)) { case JSV_UNDEFINED: *str = jsstr_undefined(); return S_OK; case JSV_NULL: - *str = jsstr_alloc(nullW); + *str = jsstr_alloc(L"null"); break; case JSV_NUMBER: return double_to_string(get_number(val), str); @@ -773,7 +764,7 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) return hres; } case JSV_BOOL: - *str = jsstr_alloc(get_bool(val) ? trueW : falseW); + *str = jsstr_alloc(get_bool(val) ? L"true" : L"false"); break; default: FIXME("unsupported %s\n", debugstr_jsval(val)); diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 9a583e33393..efed1038a95 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -159,10 +159,8 @@ static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) static BOOL skip_html_comment(parser_ctx_t *ctx) { - const WCHAR html_commentW[] = {'<','!','-','-',0}; - if(!ctx->is_html || ctx->ptr+3 >= ctx->end || - memcmp(ctx->ptr, html_commentW, sizeof(WCHAR)*4)) + memcmp(ctx->ptr, L"<!--", sizeof(WCHAR)*4)) return FALSE; ctx->nl = TRUE; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index fc6bfe10cc9..3c965323d02 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -317,7 +317,6 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u if(log_radix==0) buf[idx] = 0; else { - static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0}; WCHAR ch; if(log_radix<0) { @@ -325,7 +324,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u ch = '-'; } else ch = '+'; - swprintf(&buf[idx], ARRAY_SIZE(buf) - idx, formatW, ch, (int)log_radix); + swprintf(&buf[idx], ARRAY_SIZE(buf) - idx, L"(e%c%d)", ch, (int)log_radix); } } else buf[idx] = '\0'; @@ -608,14 +607,12 @@ HRESULT create_number_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi NumberInstance *number; HRESULT hres; - static const WCHAR NumberW[] = {'N','u','m','b','e','r',0}; - hres = alloc_number(ctx, object_prototype, &number); if(FAILED(hres)) return hres; number->value = 0; - hres = create_builtin_constructor(ctx, NumberConstr_value, NumberW, NULL, + hres = create_builtin_constructor(ctx, NumberConstr_value, L"Number", NULL, PROPF_CONSTR|1, &number->dispex, ret); jsdisp_release(&number->dispex); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 7c8fc36934a..3dd40e6744f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -31,42 +31,6 @@ typedef struct { jsstr_t *str; } StringInstance; -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 valueOfW[] = {'v','a','l','u','e','O','f',0}; -static const WCHAR anchorW[] = {'a','n','c','h','o','r',0}; -static const WCHAR bigW[] = {'b','i','g',0}; -static const WCHAR blinkW[] = {'b','l','i','n','k',0}; -static const WCHAR boldW[] = {'b','o','l','d',0}; -static const WCHAR charAtW[] = {'c','h','a','r','A','t',0}; -static const WCHAR charCodeAtW[] = {'c','h','a','r','C','o','d','e','A','t',0}; -static const WCHAR concatW[] = {'c','o','n','c','a','t',0}; -static const WCHAR fixedW[] = {'f','i','x','e','d',0}; -static const WCHAR fontcolorW[] = {'f','o','n','t','c','o','l','o','r',0}; -static const WCHAR fontsizeW[] = {'f','o','n','t','s','i','z','e',0}; -static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; -static const WCHAR italicsW[] = {'i','t','a','l','i','c','s',0}; -static const WCHAR lastIndexOfW[] = {'l','a','s','t','I','n','d','e','x','O','f',0}; -static const WCHAR linkW[] = {'l','i','n','k',0}; -static const WCHAR matchW[] = {'m','a','t','c','h',0}; -static const WCHAR replaceW[] = {'r','e','p','l','a','c','e',0}; -static const WCHAR searchW[] = {'s','e','a','r','c','h',0}; -static const WCHAR sliceW[] = {'s','l','i','c','e',0}; -static const WCHAR smallW[] = {'s','m','a','l','l',0}; -static const WCHAR splitW[] = {'s','p','l','i','t',0}; -static const WCHAR strikeW[] = {'s','t','r','i','k','e',0}; -static const WCHAR subW[] = {'s','u','b',0}; -static const WCHAR substringW[] = {'s','u','b','s','t','r','i','n','g',0}; -static const WCHAR substrW[] = {'s','u','b','s','t','r',0}; -static const WCHAR supW[] = {'s','u','p',0}; -static const WCHAR toLowerCaseW[] = {'t','o','L','o','w','e','r','C','a','s','e',0}; -static const WCHAR toUpperCaseW[] = {'t','o','U','p','p','e','r','C','a','s','e',0}; -static const WCHAR toLocaleLowerCaseW[] = {'t','o','L','o','c','a','l','e','L','o','w','e','r','C','a','s','e',0}; -static const WCHAR toLocaleUpperCaseW[] = {'t','o','L','o','c','a','l','e','U','p','p','e','r','C','a','s','e',0}; -static const WCHAR trimW[] = {'t','r','i','m',0}; -static const WCHAR localeCompareW[] = {'l','o','c','a','l','e','C','o','m','p','a','r','e',0}; -static const WCHAR fromCharCodeW[] = {'f','r','o','m','C','h','a','r','C','o','d','e',0}; - static inline StringInstance *string_from_jsdisp(jsdisp_t *jsdisp) { return CONTAINING_RECORD(jsdisp, StringInstance, dispex); @@ -255,31 +219,25 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, unsig static HRESULT String_anchor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR fontW[] = {'A',0}; - static const WCHAR colorW[] = {'N','A','M','E',0}; - - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"A", L"NAME"); } static HRESULT String_big(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR bigtagW[] = {'B','I','G',0}; - return do_attributeless_tag_format(ctx, jsthis, r, bigtagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"BIG"); } static HRESULT String_blink(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR blinktagW[] = {'B','L','I','N','K',0}; - return do_attributeless_tag_format(ctx, jsthis, r, blinktagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"BLINK"); } static HRESULT String_bold(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR boldtagW[] = {'B',0}; - return do_attributeless_tag_format(ctx, jsthis, r, boldtagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"B"); } /* ECMA-262 3rd Edition 15.5.4.5 */ @@ -456,26 +414,19 @@ static HRESULT String_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns static HRESULT String_fixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR fixedtagW[] = {'T','T',0}; - return do_attributeless_tag_format(ctx, jsthis, r, fixedtagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"TT"); } static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR fontW[] = {'F','O','N','T',0}; - static const WCHAR colorW[] = {'C','O','L','O','R',0}; - - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"FONT", L"COLOR"); } static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR fontW[] = {'F','O','N','T',0}; - static const WCHAR colorW[] = {'S','I','Z','E',0}; - - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"FONT", L"SIZE"); } static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, @@ -542,8 +493,7 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un static HRESULT String_italics(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR italicstagW[] = {'I',0}; - return do_attributeless_tag_format(ctx, jsthis, r, italicstagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"I"); } /* ECMA-262 3rd Edition 15.5.4.8 */ @@ -612,10 +562,7 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT String_link(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR fontW[] = {'A',0}; - static const WCHAR colorW[] = {'H','R','E','F',0}; - - return do_attribute_tag_format(ctx, jsthis, argc, argv, r, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, argc, argv, r, L"A", L"HREF"); } /* ECMA-262 3rd Edition 15.5.4.10 */ @@ -1123,8 +1070,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR smalltagW[] = {'S','M','A','L','L',0}; - return do_attributeless_tag_format(ctx, jsthis, r, smalltagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"SMALL"); } static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, @@ -1290,15 +1236,13 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi static HRESULT String_strike(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR striketagW[] = {'S','T','R','I','K','E',0}; - return do_attributeless_tag_format(ctx, jsthis, r, striketagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"STRIKE"); } static HRESULT String_sub(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR subtagW[] = {'S','U','B',0}; - return do_attributeless_tag_format(ctx, jsthis, r, subtagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"SUB"); } /* ECMA-262 3rd Edition 15.5.4.15 */ @@ -1418,8 +1362,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static const WCHAR suptagW[] = {'S','U','P',0}; - return do_attributeless_tag_format(ctx, jsthis, r, suptagW); + return do_attributeless_tag_format(ctx, jsthis, r, L"SUP"); } static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, @@ -1590,40 +1533,40 @@ static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) } static const builtin_prop_t String_props[] = { - {anchorW, String_anchor, PROPF_METHOD|1}, - {bigW, String_big, PROPF_METHOD}, - {blinkW, String_blink, PROPF_METHOD}, - {boldW, String_bold, PROPF_METHOD}, - {charAtW, String_charAt, PROPF_METHOD|1}, - {charCodeAtW, String_charCodeAt, PROPF_METHOD|1}, - {concatW, String_concat, PROPF_METHOD|1}, - {fixedW, String_fixed, PROPF_METHOD}, - {fontcolorW, String_fontcolor, PROPF_METHOD|1}, - {fontsizeW, String_fontsize, PROPF_METHOD|1}, - {indexOfW, String_indexOf, PROPF_METHOD|2}, - {italicsW, String_italics, PROPF_METHOD}, - {lastIndexOfW, String_lastIndexOf, PROPF_METHOD|2}, - {lengthW, NULL,0, String_get_length}, - {linkW, String_link, PROPF_METHOD|1}, - {localeCompareW, String_localeCompare, PROPF_METHOD|1}, - {matchW, String_match, PROPF_METHOD|1}, - {replaceW, String_replace, PROPF_METHOD|1}, - {searchW, String_search, PROPF_METHOD}, - {sliceW, String_slice, PROPF_METHOD}, - {smallW, String_small, PROPF_METHOD}, - {splitW, String_split, PROPF_METHOD|2}, - {strikeW, String_strike, PROPF_METHOD}, - {subW, String_sub, PROPF_METHOD}, - {substrW, String_substr, PROPF_METHOD|2}, - {substringW, String_substring, PROPF_METHOD|2}, - {supW, String_sup, PROPF_METHOD}, - {toLocaleLowerCaseW, String_toLocaleLowerCase, PROPF_METHOD}, - {toLocaleUpperCaseW, String_toLocaleUpperCase, PROPF_METHOD}, - {toLowerCaseW, String_toLowerCase, PROPF_METHOD}, - {toStringW, String_toString, PROPF_METHOD}, - {toUpperCaseW, String_toUpperCase, PROPF_METHOD}, - {trimW, String_trim, PROPF_ES5|PROPF_METHOD}, - {valueOfW, String_valueOf, PROPF_METHOD} + {L"anchor", String_anchor, PROPF_METHOD|1}, + {L"big", String_big, PROPF_METHOD}, + {L"blink", String_blink, PROPF_METHOD}, + {L"bold", String_bold, PROPF_METHOD}, + {L"charAt", String_charAt, PROPF_METHOD|1}, + {L"charCodeAt", String_charCodeAt, PROPF_METHOD|1}, + {L"concat", String_concat, PROPF_METHOD|1}, + {L"fixed", String_fixed, PROPF_METHOD}, + {L"fontcolor", String_fontcolor, PROPF_METHOD|1}, + {L"fontsize", String_fontsize, PROPF_METHOD|1}, + {L"indexOf", String_indexOf, PROPF_METHOD|2}, + {L"italics", String_italics, PROPF_METHOD}, + {L"lastIndexOf", String_lastIndexOf, PROPF_METHOD|2}, + {L"length", NULL,0, String_get_length}, + {L"link", String_link, PROPF_METHOD|1}, + {L"localeCompare", String_localeCompare, PROPF_METHOD|1}, + {L"match", String_match, PROPF_METHOD|1}, + {L"replace", String_replace, PROPF_METHOD|1}, + {L"search", String_search, PROPF_METHOD}, + {L"slice", String_slice, PROPF_METHOD}, + {L"small", String_small, PROPF_METHOD}, + {L"split", String_split, PROPF_METHOD|2}, + {L"strike", String_strike, PROPF_METHOD}, + {L"sub", String_sub, PROPF_METHOD}, + {L"substr", String_substr, PROPF_METHOD|2}, + {L"substring", String_substring, PROPF_METHOD|2}, + {L"sup", String_sup, PROPF_METHOD}, + {L"toLocaleLowerCase", String_toLocaleLowerCase, PROPF_METHOD}, + {L"toLocaleUpperCase", String_toLocaleUpperCase, PROPF_METHOD}, + {L"toLowerCase", String_toLowerCase, PROPF_METHOD}, + {L"toString", String_toString, PROPF_METHOD}, + {L"toUpperCase", String_toUpperCase, PROPF_METHOD}, + {L"trim", String_trim, PROPF_ES5|PROPF_METHOD}, + {L"valueOf", String_valueOf, PROPF_METHOD} }; static const builtin_info_t String_info = { @@ -1636,7 +1579,7 @@ static const builtin_info_t String_info = { }; static const builtin_prop_t StringInst_props[] = { - {lengthW, NULL,0, String_get_length} + {L"length", NULL,0, String_get_length} }; static const builtin_info_t StringInst_info = { @@ -1754,7 +1697,7 @@ static HRESULT string_alloc(script_ctx_t *ctx, jsdisp_t *object_prototype, jsstr } static const builtin_prop_t StringConstr_props[] = { - {fromCharCodeW, StringConstr_fromCharCode, PROPF_METHOD}, + {L"fromCharCode", StringConstr_fromCharCode, PROPF_METHOD}, }; static const builtin_info_t StringConstr_info = { @@ -1771,13 +1714,11 @@ HRESULT create_string_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi StringInstance *string; HRESULT hres; - static const WCHAR StringW[] = {'S','t','r','i','n','g',0}; - hres = string_alloc(ctx, object_prototype, jsstr_empty(), &string); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, StringConstr_value, StringW, &StringConstr_info, + hres = create_builtin_constructor(ctx, StringConstr_value, L"String", &StringConstr_info, PROPF_CONSTR|1, &string->dispex, ret); jsdisp_release(&string->dispex); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index b2678443d2c..69a77f1e56a 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -326,13 +326,11 @@ HRESULT create_vbarray_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsd VBArrayInstance *vbarray; HRESULT hres; - static const WCHAR VBArrayW[] = {'V','B','A','r','r','a','y',0}; - hres = alloc_vbarray(ctx, object_prototype, &vbarray); if(FAILED(hres)) return hres; - hres = create_builtin_constructor(ctx, VBArrayConstr_value, VBArrayW, NULL, PROPF_CONSTR|1, &vbarray->dispex, ret); + hres = create_builtin_constructor(ctx, VBArrayConstr_value, L"VBArray", NULL, PROPF_CONSTR|1, &vbarray->dispex, ret); jsdisp_release(&vbarray->dispex); return hres; -- 2.26.2

2 1

gdi32: Avoid crash by initializing variable font_set.
by Bernhard Übelacker 24 Nov '20

24 Nov '20

If the call pFcStrListNext returns NULL the loop is never entered and the variable font_set never gets written, leading to a crash cleaning up font_set by pFcFontSetDestroy. Maybe caused by dir_list being empty. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> C:\windows\system32\winemenubuilder.exe -a -r 0034:err:module:LdrInitializeThunk "gdi32.dll" failed to initialize, aborting 0034:err:module:LdrInitializeThunk Initializing dlls for L"C:\\windows\\system32\\winemenubuilder.exe" failed, status c0000005 (rr) bt #0 0x7edfea16 in IA__FcFontSetDestroy (s=0x7ee0bbec <IA__FcStrSetDestroy+12>) at fcfs.c:48 #1 0x7f114d9d in fontconfig_add_fonts_from_dir_list (config=0x7d81d740, dir_list=0x7d822c60, done_set=0x7d822c30, flags=5) at .../wine-git/dlls/gdi32/freetype.c:1509 #2 0x7f114d4a in fontconfig_add_fonts_from_dir_list (config=0x7d81d740, dir_list=0x7d822b70, done_set=0x7d822c30, flags=5) at .../wine-git/dlls/gdi32/freetype.c:1503 #3 0x7f114d4a in fontconfig_add_fonts_from_dir_list (config=0x7d81d740, dir_list=0x7d82a910, done_set=0x7d822c30, flags=5) at .../wine-git/dlls/gdi32/freetype.c:1503 #4 0x7f114d4a in fontconfig_add_fonts_from_dir_list (config=0x7d81d740, dir_list=0x7d82a570, done_set=0x7d822c30, flags=5) at .../wine-git/dlls/gdi32/freetype.c:1503 #5 0x7f114e52 in load_fontconfig_fonts () at .../wine-git/dlls/gdi32/freetype.c:1526 #6 0x7f115d46 in freetype_load_fonts () at .../wine-git/dlls/gdi32/freetype.c:1749 #7 0x6ca35fcc in font_init () at .../wine-git/dlls/gdi32/font.c:7944 #8 0x6ca37698 in DllMain@12 (inst=0x6c9c0000, reason=1, reserved=0x31fd24) at .../wine-git/dlls/gdi32/gdiobj.c:629 #9 0x7bc2c266 in call_dll_entry_point () #10 0x7bc2f6e6 in MODULE_InitDLL (wm=<optimized out>, reason=<optimized out>, lpReserved=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:1332 #11 0x7bc2fafc in process_attach (wm=0x110f10, lpReserved=0x31fd24) at .../wine-git/dlls/ntdll/loader.c:1426 #12 0x7bc2fa4a in process_attach (wm=0x1109a8, lpReserved=0x31fd24) at .../wine-git/dlls/ntdll/loader.c:1397 #13 0x7bc2fa4a in process_attach (wm=0x1107d8, lpReserved=0x31fd24) at .../wine-git/dlls/ntdll/loader.c:1397 #14 0x7bc32f58 in LdrInitializeThunk@16 (context=0x31fd24, unknown2=268427264, unknown3=1, unknown4=0) at .../wine-git/dlls/ntdll/loader.c:1397 #15 0x00000000 in ?? () (rr) (rr) print/x *dir_list $14 = {set = 0x7d820190, n = 0x0} Two frames up shows dir="/usr/share/fonts/X11/100dpi". libfontconfig1:i386 in version 2.13.1-4.2. Might be related to: a51d68e35c53 gdi32: Load font list directly from fontconfig cache. --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 993110e6fe0..e7684728c9c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1468,7 +1468,7 @@ static void init_fontconfig(void) static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir_list, FcStrSet *done_set, DWORD flags ) { const FcChar8 *dir; - FcFontSet *font_set; + FcFontSet *font_set = NULL; FcStrList *subdir_list = NULL; FcStrSet *subdir_set = NULL; FcCache *cache = NULL; -- 2.29.2

3 2

[PATCH] winex11.drv: Add a taskbar button for a minimized owned window.
by Dmitry Timoshkov 24 Nov '20

24 Nov '20

Otherwise minimizing an owned window without WS_EX_APPWINDOW style (common for Delphi applications) leads to a window completely disappearing after being minimized. Before this patch: no taskbar window for a normal or minimized owned window. After this patch: no taskbar window for normal owned window, after a window being minimized a taskbar button appears, after a window being restored a taskbar button gets removed. Essentially this patch fixes a regression caused by commit 61e50e15ba45ad54655f98619f5ef33917033165 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 12:14:43 2010 +0200 winex11: Map zero-size windows and set an empty window region for them. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964e..f0a3f07f37 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -987,7 +987,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + if (!(ex_style & WS_EX_APPWINDOW) && !(style & WS_MINIMIZE) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -2499,7 +2499,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags else { if (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED)) set_wm_hints( data ); - if (!event_type) update_net_wm_states( data ); + if (!event_type || event_type == PropertyNotify) + update_net_wm_states( data ); } } -- 2.29.2

1 0

[PATCH 2/2] winebus.sys: Support setting SDL controller mapping through environment variable.
by Hans Leidekker 24 Nov '20

24 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50154 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index feac5acf950..19c6f23e071 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1024,8 +1024,15 @@ static DWORD CALLBACK deviceloop_thread(void *args) { HKEY key; static const WCHAR szPath[] = {'m','a','p',0}; + const char *mapping; - if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) + if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) + { + TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); + if (pSDL_GameControllerAddMapping(mapping) < 0) + WARN("Failed to add environment mapping %s\n", pSDL_GetError()); + } + else if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) { DWORD index = 0; CHAR *buffer = NULL; @@ -1054,8 +1061,9 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (rc == STATUS_SUCCESS) { - TRACE("Setting mapping %s...\n",debugstr_an(buffer,29)); - pSDL_GameControllerAddMapping(buffer); + TRACE("Setting registry mapping %s\n", debugstr_a(buffer)); + if (pSDL_GameControllerAddMapping(buffer) < 0) + WARN("Failed to add registry mapping %s\n", pSDL_GetError()); index ++; } } while (rc == STATUS_SUCCESS); -- 2.29.2

1 0

[PATCH 1/2] winebus.sys: Fix registry access rights for SDL controller mapping.
by Hans Leidekker 24 Nov '20

24 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48545 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 95d5b9f9d0d..feac5acf950 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1025,7 +1025,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) HKEY key; static const WCHAR szPath[] = {'m','a','p',0}; - if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_ENUMERATE_SUB_KEYS, &key)) + if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) { DWORD index = 0; CHAR *buffer = NULL; -- 2.29.2

1 0

[PATCH 1/4] quartz: Avoid autoplugging renderers in IGraphBuilder::Connect().
by Zebediah Figura 24 Nov '20

24 Nov '20

I don't know of an application that this helps, but it seems like an optimization worth performing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cf2421f64e2..58038829217 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1397,7 +1397,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *source, I EnterCriticalSection(&graph->cs); - hr = autoplug(graph, source, sink, FALSE, 0); + hr = autoplug(graph, source, sink, TRUE, 0); LeaveCriticalSection(&graph->cs); -- 2.29.2

1 3

[PATCH] quartz/tests: Avoid some test failures related to timing.
by Zebediah Figura 24 Nov '20

24 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 11 ++++++++--- dlls/quartz/tests/vmr9.c | 17 +++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index d7daa6deed5..fd39945b2e3 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1181,7 +1181,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1201,10 +1201,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control hr = IMediaControl_GetState(control, 0, &state); todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); @@ -2108,8 +2113,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); + ok(!ret, "Did not find a sent message.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f88c43b07b5..8b46e4706a5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1220,10 +1220,15 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control hr = IMediaControl_GetState(control, 0, &state); todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %#x.\n", state); + hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); @@ -1432,18 +1437,14 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont hr = join_thread(send_frame_time(input, -2, 0x00ff0000)); /* red */ ok(hr == S_OK, "Got hr %#x.\n", hr); - thread = send_frame_time(input, 2, 0x00ff00ff); /* magenta */ - ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); - thread = send_frame_time(input, 1000000, 0x00ffffff); /* white */ ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == S_FALSE, "Got hr %#x.\n", hr); hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2351,8 +2352,8 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); + ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); + ok(!ret, "Did not find a sent message.\n"); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); -- 2.29.2

1 0

[PATCH] winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur.
by Brendan Shanks 24 Nov '20

24 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50153 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- This fixes HID device access on macOS Catalina and Big Sur when "Input Monitoring" permission has not been granted by the user (by design, a fairly inconvenient process). In the future I'd also like to have hidclass.sys defer report processing until a device is opened, not created. Then the IOHIDDeviceOpen() call can be made from the necessary vtbl functions, and the permission dialog should not appear unless an application actually tries to open a privileged HID device. dlls/winebus.sys/bus_iohid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index df578b4b9d6..ee6225bf398 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -297,6 +297,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) + { + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + return; + } + IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { @@ -365,6 +372,8 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); /* Note: Yes, we leak the buffer. But according to research there is no safe way to deallocate that buffer. */ + IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + IOHIDDeviceClose(IOHIDDevice, 0); device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { @@ -383,13 +392,6 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) - { - ERR("Couldn't open IOHIDManager.\n"); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); - return 0; - } CFRunLoopRun(); TRACE("Run Loop exiting\n"); -- 2.26.2

1 0

Re: [PATCH] shell32/tests: Increase 6 buffers to avoid potential overflows via sprintf (GCC).
by Gerald Pfeifer 23 Nov '20

23 Nov '20

This patch of mine in 2018 received a note from Nikolay "I think we should try instead to use more predictable paths. This change scatters magic increments, that looks worse than a warning in my opinion." as it's only response. It was not applied. Nearly to the day two years later pretty exactly the same patch got applied, from a different author: commit d1373e8aae1b15b96e847488e4b6617789f8fb62 Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:30 2020 +0100 shell32/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> This is the second such case I learned about this week. Gerald On Sun, 18 Feb 2018, Gerald Pfeifer wrote: > This sheds off 10 warnings from builds with current versions of GCC. > > The pattern is printing a pathname plus some additional text into a > buffer the size of a pathname. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/shell32/tests/shlexec.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c > index 9db12ce42a..4f00db44e6 100644 > --- a/dlls/shell32/tests/shlexec.c > +++ b/dlls/shell32/tests/shlexec.c > @@ -1654,7 +1654,7 @@ static void test_argify(void) > > static void test_filename(void) > { > - char filename[MAX_PATH]; > + char filename[MAX_PATH+16]; > const filename_tests_t* test; > char* c; > INT_PTR rc; > @@ -1920,7 +1920,7 @@ static void test_fileurls(void) > > static void test_urls(void) > { > - char url[MAX_PATH]; > + char url[MAX_PATH+15]; > INT_PTR rc; > > if (!create_test_class("fakeproto", FALSE)) > @@ -2015,7 +2015,7 @@ static void test_urls(void) > static void test_find_executable(void) > { > char notepad_path[MAX_PATH]; > - char filename[MAX_PATH]; > + char filename[MAX_PATH+17]; > char command[MAX_PATH]; > const filename_tests_t* test; > INT_PTR rc; > @@ -2433,7 +2433,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) > > static void test_dde(void) > { > - char filename[MAX_PATH], defApplication[MAX_PATH]; > + char filename[MAX_PATH+14], defApplication[MAX_PATH]; > const dde_tests_t* test; > char params[1024]; > INT_PTR rc; > @@ -2600,7 +2600,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) > > static void test_dde_default_app(void) > { > - char filename[MAX_PATH]; > + char filename[MAX_PATH+15]; > HSZ hszApplication; > dde_thread_info_t info = { filename, GetCurrentThreadId() }; > const dde_default_app_tests_t* test; > @@ -2702,7 +2702,7 @@ static void init_test(void) > { > HMODULE hdll; > HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*); > - char filename[MAX_PATH]; > + char filename[MAX_PATH+26]; > WCHAR lnkfile[MAX_PATH]; > char params[1024]; > const char* const * testfile; >

2 1

[PATCH v2 1/3] quartz: Return VFW_E_ENUM_OUT_OF_SYNC in IEnumFilters::Skip() when enum version doesn't match graph version.
by Gijs Vermeulen 23 Nov '20

23 Nov '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/tests/filtergraph.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b3aebabbdad..fb2cbc76b31 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -322,6 +322,9 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) TRACE("enum_filters %p, count %u.\n", enum_filters, count); + if (enum_filters->version != enum_filters->graph->version) + return VFW_E_ENUM_OUT_OF_SYNC; + if (!enum_filters->cursor) return S_FALSE; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e7ee4e5c446..446fa4ae1af 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -683,6 +683,9 @@ static void test_enum_filters(void) hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == VFW_E_ENUM_OUT_OF_SYNC, "Got hr %#x.\n", hr); + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == VFW_E_ENUM_OUT_OF_SYNC, "Got hr %#x.\n", hr); + hr = IEnumFilters_Reset(enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

2 6

[PATCH] mf/samplegrabber: Evaluate type compatibility by comparison to the initial type.
by Derek Lesho 23 Nov '20

23 Nov '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 9 ++++--- dlls/mf/tests/mf.c | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 566ee2f2930..aa583e38dc0 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -67,7 +67,7 @@ struct sample_grabber LONG refcount; IMFSampleGrabberSinkCallback *callback; IMFSampleGrabberSinkCallback2 *callback2; - IMFMediaType *media_type; + IMFMediaType *media_type, *base_type; BOOL is_shut_down; IMFMediaEventQueue *event_queue; IMFMediaEventQueue *stream_event_queue; @@ -558,7 +558,7 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber *grabber, IMFMediaType *in_type) { - const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; + const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA; DWORD flags; if (grabber->is_shut_down) @@ -567,7 +567,7 @@ static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabb if (!in_type) return E_POINTER; - if (IMFMediaType_IsEqual(grabber->media_type, in_type, &flags) == S_OK) + if (IMFMediaType_IsEqual(grabber->base_type, in_type, &flags) == S_OK) return S_OK; return (flags & supported_flags) == supported_flags ? S_OK : MF_E_INVALIDMEDIATYPE; @@ -819,6 +819,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); IMFMediaType_Release(grabber->media_type); + IMFMediaType_Release(grabber->base_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); if (grabber->clock) @@ -1284,6 +1285,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use } object->media_type = context->media_type; IMFMediaType_AddRef(object->media_type); + MFCreateMediaType(&object->base_type); + IMFMediaType_CopyAllItems(context->media_type, (IMFAttributes *)object->base_type); IMFAttributes_GetUINT32(attributes, &MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, &object->ignore_clock); IMFAttributes_GetUINT64(attributes, &MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, &object->sample_time_offset); list_init(&object->items); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 43dc9a49ee7..dd3605c1075 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2421,6 +2421,62 @@ static void test_sample_grabber(void) refcount = IMFActivate_Release(activate); ok(!refcount, "Unexpected refcount %u.\n", refcount); + /* IsMediaTypeSupported checks are done against the creation type, and check format data */ + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream); + ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + /* On Win8+ this initialization happens automatically. */ + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Failed to set media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + IMFMediaType_Release(media_type2); + IMFMediaType_Release(media_type); + + IMFMediaTypeHandler_Release(handler); + IMFMediaSink_Release(sink); + IMFStreamSink_Release(stream); + + refcount = IMFActivate_Release(activate); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + /* Rateless mode with MF_SAMPLEGRABBERSINK_IGNORE_CLOCK. */ hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); -- 2.29.2

1 0

[PATCH vkd3d 1/5] vkd3d-utils: Initialize "messages_blob" to NULL in D3DCompile2().
by Zebediah Figura 23 Nov '20

23 Nov '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f5cb5b5f..9b608f6b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -176,6 +176,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (secondary_flags) FIXME("Ignoring secondary flags %#x.\n", secondary_flags); + if (messages_blob) + *messages_blob = NULL; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; compile_info.source.code = data; -- 2.29.2

3 11

[PATCH 4/5] kernelbase: Use FileFsDeviceInformation for console handles in GetFileType.
by Jacek Caban 23 Nov '20

23 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

2 2

[PATCH] vbscript: Support property set with parameters.
by Robert Wilhelm 23 Nov '20

23 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/interp.c | 11 +++-------- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 560d3b16e69..11d95e57758 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -988,12 +988,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - - hres = stack_assume_disp(ctx, 1, &obj); + hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -1002,7 +997,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; @@ -1014,7 +1009,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8f1c1307794..034baffa4dd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -456,7 +456,7 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ed89906c9cf..419a4349896 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1772,6 +1772,17 @@ end class Class TestPropParam Public oDict + Public gotNothing + Public m_obj + + Public Property Set bar(obj) + Set m_obj = obj + End Property + Public Property Set foo(par,obj) + Set m_obj = obj + if obj is Nothing Then gotNothing = True + oDict = par + End Property Public Property Let Key(oldKey,newKey) oDict = oldKey & newKey End Property @@ -1790,6 +1801,11 @@ x.three(1,2) = 3 call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") x.ten(1,2,3,4,5,6,7,8,9) = 0 call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") +Set x.bar = Nothing +call ok(x.gotNothing=Empty,"x.gotNothing = " & x.gotNothing & " expected Empty") +Set x.foo("123") = Nothing +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +call ok(x.gotNothing=True,"x.gotNothing = " & x.gotNothing & " expected true") set x = new TestPropSyntax set x.prop = new TestPropSyntax -- 2.26.2

2 1

[PATCH v2] wined3d: Do not use wined3d_output_get_desc() to retrieve display rotation.
by Zhiyi Zhang 23 Nov '20

23 Nov '20

Most of the time when wined3d_output_get_desc() is called, display rotation is not needed. Retrieving display rotation is quite expensive because it needs to query information from XRandR. So use wined3d_output_get_display_mode() to retrieve display rotation when needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50096 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 195911 and 195912 dlls/dxgi/output.c | 34 ++++++++++++++++++++++++++++++---- dlls/wined3d/directx.c | 4 +--- include/wine/wined3d.h | 1 - 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 03b5384f326..3ffa5d16408 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -288,6 +288,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O { struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; + enum wined3d_display_rotation rotation; + struct wined3d_display_mode mode; HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); @@ -297,18 +299,26 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput6 *iface, DXGI_O wined3d_mutex_lock(); hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); - wined3d_mutex_unlock(); - if (FAILED(hr)) { WARN("Failed to get output desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); return hr; } + hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation); + if (FAILED(hr)) + { + WARN("Failed to get output display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + wined3d_mutex_unlock(); + memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = wined3d_desc.rotation; + desc->Rotation = rotation; desc->Monitor = wined3d_desc.monitor; return S_OK; @@ -550,6 +560,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, { struct dxgi_output *output = impl_from_IDXGIOutput6(iface); struct wined3d_output_desc wined3d_desc; + enum wined3d_display_rotation rotation; + struct wined3d_display_mode mode; HRESULT hr; FIXME("iface %p, desc %p semi-stub!\n", iface, desc); @@ -559,6 +571,20 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, wined3d_mutex_lock(); hr = wined3d_output_get_desc(output->wined3d_output, &wined3d_desc); + if (FAILED(hr)) + { + WARN("Failed to get output desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + + hr = wined3d_output_get_display_mode(output->wined3d_output, &mode, &rotation); + if (FAILED(hr)) + { + WARN("Failed to get output display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } wined3d_mutex_unlock(); if (FAILED(hr)) @@ -570,7 +596,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc1(IDXGIOutput6 *iface, memcpy(desc->DeviceName, wined3d_desc.device_name, sizeof(desc->DeviceName)); desc->DesktopCoordinates = wined3d_desc.desktop_rect; desc->AttachedToDesktop = wined3d_desc.attached_to_desktop; - desc->Rotation = wined3d_desc.rotation; + desc->Rotation = rotation; desc->Monitor = wined3d_desc.monitor; /* FIXME: fill this from monitor EDID */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50b1376a75b..7164b81b8ee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1002,15 +1002,13 @@ static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LP HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, struct wined3d_output_desc *desc) { - struct wined3d_display_mode mode; - TRACE("output %p, desc %p.\n", output, desc); memset(desc, 0, sizeof(*desc)); desc->ordinal = output->ordinal; lstrcpyW(desc->device_name, output->device_name); EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)desc); - return wined3d_output_get_display_mode(output, &mode, &desc->rotation); + return WINED3D_OK; } /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4a06b511211..1f370d69a88 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2157,7 +2157,6 @@ struct wined3d_output_desc WCHAR device_name[CCHDEVICENAME]; RECT desktop_rect; BOOL attached_to_desktop; - enum wined3d_display_rotation rotation; HMONITOR monitor; }; -- 2.27.0

2 1

[PATCH] quartz: Fix IEnumFilters::Skip() implementation.
by Gijs Vermeulen 23 Nov '20

23 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28332 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/filtergraph.c | 7 +++++-- dlls/quartz/tests/filtergraph.c | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b3aebabbdad..c9e26231032 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -322,13 +322,16 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) TRACE("enum_filters %p, count %u.\n", enum_filters, count); + if (enum_filters->version != enum_filters->graph->version) + return VFW_E_ENUM_OUT_OF_SYNC; + if (!enum_filters->cursor) - return S_FALSE; + return E_INVALIDARG; while (count--) { if (!(enum_filters->cursor = list_next(&enum_filters->graph->filters, enum_filters->cursor))) - return S_FALSE; + return count ? S_FALSE : S_OK; } return S_OK; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e7ee4e5c446..f35b54a02e8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -677,12 +677,39 @@ static void test_enum_filters(void) hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IEnumFilters_Skip(enum1, 0); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + IFilterGraph2_AddFilter(graph, filter1, NULL); IFilterGraph2_AddFilter(graph, filter2, NULL); hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == VFW_E_ENUM_OUT_OF_SYNC, "Got hr %#x.\n", hr); + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == VFW_E_ENUM_OUT_OF_SYNC, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumFilters_Reset(enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

2 2

[PATCH v2] d3dx9: Correctly handle sprites array reallocation.
by Matteo Bruni 23 Nov '20

23 Nov '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix allocated_sprites update (big fail on my part, thanks Henri!) dlls/d3dx9_36/sprite.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index cd244e657ef..5499904da24 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -342,6 +342,7 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t const RECT *rect, const D3DXVECTOR3 *center, const D3DXVECTOR3 *position, D3DCOLOR color) { struct d3dx9_sprite *This = impl_from_ID3DXSprite(iface); + struct sprite *new_sprites; D3DSURFACE_DESC texdesc; TRACE("iface %p, texture %p, rect %s, center %p, position %p, color 0x%08x.\n", @@ -357,9 +358,12 @@ static HRESULT WINAPI d3dx9_sprite_Draw(ID3DXSprite *iface, IDirect3DTexture9 *t } else if (This->allocated_sprites <= This->sprite_count) { - This->allocated_sprites += This->allocated_sprites / 2; - This->sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - This->sprites, This->allocated_sprites * sizeof(*This->sprites)); + new_sprites = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + This->sprites, This->allocated_sprites * 2 * sizeof(*This->sprites)); + if (!new_sprites) + return E_OUTOFMEMORY; + This->sprites = new_sprites; + This->allocated_sprites *= 2; } This->sprites[This->sprite_count].texture=texture; if(!(This->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE)) -- 2.26.2

1 0

[PATCH 1/2] wined3d: Introduce wined3d_output_get_ordinal().
by Zhiyi Zhang 23 Nov '20

23 Nov '20

Secondhand Lands calls d3d9_device_GetDeviceCaps() frequently. Introduce a wined3d_output_get_ordinal() to get output ordinal only instead of using the more expensive wined3d_output_get_desc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50096 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/device.c | 16 ++++------------ dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fec631e0e67..44a4ecdebc1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -378,10 +378,8 @@ void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_or D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD| D3DPTFILTERCAPS_MAGFGAUSSIANQUAD; struct wined3d_adapter *wined3d_adapter; - struct wined3d_output_desc output_desc; + unsigned int output_idx, output_ordinal; struct wined3d_output *wined3d_output; - unsigned int output_idx; - HRESULT hr; caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; caps->AdapterOrdinal = adapter_ordinal; @@ -535,17 +533,11 @@ void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_or wined3d_output = d3d9->wined3d_outputs[output_idx]; wined3d_mutex_lock(); - hr = wined3d_output_get_desc(wined3d_output, &output_desc); + output_ordinal = wined3d_output_get_ordinal(wined3d_output); wined3d_mutex_unlock(); - if (FAILED(hr)) - { - ERR("Failed to get output desc, hr %#x.\n", hr); - return; - } - - caps->MasterAdapterOrdinal = output_idx - output_desc.ordinal; - caps->AdapterOrdinalInGroup = output_desc.ordinal; + caps->MasterAdapterOrdinal = output_idx - output_ordinal; + caps->AdapterOrdinalInGroup = output_ordinal; if (!caps->AdapterOrdinalInGroup) { wined3d_adapter = wined3d_output_get_adapter(wined3d_output); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50b1376a75b..439720032f9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1007,12 +1007,18 @@ HRESULT CDECL wined3d_output_get_desc(const struct wined3d_output *output, TRACE("output %p, desc %p.\n", output, desc); memset(desc, 0, sizeof(*desc)); - desc->ordinal = output->ordinal; lstrcpyW(desc->device_name, output->device_name); EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)desc); return wined3d_output_get_display_mode(output, &mode, &desc->rotation); } +unsigned int CDECL wined3d_output_get_ordinal(const struct wined3d_output *output) +{ + TRACE("output %p.\n", output); + + return output->ordinal; +} + /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes of the same bpp but different resolutions */ diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 44008119a8d..e8d74e7ad84 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -170,6 +170,7 @@ @ cdecl wined3d_output_get_display_mode(ptr ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_get_mode_count(ptr long long) +@ cdecl wined3d_output_get_ordinal(ptr) @ cdecl wined3d_output_get_raster_status(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_set_display_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4a06b511211..ac51fdf3528 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2153,7 +2153,6 @@ struct wined3d_view_desc struct wined3d_output_desc { - unsigned int ordinal; WCHAR device_name[CCHDEVICENAME]; RECT desktop_rect; BOOL attached_to_desktop; @@ -2557,6 +2556,7 @@ HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, unsigned int mode_idx, struct wined3d_display_mode *mode); unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); +unsigned int __cdecl wined3d_output_get_ordinal(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_get_raster_status(const struct wined3d_output *output, struct wined3d_raster_status *raster_status); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); -- 2.27.0

2 5

[PATCH v2] d3dx10/tests: Add tests for D3DX10CreateTextureFromMemory.
by Matteo Bruni 23 Nov '20

23 Nov '20

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Clean up a bit. Supersedes patch 196205. dlls/d3dx10_43/tests/d3dx10.c | 154 ++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 5d7ffcfde3f..c8a1f9d7f71 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -542,6 +542,28 @@ test_image[] = static WCHAR temp_dir[MAX_PATH]; +static DXGI_FORMAT block_compressed_formats[] = +{ + DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, + DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, + DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, + DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, + DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, + DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, + DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB +}; + +static BOOL is_block_compressed(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i) + if (format == block_compressed_formats[i]) + return TRUE; + + return FALSE; +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -694,6 +716,93 @@ static void check_image_info(D3DX10_IMAGE_INFO *image_info, unsigned int i, unsi i, image_info->ImageFileFormat, test_image[i].expected.ImageFileFormat); } +static void check_resource_info(ID3D10Resource *resource, unsigned int i, unsigned int line) +{ + unsigned int expected_mip_levels, expected_width, expected_height, max_dimension; + D3D10_RESOURCE_DIMENSION resource_dimension; + D3D10_TEXTURE2D_DESC desc_2d; + D3D10_TEXTURE3D_DESC desc_3d; + ID3D10Texture2D *texture_2d; + ID3D10Texture3D *texture_3d; + HRESULT hr; + + expected_width = test_image[i].expected.Width; + expected_height = test_image[i].expected.Height; + if (is_block_compressed(test_image[i].expected.Format)) + { + expected_width = (expected_width + 3) & ~3; + expected_height = (expected_height + 3) & ~3; + } + expected_mip_levels = 0; + max_dimension = max(expected_width, expected_height); + while (max_dimension) + { + ++expected_mip_levels; + max_dimension >>= 1; + } + + ID3D10Resource_GetType(resource, &resource_dimension); + ok(resource_dimension == test_image[i].expected.ResourceDimension, + "Test %u: Got unexpected ResourceDimension %u, expected %u.\n", + i, resource_dimension, test_image[i].expected.ResourceDimension); + + switch (resource_dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture_2d); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ID3D10Texture2D_GetDesc(texture_2d, &desc_2d); + ok_(__FILE__, line)(desc_2d.Width == expected_width, + "Test %u: Got unexpected Width %u, expected %u.\n", + i, desc_2d.Width, expected_width); + ok_(__FILE__, line)(desc_2d.Height == expected_height, + "Test %u: Got unexpected Height %u, expected %u.\n", + i, desc_2d.Height, expected_height); + ok_(__FILE__, line)(desc_2d.MipLevels == expected_mip_levels, + "Test %u: Got unexpected MipLevels %u, expected %u.\n", + i, desc_2d.MipLevels, expected_mip_levels); + ok_(__FILE__, line)(desc_2d.ArraySize == test_image[i].expected.ArraySize, + "Test %u: Got unexpected ArraySize %u, expected %u.\n", + i, desc_2d.ArraySize, test_image[i].expected.ArraySize); + ok_(__FILE__, line)(desc_2d.Format == test_image[i].expected.Format, + "Test %u: Got unexpected Format %u, expected %u.\n", + i, desc_2d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_2d.MiscFlags == test_image[i].expected.MiscFlags, + "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + i, desc_2d.MiscFlags, test_image[i].expected.MiscFlags); + ID3D10Texture2D_Release(texture_2d); + break; + + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture_3d); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ID3D10Texture3D_GetDesc(texture_3d, &desc_3d); + ok_(__FILE__, line)(desc_3d.Width == expected_width, + "Test %u: Got unexpected Width %u, expected %u.\n", + i, desc_3d.Width, expected_width); + ok_(__FILE__, line)(desc_3d.Height == expected_height, + "Test %u: Got unexpected Height %u, expected %u.\n", + i, desc_3d.Height, expected_height); + ok_(__FILE__, line)(desc_3d.Depth == test_image[i].expected.Depth, + "Test %u: Got unexpected Depth %u, expected %u.\n", + i, desc_3d.Depth, test_image[i].expected.Depth); + ok_(__FILE__, line)(desc_3d.MipLevels == expected_mip_levels, + "Test %u: Got unexpected MipLevels %u, expected %u.\n", + i, desc_3d.MipLevels, expected_mip_levels); + ok_(__FILE__, line)(desc_3d.Format == test_image[i].expected.Format, + "Test %u: Got unexpected Format %u, expected %u.\n", + i, desc_3d.Format, test_image[i].expected.Format); + ok_(__FILE__, line)(desc_3d.MiscFlags == test_image[i].expected.MiscFlags, + "Test %u: Got unexpected MiscFlags %u, expected %u.\n", + i, desc_3d.MiscFlags, test_image[i].expected.MiscFlags); + ID3D10Texture3D_Release(texture_3d); + break; + + default: + break; + } +} + static void test_D3DX10UnsetAllDeviceObjects(void) { static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -1491,6 +1600,50 @@ static void test_get_image_info(void) CoUninitialize(); } +static void test_create_texture(void) +{ + ID3D10Resource *resource; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + device = create_device(); + if (!device) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + CoInitialize(NULL); + + /* D3DX10CreateTextureFromMemory tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromMemory(device, NULL, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, 0, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, sizeof(test_bmp_1bpp) - 1, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_resource_info(resource, i, __LINE__); + } + + CoUninitialize(); + + ID3D10Device_Release(device); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); @@ -1498,4 +1651,5 @@ START_TEST(d3dx10) test_D3DX10CreateAsyncFileLoader(); test_D3DX10CreateAsyncResourceLoader(); test_get_image_info(); + test_create_texture(); } -- 2.26.2

2 2

[PATCH] mfreadwrite/reader: Alternate between selected streams for MF_SOURCE_READER_ANY_STREAM requests.
by Nikolay Sivov 23 Nov '20

23 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 68 ++++++++++++++------------------- dlls/mfreadwrite/tests/mfplat.c | 10 ++--- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index cc1b29a2b6a..7aa8f65df7a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -101,7 +101,6 @@ enum media_stream_flags STREAM_FLAG_SAMPLE_REQUESTED = 0x1, /* Protects from making multiple sample requests. */ STREAM_FLAG_SELECTED = 0x2, /* Mirrors descriptor, used to simplify tests when starting the source. */ STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ - STREAM_FLAG_REQUESTED_ONCE = 0x8, /* Used for MF_SOURCE_READER_ANY_STREAM in synchronous mode. */ }; struct media_stream @@ -109,7 +108,7 @@ struct media_stream IMFMediaStream *stream; IMFMediaType *current; IMFTransform *decoder; - DWORD id; + unsigned int id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -169,13 +168,14 @@ struct source_reader LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; - DWORD first_audio_stream_index; - DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; + unsigned int first_audio_stream_index; + unsigned int first_video_stream_index; + unsigned int last_read_index; + unsigned int stream_count; unsigned int flags; enum media_source_state source_state; struct media_stream *streams; - DWORD stream_count; struct list responses; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; @@ -393,7 +393,7 @@ static HRESULT source_reader_request_sample(struct source_reader *reader, struct WARN("Sample request failed, hr %#x.\n", hr); else { - stream->flags |= (STREAM_FLAG_SAMPLE_REQUESTED | STREAM_FLAG_REQUESTED_ONCE); + stream->flags |= STREAM_FLAG_SAMPLE_REQUESTED; } } @@ -988,39 +988,42 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_first_selected_stream(struct source_reader *reader, unsigned int flags, - unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) { - unsigned int i, first_selected = ~0u; + unsigned int i, start_idx, stop_idx, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; - for (i = 0; i < reader->stream_count; ++i) + start_idx = (reader->last_read_index + 1) % reader->stream_count; + stop_idx = reader->last_read_index == ~0u ? reader->stream_count : reader->last_read_index; + + for (i = start_idx; i < reader->stream_count && i != stop_idx; i = (i + 1) % (reader->stream_count + 1)) { stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; - if (selected && !(reader->streams[i].flags & flags)) + if (selected) { if (first_selected == ~0u) first_selected = i; - if (!stream_drained) + /* Try to balance pending reads. */ + if (!stream_drained && reader->streams[i].requests < requests) { + requests = reader->streams[i].requests; *stream_index = i; - break; } } } - /* If all selected streams reached EOS, use first selected. This fallback only applies after reader went through all - selected streams once. */ - if (i == reader->stream_count && first_selected != ~0u && !flags) + /* If all selected streams reached EOS, use first selected. */ + if (first_selected != ~0u) { - *stream_index = first_selected; - i = first_selected; + if (requests == ~0u) + *stream_index = first_selected; + reader->last_read_index = *stream_index; } - return i == reader->stream_count ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; + return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) @@ -1037,18 +1040,7 @@ static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, *stream_index = reader->first_audio_stream_index; break; case MF_SOURCE_READER_ANY_STREAM: - if (reader->async_callback) - { - /* Pick first selected stream. */ - hr = source_reader_get_first_selected_stream(reader, 0, stream_index); - } - else - { - /* Cycle through all selected streams once, next pick first selected. */ - if (FAILED(hr = source_reader_get_first_selected_stream(reader, STREAM_FLAG_REQUESTED_ONCE, stream_index))) - hr = source_reader_get_first_selected_stream(reader, 0, stream_index); - } - return hr; + return source_reader_get_next_selected_stream(reader, stream_index); default: *stream_index = index; } @@ -1339,8 +1331,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR if (!selection_changed) { source_reader_get_stream_selection(reader, i, &selected); - if (selected ^ selection) - selection_changed = TRUE; + selection_changed = !!(selected ^ selection); } if (selection) @@ -1364,8 +1355,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR } source_reader_get_stream_selection(reader, index, &selected); - if (selected ^ selection) - selection_changed = TRUE; + selection_changed = !!(selected ^ selection); if (selection) hr = IMFPresentationDescriptor_SelectStream(reader->descriptor, index); @@ -1373,11 +1363,8 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR hr = IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); } - if (SUCCEEDED(hr) && selection_changed) - { - for (i = 0; i < reader->stream_count; ++i) - reader->streams[i].flags &= ~STREAM_FLAG_REQUESTED_ONCE; - } + if (selection_changed) + reader->last_read_index = ~0u; LeaveCriticalSection(&reader->cs); @@ -2135,6 +2122,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); + object->last_read_index = ~0u; if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 2a6e3a1cc36..8455ac64688 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -886,13 +886,12 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 2, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); - for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", - i, actual_index); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); @@ -905,13 +904,12 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); - for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", - i, actual_index); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); -- 2.29.2

1 0

[PATCH] evr/tests: Add some tests for presenter quality control.
by Nikolay Sivov 23 Nov '20

23 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/tests/evr.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bebffada509..2740f2263f0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1165,6 +1165,7 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); + todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); @@ -2010,6 +2011,67 @@ static void test_presenter_video_window(void) DestroyWindow(window); } +static void test_presenter_quality_control(void) +{ + IMFQualityAdviseLimits *qa_limits; + IMFVideoPresenter *presenter; + MF_QUALITY_DROP_MODE mode; + IMFQualityAdvise *advise; + MF_QUALITY_LEVEL level; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (qa_limits) +{ + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); + + IMFQualityAdviseLimits_Release(qa_limits); +} + +todo_wine { + mode = 1; + hr = IMFQualityAdvise_GetDropMode(advise, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + level = 1; + hr = IMFQualityAdvise_GetQualityLevel(advise, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); + + hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); + ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); + ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); +} + + IMFQualityAdvise_Release(advise); + + IMFVideoPresenter_Release(presenter); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2511,6 +2573,7 @@ START_TEST(evr) test_presenter_native_video_size(); test_presenter_ar_mode(); test_presenter_video_window(); + test_presenter_quality_control(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples(); -- 2.29.2

1 0

[PATCH 1/4] mf/tests: Relax error code test for IsMediaTypeSupported() of SAR.
by Nikolay Sivov 23 Nov '20

23 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 27e859fa82d..117e2d2e785 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3106,11 +3106,17 @@ todo_wine hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + /* Actual return value is MF_E_ATRIBUTENOTFOUND triggered by missing MF_MT_MAJOR_TYPE */ hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); -todo_wine - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); -- 2.29.2

1 3

[PATCH 1/2] winevulkan: make_vulkan handle VkDeviceAddress basetype
by Liam Middlebrook 23 Nov '20

23 Nov '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6675a813c05..336f09f125e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1387,7 +1387,7 @@ class VkParam(object): self.format_conv = "wine_dbgstr_longlong({0})" elif self.type in ["uint16_t", "uint32_t", "VkBool32"]: self.format_str = "%u" - elif self.type in ["uint64_t", "VkDeviceSize"]: + elif self.type in ["uint64_t", "VkDeviceAddress", "VkDeviceSize"]: self.format_str = "0x%s" self.format_conv = "wine_dbgstr_longlong({0})" elif self.type == "HANDLE": -- 2.28.0

1 1

[PATCH resend 01/12] include/icmpapi: Add missing function declarations.
by Gabriel Ivăncescu 23 Nov '20

23 Nov '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/icmpapi.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/include/icmpapi.h b/include/icmpapi.h index 102851a..fd86e84 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -21,6 +21,8 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H +#include "winternl.h" + #ifdef __cplusplus extern "C" { #endif @@ -30,10 +32,24 @@ HANDLE WINAPI IcmpCreateFile( VOID ); +HANDLE WINAPI Icmp6CreateFile( + VOID + ); + BOOL WINAPI IcmpCloseHandle( HANDLE IcmpHandle ); +DWORD WINAPI IcmpParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + +DWORD WINAPI Icmp6ParseReplies( + LPVOID ReplyBuffer, + DWORD ReplySize + ); + DWORD WINAPI IcmpSendEcho( HANDLE IcmpHandle, IPAddr DestinationAddress, @@ -45,6 +61,50 @@ DWORD WINAPI IcmpSendEcho( DWORD Timeout ); +DWORD WINAPI IcmpSendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + +DWORD WINAPI Icmp6SendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + struct sockaddr_in6* SourceAddress, + struct sockaddr_in6* DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ); + #ifdef __cplusplus } -- 2.21.0

1 11

[PATCH] msvcrt: Remove traces from printf.
by Piotr Caban 23 Nov '20

23 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 4 ---- 1 file changed, 4 deletions(-)

1 0

Release plans
by Alexandre Julliard 23 Nov '20

23 Nov '20

Folks, Like every year, it's now time to start the process towards releasing Wine 6.0. The plan is to start code freeze after the next release, two weeks from now. We'll then have a few weeks to fix as many bugs and regressions as possible, with a final 6.0 sometime in January. With everybody being stuck at home this year, we'll hopefully make more progress than usual during Christmas break ;-) -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] msvcrt: Update lc_category.wrefcount in __get_current_locale.
by Piotr Caban 23 Nov '20

23 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50163 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH] include: Add some DB_S_ defines
by Alistair Leslie-Hughes 23 Nov '20

23 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledberr.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 61093ea1491..c0eccba1e97 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -83,6 +83,9 @@ #define DB_E_MISMATCHEDPROVIDER 0x80040e75 +#define DB_S_BOOKMARKSKIPPED 0x00040ec3 +#define DB_S_NONEXTROWSET 0x00040ec5 +#define DB_S_ENDOFROWSET 0x00040ec6 #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */ -- 2.29.2

1 0

[PATCH v2] wininet: Fix error handling INTERNET_OPTION_PROXY in InternetSetOptionA.
by Jiangyi Chen 23 Nov '20

23 Nov '20

1 0

[PATCH v2 2/2] crypt32: Fix reading and writing CRYPT_KEY_PROV_INFO certificate property.
by Dmitry Timoshkov 23 Nov '20

23 Nov '20

v2: Updated for current git. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50024 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 251 +++++++++++++-------------------- dlls/crypt32/crypt32_private.h | 8 -- dlls/crypt32/serialize.c | 187 +++++++++++++++++++++++- dlls/crypt32/tests/cert.c | 96 +++++++++++++ 4 files changed, 375 insertions(+), 167 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c0bec721fd..aad8fa047b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -434,6 +434,84 @@ void CRYPT_ConvertKeyContext(const struct store_CERT_KEY_CONTEXT *src, CERT_KEY_ dst->dwKeySpec = src->dwKeySpec; } +/* + * Fix offsets in a continuous block of memory of CRYPT_KEY_PROV_INFO with + * its associated data. + */ +static void fix_KeyProvInfoProperty(CRYPT_KEY_PROV_INFO *info) +{ + BYTE *data; + DWORD i; + + data = (BYTE *)(info + 1) + sizeof(CRYPT_KEY_PROV_PARAM) * info->cProvParam; + + if (info->pwszContainerName) + { + info->pwszContainerName = (LPWSTR)data; + data += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + } + + if (info->pwszProvName) + { + info->pwszProvName = (LPWSTR)data; + data += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + } + + info->rgProvParam = info->cProvParam ? (CRYPT_KEY_PROV_PARAM *)(info + 1) : NULL; + + for (i = 0; i < info->cProvParam; i++) + { + info->rgProvParam[i].pbData = info->rgProvParam[i].cbData ? data : NULL; + data += info->rgProvParam[i].cbData; + } +} + +/* + * Copy to a continuous block of memory of CRYPT_KEY_PROV_INFO with + * its associated data. + */ +static void copy_KeyProvInfoProperty(const CRYPT_KEY_PROV_INFO *from, CRYPT_KEY_PROV_INFO *to) +{ + BYTE *data; + DWORD i; + + data = (BYTE *)(to + 1) + sizeof(CRYPT_KEY_PROV_PARAM) * from->cProvParam; + + if (from->pwszContainerName) + { + to->pwszContainerName = (LPWSTR)data; + lstrcpyW((LPWSTR)data, from->pwszContainerName); + data += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); + } + else + to->pwszContainerName = NULL; + + if (from->pwszProvName) + { + to->pwszProvName = (LPWSTR)data; + lstrcpyW((LPWSTR)data, from->pwszProvName); + data += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + } + else + to->pwszProvName = NULL; + + to->dwProvType = from->dwProvType; + to->dwFlags = from->dwFlags; + to->cProvParam = from->cProvParam; + to->rgProvParam = from->cProvParam ? (CRYPT_KEY_PROV_PARAM *)(to + 1) : NULL; + to->dwKeySpec = from->dwKeySpec; + + for (i = 0; i < from->cProvParam; i++) + { + to->rgProvParam[i].dwParam = from->rgProvParam[i].dwParam; + to->rgProvParam[i].dwFlags = from->rgProvParam[i].dwFlags; + to->rgProvParam[i].cbData = from->rgProvParam[i].cbData; + to->rgProvParam[i].pbData = from->rgProvParam[i].cbData ? data : NULL; + memcpy(data, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); + data += from->rgProvParam[i].cbData; + } +} + static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -535,87 +613,6 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, return ret; } -/* 64-bit compatible layout, so that 64-bit crypt32 is able to read - * the structure saved by 32-bit crypt32. - */ -typedef struct -{ - ULONG64 pwszContainerName; - ULONG64 pwszProvName; - DWORD dwProvType; - DWORD dwFlags; - DWORD cProvParam; - ULONG64 rgProvParam; - DWORD dwKeySpec; -} store_CRYPT_KEY_PROV_INFO; - -typedef struct -{ - DWORD dwParam; - ULONG64 pbData; - DWORD cbData; - DWORD dwFlags; -} store_CRYPT_KEY_PROV_PARAM; - -void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) -{ - CRYPT_KEY_PROV_INFO info; - store_CRYPT_KEY_PROV_INFO *store = (store_CRYPT_KEY_PROV_INFO *)buf; - BYTE *p = (BYTE *)(store + 1); - - if (store->pwszContainerName) - { - info.pwszContainerName = (LPWSTR)((BYTE *)store + store->pwszContainerName); - p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); - } - else - info.pwszContainerName = NULL; - - if (store->pwszProvName) - { - info.pwszProvName = (LPWSTR)((BYTE *)store + store->pwszProvName); - p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); - } - else - info.pwszProvName = NULL; - - info.dwProvType = store->dwProvType; - info.dwFlags = store->dwFlags; - info.dwKeySpec = store->dwKeySpec; - info.cProvParam = store->cProvParam; - - if (info.cProvParam) - { - DWORD i; - - info.rgProvParam = (CRYPT_KEY_PROV_PARAM *)p; - - for (i = 0; i < store->cProvParam; i++) - { - CRYPT_KEY_PROV_PARAM param; - store_CRYPT_KEY_PROV_PARAM *store_param; - - store_param = (store_CRYPT_KEY_PROV_PARAM *)p; - p += sizeof(*store_param); - - param.dwParam = store_param[i].dwParam; - param.dwFlags = store_param[i].dwFlags; - param.cbData = store_param[i].cbData; - param.pbData = param.cbData ? p : NULL; - p += store_param[i].cbData; - - memcpy(&info.rgProvParam[i], &param, sizeof(param)); - } - } - else - info.rgProvParam = NULL; - - TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info.pwszContainerName), debugstr_w(info.pwszProvName), - info.dwProvType, info.dwFlags, info.cProvParam, info.rgProvParam, info.dwKeySpec); - - *buf = info; -} - BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -649,10 +646,9 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, break; } case CERT_KEY_PROV_INFO_PROP_ID: - ret = CertContext_GetProperty(cert, dwPropId, pvData, - pcbData); + ret = CertContext_GetProperty(cert, dwPropId, pvData, pcbData); if (ret && pvData) - CRYPT_FixKeyProvInfoPointers(pvData); + fix_KeyProvInfoProperty(pvData); break; default: ret = CertContext_GetProperty(cert, dwPropId, pvData, @@ -663,69 +659,14 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, return ret; } -/* Copies key provider info from from into to, where to is assumed to be a - * contiguous buffer of memory large enough for from and all its associated - * data, but whose pointers are uninitialized. - * Upon return, to contains a contiguous copy of from, packed in the following - * order: - * - store_CRYPT_KEY_PROV_INFO - * - pwszContainerName - * - pwszProvName - * - store_CRYPT_KEY_PROV_PARAM[0] - * - store_CRYPT_KEY_PROV_PARAM[0].data - * - ... +/* + * Create a continuous block of memory for CRYPT_KEY_PROV_INFO with + * its associated data, and add it to the certificate properties. */ -static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY_PROV_INFO *from) +static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties, const CRYPT_KEY_PROV_INFO *info) { - DWORD i; - BYTE *p; - store_CRYPT_KEY_PROV_PARAM *param; - - p = (BYTE *)(to + 1); - - if (from->pwszContainerName) - { - to->pwszContainerName = p - (BYTE *)to; - lstrcpyW((LPWSTR)p, from->pwszContainerName); - p += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); - } - else - to->pwszContainerName = 0; - - if (from->pwszProvName) - { - to->pwszProvName = p - (BYTE *)to; - lstrcpyW((LPWSTR)p, from->pwszProvName); - p += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); - } - else - to->pwszProvName = 0; - - to->dwProvType = from->dwProvType; - to->dwFlags = from->dwFlags; - to->cProvParam = from->cProvParam; - to->rgProvParam = 0; - to->dwKeySpec = from->dwKeySpec; - - for (i = 0; i < to->cProvParam; i++) - { - param = (store_CRYPT_KEY_PROV_PARAM *)p; - p += sizeof(*param); - - param->dwParam = from->rgProvParam[i].dwParam; - param->pbData = 0; - param->cbData = from->rgProvParam[i].cbData; - param->dwFlags = from->rgProvParam[i].dwFlags; - memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); - p += from->rgProvParam[i].cbData; - } -} - -static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties, - const CRYPT_KEY_PROV_INFO *info) -{ - BYTE *buf; - DWORD size = sizeof(store_CRYPT_KEY_PROV_INFO), i; + CRYPT_KEY_PROV_INFO *prop; + DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i; BOOL ret; if (info->pwszContainerName) @@ -734,18 +675,20 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties size += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); for (i = 0; i < info->cProvParam; i++) - size += sizeof(store_CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; - buf = CryptMemAlloc(size); - if (buf) + prop = HeapAlloc(GetProcessHeap(), 0, size); + if (!prop) { - CRYPT_CopyKeyProvInfo((store_CRYPT_KEY_PROV_INFO *)buf, info); - ret = ContextPropertyList_SetProperty(properties, - CERT_KEY_PROV_INFO_PROP_ID, buf, size); - CryptMemFree(buf); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; } - else - ret = FALSE; + + copy_KeyProvInfoProperty(info, prop); + + ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, (const BYTE *)prop, size); + HeapFree(GetProcessHeap(), 0, prop); + return ret; } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index a4664ed85a..30cf4334de 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -370,14 +370,6 @@ BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store) DECLSPEC_H BOOL CRYPT_ReadSerializedStoreFromBlob(const CRYPT_DATA_BLOB *blob, HCERTSTORE store) DECLSPEC_HIDDEN; -/* Fixes up the pointers in info, where info is assumed to be a - * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any - * provider parameters, in a contiguous buffer, but where info's pointers are - * assumed to be invalid. Upon return, info's pointers point to the - * appropriate memory locations. - */ -void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) DECLSPEC_HIDDEN; - struct store_CERT_KEY_CONTEXT { DWORD cbSize; diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index d5153deb10..8fa24370b6 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -36,6 +36,86 @@ typedef struct _WINE_CERT_PROP_HEADER DWORD cb; } WINE_CERT_PROP_HEADER; +struct store_CRYPT_KEY_PROV_INFO +{ + DWORD pwszContainerName; + DWORD pwszProvName; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + DWORD rgProvParam; + DWORD dwKeySpec; +}; + +struct store_CRYPT_KEY_PROV_PARAM +{ + DWORD dwParam; + DWORD pbData; + DWORD cbData; + DWORD dwFlags; +}; + +static DWORD serialize_KeyProvInfoProperty(const CRYPT_KEY_PROV_INFO *info, struct store_CRYPT_KEY_PROV_INFO **ret) +{ + struct store_CRYPT_KEY_PROV_INFO *store; + struct store_CRYPT_KEY_PROV_PARAM *param; + DWORD size = sizeof(struct store_CRYPT_KEY_PROV_INFO), i; + BYTE *data; + + if (info->pwszContainerName) + size += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + if (info->pwszProvName) + size += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + + for (i = 0; i < info->cProvParam; i++) + size += sizeof(struct store_CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + + if (!ret) return size; + + store = HeapAlloc(GetProcessHeap(), 0, size); + if (!store) return 0; + + param = (struct store_CRYPT_KEY_PROV_PARAM *)(store + 1); + data = (BYTE *)param + sizeof(struct store_CRYPT_KEY_PROV_PARAM) * info->cProvParam; + + if (info->pwszContainerName) + { + store->pwszContainerName = data - (BYTE *)store; + lstrcpyW((LPWSTR)data, info->pwszContainerName); + data += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + } + else + store->pwszContainerName = 0; + + if (info->pwszProvName) + { + store->pwszProvName = data - (BYTE *)store; + lstrcpyW((LPWSTR)data, info->pwszProvName); + data += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + } + else + store->pwszProvName = 0; + + store->dwProvType = info->dwProvType; + store->dwFlags = info->dwFlags; + store->cProvParam = info->cProvParam; + store->rgProvParam = info->cProvParam ? (BYTE *)param - (BYTE *)store : 0; + store->dwKeySpec = info->dwKeySpec; + + for (i = 0; i < info->cProvParam; i++) + { + param[i].dwParam = info->rgProvParam[i].dwParam; + param[i].dwFlags = info->rgProvParam[i].dwFlags; + param[i].cbData = info->rgProvParam[i].cbData; + param[i].pbData = param[i].cbData ? data - (BYTE *)store : 0; + memcpy(data, info->rgProvParam[i].pbData, info->rgProvParam[i].cbData); + data += info->rgProvParam[i].cbData; + } + + *ret = store; + return size; +} + static BOOL CRYPT_SerializeStoreElement(const void *context, const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, const WINE_CONTEXT_INTERFACE *contextInterface, DWORD dwFlags, BOOL omitHashes, @@ -60,7 +140,16 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, ret = contextInterface->getProp(context, prop, NULL, &propSize); if (ret) + { + if (prop == CERT_KEY_PROV_INFO_PROP_ID) + { + BYTE *info = CryptMemAlloc(propSize); + contextInterface->getProp(context, prop, info, &propSize); + propSize = serialize_KeyProvInfoProperty((const CRYPT_KEY_PROV_INFO *)info, NULL); + CryptMemFree(info); + } bytesNeeded += sizeof(WINE_CERT_PROP_HEADER) + propSize; + } } } while (ret && prop != 0); @@ -106,6 +195,14 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, &propSize); if (ret) { + if (prop == CERT_KEY_PROV_INFO_PROP_ID) + { + struct store_CRYPT_KEY_PROV_INFO *store; + propSize = serialize_KeyProvInfoProperty((const CRYPT_KEY_PROV_INFO *)buf, &store); + CryptMemFree(buf); + buf = (BYTE *)store; + } + hdr = (WINE_CERT_PROP_HEADER*)pbElement; hdr->propID = prop; hdr->unknown = 1; @@ -215,6 +312,83 @@ static const WINE_CERT_PROP_HEADER *CRYPT_findPropID(const BYTE *buf, return ret; } +static DWORD read_serialized_KeyProvInfoProperty(const struct store_CRYPT_KEY_PROV_INFO *store, CRYPT_KEY_PROV_INFO **ret) +{ + const struct store_CRYPT_KEY_PROV_PARAM *param; + CRYPT_KEY_PROV_INFO *info; + DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i; + const BYTE *base; + BYTE *data; + + base = (const BYTE *)store; + param = (const struct store_CRYPT_KEY_PROV_PARAM *)(base + store->rgProvParam); + + if (store->pwszContainerName) + size += (lstrlenW((LPCWSTR)(base + store->pwszContainerName)) + 1) * sizeof(WCHAR); + if (store->pwszProvName) + size += (lstrlenW((LPCWSTR)(base + store->pwszProvName)) + 1) * sizeof(WCHAR); + + for (i = 0; i < store->cProvParam; i++) + size += sizeof(CRYPT_KEY_PROV_PARAM) + param[i].cbData; + + info = HeapAlloc(GetProcessHeap(), 0, size); + if (!info) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + + data = (BYTE *)(info + 1) + sizeof(CRYPT_KEY_PROV_PARAM) * store->cProvParam; + + if (store->pwszContainerName) + { + info->pwszContainerName = (LPWSTR)data; + lstrcpyW(info->pwszContainerName, (LPCWSTR)((const BYTE *)store + store->pwszContainerName)); + data += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); + } + else + info->pwszContainerName = NULL; + + if (store->pwszProvName) + { + info->pwszProvName = (LPWSTR)data; + lstrcpyW(info->pwszProvName, (LPCWSTR)((const BYTE *)store + store->pwszProvName)); + data += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + } + else + info->pwszProvName = NULL; + + info->dwProvType = store->dwProvType; + info->dwFlags = store->dwFlags; + info->dwKeySpec = store->dwKeySpec; + info->cProvParam = store->cProvParam; + + if (info->cProvParam) + { + DWORD i; + + info->rgProvParam = (CRYPT_KEY_PROV_PARAM *)(info + 1); + + for (i = 0; i < info->cProvParam; i++) + { + info->rgProvParam[i].dwParam = param[i].dwParam; + info->rgProvParam[i].dwFlags = param[i].dwFlags; + info->rgProvParam[i].cbData = param[i].cbData; + info->rgProvParam[i].pbData = param[i].cbData ? data : NULL; + memcpy(info->rgProvParam[i].pbData, base + param[i].pbData, param[i].cbData); + data += param[i].cbData; + } + } + else + info->rgProvParam = NULL; + + TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info->pwszContainerName), debugstr_w(info->pwszProvName), + info->dwProvType, info->dwFlags, info->cProvParam, info->rgProvParam, info->dwKeySpec); + + *ret = info; + return size; +} + static BOOL CRYPT_ReadContextProp( const WINE_CONTEXT_INTERFACE *contextInterface, const void *context, const WINE_CERT_PROP_HEADER *hdr, const BYTE *pbElement, DWORD cbElement) @@ -269,12 +443,15 @@ static BOOL CRYPT_ReadContextProp( break; case CERT_KEY_PROV_INFO_PROP_ID: { - PCRYPT_KEY_PROV_INFO info = - (PCRYPT_KEY_PROV_INFO)pbElement; + CRYPT_KEY_PROV_INFO *info; - CRYPT_FixKeyProvInfoPointers(info); - ret = contextInterface->setProp(context, - hdr->propID, 0, pbElement); + if (read_serialized_KeyProvInfoProperty((const struct store_CRYPT_KEY_PROV_INFO *)pbElement, &info)) + { + ret = contextInterface->setProp(context, hdr->propID, 0, info); + CryptMemFree(info); + } + else + ret = FALSE; break; } case CERT_KEY_CONTEXT_PROP_ID: diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d9f839c72d..745770f009 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -4142,6 +4142,101 @@ static void testGetPublicKeyLength(void) "Expected length 56, got %d\n", ret); } +static void testKeyProvInfo(void) +{ + static WCHAR containerW[] = L"Wine Test Container"; + static WCHAR providerW[] = L"Hello World CSP"; + static CRYPT_KEY_PROV_PARAM param[2] = { { 0x4444, (BYTE *)"param", 6, 0x5555 }, { 0x7777, (BYTE *)"param2", 7, 0x8888 } }; + HCERTSTORE store; + const CERT_CONTEXT *cert; + CERT_NAME_BLOB name; + CRYPT_KEY_PROV_INFO *info, info2; + BOOL ret; + DWORD size; + + store = CertOpenStore(CERT_STORE_PROV_SYSTEM_A, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER, "My"); + ok(store != NULL, "CertOpenStore error %u\n", GetLastError()); + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); + ok(cert != NULL, "CertCreateCertificateContext error %#x\n", GetLastError()); + + info2.pwszContainerName = containerW; + info2.pwszProvName = providerW; + info2.dwProvType = 0x12345678; + info2.dwFlags = 0x87654321; + info2.cProvParam = ARRAY_SIZE(param); + info2.rgProvParam = param; + info2.dwKeySpec = 0x11223344; + ret = CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &info2); + ok(ret, "CertSetCertificateContextProperty error %#x\n", GetLastError()); + + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), 0, size); + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + ok(!lstrcmpW(info->pwszContainerName, containerW), "got %s\n", wine_dbgstr_w(info->pwszContainerName)); + ok(!lstrcmpW(info->pwszProvName, providerW), "got %s\n", wine_dbgstr_w(info->pwszProvName)); + ok(info->dwProvType == 0x12345678, "got %#x\n", info->dwProvType); + ok(info->dwFlags == 0x87654321, "got %#x\n", info->dwFlags); + ok(info->dwKeySpec == 0x11223344, "got %#x\n", info->dwKeySpec); + ok(info->cProvParam == 2, "got %#x\n", info->cProvParam); + ok(info->rgProvParam != NULL, "got %p\n", info->rgProvParam); + ok(info->rgProvParam[0].dwParam == param[0].dwParam, "got %#x\n", info->rgProvParam[0].dwParam); + ok(info->rgProvParam[0].cbData == param[0].cbData, "got %#x\n", info->rgProvParam[0].cbData); + ok(!memcmp(info->rgProvParam[0].pbData, param[0].pbData, param[0].cbData), "param1 mismatch\n"); + ok(info->rgProvParam[0].dwFlags == param[0].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + ok(info->rgProvParam[1].dwParam == param[1].dwParam, "got %#x\n", info->rgProvParam[1].dwParam); + ok(info->rgProvParam[1].cbData == param[1].cbData, "got %#x\n", info->rgProvParam[1].cbData); + ok(!memcmp(info->rgProvParam[1].pbData, param[1].pbData, param[1].cbData), "param2 mismatch\n"); + ok(info->rgProvParam[1].dwFlags == param[1].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + HeapFree(GetProcessHeap(), 0, info); + + ret = CertAddCertificateContextToStore(store, cert, CERT_STORE_ADD_NEW, NULL); + ok(ret, "CertAddCertificateContextToStore error %#x\n", GetLastError()); + + CertFreeCertificateContext(cert); + CertCloseStore(store, 0); + + store = CertOpenStore(CERT_STORE_PROV_SYSTEM_A, 0, 0, + CERT_SYSTEM_STORE_CURRENT_USER | CERT_STORE_OPEN_EXISTING_FLAG, "My"); + ok(store != NULL, "CertOpenStore error %u\n", GetLastError()); + + name.pbData = subjectName; + name.cbData = sizeof(subjectName); + cert = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, CERT_FIND_SUBJECT_NAME, &name, NULL); + ok(cert != NULL, "certificate should exist in My store\n"); + + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), 0, size); + ret = CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, info, &size); + ok(ret, "CertGetCertificateContextProperty error %#x\n", GetLastError()); + ok(!lstrcmpW(info->pwszContainerName, containerW), "got %s\n", wine_dbgstr_w(info->pwszContainerName)); + ok(!lstrcmpW(info->pwszProvName, providerW), "got %s\n", wine_dbgstr_w(info->pwszProvName)); + ok(info->dwProvType == 0x12345678, "got %#x\n", info->dwProvType); + ok(info->dwFlags == 0x87654321, "got %#x\n", info->dwFlags); + ok(info->dwKeySpec == 0x11223344, "got %#x\n", info->dwKeySpec); + ok(info->cProvParam == 2, "got %#x\n", info->cProvParam); + ok(info->rgProvParam != NULL, "got %p\n", info->rgProvParam); + ok(info->rgProvParam[0].dwParam == param[0].dwParam, "got %#x\n", info->rgProvParam[0].dwParam); + ok(info->rgProvParam[0].cbData == param[0].cbData, "got %#x\n", info->rgProvParam[0].cbData); + ok(!memcmp(info->rgProvParam[0].pbData, param[0].pbData, param[0].cbData), "param1 mismatch\n"); + ok(info->rgProvParam[0].dwFlags == param[0].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + ok(info->rgProvParam[1].dwParam == param[1].dwParam, "got %#x\n", info->rgProvParam[1].dwParam); + ok(info->rgProvParam[1].cbData == param[1].cbData, "got %#x\n", info->rgProvParam[1].cbData); + ok(!memcmp(info->rgProvParam[1].pbData, param[1].pbData, param[1].cbData), "param2 mismatch\n"); + ok(info->rgProvParam[1].dwFlags == param[1].dwFlags, "got %#x\n", info->rgProvParam[1].dwFlags); + HeapFree(GetProcessHeap(), 0, info); + + ret = CertDeleteCertificateFromStore(cert); + ok(ret, "CertDeleteCertificateFromStore error %#x\n", GetLastError()); + + CertFreeCertificateContext(cert); + CertCloseStore(store, 0); +} + START_TEST(cert) { init_function_pointers(); @@ -4154,6 +4249,7 @@ START_TEST(cert) testGetSubjectCert(); testGetIssuerCert(); testLinkCert(); + testKeyProvInfo(); testCryptHashCert(); testCryptHashCert2(); -- 2.29.2

2 1

[PATCH v3] gdi32: Avoid the actual drawing position is inconsistent with the desired position when the width or height is negative.
by Jiangyi Chen 23 Nov '20

23 Nov '20

2 1

Re: widl: Set name return value (passed by reference) in the alias case alias case in get_user_type.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > So, I admit I don't really know this code, but looking at it (triggered > by a warning issued by GCC development versions), I noticed that this > variable passed by reference is not initialized here. It's initialized when we return a type, and it doesn't need to be initialized on NULL return. The code is correct, but you could probably set the variable to NULL in the caller to silence the warning. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] services: Avoid buffer overruns in test_runner and START_TEST.
by Gerald Pfeifer 23 Nov '20

23 Nov '20

I never got a response to my patch below (and, yes, I checked the list archives). More than two years later the following, essentially identical, patch by Rémi was applied: commit bcbe1d120cf6f68dd6a888b488050b3db33d1e5c Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:33 2020 +0100 services/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Hmm... Gerald On Mon, 25 Dec 2017, Gerald Pfeifer wrote: > A few days ago my GCC-based builder started picking this up, and > looking into the code there is potential for an actual buffer overrun, > since service_name is included into named_pipe_name together with some > constants, and both originally were the same size. > > This fixes it by increasing the size of the second buffer which also > addresses the following warnings issued by GCC: > > service.c: In function ‘test_runner’: > service.c:541:46: warning: ‘_pipe’ directive writing 5 bytes into a region > of size between 1 and 100 [-Wformat-overflow=] > sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); > ^~~~~ > service.c:541:5: note: ‘sprintf’ output between 15 and 114 bytes into a > destination of size ... > sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > service.c: In function ‘func_service’: > service.c:593:50: warning: ‘_pipe’ directive writing 5 bytes into a region > of size between 1 and 100 [-Wformat-overflow=] > sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); > ^~~~~ > service.c:593:9: note: ‘sprintf’ output between 15 and 114 bytes into a > destination of size ... > sprintf(named_pipe_name, "\\\\.\\pipe\\%s_pipe", service_name); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > programs/services/tests/service.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c > index 98419497a5..47adb1a397 100644 > --- a/programs/services/tests/service.c > +++ b/programs/services/tests/service.c > @@ -29,7 +29,8 @@ > static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); > > static HANDLE pipe_handle = INVALID_HANDLE_VALUE; > -static char service_name[100], named_pipe_name[100]; > +static char service_name[100], > + named_pipe_name[114]; /* will include service_name later on */ > static SERVICE_STATUS_HANDLE service_handle; > > /* Service process global variables */ >

1 0

[PATCH] kernel32: force 4096 byte page alignment
by Gerald Pfeifer 23 Nov '20

23 Nov '20

FreeBSD prefers to use a 0x200000 (super) page alignment. This causes the image base to be displaced from the requested location. Forcing a smaller page size ensures the image can be placed there. This should not have negative impact on other, e.g. Linux-based, platforms I believe. The patch was originally contributed to the FreeBSD emulators/wine(-devel) port by David Naylor in February 2015. We have carried it as part of those two ever since, with occasional adjustments of mine. I am now submitting this here with David's consent. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: David Naylor <naylor.b.david(a)gmail.com>, --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 832f2365b15..f932f83c6b6 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = kernelbase ntdll winecrt0 -EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 +EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 -Wl,-z,max-page-size=0x1000 C_SRCS = \ atom.c \ -- 2.28.0

5 7

Re: oleaut32: Reformat test_safearray such that a tab is 8 spaces.
by Gerald Pfeifer 23 Nov '20

23 Nov '20

I never got a response this, apart from the following from Marvin a month later. :-) This is an automated notification to let you know that your patch has been reviewed and its status set to "Formatting". That said, a few months later the following then addressed the issue original making me look into this: commit 00c591a947919cf67a01c86d2d5da4ee32c46dcc Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 09:58:02 2016 +0300 oleaut32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Case closed. Gerald On Sun, 10 Jan 2016, Gerald Pfeifer wrote: > When I was young (some 25 years younger, think Borland C++) for a > while I wanted to treat tabs in source files configurable, representing > anywhere from 2 to 8 blanks. > > In the meantime I have realized that for a tab to mean anything but > 8 blanks is bound to cause troubles. And GCC's -Wmisleading-indentation > is one such case. > > Luckily this was only one for-loop that's been affected here, and the > patch looks larger than it is -- only whitespace changes. > > Gerald > > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/oleaut32/tests/safearray.c | 98 ++++++++++++++++++++--------------------- > 1 file changed, 49 insertions(+), 49 deletions(-) > > diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c > index f57b886..979e2a3 100644 > --- a/dlls/oleaut32/tests/safearray.c > +++ b/dlls/oleaut32/tests/safearray.c > @@ -708,61 +708,61 @@ static void test_safearray(void) > if (!pSafeArrayAllocDescriptorEx) > return; > > - for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { > - a = NULL; > - hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a); > - ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); > - ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags); > - if (a->fFeatures & FADF_HAVEIID) { > - hres = pSafeArrayGetIID(a, &iid); > - ok(hres == S_OK,"SAGIID failed for vt %d with hres %x\n", vttypes[i].vt,hres); > - switch (vttypes[i].vt) { > - case VT_UNKNOWN: > - ok(IsEqualGUID(((GUID*)a)-1,&IID_IUnknown),"guid for VT_UNKNOWN is not IID_IUnknown\n"); > - ok(IsEqualGUID(&iid, &IID_IUnknown),"SAGIID returned wrong GUID for IUnknown\n"); > - break; > - case VT_DISPATCH: > - ok(IsEqualGUID(((GUID*)a)-1,&IID_IDispatch),"guid for VT_UNKNOWN is not IID_IDispatch\n"); > - ok(IsEqualGUID(&iid, &IID_IDispatch),"SAGIID returned wrong GUID for IDispatch\n"); > - break; > - default: > - ok(FALSE,"unknown vt %d with FADF_HAVEIID\n",vttypes[i].vt); > - break; > - } > - } else { > - hres = pSafeArrayGetIID(a, &iid); > - ok(hres == E_INVALIDARG,"SAGIID did not fail for vt %d with hres %x\n", vttypes[i].vt,hres); > - } > - if (a->fFeatures & FADF_RECORD) { > - ok(vttypes[i].vt == VT_RECORD,"FADF_RECORD for non record %d\n",vttypes[i].vt); > - } > - if (a->fFeatures & FADF_HAVEVARTYPE) { > - ok(vttypes[i].vt == ((DWORD*)a)[-1], "FADF_HAVEVARTYPE set, but vt %d mismatch stored %d\n",vttypes[i].vt,((DWORD*)a)[-1]); > + for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { > + a = NULL; > + hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a); > + ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); > + ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags); > + if (a->fFeatures & FADF_HAVEIID) { > + hres = pSafeArrayGetIID(a, &iid); > + ok(hres == S_OK,"SAGIID failed for vt %d with hres %x\n", vttypes[i].vt,hres); > + switch (vttypes[i].vt) { > + case VT_UNKNOWN: > + ok(IsEqualGUID(((GUID*)a)-1,&IID_IUnknown),"guid for VT_UNKNOWN is not IID_IUnknown\n"); > + ok(IsEqualGUID(&iid, &IID_IUnknown),"SAGIID returned wrong GUID for IUnknown\n"); > + break; > + case VT_DISPATCH: > + ok(IsEqualGUID(((GUID*)a)-1,&IID_IDispatch),"guid for VT_UNKNOWN is not IID_IDispatch\n"); > + ok(IsEqualGUID(&iid, &IID_IDispatch),"SAGIID returned wrong GUID for IDispatch\n"); > + break; > + default: > + ok(FALSE,"unknown vt %d with FADF_HAVEIID\n",vttypes[i].vt); > + break; > } > + } else { > + hres = pSafeArrayGetIID(a, &iid); > + ok(hres == E_INVALIDARG,"SAGIID did not fail for vt %d with hres %x\n", vttypes[i].vt,hres); > + } > + if (a->fFeatures & FADF_RECORD) { > + ok(vttypes[i].vt == VT_RECORD,"FADF_RECORD for non record %d\n",vttypes[i].vt); > + } > + if (a->fFeatures & FADF_HAVEVARTYPE) { > + ok(vttypes[i].vt == ((DWORD*)a)[-1], "FADF_HAVEVARTYPE set, but vt %d mismatch stored %d\n",vttypes[i].vt,((DWORD*)a)[-1]); > + } > > - hres = pSafeArrayGetVartype(a, &vt); > - ok(hres == S_OK, "SAGVT of array with vt %d failed with %x\n", vttypes[i].vt, hres); > + hres = pSafeArrayGetVartype(a, &vt); > + ok(hres == S_OK, "SAGVT of array with vt %d failed with %x\n", vttypes[i].vt, hres); > > - if (vttypes[i].vt == VT_DISPATCH) { > - /* Special case. Checked against Windows. */ > - ok(vt == VT_UNKNOWN, "SAGVT of array with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); > - } else { > - ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); > - } > + if (vttypes[i].vt == VT_DISPATCH) { > + /* Special case. Checked against Windows. */ > + ok(vt == VT_UNKNOWN, "SAGVT of array with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); > + } else { > + ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); > + } > > - if (a->fFeatures & FADF_HAVEIID) { > - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ > - ok(hres == S_OK,"SASIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); > - hres = pSafeArrayGetIID(a, &iid); > - ok(hres == S_OK,"SAGIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); > - ok(IsEqualGUID(&iid, &IID_IStorage),"returned iid is not IID_IStorage\n"); > - } else { > - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ > + if (a->fFeatures & FADF_HAVEIID) { > + hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ > + ok(hres == S_OK,"SASIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); > + hres = pSafeArrayGetIID(a, &iid); > + ok(hres == S_OK,"SAGIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); > + ok(IsEqualGUID(&iid, &IID_IStorage),"returned iid is not IID_IStorage\n"); > + } else { > + hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ > ok(hres == E_INVALIDARG,"SASIID did not failed with !FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); > - } > - hres = SafeArrayDestroyDescriptor(a); > - ok(hres == S_OK,"SADD failed with hres %x\n",hres); > } > + hres = SafeArrayDestroyDescriptor(a); > + ok(hres == S_OK,"SADD failed with hres %x\n",hres); > + } > } > > static void test_SafeArrayAllocDestroyDescriptor(void)

1 0

[PATCH] comdlg32: Use wide-char string literals.
by Michael Stefaniuc 22 Nov '20

22 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/colordlg.c | 12 ++---- dlls/comdlg32/filedlg.c | 73 +++++++++++--------------------- dlls/comdlg32/filedlg31.c | 13 +++--- dlls/comdlg32/fontdlg.c | 87 +++++++++++++++++---------------------- dlls/comdlg32/itemdlg.c | 45 +++++++------------- dlls/comdlg32/printdlg.c | 42 +++++++------------ 6 files changed, 102 insertions(+), 170 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 510e0723f26..7ab5efd0962 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -63,9 +63,6 @@ static const COLORREF predefcolors[6][8]= 0x00808040L, 0x00C0C0C0L, 0x00400040L, 0x00FFFFFFL }, }; -static const WCHAR szColourDialogProp[] = { - 'c','o','l','o','u','r','d','i','a','l','o','g','p','r','o','p',0 }; - /* Chose Color PRIVATE Structure: * * This structure is duplicated in the 16 bit code with @@ -866,7 +863,7 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) lpp->lpcc = cc; lpp->hwndSelf = hDlg; - SetPropW( hDlg, szColourDialogProp, lpp ); + SetPropW( hDlg, L"colourdialogprop", lpp ); if (!(lpp->lpcc->Flags & CC_SHOWHELP)) ShowWindow(GetDlgItem(hDlg, pshHelp), SW_HIDE); @@ -1194,7 +1191,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, { int res; - CCPRIV *lpp = GetPropW( hDlg, szColourDialogProp ); + CCPRIV *lpp = GetPropW( hDlg, L"colourdialogprop" ); if (message != WM_INITDIALOG) { @@ -1220,7 +1217,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); heap_free(lpp); - RemovePropW( hDlg, szColourDialogProp ); + RemovePropW( hDlg, L"colourdialogprop" ); break; case WM_COMMAND: if (CC_WMCommand(lpp, wParam, lParam, HIWORD(wParam), (HWND) lParam)) @@ -1301,8 +1298,7 @@ BOOL WINAPI ChooseColorW( CHOOSECOLORW *lpChCol ) { HRSRC hResInfo; HGLOBAL hDlgTmpl; - static const WCHAR wszCHOOSE_COLOR[] = {'C','H','O','O','S','E','_','C','O','L','O','R',0}; - if (!(hResInfo = FindResourceW(COMDLG32_hInstance, wszCHOOSE_COLOR, (LPWSTR)RT_DIALOG))) + if (!(hResInfo = FindResourceW(COMDLG32_hInstance, L"CHOOSE_COLOR", (LPWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 538358bd5f9..0ada09aad96 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -135,18 +135,9 @@ typedef struct tagLookInInfo static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */ static SIZE MemDialogSize = { 0, 0}; /* keep size of the (resizable) dialog */ -static const WCHAR LastVisitedMRUW[] = - {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'E','x','p','l','o','r','e','r','\\','C','o','m','D','l','g','3','2','\\', - 'L','a','s','t','V','i','s','i','t','e','d','M','R','U',0}; -static const WCHAR MRUListW[] = {'M','R','U','L','i','s','t',0}; - -static const WCHAR filedlg_info_propnameW[] = {'F','i','l','e','O','p','e','n','D','l','g','I','n','f','o','s',0}; - FileOpenDlgInfos *get_filedlg_infoptr(HWND hwnd) { - return GetPropW(hwnd, filedlg_info_propnameW); + return GetPropW(hwnd, L"FileOpenDlgInfos"); } static BOOL is_dialog_hooked(const FileOpenDlgInfos *info) @@ -268,7 +259,6 @@ static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value) static BOOL is_places_bar_enabled(const FileOpenDlgInfos *fodInfos) { - static const WCHAR noplacesbarW[] = {'N','o','P','l','a','c','e','s','B','a','r',0}; DWORD value; HKEY hkey; @@ -283,7 +273,7 @@ static BOOL is_places_bar_enabled(const FileOpenDlgInfos *fodInfos) return TRUE; value = 0; - get_config_key_as_dword(hkey, noplacesbarW, &value); + get_config_key_as_dword(hkey, L"NoPlacesBar", &value); RegCloseKey(hkey); return value == 0; } @@ -304,13 +294,12 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) { for (i = 0; i < ARRAY_SIZE(fodInfos->places); i++) { - static const WCHAR placeW[] = {'P','l','a','c','e','%','d',0}; WCHAR nameW[8]; DWORD value; HRESULT hr; WCHAR *str; - swprintf(nameW, ARRAY_SIZE(nameW), placeW, i); + swprintf(nameW, ARRAY_SIZE(nameW), L"Place%d", i); if (get_config_key_dword(hkey, nameW, &value)) { hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); @@ -1304,7 +1293,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if (SUCCEEDED(OleInitialize(NULL))) fodInfos->ole_initialized = TRUE; - SetPropW(hwnd, filedlg_info_propnameW, fodInfos); + SetPropW(hwnd, L"FileOpenDlgInfos", fodInfos); FILEDLG95_InitControls(hwnd); @@ -1431,7 +1420,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l } case WM_NCDESTROY: - RemovePropW(hwnd, filedlg_info_propnameW); + RemovePropW(hwnd, L"FileOpenDlgInfos"); return 0; case WM_NOTIFY: @@ -1497,8 +1486,6 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) BOOL win98plus = FALSE; BOOL handledPath = FALSE; OSVERSIONINFOW osVi; - static const WCHAR szwSlash[] = { '\\', 0 }; - static const WCHAR szwStar[] = { '*',0 }; static const TBBUTTON tbb[] = { @@ -1659,7 +1646,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) { /* 1. If win2000 or higher and filename contains a path, use it in preference over the lpstrInitialDir */ - if (win2000plus && *fodInfos->filename && wcspbrk(fodInfos->filename, szwSlash)) { + if (win2000plus && *fodInfos->filename && wcspbrk(fodInfos->filename, L"\\")) { WCHAR tmpBuf[MAX_PATH]; WCHAR *nameBit; DWORD result; @@ -1707,7 +1694,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) * specified, the dir part is taken */ if (PathIsDirectoryW(tmpBuf)) { PathAddBackslashW(tmpBuf); - lstrcatW(tmpBuf, szwStar); + lstrcatW(tmpBuf, L"*"); } result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); if (result) { @@ -1730,9 +1717,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir)) { /* 3. All except w2k+: if filename contains a path use it */ - if (!win2000plus && fodInfos->filename && - *fodInfos->filename && - wcspbrk(fodInfos->filename, szwSlash)) { + if (!win2000plus && fodInfos->filename && *fodInfos->filename && + wcspbrk(fodInfos->filename, L"\\")) { WCHAR tmpBuf[MAX_PATH]; WCHAR *nameBit; DWORD result; @@ -2173,15 +2159,14 @@ BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCo WCHAR lpstrNotFound[100]; WCHAR lpstrMsg[100]; WCHAR tmp[400]; - static const WCHAR nl[] = {'\n',0}; LoadStringW(COMDLG32_hInstance, IDS_FILENOTFOUND, lpstrNotFound, 100); LoadStringW(COMDLG32_hInstance, IDS_VERIFYFILE, lpstrMsg, 100); lstrcpyW(tmp, lpstrTemp); - lstrcatW(tmp, nl); + lstrcatW(tmp, L"\n"); lstrcatW(tmp, lpstrNotFound); - lstrcatW(tmp, nl); + lstrcatW(tmp, L"\n"); lstrcatW(tmp, lpstrMsg); MessageBoxW(hwnd, tmp, fodInfos->title, MB_OK | MB_ICONEXCLAMATION); @@ -2265,13 +2250,14 @@ static WCHAR FILEDLG95_MRU_get_slot(LPCWSTR module_name, LPWSTR stored_path, PHK if(stored_path) *stored_path = '\0'; - ret = RegCreateKeyW(HKEY_CURRENT_USER, LastVisitedMRUW, hkey); + ret = RegCreateKeyW(HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ComDlg32\\LastVisitedMRU", hkey); if(ret){ WARN("Unable to create MRU key: %d\n", ret); return 0; } - ret = RegGetValueW(*hkey, NULL, MRUListW, RRF_RT_REG_SZ, &key_type, + ret = RegGetValueW(*hkey, NULL, L"MRUList", RRF_RT_REG_SZ, &key_type, (LPBYTE)mru_list, &mru_list_size); if(ret || key_type != REG_SZ){ if(ret == ERROR_FILE_NOT_FOUND) @@ -2378,7 +2364,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) WCHAR *old_mru_slot, *new_mru_slot = new_mru_list; DWORD mru_list_size = sizeof(old_mru_list), key_type; - ret = RegGetValueW(hkey, NULL, MRUListW, RRF_RT_ANY, &key_type, + ret = RegGetValueW(hkey, NULL, L"MRUList", RRF_RT_ANY, &key_type, (LPBYTE)old_mru_list, &mru_list_size); if(ret || key_type != REG_SZ){ if(ret == ERROR_FILE_NOT_FOUND){ @@ -2400,7 +2386,7 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) *new_mru_slot = '\0'; } - ret = RegSetValueExW(hkey, MRUListW, 0, REG_SZ, (LPBYTE)new_mru_list, + ret = RegSetValueExW(hkey, L"MRUList", 0, REG_SZ, (LPBYTE)new_mru_list, (lstrlenW(new_mru_list) + 1) * sizeof(WCHAR)); if(ret){ WARN("Error saving MRUList data: %d\n", ret); @@ -2449,10 +2435,9 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, int nOpenAction = defAction; LPWSTR lpszTemp, lpszTemp1; LPITEMIDLIST pidl = NULL; - static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; /* check for invalid chars */ - if((wcspbrk(lpstrPathAndFile+3, szwInvalid) != NULL) && !(flags & OFN_NOVALIDATE)) + if((wcspbrk(lpstrPathAndFile+3, L"/:<>|") != NULL) && !(flags & OFN_NOVALIDATE)) { FILEDLG95_OnOpenMessage(hwnd, IDS_INVALID_FILENAME_TITLE, IDS_INVALID_FILENAME); return FALSE; @@ -2479,9 +2464,8 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, /* There are no wildcards when OFN_NOVALIDATE is set */ if(*lpszTemp==0 && !(flags & OFN_NOVALIDATE)) { - static const WCHAR wszWild[] = { '*', '?', 0 }; /* if the last element is a wildcard do a search */ - if(wcspbrk(lpszTemp1, wszWild) != NULL) + if(wcspbrk(lpszTemp1, L"*?") != NULL) { nOpenAction = ONOPEN_SEARCH; break; @@ -2722,7 +2706,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) WCHAR *filterExt = NULL; LPWSTR lpstrFilter = NULL; - static const WCHAR szwDot[] = {'.',0}; int PathLength = lstrlenW(lpstrPathAndFile); /*Get the file extension from file type filter*/ @@ -2769,7 +2752,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if (*filterExt) /* ignore filterExt="" */ { /* Attach the dot*/ - lstrcatW(lpstrPathAndFile, szwDot); + lstrcatW(lpstrPathAndFile, L"."); /* Attach the extension */ lstrcatW(lpstrPathAndFile, filterExt); } @@ -3285,17 +3268,12 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd) */ static inline BOOL FILEDLG95_unixfs_is_rooted_at_desktop(void) { HKEY hKey; - static const WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', - 'N','a','m','e','S','p','a','c','e','\\','{','9','D','2','0','A','A','E','8', - '-','0','6','2','5','-','4','4','B','0','-','9','C','A','7','-', - '7','1','8','8','9','C','2','2','5','4','D','9','}',0 }; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRootedAtDesktop, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Desktop\\NameSpace\\" + "{9D20AAE8-0625-44B0-9CA7-71889C2254D9}", 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; - + RegCloseKey(hKey); return TRUE; } @@ -4331,7 +4309,6 @@ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf) short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) { int i, len; - static const WCHAR brkpoint[] = {'*','[',']',0}; TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf); if(lpFile == NULL || lpTitle == NULL) @@ -4342,7 +4319,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) if (len == 0) return -1; - if(wcspbrk(lpFile, brkpoint)) + if(wcspbrk(lpFile, L"*[]")) return -1; len--; diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 53ef3eeb481..b134814ab03 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -43,9 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define BUFFILE 512 #define BUFFILEALLOC 512 * sizeof(WCHAR) -static const WCHAR FILE_star[] = {'*','.','*', 0}; -static const WCHAR FILE_bslash[] = {'\\', 0}; -static const WCHAR FILE_specc[] = {'%','c',':', 0}; static const int fldrHeight = 16; static const int fldrWidth = 20; @@ -167,7 +164,7 @@ static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) return fptr; fptr += lstrlenW(fptr) + 1; } - return FILE_star; /* FIXME */ + return L"*.*"; /* FIXME */ } /*********************************************************************** @@ -210,7 +207,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) } /* list of directories */ - lstrcpyW(buffer, FILE_star); + lstrcpyW(buffer, L"*.*"); if (GetDlgItem(hWnd, lst2) != 0) { lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); @@ -429,7 +426,7 @@ static LRESULT FD31_DirListDblClick( const FD31_DATA *lfs ) tmpstr[lstrlenW(tmpstr) - 1] = 0; lstrcpyW(tmpstr,tmpstr+1); } - lstrcatW(tmpstr, FILE_bslash); + lstrcatW(tmpstr, L"\\"); FD31_ScanDir(lfs->ofnW, hWnd, tmpstr); /* notify the app */ @@ -515,7 +512,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) pstr2 = path + lstrlenW(path); if (pBeginFileName == NULL || *(pBeginFileName + 1) != 0) - lstrcatW(path, FILE_bslash); + lstrcatW(path, L"\\"); /* if ScanDir succeeds, we have changed the directory */ if (FD31_ScanDir(lfs->ofnW, hWnd, path)) @@ -627,7 +624,7 @@ static LRESULT FD31_DiskChange( const FD31_DATA *lfs ) pstr = heap_alloc(BUFFILEALLOC); SendDlgItemMessageW(hWnd, cmb2, CB_GETLBTEXT, lRet, (LPARAM)pstr); - wsprintfW(diskname, FILE_specc, pstr[2]); + wsprintfW(diskname, L"%c:", pstr[2]); heap_free(pstr); return FD31_Validate( lfs, diskname, cmb2, lRet, TRUE ); diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index db2780e1218..a518c78fb17 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -47,11 +47,8 @@ typedef struct } CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT; -static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A',0}; -static const WCHAR strWineFontData_a[] = - {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','_','A',0}; -static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0}; -static const WCHAR fontsizefmtW[] = {'%','d',0}; +static const WCHAR strWineFontData[] = L"__WINE_FONTDLGDATA"; +static const WCHAR strWineFontData_a[] = L"__WINE_FONTDLGDATA_A"; /* image list with TrueType bitmaps and more */ static HIMAGELIST himlTT = 0; @@ -67,43 +64,37 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, #define CI(cs) ((IDS_CHARSET_##cs)-IDS_CHARSET_ANSI) - -static const WCHAR stWestern[]={'A','a','B','b','Y','y','Z','z',0}; /* Western and default */ -static const WCHAR stSymbol[]={'S','y','m','b','o','l',0}; /* Symbol */ -static const WCHAR stShiftJis[]={'A','a',0x3042,0x3041,0x30a2,0x30a1,0x4e9c,0x5b87,0}; /* Shift JIS */ -static const WCHAR stHangul[]={0xac00,0xb098,0xb2e4,'A','a','B','Y','y','Z','z',0}; /* Hangul */ -static const WCHAR stGB2312[]={0x5fae,0x8f6f,0x4e2d,0x6587,0x8f6f,0x4ef6,0}; /* GB2312 */ -static const WCHAR stBIG5[]={0x4e2d,0x6587,0x5b57,0x578b,0x7bc4,0x4f8b,0}; /* BIG5 */ -static const WCHAR stGreek[]={'A','a','B','b',0x0391,0x03b1,0x0392,0x03b2,0}; /* Greek */ -static const WCHAR stTurkish[]={'A','a','B','b',0x011e,0x011f,0x015e,0x015f,0}; /* Turkish */ -static const WCHAR stHebrew[]={'A','a','B','b',0x05e0,0x05e1,0x05e9,0x05ea,0}; /* Hebrew */ -static const WCHAR stArabic[]={'A','a','B','b',0x0627,0x0628,0x062c,0x062f,0x0647,0x0648,0x0632,0};/* Arabic */ -static const WCHAR stBaltic[]={'A','a','B','b','Y','y','Z','z',0}; /* Baltic */ -static const WCHAR stVietname[]={'A','a','B','b',0x01a0,0x01a1,0x01af,0x01b0,0}; /* Vietnamese */ -static const WCHAR stCyrillic[]={'A','a','B','b',0x0411,0x0431,0x0424,0x0444,0}; /* Cyrillic */ -static const WCHAR stEastEur[]={'A','a','B','b',0xc1,0xe1,0xd4,0xf4,0}; /* East European */ -static const WCHAR stThai[]={'A','a','B','b',0x0e2d,0x0e31,0x0e01,0x0e29,0x0e23,0x0e44,0x0e17,0x0e22,0}; /* Thai */ -static const WCHAR stJohab[]={0xac00,0xb098,0xb2e4,'A','a','B','Y','y','Z','z',0}; /* Johab */ -static const WCHAR stMac[]={'A','a','B','b','Y','y','Z','z',0}; /* Mac */ -static const WCHAR stOEM[]={'A','a','B','b',0xf8,0xf1,0xfd,0}; /* OEM */ -/* the following character sets actually behave different (Win2K observation): - * the sample string is 'sticky': it uses the sample string of the previous - * selected character set. That behaviour looks like some default, which is - * not (yet) implemented. */ -static const WCHAR stVISCII[]={'A','a','B','b',0}; /* VISCII */ -static const WCHAR stTCVN[]={'A','a','B','b',0}; /* TCVN */ -static const WCHAR stKOI8[]={'A','a','B','b',0}; /* KOI-8 */ -static const WCHAR stIso88593[]={'A','a','B','b',0}; /* ISO-8859-3 */ -static const WCHAR stIso88594[]={'A','a','B','b',0}; /* ISO-8859-4 */ -static const WCHAR stIso885910[]={'A','a','B','b',0}; /* ISO-8859-10 */ -static const WCHAR stCeltic[]={'A','a','B','b',0};/* Celtic */ - static const WCHAR * const sample_lang_text[]={ - stWestern,stSymbol,stShiftJis,stHangul,stGB2312, - stBIG5,stGreek,stTurkish,stHebrew,stArabic, - stBaltic,stVietname,stCyrillic,stEastEur,stThai, - stJohab,stMac,stOEM,stVISCII,stTCVN, - stKOI8,stIso88593,stIso88594,stIso885910,stCeltic}; + L"AaBbYyZz", /* Western and default */ + L"Symbol", /* Symbol */ + L"Aa\x3042\x3041\x30a2\x30a1\x4e9c\x5b87", /* Shift JIS */ + L"\xac00\xb098\xb2e4" "AaBYyZz", /* Hangul */ + L"\x5fae\x8f6f\x4e2d\x6587\x8f6f\x4ef6", /* GB2312 */ + L"\x4e2d\x6587\x5b57\x578b\x7bc4\x4f8b", /* BIG5 */ + L"AaBb\x0391\x03b1\x0392\x03b2", /* Greek */ + L"AaBb\x011e\x011f\x015e\x015f", /* Turkish */ + L"AaBb\x05e0\x05e1\x05e9\x05ea", /* Hebrew */ + L"AaBb\x0627\x0628\x062c\x062f\x0647\x0648\x0632", /* Arabic */ + L"AaBbYyZz", /* Baltic */ + L"AaBb\x01a0\x01a1\x01af\x01b0", /* Vietnamese */ + L"AaBb\x0411\x0431\x0424\x0444", /* Cyrillic */ + L"AaBb\x00c1\x00e1\x00d4\x00f4", /* East European */ + L"AaBb\x0e2d\x0e31\x0e01\x0e29\x0e23\x0e44\x0e17\x0e22", /* Thai */ + L"\xac00\xb098\xb2e4" "AaBYyZz", /* Johab */ + L"AaBbYyZz", /* Mac */ + L"AaBb\x00f8\x00f1\x00fd", /* OEM */ + /* the following character sets actually behave different (Win2K observation): + * the sample string is 'sticky': it uses the sample string of the previous + * selected character set. That behaviour looks like some default, which is + * not (yet) implemented. */ + L"AaBb", /* VISCII */ + L"AaBb", /* TCVN */ + L"AaBb", /* KOI-8 */ + L"AaBb", /* ISO-8859-3 */ + L"AaBb", /* ISO-8859-4 */ + L"AaBb", /* ISO-8859-10 */ + L"AaBb" /* Celtic */ +}; static const BYTE CHARSET_ORDER[256]={ @@ -207,7 +198,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) } else { hDlginst=COMDLG32_hInstance; - if (!(hResInfo = FindResourceW(hDlginst, chooseFontW, (LPWSTR)RT_DIALOG))) + if (!(hResInfo = FindResourceW(hDlginst, L"CHOOSE_FONT", (LPWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; @@ -261,7 +252,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) } else { hDlginst=COMDLG32_hInstance; - if (!(hResInfo = FindResourceW(hDlginst, chooseFontW, (LPWSTR)RT_DIALOG))) + if (!(hResInfo = FindResourceW(hDlginst, L"CHOOSE_FONT", (LPWSTR)RT_DIALOG))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; @@ -422,7 +413,7 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) if ( (!(lpcf->Flags & CF_LIMITSIZE)) || ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax))) { - swprintf(buffer, ARRAY_SIZE(buffer), fontsizefmtW, h); + swprintf(buffer, ARRAY_SIZE(buffer), L"%d", h); j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer); if (j==CB_ERR) { @@ -625,7 +616,6 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) CFn_ENUMSTRUCT s; LPLOGFONTW lpxx; HCURSOR hcursor=SetCursor(LoadCursorW(0,(LPWSTR)IDC_WAIT)); - static const WCHAR strColorName[] = {'[','c','o','l','o','r',' ','n','a','m','e',']',0}; SetPropW(hDlg, strWineFontData, lpcf); lpxx=lpcf->lpLogFont; @@ -662,11 +652,8 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) { WCHAR name[30]; - if( LoadStringW(COMDLG32_hInstance, IDS_COLOR_BLACK+i, name, - ARRAY_SIZE(name)) == 0 ) - { - memcpy(name, strColorName, sizeof(strColorName)); - } + if (LoadStringW(COMDLG32_hInstance, IDS_COLOR_BLACK+i, name, ARRAY_SIZE(name)) == 0) + lstrcpyW(name, L"[color name]"); j=SendDlgItemMessageW(hDlg, cmb4, CB_ADDSTRING, 0, (LPARAM)name); SendDlgItemMessageW(hDlg, cmb4, CB_SETITEMDATA, j, textcolors[i]); /* look for a fitting value in color combobox */ diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index f17c2f926d6..eb85aa10d64 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -48,10 +48,6 @@ DEFINE_GUID(IID_IFileDialogCustomizeAlt, 0x8016B7B3, 0x3D49, 0x4504, 0xA0,0xAA, WINE_DEFAULT_DEBUG_CHANNEL(commdlg); -static const WCHAR notifysink_childW[] = {'n','f','s','_','c','h','i','l','d',0}; -static const WCHAR floatnotifysinkW[] = {'F','l','o','a','t','N','o','t','i','f','y','S','i','n','k',0}; -static const WCHAR radiobuttonlistW[] = {'R','a','d','i','o','B','u','t','t','o','n','L','i','s','t',0}; - enum ITEMDLG_TYPE { ITEMDLG_TYPE_OPEN, ITEMDLG_TYPE_SAVE @@ -555,8 +551,6 @@ static HRESULT on_default_action(FileDialogImpl *This) /* Add the proper extension */ if(open_action == ONOPEN_OPEN) { - static const WCHAR dotW[] = {'.',0}; - if(This->dlg_type == ITEMDLG_TYPE_SAVE) { WCHAR extbuf[MAX_PATH], *newext = NULL; @@ -567,7 +561,7 @@ static HRESULT on_default_action(FileDialogImpl *This) } else if(This->default_ext) { - lstrcpyW(extbuf, dotW); + lstrcpyW(extbuf, L"."); lstrcatW(extbuf, This->default_ext); newext = extbuf; } @@ -586,7 +580,7 @@ static HRESULT on_default_action(FileDialogImpl *This) { if(This->default_ext) { - lstrcatW(canon_filename, dotW); + lstrcatW(canon_filename, L"."); lstrcatW(canon_filename, This->default_ext); if(!PathFileExistsW(canon_filename)) @@ -1122,7 +1116,7 @@ static LRESULT CALLBACK notifysink_proc(HWND hwnd, UINT message, WPARAM wparam, case WM_COMMAND: return notifysink_on_wm_command(This, hwnd, wparam, lparam); case WM_NOTIFY: return notifysink_on_wm_notify(This, hwnd, wparam, lparam); case WM_SIZE: - hwnd_child = GetPropW(hwnd, notifysink_childW); + hwnd_child = GetPropW(hwnd, L"nfs_child"); ctrl = (customctrl*)GetWindowLongPtrW(hwnd_child, GWLP_USERDATA); if(ctrl && ctrl->type != IDLG_CCTRL_VISUALGROUP) { @@ -1151,7 +1145,7 @@ static HRESULT cctrl_create_new(FileDialogImpl *This, DWORD id, else parent_hwnd = This->cctrls_hwnd; - ns_hwnd = CreateWindowExW(0, floatnotifysinkW, NULL, wsflags, + ns_hwnd = CreateWindowExW(0, L"FloatNotifySink", NULL, wsflags, 0, 0, This->cctrl_width, height, parent_hwnd, (HMENU)This->cctrl_next_dlgid, COMDLG32_hInstance, This); control_hwnd = CreateWindowExW(ctrl_exflags, wndclass, text, wsflags | ctrl_wsflags, @@ -1167,7 +1161,7 @@ static HRESULT cctrl_create_new(FileDialogImpl *This, DWORD id, return E_FAIL; } - SetPropW(ns_hwnd, notifysink_childW, control_hwnd); + SetPropW(ns_hwnd, L"nfs_child", control_hwnd); ctrl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(customctrl)); if(!ctrl) @@ -1492,8 +1486,7 @@ static HRESULT init_custom_controls(FileDialogImpl *This) { WNDCLASSW wc; HDC hdc; - static const WCHAR ctrl_container_classname[] = - {'i','d','l','g','_','c','o','n','t','a','i','n','e','r','_','p','a','n','e',0}; + static const WCHAR ctrl_container_classname[] = L"idlg_container_pane"; InitCommonControlsEx(NULL); @@ -1537,7 +1530,7 @@ static HRESULT init_custom_controls(FileDialogImpl *This) SetWindowLongW(This->cctrls_hwnd, GWL_STYLE, WS_TABSTOP); /* Register class for */ - if( !GetClassInfoW(COMDLG32_hInstance, floatnotifysinkW, &wc) || + if (!GetClassInfoW(COMDLG32_hInstance, L"FloatNotifySink", &wc) || wc.hInstance != COMDLG32_hInstance) { wc.style = CS_HREDRAW | CS_VREDRAW; @@ -1549,13 +1542,13 @@ static HRESULT init_custom_controls(FileDialogImpl *This) wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = NULL; - wc.lpszClassName = floatnotifysinkW; + wc.lpszClassName = L"FloatNotifySink"; if (!RegisterClassW(&wc)) ERR("Failed to register FloatNotifySink window class.\n"); } - if( !GetClassInfoW(COMDLG32_hInstance, radiobuttonlistW, &wc) || + if (!GetClassInfoW(COMDLG32_hInstance, L"RadioButtonList", &wc) || wc.hInstance != COMDLG32_hInstance) { wc.style = CS_HREDRAW | CS_VREDRAW; @@ -1567,7 +1560,7 @@ static HRESULT init_custom_controls(FileDialogImpl *This) wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = NULL; - wc.lpszClassName = radiobuttonlistW; + wc.lpszClassName = L"RadioButtonList"; if (!RegisterClassW(&wc)) ERR("Failed to register RadioButtonList window class.\n"); @@ -1970,12 +1963,9 @@ static void update_control_text(FileDialogImpl *This) static LRESULT CALLBACK dropdown_subclass_proc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam) { - static const WCHAR prop_this[] = {'i','t','e','m','d','l','g','_','T','h','i','s',0}; - static const WCHAR prop_oldwndproc[] = {'i','t','e','m','d','l','g','_','o','l','d','w','n','d','p','r','o','c',0}; - if (umessage == WM_LBUTTONDOWN) { - FileDialogImpl *This = GetPropW(hwnd, prop_this); + FileDialogImpl *This = GetPropW(hwnd, L"itemdlg_This"); SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); show_opendropdown(This); @@ -1984,7 +1974,7 @@ static LRESULT CALLBACK dropdown_subclass_proc(HWND hwnd, UINT umessage, WPARAM return 0; } - return CallWindowProcW((WNDPROC)GetPropW(hwnd, prop_oldwndproc), hwnd, umessage, wparam, lparam); + return CallWindowProcW((WNDPROC)GetPropW(hwnd, L"itemdlg_oldwndproc"), hwnd, umessage, wparam, lparam); } static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) @@ -2047,9 +2037,6 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) HWND dropdown_hwnd; LOGFONTW lfw, lfw_marlett; HFONT dialog_font; - static const WCHAR marlett[] = {'M','a','r','l','e','t','t',0}; - static const WCHAR prop_this[] = {'i','t','e','m','d','l','g','_','T','h','i','s',0}; - static const WCHAR prop_oldwndproc[] = {'i','t','e','m','d','l','g','_','o','l','d','w','n','d','p','r','o','c',0}; dropdown_hwnd = GetDlgItem(This->dlg_hwnd, psh1); @@ -2059,7 +2046,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) GetObjectW(dialog_font, sizeof(lfw), &lfw); memset(&lfw_marlett, 0, sizeof(lfw_marlett)); - lstrcpyW(lfw_marlett.lfFaceName, marlett); + lstrcpyW(lfw_marlett.lfFaceName, L"Marlett"); lfw_marlett.lfHeight = lfw.lfHeight; lfw_marlett.lfCharSet = SYMBOL_CHARSET; @@ -2068,8 +2055,8 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) SendMessageW(dropdown_hwnd, WM_SETFONT, (LPARAM)This->hfont_opendropdown, 0); /* Subclass button so we can handle LBUTTONDOWN */ - SetPropW(dropdown_hwnd, prop_this, This); - SetPropW(dropdown_hwnd, prop_oldwndproc, + SetPropW(dropdown_hwnd, L"itemdlg_This", This); + SetPropW(dropdown_hwnd, L"itemdlg_oldwndproc", (HANDLE)SetWindowLongPtrW(dropdown_hwnd, GWLP_WNDPROC, (LONG_PTR)dropdown_subclass_proc)); } @@ -3837,7 +3824,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddRadioButtonList(IFileDialogCusto HRESULT hr; TRACE("%p (%d)\n", This, dwIDCtl); - hr = cctrl_create_new(This, dwIDCtl, NULL, radiobuttonlistW, 0, 0, 0, &ctrl); + hr = cctrl_create_new(This, dwIDCtl, NULL, L"RadioButtonList", 0, 0, 0, &ctrl); if(SUCCEEDED(hr)) { ctrl->type = IDLG_CCTRL_RADIOBUTTONLIST; diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 0da728b1247..8d5ffc0e972 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -141,13 +141,8 @@ static WNDPROC lpfnStaticWndProc; static WNDPROC edit_wndproc; /* the text of the fake document to render for the Page Setup dialog */ static WCHAR wszFakeDocumentText[1024]; -static const WCHAR pd32_collateW[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; -static const WCHAR pd32_nocollateW[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; -static const WCHAR pd32_portraitW[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; -static const WCHAR pd32_landscapeW[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; -static const WCHAR printdlg_prop[] = {'_','_','W','I','N','E','_','P','R','I','N','T','D','L','G','D','A','T','A',0}; -static const WCHAR pagesetupdlg_prop[] = { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', - 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; +static const WCHAR printdlg_prop[] = L"__WINE_PRINTDLGDATA"; +static const WCHAR pagesetupdlg_prop[] = L"__WINE_PAGESETUPDLGDATA"; static LPWSTR strdupW(LPCWSTR p) @@ -735,7 +730,7 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg, lppd->Flags &= ~PD_SELECTION; if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */ - static WCHAR file[] = {'F','I','L','E',':',0}; + static WCHAR file[] = L"FILE:"; lppd->Flags |= PD_PRINTTOFILE; pi->pPortName = file; } @@ -1039,7 +1034,6 @@ static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *p { WCHAR StatusMsg[256]; WCHAR ResourceString[256]; - static const WCHAR emptyW[] = {0}; int i; /* Status Message */ @@ -1067,7 +1061,7 @@ static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *p SetDlgItemTextW(hDlg, stc14, pi->pLocation); else SetDlgItemTextW(hDlg, stc14, pi->pPortName); - SetDlgItemTextW(hDlg, stc13, pi->pComment ? pi->pComment : emptyW); + SetDlgItemTextW(hDlg, stc13, pi->pComment ? pi->pComment : L""); } @@ -1582,15 +1576,15 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, /* We load these with LoadImage because they are not a standard size and we don't want them rescaled */ PrintStructures->hCollateIcon = - LoadImageW(COMDLG32_hInstance, pd32_collateW, IMAGE_ICON, 0, 0, 0); + LoadImageW(COMDLG32_hInstance, L"PD32_COLLATE", IMAGE_ICON, 0, 0, 0); PrintStructures->hNoCollateIcon = - LoadImageW(COMDLG32_hInstance, pd32_nocollateW, IMAGE_ICON, 0, 0, 0); + LoadImageW(COMDLG32_hInstance, L"PD32_NOCOLLATE", IMAGE_ICON, 0, 0, 0); /* These can be done with LoadIcon */ PrintStructures->hPortraitIcon = - LoadIconW(COMDLG32_hInstance, pd32_portraitW); + LoadIconW(COMDLG32_hInstance, L"PD32_PORTRAIT"); PrintStructures->hLandscapeIcon = - LoadIconW(COMDLG32_hInstance, pd32_landscapeW); + LoadIconW(COMDLG32_hInstance, L"PD32_LANDSCAPE"); /* display the collate/no_collate icon */ SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON, @@ -2140,8 +2134,6 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; - static const WCHAR xpsetup[] = { 'P','R','I','N','T','3','2','_','S','E','T','U','P',0}; - static const WCHAR xprint[] = { 'P','R','I','N','T','3','2',0}; if (lppd->Flags & PD_PRINTSETUP) { if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) { @@ -2151,7 +2143,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) lppd->lpSetupTemplateName, (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(lppd->hInstance, hResInfo); } else { - hResInfo = FindResourceW(COMDLG32_hInstance, xpsetup, (LPWSTR)RT_DIALOG); + hResInfo = FindResourceW(COMDLG32_hInstance, L"PRINT32_SETUP", (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo); } } else { @@ -2163,7 +2155,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(lppd->hInstance, hResInfo); } else { - hResInfo = FindResourceW(COMDLG32_hInstance, xprint, (LPWSTR)RT_DIALOG); + hResInfo = FindResourceW(COMDLG32_hInstance, L"PRINT32", (LPWSTR)RT_DIALOG); hDlgTmpl = LoadResource(COMDLG32_hInstance, hResInfo); } } @@ -2608,7 +2600,7 @@ static WCHAR get_decimal_sep(void) if(!sep) { - WCHAR buf[] = {'.', 0}; + WCHAR buf[] = L"."; GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buf, ARRAY_SIZE(buf)); sep = buf[0]; } @@ -2617,25 +2609,21 @@ static WCHAR get_decimal_sep(void) static void size2str(const pagesetup_data *data, DWORD size, LPWSTR strout) { - static const WCHAR integer_fmt[] = {'%','d',0}; - static const WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0}; - static const WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0}; - /* FIXME use LOCALE_SDECIMAL when the edit parsing code can cope */ if (is_metric(data)) { if(size % 100) - wsprintfW(strout, hundredths_fmt, size / 100, get_decimal_sep(), size % 100); + wsprintfW(strout, L"%d%c%02d", size / 100, get_decimal_sep(), size % 100); else - wsprintfW(strout, integer_fmt, size / 100); + wsprintfW(strout, L"%d", size / 100); } else { if(size % 1000) - wsprintfW(strout, thousandths_fmt, size / 1000, get_decimal_sep(), size % 1000); + wsprintfW(strout, L"%d%c%03d", size / 1000, get_decimal_sep(), size % 1000); else - wsprintfW(strout, integer_fmt, size / 1000); + wsprintfW(strout, L"%d", size / 1000); } } -- 2.26.2

1 0

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer 22 Nov '20

22 Nov '20

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

[PATCH] xaudio2: Avoid redefining several F3DAudio related constants.
by Gerald Pfeifer 22 Nov '20

22 Nov '20

I noticed a bunch of compiler warnings like the following issued by GCC 10: In file included from ../xaudio2_7/x3daudio.c:29: .../include/F3DAudio.h:69: warning: "SPEAKER_2POINT1" redefined ../../include/x3daudio.h:127: note: this is the location of the previous definition Our own include/x3daudio.h tries to prevent that via #ifndef _SPEAKER_POSITIONS_ #define _SPEAKER_POSITIONS_ However, current it is included *before* the system provided F3DAudio.h, so this safety net falls short. Fixed thusly by changing the order of these two include files so that the system provided one comes first. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/xaudio2_7/x3daudio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index 240cd5c101..6f16ba3470 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -20,15 +20,13 @@ #include "config.h" #include <stdarg.h> - +#include <F3DAudio.h> #include "windef.h" #include "winbase.h" #include "x3daudio.h" #include "wine/debug.h" -#include <F3DAudio.h> - #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #endif -- 2.25.0

2 4

[PATCH 1/2] msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink.
by Gijs Vermeulen 22 Nov '20

22 Nov '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44502 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 584bb1044ed..9d60e18e6f3 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -34,6 +34,7 @@ #define COOKIE_MAGIC_KEYTRACESINK 0x0090 #define COOKIE_MAGIC_UIELEMENTSINK 0x00a0 #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0 +#define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 77cf47ca4f6..0e054d4e654 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfActiveLanguageProfileNotifySink)) + { + WARN("semi-stub for ITfActiveLanguageProfileNotifySink: sink won't be used.\n"); + return advise_sink(&This->ActiveLanguageProfileNotifySink, &IID_ITfActiveLanguageProfileNotifySink, + COOKIE_MAGIC_ACTIVELANGSINK, punk, pdwCookie); + } + if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink)) { WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n"); @@ -656,7 +663,8 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo magic = get_Cookie_magic(pdwCookie); if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK - && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK) + && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK + && magic != COOKIE_MAGIC_ACTIVELANGSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie); -- 2.29.2

2 2

[PATCH] avrt: Add AvSetMmMaxThreadCharacteristicsA/W stub.
by Gijs Vermeulen 22 Nov '20

22 Nov '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/avrt/avrt.spec | 4 +-- dlls/avrt/main.c | 86 ++++++++++++++++++++++++++++++++++++--------- include/avrt.h | 2 +- 3 files changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec index a7dfc42879c..0a05abcdbca 100644 --- a/dlls/avrt/avrt.spec +++ b/dlls/avrt/avrt.spec @@ -7,8 +7,8 @@ @ stub AvRtJoinThreadOrderingGroup @ stub AvRtLeaveThreadOrderingGroup @ stub AvRtWaitOnThreadOrderingGroup -@ stub AvSetMmMaxThreadCharacteristicsA -@ stub AvSetMmMaxThreadCharacteristicsW +@ stdcall AvSetMmMaxThreadCharacteristicsA(str str ptr) +@ stdcall AvSetMmMaxThreadCharacteristicsW(wstr wstr ptr) @ stdcall AvSetMmThreadCharacteristicsA(str ptr) @ stdcall AvSetMmThreadCharacteristicsW(wstr ptr) @ stdcall AvSetMmThreadPriority(ptr long) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index eb5704cc508..258c525e198 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,10 +23,21 @@ #include "winbase.h" #include "winnls.h" #include "wine/debug.h" +#include "wine/heap.h" #include "avrt.h" WINE_DEFAULT_DEBUG_CHANNEL(avrt); +static inline WCHAR *heap_strdupAW(const char *src) +{ + int len; + WCHAR *dst; + if (!src) return NULL; + len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); + if ((dst = heap_alloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + return dst; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -43,41 +54,39 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex) +HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) { + WCHAR *nameW = NULL; HANDLE ret; - LPWSTR str = NULL; - if (TaskName) + if (name && !(nameW = heap_strdupAW(name))) { - DWORD len = (lstrlenA(TaskName)+1); - str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (!str) - { - SetLastError(ERROR_OUTOFMEMORY); - return NULL; - } - MultiByteToWideChar(CP_ACP, 0, TaskName, len, str, len); + SetLastError(ERROR_OUTOFMEMORY); + return NULL; } - ret = AvSetMmThreadCharacteristicsW(str, TaskIndex); - HeapFree(GetProcessHeap(), 0, str); + + ret = AvSetMmThreadCharacteristicsW(nameW, index); + + heap_free(nameW); return ret; } -HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) +HANDLE WINAPI AvSetMmThreadCharacteristicsW(const WCHAR *name, DWORD *index) { - FIXME("(%s,%p): stub\n", debugstr_w(TaskName), TaskIndex); + FIXME("(%s,%p): stub\n", debugstr_w(name), index); - if (!TaskName) + if (!name) { SetLastError(ERROR_INVALID_TASK_NAME); return NULL; } - if (!TaskIndex) + + if (!index) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } + return (HANDLE)0x12345678; } @@ -98,3 +107,46 @@ BOOL WINAPI AvSetMmThreadPriority(HANDLE AvrtHandle, AVRT_PRIORITY prio) FIXME("(%p)->(%u) stub\n", AvrtHandle, prio); return TRUE; } + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *task2, DWORD *index) +{ + WCHAR *task1W = NULL, *task2W = NULL; + HANDLE ret; + + if (task1 && !(task1W = heap_strdupAW(task1))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + if (task2 && !(task2W = heap_strdupAW(task2))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + ret = AvSetMmMaxThreadCharacteristicsW(task1W, task2W, index); + + heap_free(task2W); + heap_free(task1W); + return ret; +} + +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(const WCHAR *task1, const WCHAR *task2, DWORD *index) +{ + FIXME("(%s,%s,%p): stub\n", debugstr_w(task1), debugstr_w(task2), index); + + if (!task1 || task2) + { + SetLastError(ERROR_INVALID_TASK_NAME); + return NULL; + } + + if (!index) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + return (HANDLE)0x12345678; +} diff --git a/include/avrt.h b/include/avrt.h index 9d12c1b5b1b..88beebb0bf8 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -43,7 +43,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) #define AvSetMmThreadCharacteristics WINELIB_NAME_AW(AvSetMmThreadCharacteristics) HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); -HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCSTR FirstTask, LPCSTR SecondTask, LPDWORD TaskIndex); +HANDLE WINAPI AvSetMmMaxThreadCharacteristicsW(LPCWSTR FirstTask, LPCWSTR SecondTask, LPDWORD TaskIndex); #define AvSetMmMaxThreadCharacteristics WINELIB_NAME_AW(AvSetMmMaxThreadCharacteristics) BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle); -- 2.29.2

2 2

[PATCH] sapi: Fix typo in ISpVoice::SetOutput() trace.
by Gijs Vermeulen 22 Nov '20

22 Nov '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/sapi/tts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 77e54e079ac..6c5e89de25c 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -517,7 +517,7 @@ static HRESULT WINAPI spvoice_GetInfo(ISpVoice *iface, SPEVENTSOURCEINFO *info) static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL changes) { - FIXME("(%p, %p, %d: stub.\n)", iface, unk, changes); + FIXME("(%p, %p, %d): stub.\n", iface, unk, changes); return E_NOTIMPL; } -- 2.29.2

1 0

[PATCH] ntdll: Fix converting large 32-bit time_t when time_t is signed.
by Erich E. Hoover 22 Nov '20

22 Nov '20

Found this while trying to fix something else. If time_t is treated as signed (32-bit Linux) and you have a time_t value where the high bit is set then when you convert it to 64-bit you get an improperly sign-extended value. See the included test for an example (make sure you run the 32-bit tests). Best, Erich

1 0

[PATCH 1/6] ntdll: Redirect wine_dbg_log/printf formatting to ntdll.so.
by Rémi Bernon 21 Nov '20

21 Nov '20

This adds a new __wine_dbg_vprintf internal export to format and output a debug message at once, using ms_abi varargs calling convention in all cases. We convert format specifiers for the MSVC extensions, and translate the calling convention by passing format specifiers and their arguments to glibc snprintf one by one. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- As it was mentionned on IRC earlier, I figured I could clean these up a bit and more formally submit them. Also it looks like that +msvcrt is now completely broken, probably because it now traces itself over and over (where it was only tracing the TRACE from PE modules previously, which was already a bit annoying). These changes also have the nice property of reducing the eventual SSE register spilling induced by the debug helpers being previously sysv_abi in non-PE modules, when called within ms_abi functions. This is solved in all cases by making them ms_abi and doing the calling convention conversion within ntdll.so. Having the format string parsing in ntdll.so will also let us introduce some other extensions for TRACE messages, to replace common dbgstr_* helpers for instance and reduce the amount of common code and ntdll.so transitions, this is illustrated in the last 3 patches of the series, and the format specifiers could be made different of course. dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 7 ++ dlls/ntdll/unix/debug.c | 198 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unixlib.h | 3 +- dlls/winecrt0/debug.c | 14 +++ include/wine/debug.h | 40 ++++---- 7 files changed, 242 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 248ae72a011..3a7adc92752 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1616,6 +1616,7 @@ @ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) +@ cdecl -norelay __wine_dbg_vprintf(str ptr) # Virtual memory @ cdecl -syscall __wine_locked_recvmsg(long ptr long) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 578c7a5436c..a7231d008c6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -74,6 +74,13 @@ int __cdecl __wine_dbg_output( const char *str ) return unix_funcs->dbg_output( str ); } +/*********************************************************************** + * __wine_dbg_vprintf (NTDLL.@) + */ +int __cdecl __wine_dbg_vprintf( const char *format, __ms_va_list args ) +{ + return unix_funcs->dbg_vprintf( format, args ); +} /******************************************************************* * KiUserApcDispatcher (NTDLL.@) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 368baac46f4..fe5c3c64272 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -30,6 +30,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> +#include <limits.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -287,6 +289,202 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ return append_output( info, buffer, strlen( buffer )); } +static int __cdecl wine_dbg_vsnprintf( char *buffer, size_t length, const char *format, __ms_va_list args ) +{ + char fmtbuf[1024]; + char *buf = buffer, *end = buffer + length; + char *fmt = fmtbuf, *tmp = fmt; + char old, *spec, *width = NULL, *prec = NULL; + int ret, w, p; + + assert( strlen( format ) < sizeof(fmtbuf) ); + memcpy( fmtbuf, format, strlen( format ) + 1 ); + + while (buf < end && *fmt) + { + if (!(tmp = strchr( tmp + 1, '%' ))) tmp = fmt + strlen( fmt ); + else if (fmt[0] == '%' && tmp == fmt + 1) continue; + old = *tmp; + *tmp = 0; + + if (fmt[0] != '%') spec = tmp; + else spec = fmt + 1 + strcspn( fmt + 1, "AacCdeEfFgGinopsSuxXZ%" ); + + if (fmt[0] != '%') prec = width = NULL; + else if (fmt[1] == '-' || fmt[1] == '+' || fmt[1] == ' ' || fmt[1] == '#' || fmt[1] == '0') width = fmt + 2; + else width = fmt + 1; + + if (!width) w = -1; + else if (*width == '*') w = va_arg( args, int ); + else if (!(w = atoi( width ))) w = -1; + + if (fmt[0] != '%' || !(prec = strchr( fmt, '.' )) || ++prec >= spec) p = INT_MAX; + else if (*prec == '*') p = va_arg( args, int ); + else if (!(p = atoi( prec ))) p = INT_MAX; + +#define append_checked( b, l, x ) \ + do { if ((ret = (x)) >= 0 && ret < (l)) b += ret; \ + else if (ret < 0) return ret; \ + else return b - buffer + ret; } while (0) + + /* dispatch width / precision arguments for all possible %*.*<spec> format specifiers */ +#define snprintf_dispatch( b, l, f, a ) \ + append_checked( b, l, (width && *width == '*' ? (prec && *prec == '*' ? snprintf( b, l, f, w, p, a ) \ + : snprintf( b, l, f, w, a )) \ + : (prec && *prec == '*' ? snprintf( b, l, f, p, a ) \ + : snprintf( b, l, f, a )))) +#define snprintf_checked( b, l, ... ) append_checked( b, l, snprintf( b, l, ## __VA_ARGS__ ) ) + + switch (*spec) + { + case 'c': + case 'C': + if (spec[-1] == 'l' || spec[-1] == 'w' || (spec[0] == 'C' && spec[-1] != 'h')) + { + unsigned int wc = va_arg( args, unsigned int ); + if (wc >= ' ' && wc <= '~') snprintf_checked( buf, end - buf, "%c", wc ); + else snprintf_checked( buf, end - buf, "\\U%04x", wc ); + snprintf_checked( buf, end - buf, spec + 1 ); + } + else + { + snprintf_checked( buf, end - buf, "%c", va_arg( args, int ) ); + snprintf_checked( buf, end - buf, spec + 1 ); + } + break; + case 'd': + case 'i': + case 'o': + case 'u': + case 'x': + case 'X': + if (spec[-1] == '4' && spec[-2] == '6' && spec[-3] == 'I') + { + spec[-3] = 'j'; + spec[-2] = spec[0]; + spec[-1] = 0; + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, uintmax_t ) ); + snprintf_checked( buf, end - buf, spec + 1 ); + break; + } + if (spec[-1] == '2' && spec[-2] == '3' && spec[-3] == 'I') + { + spec[-3] = spec[0]; + spec[-2] = 0; + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, unsigned int ) ); + snprintf_checked( buf, end - buf, spec + 1 ); + break; + } + + if (spec[-1] == 'I') spec[-1] = 'z'; + if (spec[-1] == 'j') + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, uintmax_t ) ); + else if (spec[-1] == 'z') + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, size_t ) ); + else if (spec[-1] == 't') + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, ptrdiff_t ) ); + else if (spec[-1] == 'l' && spec[-2] == 'l') + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, long long int ) ); + else if (spec[-1] == 'l') + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, long int ) ); + else + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, int ) ); + break; + case 's': + case 'S': + if (spec[-1] == 'l' || spec[-1] == 'w' || (spec[0] == 'S' && spec[-1] != 'h')) + { + WCHAR *wstr = va_arg( args, WCHAR * ); + while (*wstr && p--) + { + if (*wstr >= ' ' && *wstr <= '~') snprintf_checked( buf, end - buf, "%c", *wstr++ ); + else snprintf_checked( buf, end - buf, "\\U%04x", *wstr++ ); + } + snprintf_checked( buf, end - buf, spec + 1 ); + } + else + { + char *str = va_arg( args, char * ); + if (spec[-1] != 'l' && spec[-1] != 'w') + snprintf_dispatch( buf, end - buf, fmt, str ); + else + { + spec[-1] = 's'; + spec[0] = 0; + snprintf_dispatch( buf, end - buf, fmt, str ); + snprintf_checked( buf, end - buf, spec + 1 ); + } + } + break; + case 'Z': + if (spec[-1] == 'l' || spec[-1] == 'w') + { + UNICODE_STRING *ptr = va_arg( args, UNICODE_STRING * ); + WCHAR *wstr = ptr->Buffer; + USHORT len = ptr->Length; + while (len--) + { + if (*wstr >= ' ' && *wstr <= '~') snprintf_checked( buf, end - buf, "%c", *wstr++ ); + else snprintf_checked( buf, end - buf, "\\U%04x", *wstr++ ); + } + snprintf_checked( buf, end - buf, spec + 1 ); + } + else + { + ANSI_STRING *ptr = va_arg( args, ANSI_STRING * ); + char *str = ptr->Buffer; + USHORT len = ptr->Length; + snprintf_checked( buf, end - buf, "%.*s", len, str ); + snprintf_checked( buf, end - buf, spec + 1 ); + } + break; + case 'p': + snprintf_dispatch( buf, end - buf, fmt, va_arg( args, void * ) ); + break; + case 'A': + case 'a': + case 'e': + case 'E': + case 'f': + case 'F': + case 'g': + case 'G': + if (spec[-1] == 'l') spec[-1] = 'L'; + if (spec[-1] == 'L') snprintf_dispatch( buf, end - buf, fmt, va_arg( args, long double ) ); + else snprintf_dispatch( buf, end - buf, fmt, va_arg( args, double ) ); + break; + case '%': + case '\0': + snprintf_checked( buf, end - buf, fmt ); + break; + case 'n': + default: + fprintf( stderr, "wine_dbg_vsnprintf: unsupported format string: %s\n", fmt ); + break; + } + +#undef snprintf_checked +#undef snprintf_dispatch +#undef append_checked + + *tmp = old; + fmt = tmp; + } + + return buf - buffer; +} + +/*********************************************************************** + * __wine_dbg_vprintf (NTDLL.@) + */ +int __cdecl __wine_dbg_vprintf( const char *format, __ms_va_list args ) +{ + char buffer[1024]; + wine_dbg_vsnprintf( buffer, sizeof(buffer), format, args ); + return __wine_dbg_output( buffer ); +} + + /*********************************************************************** * dbg_init */ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index c2b6ea603e3..310a4dab93c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1546,6 +1546,7 @@ static struct unix_funcs unix_funcs = __wine_dbg_strdup, __wine_dbg_output, __wine_dbg_header, + __wine_dbg_vprintf, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 7ed3148e4c4..1e98700a3fd 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 106 +#define NTDLL_UNIXLIB_VERSION 107 struct unix_funcs { @@ -98,6 +98,7 @@ struct unix_funcs int (CDECL *dbg_output)( const char *str ); int (CDECL *dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *function ); + int (CDECL *dbg_vprintf)( const char *format, __ms_va_list args ); }; #endif /* __NTDLL_UNIXLIB_H */ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index cb07c7835d4..5dc93acbecb 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -33,6 +33,7 @@ WINE_DECLARE_DEBUG_CHANNEL(timestamp); static const char * (__cdecl *p__wine_dbg_strdup)( const char *str ); static int (__cdecl *p__wine_dbg_output)( const char *str ); +static int (__cdecl *p__wine_dbg_vprintf)( const char *format, __ms_va_list args ); static unsigned char (__cdecl *p__wine_dbg_get_channel_flags)( struct __wine_debug_channel *channel ); static int (__cdecl *p__wine_dbg_header)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, @@ -178,6 +179,13 @@ static int __cdecl fallback__wine_dbg_output( const char *str ) return fwrite( str, 1, len, stderr ); } +static int __cdecl fallback__wine_dbg_vprintf( const char *format, __ms_va_list args ) +{ + char str[1024]; + vsnprintf( str, sizeof(str), format, args ); + return __wine_dbg_output( str ); +} + static int __cdecl fallback__wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *function ) @@ -236,6 +244,12 @@ int __cdecl __wine_dbg_output( const char *str ) return p__wine_dbg_output( str ); } +int __cdecl __wine_dbg_vprintf( const char *format, __ms_va_list args ) +{ + LOAD_FUNC( __wine_dbg_vprintf ); + return p__wine_dbg_vprintf( format, args ); +} + unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) { LOAD_FUNC( __wine_dbg_get_channel_flags ); diff --git a/include/wine/debug.h b/include/wine/debug.h index e064aaefb8e..7024ef270fc 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -148,6 +148,7 @@ extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, const char *function ); +extern int __cdecl __wine_dbg_vprintf( const char *format, __ms_va_list args ); /* * Exported definitions and macros @@ -181,27 +182,25 @@ static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format return __wine_dbg_strdup( buffer ); } -static int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); -static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) +static int __cdecl wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); +static inline int __cdecl wine_dbg_printf( const char *format, ... ) { - char buffer[1024]; - __wine_dbg_va_list args; - - __wine_dbg_va_start( args, format ); - vsnprintf( buffer, sizeof(buffer), format, args ); - __wine_dbg_va_end( args ); - return __wine_dbg_output( buffer ); + __ms_va_list args; + int ret; + __ms_va_start( args, format ); + ret = __wine_dbg_vprintf( format, args ); + __ms_va_end( args ); + return ret; } -static int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, - struct __wine_debug_channel *channel, const char *func, - const char *format, ... ) __WINE_PRINTF_ATTR(4,5); -static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, - struct __wine_debug_channel *channel, - const char *function, const char *format, ... ) +static int __cdecl wine_dbg_log( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, const char *func, + const char *format, ... ) __WINE_PRINTF_ATTR(4,5); +static inline int __cdecl wine_dbg_log( enum __wine_debug_class cls, + struct __wine_debug_channel *channel, + const char *function, const char *format, ... ) { - char buffer[1024]; - __wine_dbg_va_list args; + __ms_va_list args; int ret; if (*format == '\1') /* special magic to avoid standard prefix */ @@ -211,10 +210,9 @@ static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls, } if ((ret = __wine_dbg_header( cls, channel, function )) == -1) return ret; - __wine_dbg_va_start( args, format ); - vsnprintf( buffer, sizeof(buffer), format, args ); - __wine_dbg_va_end( args ); - ret += __wine_dbg_output( buffer ); + __ms_va_start( args, format ); + ret += __wine_dbg_vprintf( format, args ); + __ms_va_end( args ); return ret; } -- 2.29.2

2 6

[PATCH v2 1/7] quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer.
by Zebediah Figura 21 Nov '20

21 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: give w10pro64 more time dlls/quartz/tests/dsoundrender.c | 142 +++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 558e6989c98..c33c074d93d 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -877,6 +877,147 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control ok(hr == S_OK, "Got hr %#x.\n", hr); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = send_frame(input); + todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 2000); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); +} + static void test_connect_pin(void) { ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; @@ -971,6 +1112,7 @@ static void test_connect_pin(void) test_filter_state(input, control); test_flushing(pin, input, control); + test_eos(pin, input, control); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

1 6

[PATCH 1/2] gdiplus: Fix function name typo in comment.
by Jeff Smith 21 Nov '20

21 Nov '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index b0504b5d894..4301fa3aaa3 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1037,7 +1037,7 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilySansSerif(GpFontFamily **nativeFamil } /***************************************************************************** - * GdipGetGenericFontFamilySansSerif [GDIPLUS.@] + * GdipNewPrivateFontCollection [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollection) { -- 2.23.0

2 3

Wine staging 5.22 release
by Alistair Leslie-Hughes 21 Nov '20

21 Nov '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.22 (685 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * winegstreamer: Implement IMFMediaSource::GetCharacteristics. * winegstreamer: Calculate the MF_PD_DURATION of the media source's PD. * winspool: Add sRGB color profile * dxdiagn: Enumerate DirectSound devices and add some basic properties. * dxdiagn: Calling GetChildContainer with an empty string on a leaf container returns the object itself Added: * None Updated: * mfplat-streaming-support * eventfd_synchronization Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary.
by Zebediah Figura 21 Nov '20

21 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50105 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/loader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 368448c9f8d..ff5a175027c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -608,19 +608,20 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS const IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; WINE_MODREF *wm; - WCHAR mod_name[32]; + WCHAR buffer[32], *mod_name = buffer; const char *end = strrchr(forward, '.'); FARPROC proc = NULL; if (!end) return NULL; - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name)) return NULL; + if ((end - forward) * sizeof(WCHAR) > sizeof(buffer) - sizeof(dllW)) + { + if (!(mod_name = RtlAllocateHeap( GetProcessHeap(), 0, (end - forward + sizeof(dllW)) * sizeof(WCHAR) ))) + return NULL; + } ascii_to_unicode( mod_name, forward, end - forward ); mod_name[end - forward] = 0; if (!wcschr( mod_name, '.' )) - { - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name) - sizeof(dllW)) return NULL; memcpy( mod_name + (end - forward), dllW, sizeof(dllW) ); - } if (!(wm = find_basename_module( mod_name ))) { @@ -642,6 +643,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!wm) { + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); ERR( "module not found for forward '%s' used by %s\n", forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); return NULL; @@ -664,6 +666,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer), debugstr_w(get_modref(module)->ldr.BaseDllName.Buffer) ); } + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); return proc; } -- 2.29.2

2 1

[PATCH 2/2] windowscodecs: Initialize encoder flags for png encoder.
by Esme Povirk 20 Nov '20

20 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/libpng.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index ee02d493f57..a5068c20349 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -997,6 +997,7 @@ HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **res This->data = NULL; *result = &This->encoder; + info->flags = 0; info->container_format = GUID_ContainerFormatPng; info->clsid = CLSID_WICPngEncoder; info->encoder_options[0] = ENCODER_OPTION_INTERLACE; -- 2.17.1

1 0

[PATCH 1/2] windowscodes: Move tiff encoding to the unix lib.
by Esme Povirk 20 Nov '20

20 Nov '20

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/encoder.c | 6 +- dlls/windowscodecs/libtiff.c | 260 +++++- dlls/windowscodecs/main.c | 28 + dlls/windowscodecs/tiffformat.c | 1001 ------------------------ dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 3 + 7 files changed, 297 insertions(+), 1005 deletions(-) delete mode 100644 dlls/windowscodecs/tiffformat.c diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index e175359ab9d..d7f9336916b 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -37,7 +37,6 @@ C_SRCS = \ scaler.c \ stream.c \ tgaformat.c \ - tiffformat.c \ ungif.c \ unix_iface.c \ unix_lib.c \ diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index 0ddc54cc57e..bb673b13076 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -36,10 +36,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static const WCHAR wszPngInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; static const WCHAR wszPngFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; +static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; +static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; static const PROPBAG2 encoder_option_properties[ENCODER_OPTION_END] = { { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption } + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality } }; typedef struct CommonEncoder { diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 7f174bbd5dd..6f5cfc53c62 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -143,8 +143,13 @@ static tsize_t tiff_stream_read(thandle_t client_data, tdata_t data, tsize_t siz static tsize_t tiff_stream_write(thandle_t client_data, tdata_t data, tsize_t size) { - FIXME("stub\n"); - return 0; + IStream *stream = (IStream*)client_data; + ULONG bytes_written; + HRESULT hr; + + hr = stream_write(stream, data, size, &bytes_written); + if (FAILED(hr)) bytes_written = 0; + return bytes_written; } static toff_t tiff_stream_seek(thandle_t client_data, toff_t offset, int whence) @@ -1176,6 +1181,251 @@ HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **re return S_OK; } +struct tiff_encode_format { + const WICPixelFormatGUID *guid; + int photometric; + int bps; + int samples; + int bpp; + int extra_sample; + int extra_sample_type; + int reverse_bgr; + int indexed; +}; + +static const struct tiff_encode_format formats[] = { + {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, + {&GUID_WICPixelFormat24bppRGB, 2, 8, 3, 24, 0, 0, 0}, + {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0}, + {&GUID_WICPixelFormat32bppBGRA, 2, 8, 4, 32, 1, 2, 1}, + {&GUID_WICPixelFormat32bppPBGRA, 2, 8, 4, 32, 1, 1, 1}, + {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, + {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, + {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0, 1}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0, 1}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0, 1}, + {0} +}; + +typedef struct tiff_encoder { + struct encoder encoder; + TIFF *tiff; + const struct tiff_encode_format *format; + struct encoder_frame encoder_frame; + DWORD num_frames; + DWORD lines_written; +} tiff_encoder; + +static inline struct tiff_encoder *impl_from_encoder(struct encoder* iface) +{ + return CONTAINING_RECORD(iface, struct tiff_encoder, encoder); +} + +static HRESULT CDECL tiff_encoder_initialize(struct encoder* iface, IStream *stream) +{ + struct tiff_encoder* This = impl_from_encoder(iface); + TIFF *tiff; + + tiff = tiff_open_stream(stream, "w"); + + if (!tiff) + return E_FAIL; + + This->tiff = tiff; + + return S_OK; +} + +static HRESULT CDECL tiff_encoder_get_supported_format(struct encoder *iface, + GUID *pixel_format, DWORD *bpp, BOOL *indexed) +{ + int i; + + if (IsEqualGUID(pixel_format, &GUID_WICPixelFormat2bppIndexed)) + *pixel_format = GUID_WICPixelFormat4bppIndexed; + + for (i=0; formats[i].guid; i++) + { + if (IsEqualGUID(formats[i].guid, pixel_format)) + break; + } + + if (!formats[i].guid) i = 0; + + *pixel_format = *formats[i].guid; + *bpp = formats[i].bpp; + *indexed = formats[i].indexed; + + return S_OK; +} + +static HRESULT CDECL tiff_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) +{ + struct tiff_encoder* This = impl_from_encoder(iface); + int i; + + if (This->num_frames != 0) + pTIFFWriteDirectory(This->tiff); + + This->num_frames++; + This->lines_written = 0; + This->encoder_frame = *frame; + + for (i=0; formats[i].guid; i++) + { + if (IsEqualGUID(formats[i].guid, &frame->pixel_format)) + break; + } + + This->format = &formats[i]; + + pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); + pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); + pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); + pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); + + if (This->format->extra_sample) + { + uint16 extra_samples; + extra_samples = This->format->extra_sample_type; + + pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); + } + + pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32)frame->width); + pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32)frame->height); + + if (frame->dpix != 0.0 && frame->dpiy != 0.0) + { + pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ + pTIFFSetField(This->tiff, TIFFTAG_XRESOLUTION, (float)frame->dpix); + pTIFFSetField(This->tiff, TIFFTAG_YRESOLUTION, (float)frame->dpiy); + } + + if (This->format->bpp <= 8 && frame->num_colors && This->format->indexed) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < frame->num_colors; i++) + { + red[i] = (frame->palette[i] >> 8) & 0xff00; + green[i] = frame->palette[i] & 0xff00; + blue[i] = (frame->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + + return S_OK; +} + +static HRESULT CDECL tiff_encoder_write_lines(struct encoder* iface, + BYTE *data, DWORD line_count, DWORD stride) +{ + struct tiff_encoder* This = impl_from_encoder(iface); + BYTE *row_data, *swapped_data = NULL; + UINT i, j, line_size; + + line_size = ((This->encoder_frame.width * This->format->bpp)+7)/8; + + if (This->format->reverse_bgr) + { + swapped_data = malloc(line_size); + if (!swapped_data) + return E_OUTOFMEMORY; + } + + for (i=0; i<line_count; i++) + { + row_data = data + i * stride; + + if (This->format->reverse_bgr && This->format->bps == 8) + { + memcpy(swapped_data, row_data, line_size); + for (j=0; j<line_size; j += This->format->samples) + { + BYTE temp; + temp = swapped_data[j]; + swapped_data[j] = swapped_data[j+2]; + swapped_data[j+2] = temp; + } + row_data = swapped_data; + } + + pTIFFWriteScanline(This->tiff, (tdata_t)row_data, i+This->lines_written, 0); + } + + This->lines_written += line_count; + + return S_OK; +} + +static HRESULT CDECL tiff_encoder_commit_frame(struct encoder* iface) +{ + return S_OK; +} + +static HRESULT CDECL tiff_encoder_commit_file(struct encoder* iface) +{ + struct tiff_encoder* This = impl_from_encoder(iface); + + pTIFFClose(This->tiff); + This->tiff = NULL; + + return S_OK; +} + +static void CDECL tiff_encoder_destroy(struct encoder* iface) +{ + struct tiff_encoder *This = impl_from_encoder(iface); + + if (This->tiff) pTIFFClose(This->tiff); + RtlFreeHeap(GetProcessHeap(), 0, This); +} + +static const struct encoder_funcs tiff_encoder_vtable = { + tiff_encoder_initialize, + tiff_encoder_get_supported_format, + tiff_encoder_create_frame, + tiff_encoder_write_lines, + tiff_encoder_commit_frame, + tiff_encoder_commit_file, + tiff_encoder_destroy +}; + +HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **result) +{ + struct tiff_encoder *This; + + if (!load_libtiff()) + { + ERR("Failed writing TIFF because unable to load %s\n",SONAME_LIBTIFF); + return E_FAIL; + } + + This = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->encoder.vtable = &tiff_encoder_vtable; + This->tiff = NULL; + This->num_frames = 0; + + info->flags = ENCODER_FLAGS_MULTI_FRAME; + info->container_format = GUID_ContainerFormatTiff; + info->clsid = CLSID_WICTiffEncoder; + info->encoder_options[0] = ENCODER_OPTION_COMPRESSION_METHOD; + info->encoder_options[1] = ENCODER_OPTION_COMPRESSION_QUALITY; + info->encoder_options[2] = ENCODER_OPTION_END; + + *result = &This->encoder; + + return S_OK; +} + #else /* !SONAME_LIBTIFF */ HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **result) @@ -1184,4 +1434,10 @@ HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **re return E_FAIL; } +HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **result) +{ + ERR("Trying to save TIFF picture, but Wine was compiled without TIFF support.\n"); + return E_FAIL; +} + #endif diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 3817d23eb4c..bc12eb2fda1 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -251,3 +251,31 @@ HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) return hr; } + +HRESULT TiffDecoder_CreateInstance(REFIID iid, void** ppv) +{ + HRESULT hr; + struct decoder *decoder; + struct decoder_info decoder_info; + + hr = get_unix_decoder(&CLSID_WICTiffDecoder, &decoder_info, &decoder); + + if (SUCCEEDED(hr)) + hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, ppv); + + return hr; +} + +HRESULT TiffEncoder_CreateInstance(REFIID iid, void** ppv) +{ + HRESULT hr; + struct encoder *encoder; + struct encoder_info encoder_info; + + hr = get_unix_encoder(&CLSID_WICTiffEncoder, &encoder_info, &encoder); + + if (SUCCEEDED(hr)) + hr = CommonEncoder_CreateInstance(encoder, &encoder_info, iid, ppv); + + return hr; +} diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c deleted file mode 100644 index b2478380334..00000000000 --- a/dlls/windowscodecs/tiffformat.c +++ /dev/null @@ -1,1001 +0,0 @@ -/* - * Copyright 2010 Vincent Povirk for CodeWeavers - * Copyright 2016 Dmitry Timoshkov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_TIFFIO_H -#include <tiffio.h> -#endif - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" - -#include "wincodecs_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); - -#ifdef SONAME_LIBTIFF - -/* Workaround for broken libtiff 4.x headers on some 64-bit hosts which - * define TIFF_UINT64_T/toff_t as 32-bit for 32-bit builds, while they - * are supposed to be always 64-bit. - * TIFF_UINT64_T doesn't exist in libtiff 3.x, it was introduced in 4.x. - */ -#ifdef TIFF_UINT64_T -# undef toff_t -# define toff_t UINT64 -#endif - -static CRITICAL_SECTION init_tiff_cs; -static CRITICAL_SECTION_DEBUG init_tiff_cs_debug = -{ - 0, 0, &init_tiff_cs, - { &init_tiff_cs_debug.ProcessLocksList, - &init_tiff_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": init_tiff_cs") } -}; -static CRITICAL_SECTION init_tiff_cs = { &init_tiff_cs_debug, -1, 0, 0, 0, 0 }; - -static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; -static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; - -static void *libtiff_handle; -#define MAKE_FUNCPTR(f) static typeof(f) * p##f -MAKE_FUNCPTR(TIFFClientOpen); -MAKE_FUNCPTR(TIFFClose); -MAKE_FUNCPTR(TIFFCurrentDirOffset); -MAKE_FUNCPTR(TIFFGetField); -MAKE_FUNCPTR(TIFFIsByteSwapped); -MAKE_FUNCPTR(TIFFNumberOfDirectories); -MAKE_FUNCPTR(TIFFReadDirectory); -MAKE_FUNCPTR(TIFFReadEncodedStrip); -MAKE_FUNCPTR(TIFFReadEncodedTile); -MAKE_FUNCPTR(TIFFSetDirectory); -MAKE_FUNCPTR(TIFFSetField); -MAKE_FUNCPTR(TIFFWriteDirectory); -MAKE_FUNCPTR(TIFFWriteScanline); -#undef MAKE_FUNCPTR - -static void *load_libtiff(void) -{ - void *result; - - EnterCriticalSection(&init_tiff_cs); - - if (!libtiff_handle && - (libtiff_handle = dlopen(SONAME_LIBTIFF, RTLD_NOW)) != NULL) - { - void * (*pTIFFSetWarningHandler)(void *); - void * (*pTIFFSetWarningHandlerExt)(void *); - -#define LOAD_FUNCPTR(f) \ - if((p##f = dlsym(libtiff_handle, #f)) == NULL) { \ - ERR("failed to load symbol %s\n", #f); \ - libtiff_handle = NULL; \ - LeaveCriticalSection(&init_tiff_cs); \ - return NULL; \ - } - LOAD_FUNCPTR(TIFFClientOpen); - LOAD_FUNCPTR(TIFFClose); - LOAD_FUNCPTR(TIFFCurrentDirOffset); - LOAD_FUNCPTR(TIFFGetField); - LOAD_FUNCPTR(TIFFIsByteSwapped); - LOAD_FUNCPTR(TIFFNumberOfDirectories); - LOAD_FUNCPTR(TIFFReadDirectory); - LOAD_FUNCPTR(TIFFReadEncodedStrip); - LOAD_FUNCPTR(TIFFReadEncodedTile); - LOAD_FUNCPTR(TIFFSetDirectory); - LOAD_FUNCPTR(TIFFSetField); - LOAD_FUNCPTR(TIFFWriteDirectory); - LOAD_FUNCPTR(TIFFWriteScanline); -#undef LOAD_FUNCPTR - - if ((pTIFFSetWarningHandler = dlsym(libtiff_handle, "TIFFSetWarningHandler"))) - pTIFFSetWarningHandler(NULL); - if ((pTIFFSetWarningHandlerExt = dlsym(libtiff_handle, "TIFFSetWarningHandlerExt"))) - pTIFFSetWarningHandlerExt(NULL); - } - - result = libtiff_handle; - - LeaveCriticalSection(&init_tiff_cs); - return result; -} - -static tsize_t tiff_stream_read(thandle_t client_data, tdata_t data, tsize_t size) -{ - IStream *stream = (IStream*)client_data; - ULONG bytes_read; - HRESULT hr; - - hr = IStream_Read(stream, data, size, &bytes_read); - if (FAILED(hr)) bytes_read = 0; - return bytes_read; -} - -static tsize_t tiff_stream_write(thandle_t client_data, tdata_t data, tsize_t size) -{ - IStream *stream = (IStream*)client_data; - ULONG bytes_written; - HRESULT hr; - - hr = IStream_Write(stream, data, size, &bytes_written); - if (FAILED(hr)) bytes_written = 0; - return bytes_written; -} - -static toff_t tiff_stream_seek(thandle_t client_data, toff_t offset, int whence) -{ - IStream *stream = (IStream*)client_data; - LARGE_INTEGER move; - DWORD origin; - ULARGE_INTEGER new_position; - HRESULT hr; - - move.QuadPart = offset; - switch (whence) - { - case SEEK_SET: - origin = STREAM_SEEK_SET; - break; - case SEEK_CUR: - origin = STREAM_SEEK_CUR; - break; - case SEEK_END: - origin = STREAM_SEEK_END; - break; - default: - ERR("unknown whence value %i\n", whence); - return -1; - } - - hr = IStream_Seek(stream, move, origin, &new_position); - if (SUCCEEDED(hr)) return new_position.QuadPart; - else return -1; -} - -static int tiff_stream_close(thandle_t client_data) -{ - /* Caller is responsible for releasing the stream object. */ - return 0; -} - -static toff_t tiff_stream_size(thandle_t client_data) -{ - IStream *stream = (IStream*)client_data; - STATSTG statstg; - HRESULT hr; - - hr = IStream_Stat(stream, &statstg, STATFLAG_NONAME); - - if (SUCCEEDED(hr)) return statstg.cbSize.QuadPart; - else return -1; -} - -static int tiff_stream_map(thandle_t client_data, tdata_t *addr, toff_t *size) -{ - /* Cannot mmap streams */ - return 0; -} - -static void tiff_stream_unmap(thandle_t client_data, tdata_t addr, toff_t size) -{ - /* No need to ever do this, since we can't map things. */ -} - -static TIFF* tiff_open_stream(IStream *stream, const char *mode) -{ - LARGE_INTEGER zero; - - zero.QuadPart = 0; - IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); - - return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, - tiff_stream_write, (void *)tiff_stream_seek, tiff_stream_close, - (void *)tiff_stream_size, (void *)tiff_stream_map, (void *)tiff_stream_unmap); -} - -struct tiff_encode_format { - const WICPixelFormatGUID *guid; - int photometric; - int bps; - int samples; - int bpp; - int extra_sample; - int extra_sample_type; - int reverse_bgr; -}; - -static const struct tiff_encode_format formats[] = { - {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, - {&GUID_WICPixelFormat24bppRGB, 2, 8, 3, 24, 0, 0, 0}, - {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, - {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, - {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0}, - {&GUID_WICPixelFormat32bppBGRA, 2, 8, 4, 32, 1, 2, 1}, - {&GUID_WICPixelFormat32bppPBGRA, 2, 8, 4, 32, 1, 1, 1}, - {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, - {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, - {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, - {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, - {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, - {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, - {0} -}; - -typedef struct TiffEncoder { - IWICBitmapEncoder IWICBitmapEncoder_iface; - LONG ref; - IStream *stream; - CRITICAL_SECTION lock; /* Must be held when tiff is used or fields below are set */ - TIFF *tiff; - BOOL initialized; - BOOL committed; - ULONG num_frames; - ULONG num_frames_committed; -} TiffEncoder; - -static inline TiffEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) -{ - return CONTAINING_RECORD(iface, TiffEncoder, IWICBitmapEncoder_iface); -} - -typedef struct TiffFrameEncode { - IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; - LONG ref; - TiffEncoder *parent; - /* fields below are protected by parent->lock */ - BOOL initialized; - BOOL info_written; - BOOL committed; - const struct tiff_encode_format *format; - UINT width, height; - double xres, yres; - UINT lines_written; - WICColor palette[256]; - UINT colors; -} TiffFrameEncode; - -static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) -{ - return CONTAINING_RECORD(iface, TiffFrameEncode, IWICBitmapFrameEncode_iface); -} - -static HRESULT WINAPI TiffFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, - void **ppv) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || - IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) - { - *ppv = &This->IWICBitmapFrameEncode_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI TiffFrameEncode_AddRef(IWICBitmapFrameEncode *iface) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - return ref; -} - -static ULONG WINAPI TiffFrameEncode_Release(IWICBitmapFrameEncode *iface) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - if (ref == 0) - { - IWICBitmapEncoder_Release(&This->parent->IWICBitmapEncoder_iface); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, - IPropertyBag2 *pIEncoderOptions) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%p)\n", iface, pIEncoderOptions); - - EnterCriticalSection(&This->parent->lock); - - if (This->initialized) - { - LeaveCriticalSection(&This->parent->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->initialized = TRUE; - - LeaveCriticalSection(&This->parent->lock); - - return S_OK; -} - -static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, - UINT uiWidth, UINT uiHeight) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); - - EnterCriticalSection(&This->parent->lock); - - if (!This->initialized || This->info_written) - { - LeaveCriticalSection(&This->parent->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->width = uiWidth; - This->height = uiHeight; - - LeaveCriticalSection(&This->parent->lock); - - return S_OK; -} - -static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, - double dpiX, double dpiY) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); - - EnterCriticalSection(&This->parent->lock); - - if (!This->initialized || This->info_written) - { - LeaveCriticalSection(&This->parent->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - This->xres = dpiX; - This->yres = dpiY; - - LeaveCriticalSection(&This->parent->lock); - - return S_OK; -} - -static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, - WICPixelFormatGUID *pPixelFormat) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - int i; - - TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); - - EnterCriticalSection(&This->parent->lock); - - if (!This->initialized || This->info_written) - { - LeaveCriticalSection(&This->parent->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) - *pPixelFormat = GUID_WICPixelFormat4bppIndexed; - - for (i=0; formats[i].guid; i++) - { - if (IsEqualGUID(formats[i].guid, pPixelFormat)) - break; - } - - if (!formats[i].guid) i = 0; - - This->format = &formats[i]; - memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); - - LeaveCriticalSection(&This->parent->lock); - - return S_OK; -} - -static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, - UINT cCount, IWICColorContext **ppIColorContext) -{ - FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); - return E_NOTIMPL; -} - -static HRESULT WINAPI TiffFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *palette) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - HRESULT hr; - - TRACE("(%p,%p)\n", iface, palette); - - if (!palette) return E_INVALIDARG; - - EnterCriticalSection(&This->parent->lock); - - if (This->initialized) - hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); - else - hr = WINCODEC_ERR_NOTINITIALIZED; - - LeaveCriticalSection(&This->parent->lock); - return hr; -} - -static HRESULT WINAPI TiffFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, - IWICBitmapSource *pIThumbnail) -{ - FIXME("(%p,%p): stub\n", iface, pIThumbnail); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, - UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - BYTE *row_data, *swapped_data = NULL; - UINT i, j, line_size; - - TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - - EnterCriticalSection(&This->parent->lock); - - if (!This->initialized || !This->width || !This->height || !This->format) - { - LeaveCriticalSection(&This->parent->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - if (lineCount == 0 || lineCount + This->lines_written > This->height) - { - LeaveCriticalSection(&This->parent->lock); - return E_INVALIDARG; - } - - line_size = ((This->width * This->format->bpp)+7)/8; - - if (This->format->reverse_bgr) - { - swapped_data = HeapAlloc(GetProcessHeap(), 0, line_size); - if (!swapped_data) - { - LeaveCriticalSection(&This->parent->lock); - return E_OUTOFMEMORY; - } - } - - if (!This->info_written) - { - pTIFFSetField(This->parent->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); - pTIFFSetField(This->parent->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); - pTIFFSetField(This->parent->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); - pTIFFSetField(This->parent->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); - - if (This->format->extra_sample) - { - uint16 extra_samples; - extra_samples = This->format->extra_sample_type; - - pTIFFSetField(This->parent->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); - } - - pTIFFSetField(This->parent->tiff, TIFFTAG_IMAGEWIDTH, (uint32)This->width); - pTIFFSetField(This->parent->tiff, TIFFTAG_IMAGELENGTH, (uint32)This->height); - - if (This->xres != 0.0 && This->yres != 0.0) - { - pTIFFSetField(This->parent->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ - pTIFFSetField(This->parent->tiff, TIFFTAG_XRESOLUTION, (float)This->xres); - pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); - } - - if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) - { - uint16 red[256], green[256], blue[256]; - UINT i; - - for (i = 0; i < This->colors; i++) - { - red[i] = (This->palette[i] >> 8) & 0xff00; - green[i] = This->palette[i] & 0xff00; - blue[i] = (This->palette[i] << 8) & 0xff00; - } - - pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); - } - - This->info_written = TRUE; - } - - for (i=0; i<lineCount; i++) - { - row_data = pbPixels + i * cbStride; - - if (This->format->reverse_bgr && This->format->bps == 8) - { - memcpy(swapped_data, row_data, line_size); - for (j=0; j<line_size; j += This->format->samples) - { - BYTE temp; - temp = swapped_data[j]; - swapped_data[j] = swapped_data[j+2]; - swapped_data[j+2] = temp; - } - row_data = swapped_data; - } - - pTIFFWriteScanline(This->parent->tiff, (tdata_t)row_data, i+This->lines_written, 0); - } - - This->lines_written += lineCount; - - LeaveCriticalSection(&This->parent->lock); - - HeapFree(GetProcessHeap(), 0, swapped_data); - - return S_OK; -} - -static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, - IWICBitmapSource *pIBitmapSource, WICRect *prc) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - HRESULT hr; - - TRACE("(%p,%p,%s)\n", iface, pIBitmapSource, debug_wic_rect(prc)); - - if (!This->initialized) - return WINCODEC_ERR_WRONGSTATE; - - hr = configure_write_source(iface, pIBitmapSource, prc, - This->format ? This->format->guid : NULL, This->width, This->height, - This->xres, This->yres); - - if (SUCCEEDED(hr)) - { - hr = write_source(iface, pIBitmapSource, prc, - This->format->guid, This->format->bpp, - !This->colors && This->format->bpp <= 8 && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite), - This->width, This->height); - } - - return hr; -} - -static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface) -{ - TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); - - TRACE("(%p)\n", iface); - - EnterCriticalSection(&This->parent->lock); - - if (!This->info_written || This->lines_written != This->height || This->committed) - { - LeaveCriticalSection(&This->parent->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - /* libtiff will commit the data when creating a new frame or closing the file */ - - This->committed = TRUE; - This->parent->num_frames_committed++; - - LeaveCriticalSection(&This->parent->lock); - - return S_OK; -} - -static HRESULT WINAPI TiffFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, - IWICMetadataQueryWriter **ppIMetadataQueryWriter) -{ - FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); - return E_NOTIMPL; -} - -static const IWICBitmapFrameEncodeVtbl TiffFrameEncode_Vtbl = { - TiffFrameEncode_QueryInterface, - TiffFrameEncode_AddRef, - TiffFrameEncode_Release, - TiffFrameEncode_Initialize, - TiffFrameEncode_SetSize, - TiffFrameEncode_SetResolution, - TiffFrameEncode_SetPixelFormat, - TiffFrameEncode_SetColorContexts, - TiffFrameEncode_SetPalette, - TiffFrameEncode_SetThumbnail, - TiffFrameEncode_WritePixels, - TiffFrameEncode_WriteSource, - TiffFrameEncode_Commit, - TiffFrameEncode_GetMetadataQueryWriter -}; - -static HRESULT WINAPI TiffEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, - void **ppv) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); - - if (!ppv) return E_INVALIDARG; - - if (IsEqualIID(&IID_IUnknown, iid) || - IsEqualIID(&IID_IWICBitmapEncoder, iid)) - { - *ppv = &This->IWICBitmapEncoder_iface; - } - else - { - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - -static ULONG WINAPI TiffEncoder_AddRef(IWICBitmapEncoder *iface) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - return ref; -} - -static ULONG WINAPI TiffEncoder_Release(IWICBitmapEncoder *iface) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) refcount=%u\n", iface, ref); - - if (ref == 0) - { - if (This->tiff) pTIFFClose(This->tiff); - if (This->stream) IStream_Release(This->stream); - This->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->lock); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI TiffEncoder_Initialize(IWICBitmapEncoder *iface, - IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - TIFF *tiff; - HRESULT hr=S_OK; - - TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); - - EnterCriticalSection(&This->lock); - - if (This->initialized || This->committed) - { - hr = WINCODEC_ERR_WRONGSTATE; - goto exit; - } - - tiff = tiff_open_stream(pIStream, "w"); - - if (!tiff) - { - hr = E_FAIL; - goto exit; - } - - This->tiff = tiff; - This->stream = pIStream; - IStream_AddRef(pIStream); - This->initialized = TRUE; - -exit: - LeaveCriticalSection(&This->lock); - return hr; -} - -static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, - GUID *pguidContainerFormat) -{ - TRACE("(%p,%p)\n", iface, pguidContainerFormat); - - if (!pguidContainerFormat) - return E_INVALIDARG; - - memcpy(pguidContainerFormat, &GUID_ContainerFormatTiff, sizeof(GUID)); - return S_OK; -} - -static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) -{ - IWICComponentInfo *comp_info; - HRESULT hr; - - TRACE("%p,%p\n", iface, info); - - if (!info) return E_INVALIDARG; - - hr = CreateComponentInfo(&CLSID_WICTiffEncoder, &comp_info); - if (hr == S_OK) - { - hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); - IWICComponentInfo_Release(comp_info); - } - return hr; -} - -static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, - UINT cCount, IWICColorContext **ppIColorContext) -{ - FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); - return E_NOTIMPL; -} - -static HRESULT WINAPI TiffEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *palette) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - HRESULT hr; - - TRACE("(%p,%p)\n", iface, palette); - - EnterCriticalSection(&This->lock); - - hr = This->stream ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; - - LeaveCriticalSection(&This->lock); - - return hr; -} - -static HRESULT WINAPI TiffEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) -{ - TRACE("(%p,%p)\n", iface, pIThumbnail); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI TiffEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) -{ - TRACE("(%p,%p)\n", iface, pIPreview); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; -} - -static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, - IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - TiffFrameEncode *result; - static const PROPBAG2 opts[2] = - { - { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, - { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality }, - }; - HRESULT hr=S_OK; - - TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); - - EnterCriticalSection(&This->lock); - - if (!This->initialized || This->committed) - { - hr = WINCODEC_ERR_WRONGSTATE; - } - else if (This->num_frames != This->num_frames_committed) - { - FIXME("New frame created before previous frame was committed\n"); - hr = E_FAIL; - } - - if (ppIEncoderOptions && SUCCEEDED(hr)) - { - hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); - if (SUCCEEDED(hr)) - { - VARIANT v; - VariantInit(&v); - V_VT(&v) = VT_UI1; - V_UI1(&v) = WICTiffCompressionDontCare; - hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); - VariantClear(&v); - if (FAILED(hr)) - { - IPropertyBag2_Release(*ppIEncoderOptions); - *ppIEncoderOptions = NULL; - } - } - } - - if (SUCCEEDED(hr)) - { - result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); - - if (result) - { - result->IWICBitmapFrameEncode_iface.lpVtbl = &TiffFrameEncode_Vtbl; - result->ref = 1; - result->parent = This; - result->initialized = FALSE; - result->info_written = FALSE; - result->committed = FALSE; - result->format = NULL; - result->width = 0; - result->height = 0; - result->xres = 0.0; - result->yres = 0.0; - result->lines_written = 0; - result->colors = 0; - - IWICBitmapEncoder_AddRef(iface); - *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface; - - if (This->num_frames != 0) - pTIFFWriteDirectory(This->tiff); - - This->num_frames++; - } - else - hr = E_OUTOFMEMORY; - - if (FAILED(hr)) - { - IPropertyBag2_Release(*ppIEncoderOptions); - *ppIEncoderOptions = NULL; - } - } - - LeaveCriticalSection(&This->lock); - - return hr; -} - -static HRESULT WINAPI TiffEncoder_Commit(IWICBitmapEncoder *iface) -{ - TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); - - TRACE("(%p)\n", iface); - - EnterCriticalSection(&This->lock); - - if (!This->initialized || This->committed) - { - LeaveCriticalSection(&This->lock); - return WINCODEC_ERR_WRONGSTATE; - } - - pTIFFClose(This->tiff); - IStream_Release(This->stream); - This->stream = NULL; - This->tiff = NULL; - - This->committed = TRUE; - - LeaveCriticalSection(&This->lock); - - return S_OK; -} - -static HRESULT WINAPI TiffEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, - IWICMetadataQueryWriter **ppIMetadataQueryWriter) -{ - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); - return E_NOTIMPL; -} - -static const IWICBitmapEncoderVtbl TiffEncoder_Vtbl = { - TiffEncoder_QueryInterface, - TiffEncoder_AddRef, - TiffEncoder_Release, - TiffEncoder_Initialize, - TiffEncoder_GetContainerFormat, - TiffEncoder_GetEncoderInfo, - TiffEncoder_SetColorContexts, - TiffEncoder_SetPalette, - TiffEncoder_SetThumbnail, - TiffEncoder_SetPreview, - TiffEncoder_CreateNewFrame, - TiffEncoder_Commit, - TiffEncoder_GetMetadataQueryWriter -}; - -HRESULT TiffEncoder_CreateInstance(REFIID iid, void** ppv) -{ - TiffEncoder *This; - HRESULT ret; - - TRACE("(%s,%p)\n", debugstr_guid(iid), ppv); - - *ppv = NULL; - - if (!load_libtiff()) - { - ERR("Failed writing TIFF because unable to load %s\n",SONAME_LIBTIFF); - return E_FAIL; - } - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(TiffEncoder)); - if (!This) return E_OUTOFMEMORY; - - This->IWICBitmapEncoder_iface.lpVtbl = &TiffEncoder_Vtbl; - This->ref = 1; - This->stream = NULL; - InitializeCriticalSection(&This->lock); - This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TiffEncoder.lock"); - This->tiff = NULL; - This->initialized = FALSE; - This->num_frames = 0; - This->num_frames_committed = 0; - This->committed = FALSE; - - ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); - IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); - - return ret; -} - -#else /* !SONAME_LIBTIFF */ - -HRESULT TiffEncoder_CreateInstance(REFIID iid, void** ppv) -{ - ERR("Trying to save TIFF picture, but Wine was compiled without TIFF support.\n"); - return E_FAIL; -} - -#endif - -HRESULT TiffDecoder_CreateInstance(REFIID iid, void** ppv) -{ - HRESULT hr; - struct decoder *decoder; - struct decoder_info decoder_info; - - hr = get_unix_decoder(&CLSID_WICTiffDecoder, &decoder_info, &decoder); - - if (SUCCEEDED(hr)) - hr = CommonDecoder_CreateInstance(decoder, &decoder_info, iid, ppv); - - return hr; -} diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 7fc5f388697..7101880b93c 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -86,6 +86,9 @@ HRESULT CDECL encoder_create(const CLSID *encoder_clsid, struct encoder_info *in if (IsEqualGUID(encoder_clsid, &CLSID_WICPngEncoder)) return png_encoder_create(info, result); + if (IsEqualGUID(encoder_clsid, &CLSID_WICTiffEncoder)) + return tiff_encoder_create(info, result); + return E_NOTIMPL; } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index a3d5f5591b0..ab0329b8bb3 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -341,6 +341,8 @@ enum encoder_option { ENCODER_OPTION_INTERLACE, ENCODER_OPTION_FILTER, + ENCODER_OPTION_COMPRESSION_METHOD, + ENCODER_OPTION_COMPRESSION_QUALITY, ENCODER_OPTION_END }; @@ -397,6 +399,7 @@ HRESULT CDECL tiff_decoder_create(struct decoder_info *info, struct decoder **re HRESULT CDECL jpeg_decoder_create(struct decoder_info *info, struct decoder **result); HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **result); +HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **result); struct unix_funcs { -- 2.17.1

1 0

[PATCH v2] winebuild: Find main/wmain in static libraries.
by Kevin Puetz 20 Nov '20

20 Nov '20

Have the winebuild -spec.o include an undefined .globl referencing symbols we know the winecrt0 entry point will eventually reference, so ld knows about what it needs before scanning library archives. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- This one had fuzz in spec32.c from d5c089f5fa71e2ae568b2f1bcb9158223c552040 Still applied correctly, but marvin apparently doesn't like fuzz. Oops. --- wine.exe.so files set __wine_spec_exe_entry as the entry point. Therefore the linker is not initially looking for main and will pass over objects in lib.a archives that might provide it. When it gets to libwinecrt0.a is reached, it finds __wine_spec_exe_entry and learns that this wants main, but the resulting rescan will find the winecrt0 definition in terms of WinMain, before rescanning earlier libraries. So only a direct .o file (which is never passed over) can override the winecrt0 definition, and libraries like -lgtest_main do not work. --- tools/winebuild/build.h | 2 ++ tools/winebuild/main.c | 22 ++++++++++++++++++++-- tools/winebuild/spec32.c | 12 ++++++++++++ tools/winegcc/winegcc.c | 4 ++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 03715af9563..a4b9bc97e3e 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ @@ -299,6 +300,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e5e1627dda..68137b0f4c2 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -396,8 +396,25 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) { + add_spec_extra_ld_symbol("WinMain16"); + return "__wine_spec_exe16_entry"; + } + if (spec->unicode_app) { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("wWinMain"); + } + return "__wine_spec_exe_wentry"; + } else { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("WinMain"); + } + return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +465,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ba2edfb588f..a12e7d38aac 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} static unsigned int hash_filename( const char *name ) { @@ -610,6 +617,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -688,6 +696,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9268a5dfd1d..cef0832455c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1245,8 +1245,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry@8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1258,6 +1256,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

1 0

[PATCH resend] winebuild: Find main/wmain in static libraries.
by Kevin Puetz 20 Nov '20

20 Nov '20

Have the winebuild -spec.o include an undefined .globl referencing symbols we know the winecrt0 entry point will eventually reference, so ld knows about what it needs before scanning library archives. --- wine.exe.so files set __wine_spec_exe_entry as the entry point. Therefore the linker is not initially looking for main and will pass over objects in lib.a archives that might provide it. When it gets to libwinecrt0.a is reached, it finds __wine_spec_exe_entry and learns that this wants main, but the resulting rescan will find the winecrt0 definition in terms of WinMain, before rescanning earlier libraries. So only a direct .o file (which is never passed over) can override the winecrt0 definition, and libraries like -lgtest_main do not work. Index: wine/tools/winebuild/build.h =================================================================== --- wine.orig/tools/winebuild/build.h +++ wine/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */ @@ -297,6 +298,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); Index: wine/tools/winebuild/main.c =================================================================== --- wine.orig/tools/winebuild/main.c +++ wine/tools/winebuild/main.c @@ -396,8 +396,25 @@ static const char *get_default_entry_poi { if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; + if (spec->type == SPEC_WIN16) { + add_spec_extra_ld_symbol("WinMain16"); + return "__wine_spec_exe16_entry"; + } + if (spec->unicode_app) { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("wWinMain"); + } + return "__wine_spec_exe_wentry"; + } else { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); + if(spec->subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { + add_spec_extra_ld_symbol("WinMain"); + } + return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ @@ -448,6 +465,7 @@ static char **parse_options( int argc, c else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unix" )) unix_lib = 1; + else if (!strcmp( optarg, "unicode" )) spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); Index: wine/tools/winebuild/spec32.c =================================================================== --- wine.orig/tools/winebuild/spec32.c +++ wine/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) @@ -602,6 +609,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -680,6 +688,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" ); Index: wine/tools/winegcc/winegcc.c =================================================================== --- wine.orig/tools/winegcc/winegcc.c +++ wine/tools/winegcc/winegcc.c @@ -1228,8 +1228,6 @@ static void build(struct options* opts) entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry@8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; - else if (!is_pe && !opts->shared && opts->unicode_app) - entry_point = "__wine_spec_exe_wentry"; } else entry_point = opts->entry_point; @@ -1241,6 +1239,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); + if(opts->unicode_app) + strarray_add(spec_args, "-municode"); strarray_add(spec_args, "-D_REENTRANT"); if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe");

2 1

winegcc: Implement -Wl,--out-implib
by Kevin Puetz 20 Nov '20

20 Nov '20

This allows a CMake toolchain (or other caller) to treat winegcc like MinGW, specifying that it produce a separate file for imports, e.g. set(CMAKE_IMPORT_LIBRARY_PREFIX lib) set(CMAKE_IMPORT_LIBRARY_SUFFIX .a) string(APPEND CMAKE_C_CREATE_SHARED_LIBRARY " -Wl,--out-implib,<TARGET_IMPLIB>") Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- makedep.c isn't changed to use use this because the few cases in which wine currently uses #pragma implib (and thus winebuild --implib) involve putting some (but not all) of the object files into the libfoo.a as well. The motive is to fix our CMake toolchain for wineg++ to support using target_link_libraries to link other SHARED_LIBRARY targets in the project. This broke when wine-5.7 removed __wine_spec_init from winecrt0; the issue is that CMake links to with an absolute path to the .so (i.e. foo.dll.so). So we had been (unnnoticed until it quit working) getting an ELF DT_NEEDED instead of a PE import. This "worked" before, since __wine_spec_init would still register the builtin dll loaded in such a fashion. Now the dependency's own dllimports (from kernel32, etc) don't get loaded anymore. And I'm pretty sure it only worked before by happy accident. CMake supports windows-style DLL/implib separation, but it really wants the link rule to produce both artifacts (as MSVC/MinGW do) and the implib needs to be a file that can be passed to linking as an absolute path. And (for least surprise) it seems like that filename should work with -lfoo too, even though CMake will always pass a full path. libfoo.def doesn't, because winegcc sees libfoo.def as the spec_file (i.e. --export). The only way I could find to pass a libfoo.def file and have it be imports (besides having winegcc find it via -lfoo) was to conceal it in -Wb,libfoo.def, which feels rather hacky. Just forwarding the mingw-style -Wl,--out-implib to winebuild --implib seemed easy and MinGW-like (which winegcc often seems to aim for). add_undef_import is subtle, but it's already there (for #pragma implib) so I didn't see any a reason to prefer a libfoo.def over a libfoo.a, when the latter already works as a filename and as -lfoo. If I've overlooked some reason it's preferable to use .def files, perhaps there could be a distinct extension (.impdef, .a.def, or .lib ala MSVC?) which get_file_type treats as file_dll and guess_lib_type (also?) searches. Then --out-implib could check the extension and use winebuild --def vs winebuild --implib accordingly (like how winegcc already reacts to the extension of -o to decide between generate_app_loader, --fake, etc). Signed-off-by in the sense that I think this is correct and adequate, but I'm happy to take feedback if there's other use-cases an upstream submission should try to address... Index: wine/tools/winegcc/winegcc.c =================================================================== --- wine.orig/tools/winegcc/winegcc.c +++ wine/tools/winegcc/winegcc.c @@ -231,6 +231,7 @@ struct options const char* entry_point; const char* prelink; const char* debug_file; + const char* out_implib; strarray* prefix; strarray* lib_dirs; strarray* args; @@ -1085,7 +1086,7 @@ static void add_library( struct options static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args, *tool; + strarray *spec_args, *link_args, *implib_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1454,6 +1455,26 @@ static void build(struct options* opts) strarray_free(tool); } + if(opts->out_implib) + { + if (!spec_file) + error("--out-implib requires a .spec or .def file\n"); + + implib_args = get_winebuild_args( opts ); + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( implib_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if ((tool = build_tool_name( opts, TOOL_LD ))) strarray_add( implib_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + + strarray_add(implib_args, "--implib"); + strarray_add(implib_args, "-o"); + strarray_add(implib_args, opts->out_implib); + strarray_add(implib_args, "--export"); + strarray_add(implib_args, spec_file); + strarray_addall(implib_args, opts->winebuild_args); + + spawn(opts->prefix, implib_args, 0); + strarray_free (implib_args); + } + /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1966,6 +1987,11 @@ int main(int argc, char **argv) strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); continue; } + if (!strcmp(Wl->base[j], "--out-implib")) + { + opts.out_implib = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); } Index: wine/tools/winegcc/winegcc.man.in =================================================================== --- wine.orig/tools/winegcc/winegcc.man.in +++ wine/tools/winegcc/winegcc.man.in @@ -72,6 +72,9 @@ Do not add the winecrt0 library when lin .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.IP "\fB-b,--target \fItarget\fR" +.IP "\fB-Wl,--out-implib,\fIlib.a\fR" +This option should be used while linking a dll, and is implemented for compatibility with MinGW-gcc. A \fIlib.spec\fR or \fIlib.def\fR must also be provided. Despite the name, it is actually forwarded to \fBwinebuild --implib -o \fIlib.a\fR rather than to the linker. .SH ENVIRONMENT .TP .B WINEBUILD

1 0

[PATCH] mmdveapi: Support older version of the AudioClientProperties structure
by Andrew Eikum 20 Nov '20

20 Nov '20

Warframe when using a win10 prefix uses an xaudio2_9redist.dll which uses the older AudioClientProperties structure (missing the Options member). Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/tests/render.c | 12 +++++++++++- dlls/winealsa.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/wineandroid.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/wineoss.drv/mmdevdrv.c | 22 +++++++++++++++------- dlls/winepulse.drv/mmdevdrv.c | 22 +++++++++++++++------- include/audioclient.idl | 8 ++++++++ 7 files changed, 94 insertions(+), 36 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index a0aa1b18936..495c1c6f496 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -276,6 +276,7 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, NULL); ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + /* invalid cbSize */ client_props.cbSize = 0; client_props.bIsOffload = FALSE; client_props.eCategory = AudioCategory_BackgroundCapableMedia; @@ -284,7 +285,8 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); - client_props.cbSize = sizeof(client_props); + /* offload consistency */ + client_props.cbSize = sizeof(client_props) - sizeof(client_props.Options); client_props.bIsOffload = TRUE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); @@ -293,10 +295,18 @@ static void test_audioclient(void) else ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + /* disable offload */ client_props.bIsOffload = FALSE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + /* Options field added in Win 8.1 */ + client_props.cbSize = sizeof(client_props); + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK || + broken(hr == E_INVALIDARG) /* <= win8 */, + "SetClientProperties failed: %08x\n", hr); + IAudioClient2_Release(ac2); } else diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0c255a66f7d..318350471db 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2676,21 +2676,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 7d543ec4f61..d9b7cde2c80 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1635,21 +1635,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 846e0ae3b1e..b002189e199 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2243,21 +2243,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fd0784eb323..db2c6b23914 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1800,21 +1800,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cef8a2d4d5b..417067f0bf8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2248,21 +2248,29 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, const AudioClientProperties *prop) { ACImpl *This = impl_from_IAudioClient3(iface); + const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop; TRACE("(%p)->(%p)\n", This, prop); - if(!prop) + if(!legacy_prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + if(legacy_prop->cbSize == sizeof(AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory, + prop->Options); + }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){ + TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", + legacy_prop->bIsOffload, + legacy_prop->eCategory); + }else{ + WARN("Unsupported Size = %d\n", legacy_prop->cbSize); return E_INVALIDARG; + } - TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", - prop->bIsOffload, - prop->eCategory, - prop->Options); - if(prop->bIsOffload) + if(legacy_prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; return S_OK; diff --git a/include/audioclient.idl b/include/audioclient.idl index 132e78a602b..cd13be5d575 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -126,6 +126,14 @@ typedef struct _AudioClientProperties AUDCLNT_STREAMOPTIONS Options; } AudioClientProperties; +typedef struct _Win8AudioClientProperties +{ + UINT32 cbSize; + BOOL bIsOffload; + AUDIO_STREAM_CATEGORY eCategory; + /* Options field added in Win 8.1 */ +} Win8AudioClientProperties; + [ local, pointer_default(unique), -- 2.29.2

2 1

[PATCH 3/5] server: Support FileFsDeviceInformation queries on console handles.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 20 ++++++++++++++++++++ server/console.c | 27 +++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-)

2 1

[PATCH 2/5] kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 -- dlls/kernelbase/file.c | 6 ------ 2 files changed, 8 deletions(-)

2 1

[PATCH 1/5] server: Properly handle NtQueryInformationFile on console handles.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 28 ++++++++++++++++++++++++++++ server/console.c | 10 ++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-)

2 1

[PATCH 5/5] server: Remove no longer needed hack for inheriting console from stdin.
by Jacek Caban 20 Nov '20

20 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 30 ------------------------------ server/process.c | 12 +++--------- server/process.h | 2 -- 3 files changed, 3 insertions(+), 41 deletions(-)

1 0

[PATCH v2] wineboot: Fill ActiveProcessorAffinity field in USD.
by Paul Gofman 20 Nov '20

20 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - define ActiveProcessorAffinity as ULONGLONG in USD; - use ULONGLONG instead of ULONG_PTR. dlls/ntdll/tests/virtual.c | 7 +++++++ include/ddk/wdm.h | 2 +- programs/wineboot/wineboot.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9c2cf824018..f2c8343e1a6 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -579,6 +579,13 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + if (user_shared_data->ActiveProcessorCount) + ok(user_shared_data->ActiveProcessorAffinity + == (user_shared_data->ActiveProcessorCount >= 8 * sizeof(ULONGLONG) + ? ~(ULONGLONG)0 : ((ULONGLONG)1 << user_shared_data->ActiveProcessorCount) - 1) + || broken(!user_shared_data->ActiveProcessorAffinity) /* before Win7 */, + "Got unexpected ActiveProcessorAffinity %s.\n", + wine_dbgstr_longlong(user_shared_data->ActiveProcessorAffinity)); ok(user_shared_data->ActiveGroupCount == 1 || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6885de1cf89..aa2551be035 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1320,7 +1320,7 @@ typedef struct _KUSER_SHARED_DATA { USHORT UserModeGlobalLogger[16]; /* 0x380 */ ULONG ImageFileExecutionOptions; /* 0x3a0 */ ULONG LangGenerationCount; /* 0x3a4 */ - ULONG ActiveProcessorAffinity; /* 0x3a8 */ + ULONGLONG ActiveProcessorAffinity; /* 0x3a8 */ volatile ULONGLONG InterruptTimeBias; /* 0x3b0 */ volatile ULONGLONG QpcBias; /* 0x3b8 */ ULONG ActiveProcessorCount; /* 0x3c0 */ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..5bf839ec520 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -332,6 +332,8 @@ static void create_user_shared_data(void) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveProcessorAffinity = data->ActiveProcessorCount >= 8 * sizeof(ULONGLONG) + ? ~(ULONGLONG)0 : ((ULONGLONG)1 << data->ActiveProcessorCount) - 1; data->ActiveGroupCount = 1; initialize_xstate_features( data ); -- 2.28.0

1 1

[PATCH] wineboot: Fill ActiveProcessorAffinity field in USD.
by Paul Gofman 20 Nov '20

20 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 6 ++++++ programs/wineboot/wineboot.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9c2cf824018..df5d601927a 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -579,6 +579,12 @@ static void test_user_shared_data(void) ok(user_shared_data->ActiveProcessorCount == NtCurrentTeb()->Peb->NumberOfProcessors || broken(!user_shared_data->ActiveProcessorCount) /* before Win7 */, "Got unexpected ActiveProcessorCount %u.\n", user_shared_data->ActiveProcessorCount); + if (user_shared_data->ActiveProcessorCount) + ok(user_shared_data->ActiveProcessorAffinity == (user_shared_data->ActiveProcessorCount >= 64 + ? ~(ULONG_PTR)0 : ((ULONG_PTR)1 << user_shared_data->ActiveProcessorCount) - 1) + || broken(!user_shared_data->ActiveProcessorAffinity) /* before Win7 */, + "Got unexpected ActiveProcessorAffinity %s.\n", + wine_dbgstr_longlong(user_shared_data->ActiveProcessorAffinity)); ok(user_shared_data->ActiveGroupCount == 1 || broken(!user_shared_data->ActiveGroupCount) /* before Win7 */, "Got unexpected ActiveGroupCount %u.\n", user_shared_data->ActiveGroupCount); diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..b3a28444a06 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -332,6 +332,8 @@ static void create_user_shared_data(void) break; } data->ActiveProcessorCount = NtCurrentTeb()->Peb->NumberOfProcessors; + data->ActiveProcessorAffinity = data->ActiveProcessorCount >= 64 + ? ~(ULONG_PTR)0 : ((ULONG_PTR)1 << data->ActiveProcessorCount) - 1; data->ActiveGroupCount = 1; initialize_xstate_features( data ); -- 2.28.0

2 5

[v2 PATCH 1/3] mf/session: Shutdown and release presentation clock on session shutdown.
by Nikolay Sivov 20 Nov '20

20 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 3 +++ dlls/mf/tests/mf.c | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index dffd5113ff9..4821ed5c90a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1792,6 +1792,9 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFMediaEventQueue_Shutdown(session->event_queue); if (session->quality_manager) IMFQualityManager_Shutdown(session->quality_manager); + MFShutdownObject((IUnknown *)session->clock); + IMFPresentationClock_Release(session->clock); + session->clock = NULL; } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a671225a11..27e859fa82d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1188,13 +1188,14 @@ static void test_media_session(void) IMFAttributes *attributes; IMFMediaSession *session; IMFTopology *topology; + IMFShutdown *shutdown; PROPVARIANT propvar; + DWORD status, caps; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; - DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1275,9 +1276,24 @@ todo_wine hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected shutdown status %u.\n", status); + + IMFShutdown_Release(shutdown); + hr = IMFMediaSession_ClearTopologies(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.29.2

1 2

[PATCH] mshtml: Fix spelling of fuchsia.
by Michael Stefaniuc 20 Nov '20

20 Nov '20

Spotted by Rafał Mużyło. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlbody.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fddc4c6da0e..4209fd2cc2e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -52,7 +52,7 @@ static const struct { {L"aqua", 0x00ffff}, {L"black", 0x000000}, {L"blue", 0x0000ff}, - {L"fushsia", 0xff00ff}, + {L"fuchsia", 0xff00ff}, {L"gray", 0x808080}, {L"green", 0x008000}, {L"lime", 0x00ff00}, -- 2.26.2

2 1

[PATCH 1/3] mf/session: Shutdown and release presentation clock on session shutdown.
by Nikolay Sivov 20 Nov '20

20 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 3 +++ dlls/mf/tests/mf.c | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index dffd5113ff9..4821ed5c90a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1792,6 +1792,9 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFMediaEventQueue_Shutdown(session->event_queue); if (session->quality_manager) IMFQualityManager_Shutdown(session->quality_manager); + MFShutdownObject((IUnknown *)session->clock); + IMFPresentationClock_Release(session->clock); + session->clock = NULL; } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a671225a11..27e859fa82d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1188,13 +1188,14 @@ static void test_media_session(void) IMFAttributes *attributes; IMFMediaSession *session; IMFTopology *topology; + IMFShutdown *shutdown; PROPVARIANT propvar; + DWORD status, caps; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; - DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1275,9 +1276,24 @@ todo_wine hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + hr = IMFMediaSession_GetClock(session, &clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFClock_QueryInterface(clock, &IID_IMFShutdown, (void **)&shutdown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected shutdown status %u.\n", status); + + IMFShutdown_Release(shutdown); + hr = IMFMediaSession_ClearTopologies(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.29.2

1 2

[PATCH 2/2] msado15: Implement ADORecordsetConstruction get/put Rowset
by Alistair Leslie-Hughes 20 Nov '20

20 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 31 ++++++++++++++++++++++++++----- dlls/msado15/tests/msado15.c | 8 ++++---- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 79679e455af..17200d73790 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -23,6 +23,7 @@ #define COBJMACROS #include "objbase.h" #include "msado15_backcompat.h" +#include "oledb.h" #include "wine/debug.h" #include "wine/heap.h" @@ -46,6 +47,7 @@ struct recordset VARIANT *data; CursorLocationEnum cursor_location; CursorTypeEnum cursor_type; + IRowset *row_set; }; struct fields @@ -757,6 +759,8 @@ static void close_recordset( struct recordset *recordset ) { ULONG row, col, col_count; + if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + if (!recordset->fields) return; col_count = get_column_count( recordset ); @@ -1611,15 +1615,31 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %p\n", recordset, row_set ); - return E_NOTIMPL; + HRESULT hr; + + TRACE( "%p, %p\n", recordset, row_set ); + + hr = IRowset_QueryInterface(recordset->row_set, &IID_IUnknown, (void**)row_set); + if ( FAILED(hr) ) return E_FAIL; + + return S_OK; } -static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) +static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *unk) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p, %p\n", recordset, row_set ); - return E_NOTIMPL; + HRESULT hr; + IRowset *rowset; + + TRACE( "%p, %p\n", recordset, unk ); + + hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); + if ( FAILED(hr) ) return E_FAIL; + + if ( recordset->row_set ) IRowset_Release( recordset->row_set ); + recordset->row_set = rowset; + + return S_OK; } static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) @@ -1679,6 +1699,7 @@ HRESULT Recordset_create( void **obj ) recordset->index = -1; recordset->cursor_location = adUseServer; recordset->cursor_type = adOpenForwardOnly; + recordset->row_set = NULL; *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 288e579f10c..cafb73d64e4 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -582,17 +582,17 @@ static void test_ADORecordsetConstruction(void) ref = get_refcount( rowset ); ok( ref == 1, "got %d\n", ref ); hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); ref = get_refcount( rowset ); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); ok( fields != NULL, "NULL value\n"); ref = get_refcount( rowset ); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); @@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - todo_wine ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %d\n", ref ); Fields_Release(fields); -- 2.29.2

2 1

[PATCH 1/2] msado15: Support ADORecordsetConstruction in _Recordset
by Alistair Leslie-Hughes 20 Nov '20

20 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 123 +++++++++++++++++++++++++++++++++++ dlls/msado15/tests/msado15.c | 10 +-- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index e3dd83a4309..79679e455af 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -35,6 +35,7 @@ struct fields; struct recordset { _Recordset Recordset_iface; + ADORecordsetConstruction ADORecordsetConstruction_iface; ISupportErrorInfo ISupportErrorInfo_iface; LONG refs; LONG state; @@ -739,6 +740,11 @@ static inline struct recordset *impl_from_Recordset( _Recordset *iface ) return CONTAINING_RECORD( iface, struct recordset, Recordset_iface ); } +static inline struct recordset *impl_from_ADORecordsetConstruction( ADORecordsetConstruction *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ADORecordsetConstruction_iface ); +} + static ULONG WINAPI recordset_AddRef( _Recordset *iface ) { struct recordset *recordset = impl_from_Recordset( iface ); @@ -798,6 +804,10 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_ADORecordsetConstruction )) + { + *obj = &recordset->ADORecordsetConstruction_iface; + } else if (IsEqualGUID( riid, &IID_IRunnableObject )) { TRACE("IID_IRunnableObject not supported returning NULL\n"); @@ -1545,6 +1555,118 @@ static const ISupportErrorInfoVtbl recordset_supporterrorinfo_vtbl = recordset_supporterrorinfo_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI rsconstruction_QueryInterface(ADORecordsetConstruction *iface, + REFIID riid, void **obj) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI rsconstruction_AddRef(ADORecordsetConstruction *iface) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI rsconstruction_Release(ADORecordsetConstruction *iface) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + return _Recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI rsconstruction_GetTypeInfoCount(ADORecordsetConstruction *iface, UINT *pctinfo) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + TRACE( "%p, %p\n", recordset, pctinfo ); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI rsconstruction_GetTypeInfo(ADORecordsetConstruction *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_GetIDsOfNames(ADORecordsetConstruction *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_set ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_Chapter(ADORecordsetConstruction *iface, LONG *chapter) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, chapter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_Chapter(ADORecordsetConstruction *iface, LONG chapter) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %d\n", recordset, chapter ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_get_RowPosition(ADORecordsetConstruction *iface, IUnknown **row_pos) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_pos ); + return E_NOTIMPL; +} + +static HRESULT WINAPI rsconstruction_put_RowPosition(ADORecordsetConstruction *iface, IUnknown *row_pos) +{ + struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); + FIXME( "%p, %p\n", recordset, row_pos ); + return E_NOTIMPL; +} + +static const ADORecordsetConstructionVtbl rsconstruction_vtbl = +{ + rsconstruction_QueryInterface, + rsconstruction_AddRef, + rsconstruction_Release, + rsconstruction_GetTypeInfoCount, + rsconstruction_GetTypeInfo, + rsconstruction_GetIDsOfNames, + rsconstruction_Invoke, + rsconstruction_get_Rowset, + rsconstruction_put_Rowset, + rsconstruction_get_Chapter, + rsconstruction_put_Chapter, + rsconstruction_get_RowPosition, + rsconstruction_put_RowPosition +}; + HRESULT Recordset_create( void **obj ) { struct recordset *recordset; @@ -1552,6 +1674,7 @@ HRESULT Recordset_create( void **obj ) if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; + recordset->ADORecordsetConstruction_iface.lpVtbl = &rsconstruction_vtbl; recordset->refs = 1; recordset->index = -1; recordset->cursor_location = adUseServer; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 70c2db7a62d..288e579f10c 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -566,7 +566,7 @@ static void test_ADORecordsetConstruction(void) ok( hr == S_OK, "got %08x\n", hr ); hr = _Recordset_QueryInterface( recordset, &IID_ADORecordsetConstruction, (void**)&construct ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); if (FAILED(hr)) { goto done; @@ -585,18 +585,18 @@ static void test_ADORecordsetConstruction(void) todo_wine ok( hr == S_OK, "got %08x\n", hr ); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); ok( fields != NULL, "NULL value\n"); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( count == 1, "got %d\n", count ); + todo_wine ok( count == 1, "got %d\n", count ); if (count > 0) { VARIANT index; @@ -623,7 +623,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - ok( ref == 2, "got %d\n", ref ); + todo_wine ok( ref == 2, "got %d\n", ref ); Fields_Release(fields); -- 2.29.2

2 1

[PATCH] gdi32: fix PatBlt() drawing with negative width/height
by Damjan Jovanovic 20 Nov '20

20 Nov '20

In a (x, y, w, h) rectangle passed to PatBlt(), a negative w results in the rectangle drawn being (x+w, y, -w, h), and negative h results in (x, y+h, w, -h). Wine instead does (x+w+1, y, -w, h) and (x, y+h+1, w, -h), so the rectangle drawn is shifted 1 pixel row too far down and/or 1 pixel column too far right. This patch recalculates the rectangle dimensions correctly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27584 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdi32/bitblt.c | 11 +++++++++++ dlls/gdi32/tests/bitmap.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)

2 1

[PATCH] ntdll: Fix SMT CPU flag reporting.
by Paul Gofman 20 Nov '20

20 Nov '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c8d0340f76f..dc6f4d27a8b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -538,8 +538,9 @@ static DWORD count_bits(ULONG_PTR mask) DWORD count = 0; while (mask > 0) { + if (mask & 1) + ++count; mask >>= 1; - count++; } return count; } -- 2.28.0

1 0

[PATCH 1/4] gdi32: Ignore Type 1 fonts in fontconfig enumeration.
by Rémi Bernon 20 Nov '20

20 Nov '20

Instead of loading the font with FreeType to discard it right away. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series brings another ~350ms prefix startup time improvement, with "wine cmd /c exit" execution time going from ~1.25s to ~0.9s on average. dlls/gdi32/freetype.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 61397e8b542..7ea96af0a59 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1393,6 +1393,7 @@ static void load_fontconfig_fonts(void) { FcPattern *pat; FcFontSet *fontset; + const char *format; int i, len; char *file; const char *ext; @@ -1428,6 +1429,18 @@ static void load_fontconfig_fonts(void) continue; } + if (pFcPatternGetString( fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) + { + TRACE( "ignoring unknown font format %s\n", debugstr_a(file) ); + continue; + } + + if (!strcmp( format, "Type 1" )) + { + TRACE( "ignoring Type 1 font %s\n", debugstr_a(file) ); + continue; + } + aa_flags = parse_aa_pattern( fontset->fonts[i] ); TRACE("fontconfig: %s aa %x\n", file, aa_flags); -- 2.29.2

2 5

[PATCH v2 4/4] gdi32: Lazily create and cache fontconfig patterns.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7d8bc5f5b05..993110e6fe0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1343,21 +1343,22 @@ static UINT parse_aa_pattern( FcPattern *pattern ) return aa_flags; } -static FcPattern *create_family_pattern( const char *name ) +static FcPattern *create_family_pattern( const char *name, FcPattern **cached ) { - FcPattern *ret, *pattern = pFcPatternCreate(); + FcPattern *ret = NULL, *tmp, *pattern = pFcPatternCreate(); FcResult result; - + if (*cached) return *cached; pFcPatternAddString( pattern, FC_FAMILY, (const FcChar8 *)name ); pFcPatternAddString( pattern, FC_NAMELANG, (const FcChar8 *)"en-us" ); pFcPatternAddString( pattern, FC_PRGNAME, (const FcChar8 *)"wine" ); pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); pFcDefaultSubstitute( pattern ); - ret = pFcFontMatch( NULL, pattern, &result ); + tmp = pFcFontMatch( NULL, pattern, &result ); pFcPatternDestroy( pattern ); - if (ret && result == FcResultMatch) return ret; - pFcPatternDestroy( ret ); - return NULL; + if (result != FcResultMatch) pFcPatternDestroy( tmp ); + else if ((ret = InterlockedCompareExchangePointer( (void **)cached, tmp, NULL ))) pFcPatternDestroy( tmp ); + else ret = tmp; + return ret; } static void fontconfig_add_font( FcPattern *pattern, DWORD flags ) @@ -1458,9 +1459,6 @@ static void init_fontconfig(void) default_aa_flags = parse_aa_pattern( pattern ); pFcPatternDestroy( pattern ); } - pattern_serif = create_family_pattern( "serif" ); - pattern_fixed = create_family_pattern( "monospace" ); - pattern_sans = create_family_pattern( "sans" ); TRACE( "enabled, default flags = %x\n", default_aa_flags ); fontconfig_enabled = TRUE; @@ -2213,9 +2211,9 @@ static BOOL CDECL fontconfig_enum_family_fallbacks( DWORD pitch_and_family, int char *str; DWORD len; - if ((pitch_and_family & FIXED_PITCH) || (pitch_and_family & 0xf0) == FF_MODERN) pat = pattern_fixed; - else if ((pitch_and_family & 0xf0) == FF_ROMAN) pat = pattern_serif; - else pat = pattern_sans; + if ((pitch_and_family & FIXED_PITCH) || (pitch_and_family & 0xf0) == FF_MODERN) pat = create_family_pattern( "monospace", &pattern_fixed ); + else if ((pitch_and_family & 0xf0) == FF_ROMAN) pat = create_family_pattern( "serif", &pattern_serif ); + else pat = create_family_pattern( "sans", &pattern_sans ); if (!pat) return FALSE; if (pFcPatternGetString( pat, FC_FAMILY, index, (FcChar8 **)&str ) != FcResultMatch) return FALSE; -- 2.23.0

1 0

[PATCH v2 3/4] gdi32: Load font list directly from fontconfig cache.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Instead of going through the -slow- font matching. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 169 +++++++++++++++++++++++++++++++----------- 1 file changed, 125 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 45b5e94d341..7d8bc5f5b05 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -190,6 +190,20 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); +MAKE_FUNCPTR(FcConfigGetFontDirs); +MAKE_FUNCPTR(FcConfigGetCurrent); +MAKE_FUNCPTR(FcCacheCopySet); +MAKE_FUNCPTR(FcCacheNumSubdir); +MAKE_FUNCPTR(FcCacheSubdir); +MAKE_FUNCPTR(FcDirCacheRead); +MAKE_FUNCPTR(FcDirCacheUnload); +MAKE_FUNCPTR(FcStrListCreate); +MAKE_FUNCPTR(FcStrListDone); +MAKE_FUNCPTR(FcStrListNext); +MAKE_FUNCPTR(FcStrSetAdd); +MAKE_FUNCPTR(FcStrSetCreate); +MAKE_FUNCPTR(FcStrSetDestroy); +MAKE_FUNCPTR(FcStrSetMember); #ifndef FC_NAMELANG #define FC_NAMELANG "namelang" #endif @@ -1346,6 +1360,51 @@ static FcPattern *create_family_pattern( const char *name ) return NULL; } +static void fontconfig_add_font( FcPattern *pattern, DWORD flags ) +{ + const char *unix_name, *format; + WCHAR *dos_name; + FcBool scalable; + DWORD aa_flags; + int face_index; + + TRACE( "(%p %#x)\n", pattern, flags ); + + if (pFcPatternGetString( pattern, FC_FILE, 0, (FcChar8 **)&unix_name ) != FcResultMatch) + return; + + if (pFcPatternGetBool( pattern, FC_SCALABLE, 0, &scalable ) != FcResultMatch) + scalable = FALSE; + + if (pFcPatternGetString( pattern, FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) + { + TRACE( "ignoring unknown font format %s\n", debugstr_a(unix_name) ); + return; + } + + if (!strcmp( format, "Type 1" )) + { + TRACE( "ignoring Type 1 font %s\n", debugstr_a(unix_name) ); + return; + } + + if (!scalable && !(flags & ADDFONT_ALLOW_BITMAP)) + { + TRACE( "ignoring non-scalable font %s\n", debugstr_a(unix_name) ); + return; + } + + if (!(aa_flags = parse_aa_pattern( pattern ))) aa_flags = default_aa_flags; + flags |= ADDFONT_AA_FLAGS(aa_flags); + + if (pFcPatternGetInteger( pattern, FC_INDEX, 0, &face_index ) != FcResultMatch) + face_index = 0; + + dos_name = get_dos_file_name( unix_name ); + add_unix_face( unix_name, dos_name, NULL, 0, face_index, flags, NULL ); + RtlFreeHeap( GetProcessHeap(), 0, dos_name ); +} + static void init_fontconfig(void) { void *fc_handle = dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW); @@ -1369,6 +1428,20 @@ static void init_fontconfig(void) LOAD_FUNCPTR(FcPatternGetBool); LOAD_FUNCPTR(FcPatternGetInteger); LOAD_FUNCPTR(FcPatternGetString); + LOAD_FUNCPTR(FcConfigGetFontDirs); + LOAD_FUNCPTR(FcConfigGetCurrent); + LOAD_FUNCPTR(FcCacheCopySet); + LOAD_FUNCPTR(FcCacheNumSubdir); + LOAD_FUNCPTR(FcCacheSubdir); + LOAD_FUNCPTR(FcDirCacheRead); + LOAD_FUNCPTR(FcDirCacheUnload); + LOAD_FUNCPTR(FcStrListCreate); + LOAD_FUNCPTR(FcStrListDone); + LOAD_FUNCPTR(FcStrListNext); + LOAD_FUNCPTR(FcStrSetAdd); + LOAD_FUNCPTR(FcStrSetCreate); + LOAD_FUNCPTR(FcStrSetDestroy); + LOAD_FUNCPTR(FcStrSetMember); #undef LOAD_FUNCPTR if (pFcInit()) @@ -1394,61 +1467,69 @@ static void init_fontconfig(void) } } -static void load_fontconfig_fonts(void) +static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir_list, FcStrSet *done_set, DWORD flags ) { - FcPattern *pat; - FcFontSet *fontset; - const char *format; + const FcChar8 *dir; + FcFontSet *font_set; + FcStrList *subdir_list = NULL; + FcStrSet *subdir_set = NULL; + FcCache *cache = NULL; int i; - char *file; - if (!fontconfig_enabled) return; - - pat = pFcPatternCreate(); - if (!pat) return; + TRACE( "(%p %p %p %#x)\n", config, dir_list, done_set, flags ); - fontset = pFcFontList(NULL, pat, NULL); - if (!fontset) + while ((dir = pFcStrListNext( dir_list ))) { - pFcPatternDestroy(pat); - return; + if (pFcStrSetMember( done_set, dir )) continue; + + TRACE( "adding fonts from %s\n", dir ); + if (!(cache = pFcDirCacheRead( dir, FcFalse, config ))) continue; + + if (!(font_set = pFcCacheCopySet( cache ))) goto done; + for (i = 0; i < font_set->nfont; i++) + fontconfig_add_font( font_set->fonts[i], flags ); + pFcFontSetDestroy( font_set ); + font_set = NULL; + + if (!(subdir_set = pFcStrSetCreate())) goto done; + for (i = 0; i < pFcCacheNumSubdir( cache ); i++) + pFcStrSetAdd( subdir_set, pFcCacheSubdir( cache, i ) ); + pFcDirCacheUnload( cache ); + cache = NULL; + + if (!(subdir_list = pFcStrListCreate( subdir_set ))) goto done; + pFcStrSetDestroy( subdir_set ); + subdir_set = NULL; + + pFcStrSetAdd( done_set, dir ); + fontconfig_add_fonts_from_dir_list( config, subdir_list, done_set, flags ); + pFcStrListDone( subdir_list ); + subdir_list = NULL; } - for(i = 0; i < fontset->nfont; i++) { - FcBool scalable; - DWORD aa_flags; - - if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) - continue; - - pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); - - if(pFcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable) == FcResultMatch && !scalable) - { - TRACE("not scalable\n"); - continue; - } +done: + if (font_set) pFcFontSetDestroy( font_set ); + if (subdir_list) pFcStrListDone( subdir_list ); + if (subdir_set) pFcStrSetDestroy( subdir_set ); + if (cache) pFcDirCacheUnload( cache ); +} - if (pFcPatternGetString( fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) - { - TRACE( "ignoring unknown font format %s\n", debugstr_a(file) ); - continue; - } +static void load_fontconfig_fonts( void ) +{ + FcStrList *dir_list = NULL; + FcStrSet *done_set = NULL; + FcConfig *config; - if (!strcmp( format, "Type 1" )) - { - TRACE( "ignoring Type 1 font %s\n", debugstr_a(file) ); - continue; - } + if (!fontconfig_enabled) return; + if (!(config = pFcConfigGetCurrent())) goto done; + if (!(done_set = pFcStrSetCreate())) goto done; + if (!(dir_list = pFcConfigGetFontDirs( config ))) goto done; - aa_flags = parse_aa_pattern( fontset->fonts[i] ); - TRACE("fontconfig: %s aa %x\n", file, aa_flags); + fontconfig_add_fonts_from_dir_list( config, dir_list, done_set, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE ); - AddFontToList( NULL, file, NULL, 0, - ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); - } - pFcFontSetDestroy(fontset); - pFcPatternDestroy(pat); +done: + if (dir_list) pFcStrListDone( dir_list ); + if (done_set) pFcStrSetDestroy( done_set ); } #elif defined(HAVE_CARBON_CARBON_H) -- 2.23.0

1 0

[PATCH v2 2/4] gdi32: Move FreeType face creation to AddFaceToList.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> So we can use it to add individual fontconfig fonts without iterating all faces. And rename it to add_unix_face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 127 ++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1722f0c746c..45b5e94d341 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1002,50 +1002,6 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static int AddFaceToList(FT_Face ft_face, const WCHAR *file, void *data_ptr, SIZE_T data_size, - FT_Long face_index, DWORD flags ) -{ - struct bitmap_font_size size; - FONTSIGNATURE fs; - int ret; - WCHAR *family_name = ft_face_get_family_name( ft_face, system_lcid ); - WCHAR *second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - WCHAR *style_name = ft_face_get_style_name( ft_face, system_lcid ); - WCHAR *full_name = ft_face_get_full_name( ft_face, system_lcid ); - - /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = NULL; - } - } - - get_fontsig( ft_face, &fs ); - if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); - if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - - ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, - data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), - get_font_version( ft_face ), flags, - FT_IS_SCALABLE(ft_face) ? NULL : &size ); - - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - - RtlFreeHeap( GetProcessHeap(), 0, family_name ); - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - RtlFreeHeap( GetProcessHeap(), 0, style_name ); - RtlFreeHeap( GetProcessHeap(), 0, full_name ); - return ret; -} - static FT_Face new_ft_face( const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, BOOL allow_bitmap ) { @@ -1122,6 +1078,68 @@ fail: return NULL; } +static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_ptr, SIZE_T data_size, + DWORD face_index, DWORD flags, DWORD *num_faces ) +{ + struct bitmap_font_size size; + FONTSIGNATURE fs; + FT_Face ft_face; + WCHAR *family_name, *second_name, *style_name, *full_name; + int ret; + + if (num_faces) *num_faces = 0; + + if (!(ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + return 0; + + if (ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + { + TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); + pFT_Done_Face( ft_face ); + return 0; + } + + family_name = ft_face_get_family_name( ft_face, system_lcid ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + style_name = ft_face_get_style_name( ft_face, system_lcid ); + full_name = ft_face_get_full_name( ft_face, system_lcid ); + + /* try to find another secondary name, preferring the lowest langids */ + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), + second_name, lstrlenW(second_name), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + second_name = NULL; + } + } + + get_fontsig( ft_face, &fs ); + if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); + if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); + + ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, + data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), + get_font_version( ft_face ), flags, + FT_IS_SCALABLE(ft_face) ? NULL : &size ); + + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", + fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); + + RtlFreeHeap( GetProcessHeap(), 0, family_name ); + RtlFreeHeap( GetProcessHeap(), 0, second_name ); + RtlFreeHeap( GetProcessHeap(), 0, style_name ); + RtlFreeHeap( GetProcessHeap(), 0, full_name ); + + if (num_faces) *num_faces = ft_face->num_faces; + pFT_Done_Face( ft_face ); + return ret; +} + static WCHAR *get_dos_file_name( LPCSTR str ) { WCHAR *buffer; @@ -1176,8 +1194,7 @@ static char *get_unix_file_name( LPCWSTR dosW ) static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *font_data_ptr, DWORD font_data_size, DWORD flags) { - FT_Face ft_face; - FT_Long face_index = 0, num_faces; + DWORD face_index = 0, num_faces; INT ret = 0; WCHAR *filename = NULL; @@ -1207,22 +1224,10 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon if (!dos_name && unix_name) dos_name = filename = get_dos_file_name( unix_name ); - do { - ft_face = new_ft_face( unix_name, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); - if (!ft_face) break; - - if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ - { - TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); - pFT_Done_Face(ft_face); - break; - } - - ret += AddFaceToList(ft_face, dos_name, font_data_ptr, font_data_size, face_index, flags); + do + ret += add_unix_face( unix_name, dos_name, font_data_ptr, font_data_size, face_index, flags, &num_faces ); + while (num_faces > ++face_index); - num_faces = ft_face->num_faces; - pFT_Done_Face(ft_face); - } while(num_faces > ++face_index); RtlFreeHeap( GetProcessHeap(), 0, filename ); return ret; } -- 2.23.0

1 0

[PATCH v2 1/4] gdi32: Ignore Type 1 fonts in fontconfig enumeration.
by Huw Davies 20 Nov '20

20 Nov '20

From: Rémi Bernon <rbernon(a)codeweavers.com> Instead of loading the font with FreeType to discard it right away. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 61397e8b542..1722f0c746c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1393,9 +1393,9 @@ static void load_fontconfig_fonts(void) { FcPattern *pat; FcFontSet *fontset; - int i, len; + const char *format; + int i; char *file; - const char *ext; if (!fontconfig_enabled) return; @@ -1418,25 +1418,29 @@ static void load_fontconfig_fonts(void) pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); - /* We're just interested in OT/TT fonts for now, so this hack just - picks up the scalable fonts without extensions .pf[ab] to save time - loading every other font */ - if(pFcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable) == FcResultMatch && !scalable) { TRACE("not scalable\n"); continue; } + if (pFcPatternGetString( fontset->fonts[i], FC_FONTFORMAT, 0, (FcChar8 **)&format ) != FcResultMatch) + { + TRACE( "ignoring unknown font format %s\n", debugstr_a(file) ); + continue; + } + + if (!strcmp( format, "Type 1" )) + { + TRACE( "ignoring Type 1 font %s\n", debugstr_a(file) ); + continue; + } + aa_flags = parse_aa_pattern( fontset->fonts[i] ); TRACE("fontconfig: %s aa %x\n", file, aa_flags); - len = strlen( file ); - if(len < 4) continue; - ext = &file[ len - 3 ]; - if(_strnicmp(ext, "pfa", -1) && _strnicmp(ext, "pfb", -1)) - AddFontToList(NULL, file, NULL, 0, - ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); + AddFontToList( NULL, file, NULL, 0, + ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); } pFcFontSetDestroy(fontset); pFcPatternDestroy(pat); -- 2.23.0

1 0

[PATCH] gdi32: Avoid the actual drawing position is inconsistent with the desired position when the width or height is negative.
by Jiangyi Chen 20 Nov '20

20 Nov '20

The attachment contains a test program and source code written on the window. Please take a look.

2 1

[PATCH 1/2] quartz/tests: Add some tests for flushing on the DirectSound renderer.
by Zebediah Figura 20 Nov '20

20 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/dsoundrender.c | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 5142ca2da6d..558e6989c98 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -832,6 +832,51 @@ static void test_filter_state(IMemInputPin *input, IMediaControl *control) * completely paused. */ } +static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + OAFilterState state; + HRESULT hr; + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + static void test_connect_pin(void) { ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; @@ -925,6 +970,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_filter_state(input, control); + test_flushing(pin, input, control); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

2 2

[PATCH 1/4] quartz/avidec: Don't send ICM_DECOMPRESS_BEGIN or ICM_DECOMPRESS_END messages if the source is disconnected.
by Zebediah Figura 19 Nov '20

19 Nov '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/avidec.c | 11 ++++++++--- dlls/quartz/tests/avidec.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 72f69ef7c5a..4995276dbfc 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -565,6 +565,9 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) LRESULT res; HRESULT hr; + if (!filter->source.pin.peer) + return S_OK; + filter->late = -1; source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat; @@ -574,7 +577,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) return E_FAIL; } - if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); return S_OK; @@ -585,14 +588,16 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) struct avi_decompressor *filter = impl_from_strmbase_filter(iface); LRESULT res; + if (!filter->source.pin.peer) + return S_OK; + if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) { ERR("ICDecompressEnd() failed, error %ld.\n", res); return E_FAIL; } - if (filter->source.pin.peer) - IMemAllocator_Decommit(filter->source.pAllocator); + IMemAllocator_Decommit(filter->source.pAllocator); return S_OK; } diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index ddfe22ed797..8717e107106 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -692,25 +692,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -720,11 +720,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -956,7 +956,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); hr = IMediaControl_Pause(control); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, &req_mt); ok(hr == VFW_E_NOT_STOPPED, "Got hr %#x.\n", hr); hr = IMediaControl_Stop(control); -- 2.29.2

1 3

Re: [PATCH] msvcp120: Avoid type conversion warnings in test_tr2_sys__dir_operation.
by Gerald Pfeifer 19 Nov '20

19 Nov '20

This patch is obsolete now since a month later the essentially identical commit d276cf7112aa15aac102b03e519cc133da8ec1c1 Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:35 2020 +0200 msvcp120/tests: Fix signed integral cast warning. First cast to int, then to enum file_type. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Gerald On Sun, 3 May 2020, Gerald Pfeifer wrote: > GCC 10 warns > > msvcp120.c:1777:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > msvcp120.c:1807:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > msvcp120.c:1817:11: warning: overflow in conversion from 'enum file_type' > to 'int' changes value from 'type = 3735928559' to '-559038737' > > where 3735928559 is 0xdeadbeef. > > This happens since first this variable is assigned to an enum and > that then to an int, and GCC diagnoses the latter as an overflow > (from signed to unsigned). > > Assigning a hex constant does not trigger, so simply break out those > two assignments. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/msvcp120/tests/msvcp120.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > index 7a382ac6fa..3cfabaa7ca 100644 > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -1774,7 +1774,8 @@ static void test_tr2_sys__dir_operation(void) > > memset(first_file_name, 0xff, MAX_PATH); > memset(dest, 0, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = NULL; > result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); > ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); > @@ -1804,7 +1805,8 @@ static void test_tr2_sys__dir_operation(void) > ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); > > memset(first_file_name, 0xff, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > 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); > @@ -1814,7 +1816,8 @@ static void test_tr2_sys__dir_operation(void) > > CreateDirectoryA("empty_dir", NULL); > memset(first_file_name, 0xff, MAX_PATH); > - err = type = 0xdeadbeef; > + err = 0xdeadbeef; > + type = 0xdeadbeef; > result_handle = file; > result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); > ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle);

1 0

[PATCH] imm32: Use wide-char string literals.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/imm.c | 45 ++++++++++++++-------------------------- dlls/imm32/tests/imm32.c | 10 +++------ 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0f3d7d5f8c8..9d2a09f22be 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -99,14 +99,8 @@ typedef struct _tagIMMThreadData { static struct list ImmHklList = LIST_INIT(ImmHklList); static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); -static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; - -static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; -static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; - -static const WCHAR szwIME[] = {'I','M','E',0}; -static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; +static const WCHAR szwWineIMCProperty[] = L"WineImmHIMCProperty"; +static const WCHAR szImeRegFmt[] = L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\%08lx"; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -297,23 +291,15 @@ static void IMM_FreeThreadData(void) static HMODULE load_graphics_driver(void) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; + static const WCHAR displayW[] = L"}\\0000"; HMODULE ret = 0; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), L"__wine_display_device_guid" )); if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); @@ -321,7 +307,8 @@ static HMODULE load_graphics_driver(void) lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + if (!RegQueryValueExW( hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)path, &size )) + ret = LoadLibraryW( path ); RegCloseKey( hkey ); TRACE( "%s %p\n", debugstr_w(path), ret ); return ret; @@ -1642,7 +1629,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, L"IME")) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1680,7 +1667,7 @@ BOOL WINAPI __wine_register_window(HWND hwnd) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); - new = CreateWindowExW( 0, szwIME, szwDefaultIME, + new = CreateWindowExW( 0, L"IME", L"Default IME", WS_POPUP | WS_DISABLED | WS_CLIPSIBLINGS, 0, 0, 1, 1, 0, 0, 0, 0); /* thread_data is in the current thread so we can assume it's still valid */ @@ -1785,13 +1772,11 @@ UINT WINAPI ImmGetDescriptionA( */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { - static const WCHAR name[] = { 'W','i','n','e',' ','X','I','M',0 }; - FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen); if (!hKL) return 0; - if (!uBufLen) return lstrlenW( name ); - lstrcpynW( lpszDescription, name, uBufLen ); + if (!uBufLen) return lstrlenW(L"Wine XIM" ); + lstrcpynW( lpszDescription, L"Wine XIM", uBufLen ); return lstrlenW( lpszDescription ); } @@ -1872,7 +1857,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) } length = 0; - rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + rc = RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, NULL, &length); if (rc != ERROR_SUCCESS) { @@ -1892,7 +1877,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) return length / sizeof(WCHAR); } - RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + RegGetValueW(hkey, NULL, L"Ime File", RRF_RT_REG_SZ, NULL, lpszFileName, &length); RegCloseKey(hkey); @@ -2111,10 +2096,10 @@ HKL WINAPI ImmInstallIMEW( if (rc == ERROR_SUCCESS) { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, + rc = RegSetValueExW(hkey, L"Ime File", 0, REG_SZ, (const BYTE*)lpszIMEFileName, (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, + rc = RegSetValueExW(hkey, L"Layout Text", 0, REG_SZ, (const BYTE*)lpszLayoutText, (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return hkl; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 827b31eec2e..cc9e0e8c01f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1099,10 +1099,9 @@ static void test_ImmDefaultHwnd(void) static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) { - static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, L"IME")) { *ime_window = hWnd; return FALSE; @@ -1562,9 +1561,6 @@ static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, static void test_ime_processkey(void) { - WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; - WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; - MSG msg; WNDCLASSW wclass; HANDLE hInstance = GetModuleHandleW(NULL); @@ -1573,7 +1569,7 @@ static void test_ime_processkey(void) INT rc; HWND hWndTest; - wclass.lpszClassName = classNameW; + wclass.lpszClassName = L"ProcessKeyTestClass"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = processkey_wnd_proc; wclass.hInstance = hInstance; @@ -1589,7 +1585,7 @@ static void test_ime_processkey(void) } /* create the test window that will receive the keystrokes */ - hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + hWndTest = CreateWindowW(wclass.lpszClassName, L"ProcessKey", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, hInstance, NULL); -- 2.26.2

1 0

[PATCH] itss: Use zero terminated WCHAR strings.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/protocol.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 167ce906b90..6d40ddf738f 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -148,16 +148,16 @@ static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) static LPCWSTR skip_schema(LPCWSTR url) { - static const WCHAR its_schema[] = {'i','t','s',':'}; - static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; - static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; - - if(!wcsnicmp(its_schema, url, ARRAY_SIZE(its_schema))) - return url + ARRAY_SIZE(its_schema); - if(!wcsnicmp(msits_schema, url, ARRAY_SIZE(msits_schema))) - return url + ARRAY_SIZE(msits_schema); - if(!wcsnicmp(mk_schema, url, ARRAY_SIZE(mk_schema))) - return url + ARRAY_SIZE(mk_schema); + static const WCHAR its_schema[] = L"its:"; + static const WCHAR msits_schema[] = L"ms-its:"; + static const WCHAR mk_schema[] = L"mk:@MSITStore:"; + + if(!wcsnicmp(its_schema, url, ARRAY_SIZE(its_schema) - 1)) + return url + ARRAY_SIZE(its_schema) - 1; + if(!wcsnicmp(msits_schema, url, ARRAY_SIZE(msits_schema) - 1)) + return url + ARRAY_SIZE(msits_schema) - 1; + if(!wcsnicmp(mk_schema, url, ARRAY_SIZE(mk_schema) - 1)) + return url + ARRAY_SIZE(mk_schema) - 1; return NULL; } -- 2.26.2

1 0

[PATCH] itss: Use wide-char string literals.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/itss/chm_lib.c | 33 ++++------------------ dlls/itss/moniker.c | 7 ++--- dlls/itss/protocol.c | 8 ++---- dlls/itss/storage.c | 3 +- dlls/itss/tests/protocol.c | 58 +++++++++++++------------------------- 5 files changed, 29 insertions(+), 80 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index be04ae5673a..91e3fa3d811 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -203,31 +203,6 @@ static BOOL _unmarshal_uuid(unsigned char **pData, return _unmarshal_uchar_array(pData, pDataLen, dest, 16); } -/* names of sections essential to decompression */ -static const WCHAR _CHMU_RESET_TABLE[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'T','r','a','n','s','f','o','r','m','/', - '{','7','F','C','2','8','9','4','0','-','9','D','3','1', - '-','1','1','D','0','-','9','B','2','7','-', - '0','0','A','0','C','9','1','E','9','C','7','C','}','/', - 'I','n','s','t','a','n','c','e','D','a','t','a','/', - 'R','e','s','e','t','T','a','b','l','e',0 -}; -static const WCHAR _CHMU_LZXC_CONTROLDATA[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'C','o','n','t','r','o','l','D','a','t','a',0 -}; -static const WCHAR _CHMU_CONTENT[] = { -':',':','D','a','t','a','S','p','a','c','e','/', - 'S','t','o','r','a','g','e','/', - 'M','S','C','o','m','p','r','e','s','s','e','d','/', - 'C','o','n','t','e','n','t',0 -}; - /* * structures local to this module */ @@ -766,15 +741,17 @@ struct chmFile *chm_openW(const WCHAR *filename) /* prefetch most commonly needed unit infos */ if (CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_RESET_TABLE, + L"::DataSpace/Storage/MSCompressed/Transform/" + "{7FC28940-9D31-11D0-9B27-00A0C91E9C7C}/" + "InstanceData/ResetTable", &newHandle->rt_unit) || newHandle->rt_unit.space == CHM_COMPRESSED || CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_CONTENT, + L"::DataSpace/Storage/MSCompressed/Content", &newHandle->cn_unit) || newHandle->cn_unit.space == CHM_COMPRESSED || CHM_RESOLVE_SUCCESS != chm_resolve_object(newHandle, - _CHMU_LZXC_CONTROLDATA, + L"::DataSpace/Storage/MSCompressed/ControlData", &uiLzxc) || uiLzxc.space == CHM_COMPRESSED) { diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 41faa23fb5e..3d0063f2bb7 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -283,8 +283,6 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( LPOLESTR* ppszDisplayName) { ITS_IMonikerImpl *This = impl_from_IMoniker(iface); - static const WCHAR szFormat[] = { - 'm','s','-','i','t','s',':','%','s',':',':','%','s',0 }; DWORD len; LPWSTR str; @@ -292,7 +290,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( len = lstrlenW( This->szFile ) + lstrlenW( This->szHtml ); str = CoTaskMemAlloc( len*sizeof(WCHAR) ); - swprintf( str, len, szFormat, This->szFile, This->szHtml ); + swprintf( str, len, L"ms-its:%s::%s", This->szFile, This->szHtml ); *ppszDisplayName = str; @@ -431,8 +429,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( ULONG * pchEaten, IMoniker ** ppmkOut) { - static const WCHAR szPrefix[] = { - '@','M','S','I','T','S','t','o','r','e',':',0 }; + static const WCHAR szPrefix[] = L"@MSITStore:"; const DWORD prefix_len = ARRAY_SIZE(szPrefix)-1; DWORD n; diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 3f5362e5b9b..167ce906b90 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -231,8 +231,6 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, int res; HRESULT hres; - static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); @@ -260,7 +258,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, return hres; } - p = wcsstr(file_name, separator); + p = wcsstr(file_name, L"::"); if(!p) { WARN("invalid url\n"); HeapFree(GetProcessHeap(), 0, file_name); @@ -480,13 +478,11 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, LPCWSTR base_end, ptr; DWORD rel_len; - static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); - base_end = wcsstr(pwzBaseUrl, separator); + base_end = wcsstr(pwzBaseUrl, L"::"); if(!base_end) return 0x80041001; base_end += 2; diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 86d33f29dfb..ee5432d4d61 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -639,7 +639,6 @@ HRESULT ITSS_StgOpenStorage( IStorage** ppstgOpen) { struct chmFile *chmfile; - static const WCHAR szRoot[] = { '/', 0 }; TRACE("%s\n", debugstr_w(pwcsName) ); @@ -647,7 +646,7 @@ HRESULT ITSS_StgOpenStorage( if( !chmfile ) return E_FAIL; - return ITSS_create_chm_storage( chmfile, szRoot, ppstgOpen ); + return ITSS_create_chm_storage( chmfile, L"/", ppstgOpen ); } /************************************************************************/ diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 4cafba7b615..43d867b9cfb 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -66,36 +66,24 @@ static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; static DWORD bindf; -static const WCHAR blank_url1[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url2[] = {'m','S','-','i','T','s',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url3[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url4[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url5[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url6[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','%','6','2','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url7[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR blank_url8[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; -static const WCHAR blank_url9[] = {'i','t','s',':', - 't','e','s','t','.','c','h','m',':',':','/','d','i','r','/','.','.','/','b','l','a','n','k','.','h','t','m','l',0}; +static const WCHAR blank_url1[] = L"its:test.chm::/blank.html"; +static const WCHAR blank_url2[] = L"mS-iTs:test.chm::/blank.html"; +static const WCHAR blank_url3[] = L"mk:@MSITStore:test.chm::/blank.html"; +static const WCHAR blank_url4[] = L"its:test.chm::blank.html"; +static const WCHAR blank_url5[] = L"its:test.chm::\\blank.html"; +static const WCHAR blank_url6[] = L"its:test.chm::/%62lank.html"; +static const WCHAR blank_url7[] = L"mk:@MSITStore:test.chm::\\blank.html"; +static const WCHAR blank_url8[] = L"mk:@MSITStore:test.chm::/blank.html/"; +static const WCHAR blank_url9[] = L"its:test.chm::/dir/../blank.html"; static enum { ITS_PROTOCOL, MK_PROTOCOL } test_protocol; -static const WCHAR cache_file1[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR cache_file2[] = - {'t','e','s','t','.','c','h','m',':',':','\\','b','l','a','n','k','.','h','t','m','l',0}; -static const WCHAR cache_file3[] = - {'t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l','/',0}; +static const WCHAR cache_file1[] = L"test.chm::/blank.html"; +static const WCHAR cache_file2[] = L"test.chm::\\blank.html"; +static const WCHAR cache_file3[] = L"test.chm::/blank.html/"; static const WCHAR *cache_file = cache_file1; static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) @@ -126,9 +114,6 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { - static const WCHAR blank_html[] = {'b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; - switch(ulStatusCode) { case BINDSTATUS_BEGINDOWNLOADDATA: CHECK_EXPECT(ReportProgress_BEGINDOWNLOADDATA); @@ -137,13 +122,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); if(test_protocol == ITS_PROTOCOL) - ok(!lstrcmpW(szStatusText, blank_html), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, L"blank.html"), "unexpected szStatusText\n"); else ok(szStatusText == NULL, "szStatusText != NULL\n"); break; case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - ok(!lstrcmpW(szStatusText, text_html), "unexpected szStatusText\n"); + ok(!lstrcmpW(szStatusText, L"text/html"), "unexpected szStatusText\n"); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -523,16 +508,11 @@ static void test_its_protocol(void) ULONG ref; HRESULT hres; - static const WCHAR wrong_url1[] = - {'i','t','s',':','t','e','s','t','.','c','h','m',':',':','/','b','l','a','n','.','h','t','m','l',0}; - static const WCHAR wrong_url2[] = - {'i','t','s',':','t','e','s','.','c','h','m',':',':','b','/','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url3[] = - {'i','t','s',':','t','e','s','t','.','c','h','m','/','b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url4[] = {'m','k',':','@','M','S','I','T','S','t','o','r',':', - 't','e','s','t','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; - static const WCHAR wrong_url5[] = {'f','i','l','e',':', - 't','e','s','.','c','h','m',':',':','/','b','l','a','n','k','.','h','t','m','l',0}; + static const WCHAR wrong_url1[] = L"its:test.chm::/blan.html"; + static const WCHAR wrong_url2[] = L"its:tes.chm::b/lank.html"; + static const WCHAR wrong_url3[] = L"its:test.chm/blank.html"; + static const WCHAR wrong_url4[] = L"mk:@MSITStor:test.chm::/blank.html"; + static const WCHAR wrong_url5[] = L"file:tes.chm::/blank.html"; test_protocol = ITS_PROTOCOL; -- 2.26.2

1 0

[PATCH] msvcrt: #include <stdarg.h> from unixlib.c
by Gerald Pfeifer 19 Nov '20

19 Nov '20

commit c72e1b096d16a1e9a36b86fbc8c403ec3653a504 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:14:50 2020 +0100 msvcrt: Move math functions to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke the build on FreeBSD whose system headers do not pull in others as commonly as is the case on GNU/Linux systems. Explicitly including <stdarg.h> addresses this. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/msvcrt/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index edc3d96af4a..b64355ebf16 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -26,6 +26,7 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> #define __USE_ISOC9X 1 #define __USE_ISOC99 1 #include <math.h> -- 2.28.0

1 0

[PATCH v2 1/2] winemac.drv: Use Metal to get a display's GPU info if possible.
by Brendan Shanks 19 Nov '20

19 Nov '20

Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: - Remove now-inaccurate comment (thanks Zhiyi) - macdrv_get_gpu_info_from_display_id_using_metal() needs an autorelease pool dlls/winemac.drv/cocoa_display.m | 39 +++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /*********************************************************************** -- 2.26.2

1 1

[PATCH] msvcrt: Don't overwrite threadmbcinfostruct structure in _setmbcp.
by Piotr Caban 19 Nov '20

19 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 25 +++++++++++++++++---- dlls/msvcrt/locale.c | 19 ++++++++-------- dlls/msvcrt/mbcs.c | 42 +++++++++++++++++++++++++----------- dlls/msvcrt/msvcrt.h | 3 ++- 4 files changed, 63 insertions(+), 26 deletions(-)

1 0

[PATCH v2 1/5] strmbase: Forbid disconnecting the sink if the filter is not stopped.
by Zebediah Figura 19 Nov '20

19 Nov '20

Addendum to 2a6037e263ff3fae8ca82d90b0b141bea1cd473d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c08f04730e7..d7788cda493 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -887,6 +887,13 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) EnterCriticalSection(&pin->pin.filter->csFilter); + if (pin->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (pin->pin.peer) { if (pin->pFuncsTable->sink_disconnect) -- 2.29.2

2 5

[PATCH] makedep: Use short debug file names.
by Jacek Caban 19 Nov '20

19 Nov '20

Fixes gitignore entries for symbol files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/makedep.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 4/4] kernel32: Import ReadFile from kernelbase.
by Jacek Caban 19 Nov '20

19 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 30 ------------------------------ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-)

2 1

[PATCH 3/4] server: Allow reading directly from console handle.
by Jacek Caban 19 Nov '20

19 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] kernelbase: Move Unicode conversion from ReadConsoleA to conhost.
by Jacek Caban 19 Nov '20

19 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 17 ++------- include/wine/condrv.h | 21 ++++++----- programs/conhost/conhost.c | 76 ++++++++++++++++++++++++++++++++------ server/console.c | 10 ++++- 4 files changed, 88 insertions(+), 36 deletions(-)

1 0

[PATCH 1/4] conhost/tests: Add more ReadConsoleA tests.
by Jacek Caban 19 Nov '20

19 Nov '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/tests/tty.c | 121 +++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)

1 0

[PATCH v5 1/3] winevulkan: Generate helpers for wrapped handles.
by Georg Lehmann 19 Nov '20

19 Nov '20

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 51 ++++++++++++++++++++++++++++++-- dlls/winevulkan/vulkan.c | 21 ++----------- dlls/winevulkan/vulkan_private.h | 3 ++ 3 files changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2cddb161d6..afea087a92 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -939,9 +939,6 @@ class VkHandle(object): def native_handle(self, name): """ Provide access to the native handle of a wrapped object. """ - # Remember to add any new native handle whose parent is VkDevice - # to unwrap_object_handle() in vulkan.c - if self.name == "VkCommandPool": return "wine_cmd_pool_from_handle({0})->command_pool".format(name) @@ -965,6 +962,24 @@ class VkHandle(object): LOGGER.error("Unhandled native handle for: {0}".format(self.name)) return None + def is_wrapped(self): + return self.native_handle("test") is not None + + def object_type(self): + """ Generates the matching VkObjectType """ + + # FIXME: use the xml comments for VkObjectType instead + if not self.name.startswith("Vk") or any(c.isdigit() for c in self.name): + LOGGER.warn("object type generation might fail for: {0}".format(self.name)) + + type_ = "VK_OBJECT_TYPE" + previous = "f" + for char in self.name[2:]: + if char.isupper() and previous.islower(): + type_ += "_" + type_ += char.upper() + previous = char + return type_ class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, @@ -2276,6 +2291,36 @@ class VkGenerator(object): f.write(" return TRUE;\n") f.write(" }\n") f.write(" return FALSE;\n") + f.write("}\n\n") + + f.write("BOOL wine_vk_is_type_wrapped(VkObjectType type)\n") + f.write("{\n") + f.write(" return ") + for handle in self.registry.handles: + if not handle.is_required() or not handle.is_wrapped(): + continue + f.write("type == {} || ".format(handle.object_type())) + f.write("FALSE;\n") + f.write("}\n\n") + + f.write("uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle)\n") + f.write("{\n") + f.write(" switch(type)\n") + f.write(" {\n") + for handle in self.registry.handles: + if not handle.is_required() or not handle.is_wrapped(): + continue + f.write(" case {}:\n".format(handle.object_type())) + if handle.is_dispatchable(): + f.write(" return (uint64_t) (uintptr_t) ") + f.write(handle.native_handle("(({}) (uintptr_t) handle)".format(handle.name))) + else: + f.write(" return (uint64_t) ") + f.write(handle.native_handle("handle")) + f.write(";\n"); + f.write(" default:\n") + f.write(" return handle;\n") + f.write(" }\n") f.write("}\n") def generate_thunks_h(self, f, prefix): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f730c04923..3d1e8bd0ab 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1534,30 +1534,13 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDev properties->externalSemaphoreFeatures = 0; } -static uint64_t unwrap_object_handle(VkObjectType type, uint64_t handle) -{ - switch (type) - { - case VK_OBJECT_TYPE_DEVICE: - return (uint64_t) (uintptr_t) ((VkDevice) (uintptr_t) handle)->device; - case VK_OBJECT_TYPE_QUEUE: - return (uint64_t) (uintptr_t) ((VkQueue) (uintptr_t) handle)->queue; - case VK_OBJECT_TYPE_COMMAND_BUFFER: - return (uint64_t) (uintptr_t) ((VkCommandBuffer) (uintptr_t) handle)->command_buffer; - case VK_OBJECT_TYPE_COMMAND_POOL: - return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; - default: - return handle; - } -} - VkResult WINAPI wine_vkSetPrivateDataEXT(VkDevice device, VkObjectType object_type, uint64_t object_handle, VkPrivateDataSlotEXT private_data_slot, uint64_t data) { TRACE("%p, %#x, 0x%s, 0x%s, 0x%s\n", device, object_type, wine_dbgstr_longlong(object_handle), wine_dbgstr_longlong(private_data_slot), wine_dbgstr_longlong(data)); - object_handle = unwrap_object_handle(object_type, object_handle); + object_handle = wine_vk_unwrap_handle(object_type, object_handle); return device->funcs.p_vkSetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } @@ -1567,7 +1550,7 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, TRACE("%p, %#x, 0x%s, 0x%s, %p\n", device, object_type, wine_dbgstr_longlong(object_handle), wine_dbgstr_longlong(private_data_slot), data); - object_handle = unwrap_object_handle(object_type, object_handle); + object_handle = wine_vk_unwrap_handle(object_type, object_handle); device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4bcc4de440..bf09401c52 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -138,4 +138,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; +BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; +uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_PRIVATE_H */ -- 2.28.0

4 8

[PATCH 3/5] server: Move the cursor position and last change time to the shared data.
by Huw Davies 19 Nov '20

19 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- server/protocol.def | 9 ++++++- server/queue.c | 62 ++++++++++++++++++++++----------------------- server/user.h | 3 --- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/server/protocol.def b/server/protocol.def index c1c33d7e3d1..d61d7f3c549 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -796,9 +796,16 @@ typedef struct lparam_t info; } cursor_pos_t; +struct shared_cursor +{ + int x; /* cursor position */ + int y; + unsigned int last_change; /* time of last position change */ +}; + struct desktop_shared_memory { - int placeholder; + struct shared_cursor cursor; /* global cursor information */ }; /****************************************************************/ diff --git a/server/queue.c b/server/queue.c index 935475b4c09..f6664509ee3 100644 --- a/server/queue.c +++ b/server/queue.c @@ -377,10 +377,10 @@ static int update_desktop_cursor_pos( struct desktop *desktop, int x, int y ) x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); y = max( min( y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); - updated = (desktop->cursor.x != x || desktop->cursor.y != y); - desktop->cursor.x = x; - desktop->cursor.y = y; - desktop->cursor.last_change = get_tick_count(); + updated = (desktop->shared->cursor.x != x || desktop->shared->cursor.y != y); + desktop->shared->cursor.x = x; + desktop->shared->cursor.y = y; + desktop->shared->cursor.last_change = get_tick_count(); return updated; } @@ -411,8 +411,8 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig { struct desktop *desktop = queue->input->desktop; - *x = desktop->cursor.x; - *y = desktop->cursor.y; + *x = desktop->shared->cursor.x; + *y = desktop->shared->cursor.y; *time = get_tick_count(); } @@ -439,9 +439,9 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); /* warp the mouse to be inside the clip rect */ - x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); - y = max( min( desktop->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); - if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); + x = max( min( desktop->shared->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + y = max( min( desktop->shared->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); + if (x != desktop->shared->cursor.x || y != desktop->shared->cursor.y) set_cursor_pos( desktop, x, y ); } /* change the foreground input and reset the cursor clip rect */ @@ -1568,8 +1568,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg if (desktop->keystate[VK_XBUTTON1] & 0x80) msg->wparam |= MK_XBUTTON1; if (desktop->keystate[VK_XBUTTON2] & 0x80) msg->wparam |= MK_XBUTTON2; } - msg->x = desktop->cursor.x; - msg->y = desktop->cursor.y; + msg->x = desktop->shared->cursor.x; + msg->y = desktop->shared->cursor.y; if (msg->win && (thread = get_window_thread( msg->win ))) { @@ -1737,10 +1737,10 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons WM_MOUSEHWHEEL /* 0x1000 = MOUSEEVENTF_HWHEEL */ }; - update_desktop_cursor_pos( desktop, desktop->cursor.x, desktop->cursor.y ); /* Update last change time */ + update_desktop_cursor_pos( desktop, desktop->shared->cursor.x, desktop->shared->cursor.y ); /* Update last change time */ flags = input->mouse.flags; time = input->mouse.time; - if (!time) time = desktop->cursor.last_change; + if (!time) time = desktop->shared->cursor.last_change; if (flags & MOUSEEVENTF_MOVE) { @@ -1749,19 +1749,19 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons x = input->mouse.x; y = input->mouse.y; if (flags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE) && - x == desktop->cursor.x && y == desktop->cursor.y) + x == desktop->shared->cursor.x && y == desktop->shared->cursor.y) flags &= ~MOUSEEVENTF_MOVE; } else { - x = desktop->cursor.x + input->mouse.x; - y = desktop->cursor.y + input->mouse.y; + x = desktop->shared->cursor.x + input->mouse.x; + y = desktop->shared->cursor.y + input->mouse.y; } } else { - x = desktop->cursor.x; - y = desktop->cursor.y; + x = desktop->shared->cursor.x; + y = desktop->shared->cursor.y; } if ((foreground = get_foreground_thread( desktop, win ))) @@ -1775,8 +1775,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg_data->info = input->mouse.info; msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; - msg_data->rawinput.mouse.x = x - desktop->cursor.x; - msg_data->rawinput.mouse.y = y - desktop->cursor.y; + msg_data->rawinput.mouse.x = x - desktop->shared->cursor.x; + msg_data->rawinput.mouse.y = y - desktop->shared->cursor.y; msg_data->rawinput.mouse.data = input->mouse.data; enum_processes( queue_rawinput_message, &raw_msg ); @@ -1967,8 +1967,8 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg->msg = input->hw.msg; msg->wparam = 0; msg->lparam = input->hw.lparam; - msg->x = desktop->cursor.x; - msg->y = desktop->cursor.y; + msg->x = desktop->shared->cursor.x; + msg->y = desktop->shared->cursor.y; queue_hardware_message( desktop, msg, 1 ); } @@ -2473,8 +2473,8 @@ DECL_HANDLER(send_hardware_message) } } - reply->prev_x = desktop->cursor.x; - reply->prev_y = desktop->cursor.y; + reply->prev_x = desktop->shared->cursor.x; + reply->prev_y = desktop->shared->cursor.y; switch (req->input.type) { @@ -2492,8 +2492,8 @@ DECL_HANDLER(send_hardware_message) } if (thread) release_object( thread ); - reply->new_x = desktop->cursor.x; - reply->new_y = desktop->cursor.y; + reply->new_x = desktop->shared->cursor.x; + reply->new_y = desktop->shared->cursor.y; set_reply_data( desktop->keystate, size ); release_object( desktop ); } @@ -3202,8 +3202,8 @@ DECL_HANDLER(set_cursor) reply->prev_handle = input->cursor; reply->prev_count = input->cursor_count; - reply->prev_x = input->desktop->cursor.x; - reply->prev_y = input->desktop->cursor.y; + reply->prev_x = input->desktop->shared->cursor.x; + reply->prev_y = input->desktop->shared->cursor.y; if (req->flags & SET_CURSOR_HANDLE) { @@ -3234,10 +3234,10 @@ DECL_HANDLER(set_cursor) set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip, 0 ); } - reply->new_x = input->desktop->cursor.x; - reply->new_y = input->desktop->cursor.y; + reply->new_x = input->desktop->shared->cursor.x; + reply->new_y = input->desktop->shared->cursor.y; reply->new_clip = input->desktop->cursor.clip; - reply->last_change = input->desktop->cursor.last_change; + reply->last_change = input->desktop->shared->cursor.last_change; } /* Get the history of the 64 last cursor positions */ diff --git a/server/user.h b/server/user.h index 9a28ba7f449..e525957c5bc 100644 --- a/server/user.h +++ b/server/user.h @@ -54,11 +54,8 @@ struct winstation struct global_cursor { - int x; /* cursor position */ - int y; rectangle_t clip; /* cursor clip rectangle */ unsigned int clip_msg; /* message to post for cursor clip changes */ - unsigned int last_change; /* time of last position change */ user_handle_t win; /* window that contains the cursor */ }; -- 2.23.0

3 6

[PATCH 1/2] combase: Set a flag on thread id initialization.
by Nikolay Sivov 19 Nov '20

19 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For Chromimum issues reported as https://bugs.winehq.org/show_bug.cgi?id=50149. Flags names are taken from dotnet/coreclr headers. dlls/combase/combase.c | 3 ++ dlls/combase/combase_private.h | 7 ++- dlls/ole32/tests/compobj.c | 96 ++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7a85b95a19b..72ff6cc31f9 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2547,7 +2547,10 @@ HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) return hr; if (IsEqualGUID(&tlsdata->causality_id, &GUID_NULL)) + { CoCreateGuid(&tlsdata->causality_id); + tlsdata->flags |= OLETLS_UUIDINITIALIZED; + } *id = tlsdata->causality_id; diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 55ce02d06f0..4ff46077b45 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -63,13 +63,18 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DE #define CHARS_IN_GUID 39 +enum tlsdataflags +{ + OLETLS_UUIDINITIALIZED = 0x2, +}; + /* this is what is stored in TEB->ReservedForOle */ struct tlsdata { struct apartment *apt; IErrorInfo *errorinfo; DWORD thread_seqid;/* returned with CoGetCurrentProcess */ - DWORD apt_mask; /* apartment mask (+0Ch on x86) */ + DWORD flags; /* apartment mask (+0Ch on x86) */ void *unknown0; DWORD inits; /* number of times CoInitializeEx called */ DWORD ole_inits; /* number of times OleInitialize called */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 0d7f3d8adee..c79e379f92a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -36,6 +36,7 @@ #include "ctxtcall.h" #include "wine/test.h" +#include "winternl.h" #include "initguid.h" #define DEFINE_EXPECT(func) \ @@ -4245,6 +4246,100 @@ static void test_call_cancellation(void) ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); } +enum oletlsflags +{ + OLETLS_UUIDINITIALIZED = 0x2, + OLETLS_DISABLE_OLE1DDE = 0x40, + OLETLS_APARTMENTTHREADED = 0x80, + OLETLS_MULTITHREADED = 0x100, +}; + +struct oletlsdata +{ + void *threadbase; + void *smallocator; + DWORD id; + DWORD flags; +}; + +static DWORD get_oletlsflags(void) +{ + struct oletlsdata *data = NtCurrentTeb()->ReservedForOle; + return data ? data->flags : 0; +} + +static DWORD CALLBACK oletlsdata_test_thread(void *arg) +{ + IUnknown *unk; + DWORD flags; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + /* Flag is not set for implicit MTA. */ + flags = get_oletlsflags(); + ok(!(flags & OLETLS_MULTITHREADED), "Unexpected flags %#x.\n", flags); + + return 0; +} + +static void test_oletlsdata(void) +{ + HANDLE thread; + DWORD flags; + HRESULT hr; + GUID guid; + + /* STA */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_APARTMENTTHREADED && !(flags & OLETLS_DISABLE_OLE1DDE), "Unexpected flags %#x.\n", flags); + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_APARTMENTTHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + /* MTA */ + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_MULTITHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); + + /* Implicit case. */ + thread = CreateThread(NULL, 0, oletlsdata_test_thread, NULL, 0, &flags); + ok(thread != NULL, "Failed to create a test thread, error %d.\n", GetLastError()); + ok(!WaitForSingleObject(thread, 5000), "Wait timed out.\n"); + CloseHandle(thread); + + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + /* Thread ID. */ + flags = get_oletlsflags(); + ok(!(flags & OLETLS_UUIDINITIALIZED), "Unexpected flags %#x.\n", flags); + + hr = CoGetCurrentLogicalThreadId(&guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + flags = get_oletlsflags(); + ok(flags & OLETLS_UUIDINITIALIZED && !(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED)), + "Unexpected flags %#x.\n", flags); +} + START_TEST(compobj) { init_funcs(); @@ -4254,6 +4349,7 @@ START_TEST(compobj) lstrcatA(testlib, "\\testlib.dll"); extract_resource("testlib.dll", "TESTDLL", testlib); + test_oletlsdata(); test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString(); -- 2.29.2

2 2

[PATCH v2 2/2] combase: Update thread flags when entering/leaving apartments.
by Huw Davies 19 Nov '20

19 Nov '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/apartment.c | 10 +++++++++- dlls/combase/combase_private.h | 3 +++ dlls/ole32/tests/compobj.c | 3 --- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 1181e393ada..108d6a71c5c 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -556,6 +556,8 @@ static struct apartment *apartment_get_or_create(DWORD model) if (!apt) { + com_get_tlsdata(&data); + if (model & COINIT_APARTMENTTHREADED) { EnterCriticalSection(&apt_cs); @@ -568,6 +570,10 @@ static struct apartment *apartment_get_or_create(DWORD model) TRACE("Created main-threaded apartment with OXID %s\n", wine_dbgstr_longlong(apt->oxid)); } + data->flags |= OLETLS_APARTMENTTHREADED; + if (model & COINIT_DISABLE_OLE1DDE) + data->flags |= OLETLS_DISABLE_OLE1DDE; + LeaveCriticalSection(&apt_cs); if (apt->main) @@ -588,11 +594,12 @@ static struct apartment *apartment_get_or_create(DWORD model) else mta = apartment_construct(model); + data->flags |= OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE; + apt = mta; LeaveCriticalSection(&apt_cs); } - com_get_tlsdata(&data); data->apt = apt; } @@ -1146,6 +1153,7 @@ void leave_apartment(struct tlsdata *data) WARN( "Uninitializing apartment while Ole is still initialized\n" ); apartment_release(data->apt); data->apt = NULL; + data->flags &= ~(OLETLS_DISABLE_OLE1DDE | OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED); } } diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 46a7c7f655d..9247af4ebb6 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -66,6 +66,9 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DE enum tlsdata_flags { OLETLS_UUIDINITIALIZED = 0x2, + OLETLS_DISABLE_OLE1DDE = 0x40, + OLETLS_APARTMENTTHREADED = 0x80, + OLETLS_MULTITHREADED = 0x100, }; /* this is what is stored in TEB->ReservedForOle */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c79e379f92a..5d44cd5a0ba 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4296,7 +4296,6 @@ static void test_oletlsdata(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); flags = get_oletlsflags(); -todo_wine ok(flags & OLETLS_APARTMENTTHREADED && !(flags & OLETLS_DISABLE_OLE1DDE), "Unexpected flags %#x.\n", flags); CoUninitialize(); flags = get_oletlsflags(); @@ -4305,7 +4304,6 @@ todo_wine hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); flags = get_oletlsflags(); -todo_wine ok(flags & OLETLS_APARTMENTTHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); CoUninitialize(); flags = get_oletlsflags(); @@ -4315,7 +4313,6 @@ todo_wine hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); flags = get_oletlsflags(); -todo_wine ok(flags & OLETLS_MULTITHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); /* Implicit case. */ -- 2.23.0

1 0

[PATCH v2 1/2] combase: Set a flag on thread id initialization.
by Huw Davies 19 Nov '20

19 Nov '20

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/combase/combase.c | 3 ++ dlls/combase/combase_private.h | 15 ++++-- dlls/ole32/compobj_private.h | 36 ++++++------- dlls/ole32/tests/compobj.c | 96 ++++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 23 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7a85b95a19b..72ff6cc31f9 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2547,7 +2547,10 @@ HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) return hr; if (IsEqualGUID(&tlsdata->causality_id, &GUID_NULL)) + { CoCreateGuid(&tlsdata->causality_id); + tlsdata->flags |= OLETLS_UUIDINITIALIZED; + } *id = tlsdata->causality_id; diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 55ce02d06f0..46a7c7f655d 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -63,17 +63,22 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DE #define CHARS_IN_GUID 39 +enum tlsdata_flags +{ + OLETLS_UUIDINITIALIZED = 0x2, +}; + /* this is what is stored in TEB->ReservedForOle */ struct tlsdata { struct apartment *apt; IErrorInfo *errorinfo; - DWORD thread_seqid;/* returned with CoGetCurrentProcess */ - DWORD apt_mask; /* apartment mask (+0Ch on x86) */ + DWORD thread_seqid; /* returned with CoGetCurrentProcess */ + DWORD flags; /* tlsdata_flags (+0Ch on x86) */ void *unknown0; - DWORD inits; /* number of times CoInitializeEx called */ - DWORD ole_inits; /* number of times OleInitialize called */ - GUID causality_id; /* unique identifier for each COM call */ + DWORD inits; /* number of times CoInitializeEx called */ + DWORD ole_inits; /* number of times OleInitialize called */ + GUID causality_id; /* unique identifier for each COM call */ LONG pending_call_count_client; /* number of client calls pending */ LONG pending_call_count_server; /* number of server calls pending */ DWORD unknown; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 4ec22d51f45..3c0e338127c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -45,24 +45,24 @@ DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); struct oletls { struct apartment *apt; - IErrorInfo *errorinfo; /* see errorinfo.c */ - DWORD thread_seqid;/* returned with CoGetCurrentProcess */ - DWORD apt_mask; /* apartment mask (+0Ch on x86) */ - void *unknown0; - DWORD inits; /* number of times CoInitializeEx called */ - DWORD ole_inits; /* number of times OleInitialize called */ - GUID causality_id; /* unique identifier for each COM call */ - LONG pending_call_count_client; /* number of client calls pending */ - LONG pending_call_count_server; /* number of server calls pending */ - DWORD unknown; - IObjContext *context_token; /* (+38h on x86) */ - IUnknown *call_state; /* current call context (+3Ch on x86) */ - DWORD unknown2[46]; - IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ - IUnknown *state; /* see CoSetState */ - struct list spies; /* Spies installed with CoRegisterInitializeSpy */ - DWORD spies_lock; - DWORD cancelcount; + IErrorInfo *errorinfo; /* see errorinfo.c */ + DWORD thread_seqid; /* returned with CoGetCurrentProcess */ + DWORD flags; /* tlsdata_flags (+0Ch on x86) */ + void *unknown0; + DWORD inits; /* number of times CoInitializeEx called */ + DWORD ole_inits; /* number of times OleInitialize called */ + GUID causality_id; /* unique identifier for each COM call */ + LONG pending_call_count_client; /* number of client calls pending */ + LONG pending_call_count_server; /* number of server calls pending */ + DWORD unknown; + IObjContext *context_token; /* (+38h on x86) */ + IUnknown *call_state; /* current call context (+3Ch on x86) */ + DWORD unknown2[46]; + IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + IUnknown *state; /* see CoSetState */ + struct list spies; /* Spies installed with CoRegisterInitializeSpy */ + DWORD spies_lock; + DWORD cancelcount; }; /* Global Interface Table Functions */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 0d7f3d8adee..c79e379f92a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -36,6 +36,7 @@ #include "ctxtcall.h" #include "wine/test.h" +#include "winternl.h" #include "initguid.h" #define DEFINE_EXPECT(func) \ @@ -4245,6 +4246,100 @@ static void test_call_cancellation(void) ok(hr == CO_E_CANCEL_DISABLED, "Unexpected hr %#x.\n", hr); } +enum oletlsflags +{ + OLETLS_UUIDINITIALIZED = 0x2, + OLETLS_DISABLE_OLE1DDE = 0x40, + OLETLS_APARTMENTTHREADED = 0x80, + OLETLS_MULTITHREADED = 0x100, +}; + +struct oletlsdata +{ + void *threadbase; + void *smallocator; + DWORD id; + DWORD flags; +}; + +static DWORD get_oletlsflags(void) +{ + struct oletlsdata *data = NtCurrentTeb()->ReservedForOle; + return data ? data->flags : 0; +} + +static DWORD CALLBACK oletlsdata_test_thread(void *arg) +{ + IUnknown *unk; + DWORD flags; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + /* Flag is not set for implicit MTA. */ + flags = get_oletlsflags(); + ok(!(flags & OLETLS_MULTITHREADED), "Unexpected flags %#x.\n", flags); + + return 0; +} + +static void test_oletlsdata(void) +{ + HANDLE thread; + DWORD flags; + HRESULT hr; + GUID guid; + + /* STA */ + hr = CoInitialize(NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_APARTMENTTHREADED && !(flags & OLETLS_DISABLE_OLE1DDE), "Unexpected flags %#x.\n", flags); + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_APARTMENTTHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + /* MTA */ + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + flags = get_oletlsflags(); +todo_wine + ok(flags & OLETLS_MULTITHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); + + /* Implicit case. */ + thread = CreateThread(NULL, 0, oletlsdata_test_thread, NULL, 0, &flags); + ok(thread != NULL, "Failed to create a test thread, error %d.\n", GetLastError()); + ok(!WaitForSingleObject(thread, 5000), "Wait timed out.\n"); + CloseHandle(thread); + + CoUninitialize(); + flags = get_oletlsflags(); + ok(!(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE)), "Unexpected flags %#x.\n", flags); + + /* Thread ID. */ + flags = get_oletlsflags(); + ok(!(flags & OLETLS_UUIDINITIALIZED), "Unexpected flags %#x.\n", flags); + + hr = CoGetCurrentLogicalThreadId(&guid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + flags = get_oletlsflags(); + ok(flags & OLETLS_UUIDINITIALIZED && !(flags & (OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED)), + "Unexpected flags %#x.\n", flags); +} + START_TEST(compobj) { init_funcs(); @@ -4254,6 +4349,7 @@ START_TEST(compobj) lstrcatA(testlib, "\\testlib.dll"); extract_resource("testlib.dll", "TESTDLL", testlib); + test_oletlsdata(); test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString(); -- 2.23.0

1 0

[PATCH 5/5] user32: Use the desktop shared data for GetCursorPos().
by Huw Davies 19 Nov '20

19 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/input.c | 20 ++++++------- dlls/user32/user_private.h | 23 +++++++++++++++ dlls/user32/winstation.c | 60 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 11 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index e06f8b4413e..efe9922e62a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -246,25 +246,23 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { - BOOL ret; + BOOL ret = TRUE; DWORD last_change; UINT dpi; + volatile struct desktop_shared_memory *shared = get_desktop_shared_memory(); - if (!pt) return FALSE; + if (!pt || !shared) return FALSE; - SERVER_START_REQ( set_cursor ) + SHARED_READ_BEGIN( &shared->seq ) { - if ((ret = !wine_server_call( req ))) - { - pt->x = reply->new_x; - pt->y = reply->new_y; - last_change = reply->last_change; - } + pt->x = shared->cursor.x; + pt->y = shared->cursor.y; + last_change = shared->cursor.last_change; } - SERVER_END_REQ; + SHARED_READ_END( &shared->seq ); /* query new position from graphics driver if we haven't updated recently */ - if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); + if (GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); if (ret && (dpi = get_thread_dpi())) { DPI_AWARENESS_CONTEXT context; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7761a1ceb4f..2cff12c2275 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -202,6 +202,8 @@ struct user_thread_info HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */ + HANDLE desktop_shared_map; /* HANDLE to server's desktop shared memory */ + struct desktop_shared_memory *shared_memory; /* Ptr to server's desktop shared memory */ }; C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); @@ -293,6 +295,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; +extern volatile struct desktop_shared_memory *get_desktop_shared_memory( void ) DECLSPEC_HIDDEN; /* message spy definitions */ @@ -391,4 +394,24 @@ static inline WCHAR *heap_strdupW(const WCHAR *src) return dst; } +#if defined(__i386__) || defined(__x86_64__) +#define __SHARED_READ_SEQ( x ) (*(x)) +#define __SHARED_READ_FENCE do {} while(0) +#else +#define __SHARED_READ_SEQ( x ) __atomic_load_n( x, __ATOMIC_RELAXED ) +#define __SHARED_READ_FENCE __atomic_thread_fence( __ATOMIC_ACQUIRE ) +#endif + +#define SHARED_READ_BEGIN( x ) \ + do { \ + unsigned int __seq; \ + do { \ + while ((__seq = __SHARED_READ_SEQ( x )) & SEQUENCE_MASK) NtYieldExecution(); \ + __SHARED_READ_FENCE; + +#define SHARED_READ_END( x ) \ + __SHARED_READ_FENCE; \ + } while (__SHARED_READ_SEQ( x ) != __seq); \ + } while(0) + #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 95a9eb85099..821c04608e7 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -100,6 +100,60 @@ static const WCHAR *get_winstation_default_name( void ) return ret ? default_name : NULL; } + +volatile struct desktop_shared_memory *get_desktop_shared_memory( void ) +{ + static const WCHAR dir_desktop_mapsW[] = {'_','_','w','i','n','e','_','d','e','s','k','t','o','p','_','m','a','p','p','i','n','g','s','\\'}; + struct user_thread_info *thread_info = get_user_thread_info(); + HANDLE root = get_winstations_dir_handle(), handles[2]; + WCHAR buf[MAX_PATH], *ptr; + DWORD i, needed; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING section_str; + NTSTATUS status; + SIZE_T size; + + if (thread_info->shared_memory) return thread_info->shared_memory; + + handles[0] = GetProcessWindowStation(); + handles[1] = GetThreadDesktop( GetCurrentThreadId() ); + + memcpy( buf, dir_desktop_mapsW, sizeof(dir_desktop_mapsW) ); + ptr = buf + ARRAY_SIZE(dir_desktop_mapsW); + + for (i = 0; i < 2; i++) + { + GetUserObjectInformationW( handles[i], UOI_NAME, (void *)ptr, sizeof(buf) - (ptr - buf) * sizeof(WCHAR), &needed ); + ptr += needed / sizeof(WCHAR); + if (i == 0) *(ptr - 1) = '\\'; + } + + RtlInitUnicodeString( &section_str, buf ); + InitializeObjectAttributes( &attr, &section_str, 0, root, NULL ); + status = NtOpenSection( &handles[0], SECTION_ALL_ACCESS, &attr ); + if (status) + { + ERR( "failed to open the desktop section: %08x\n", status ); + return NULL; + } + + ptr = NULL; + size = sizeof(struct desktop_shared_memory); + status = NtMapViewOfSection( handles[0], GetCurrentProcess(), (void *)&ptr, 0, 0, NULL, + &size, ViewUnmap, 0, PAGE_READONLY ); + if (status) + { + ERR( "failed to map view of the desktop section: %08x\n", status ); + CloseHandle( handles[0] ); + return NULL; + } + + thread_info->desktop_shared_map = handles[0]; + thread_info->shared_memory = (struct desktop_shared_memory *)ptr; + return thread_info->shared_memory; +} + + /*********************************************************************** * CreateWindowStationA (USER32.@) */ @@ -460,6 +514,12 @@ BOOL WINAPI SetThreadDesktop( HDESK handle ) thread_info->top_window = 0; thread_info->msg_window = 0; if (key_state_info) key_state_info->time = 0; + if (thread_info->desktop_shared_map) + { + CloseHandle( thread_info->desktop_shared_map ); + thread_info->desktop_shared_map = NULL; + thread_info->shared_memory = NULL; + } } return ret; } -- 2.23.0

2 1

[PATCH] riched20: Use a wchar string literal for the array of neutral chars.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Wanted to keep it as an array but IMHO it looks more readable this way. No-op code wise. dlls/riched20/editor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d89735acc82..f0662682044 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5310,13 +5310,13 @@ static int __cdecl wchar_comp( const void *key, const void *elem ) static BOOL isurlneutral( WCHAR c ) { /* NB this list is sorted */ - static const WCHAR neutral_chars[] = {'!','\"','\'','(',')',',','-','.',':',';','<','>','?','[',']','{','}'}; + static const WCHAR neutral_chars[] = L"!\"'(),-.:;<>?[]{}"; /* Some shortcuts */ if (isalnum( c )) return FALSE; - if (c > neutral_chars[ARRAY_SIZE( neutral_chars ) - 1]) return FALSE; + if (c > L'}') return FALSE; - return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ), sizeof(c), wchar_comp ); + return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ) - 1, sizeof(c), wchar_comp ); } /** -- 2.26.2

2 1

[PATCH] riched20: Use zero terminated wchar strings.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 17 ++++++----------- dlls/riched20/writer.c | 4 +--- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ee392f6fa6a..d89735acc82 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -627,10 +627,9 @@ void ME_RTFParAttrHook(RTF_Info *info) else { ME_Cursor cursor; - WCHAR endl = '\r'; cursor = info->editor->pCursors[0]; if (cursor.nOffset || cursor.run->nCharOfs) - ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); + ME_InsertTextFromCursor(info->editor, 0, L"\r", 1, info->style); tableDef->row_start = table_insert_row_start( info->editor, info->editor->pCursors ); } @@ -1079,8 +1078,6 @@ void ME_RTFSpecialCharHook(RTF_Info *info) } else /* v1.0 - v3.0 */ { - WCHAR endl = '\r'; - para = info->editor->pCursors[0].para; para->fmt.dxOffset = info->tableDef->gapH; para->fmt.dxStartIndent = info->tableDef->leftEdge; @@ -1094,7 +1091,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) } para->fmt.cTabCount = min(tableDef->numCellsDefined, MAX_TAB_STOPS); if (!tableDef->numCellsDefined) para->fmt.wEffects &= ~PFE_TABLE; - ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); + ME_InsertTextFromCursor(info->editor, 0, L"\r", 1, info->style); tableDef->numCellsInserted = 0; } break; @@ -2488,8 +2485,6 @@ static BOOL handle_enter(ME_TextEditor *editor) if (editor->styleFlags & ES_MULTILINE) { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; int from, to; @@ -2530,7 +2525,7 @@ static BOOL handle_enter(ME_TextEditor *editor) editor->pCursors[0].para = para; editor->pCursors[0].run = para_first_run( para ); editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor( editor, 0, &endl, 1, editor->pCursors[0].run->style ); + ME_InsertTextFromCursor( editor, 0, L"\r", 1, editor->pCursors[0].run->style ); para = editor_first_para( editor ); editor_set_default_para_fmt( editor, &para->fmt ); para->nFlags = 0; @@ -2579,7 +2574,7 @@ static BOOL handle_enter(ME_TextEditor *editor) } editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor( editor, 0, &endl, 1, editor->pCursors[0].run->style ); + ME_InsertTextFromCursor( editor, 0, L"\r", 1, editor->pCursors[0].run->style ); } else { @@ -2611,9 +2606,9 @@ static BOOL handle_enter(ME_TextEditor *editor) ME_InsertEndRowFromCursor(editor, 0); else if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + ME_InsertTextFromCursor(editor, 0, L"\r", 1, eop_style); else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_InsertTextFromCursor(editor, 0, L"\r\n", 2, eop_style); ME_CommitCoalescingUndo(editor); SetCursor(NULL); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 49cbb0e021f..50eccfa714b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1139,11 +1139,9 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, if (!editor->bEmulateVersion10 && cursor.run->nFlags & MERF_ENDPARA) { - static const WCHAR szEOL[] = { '\r', '\n' }; - /* richedit 2.0 - all line breaks are \r\n */ if (dwFormat & SF_UNICODE) - success = ME_StreamOutMove(pStream, (const char *)szEOL, sizeof(szEOL)); + success = ME_StreamOutMove(pStream, (const char *)L"\r\n", 2 * sizeof(WCHAR)); else success = ME_StreamOutMove(pStream, "\r\n", 2); } else { -- 2.26.2

2 1

[PATCH] riched20: Use wide-char string literals in a struct initialization.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 985bcc3d573..ee392f6fa6a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5433,23 +5433,25 @@ done: static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, int nChars) { #define MAX_PREFIX_LEN 9 +#define X(str) str, ARRAY_SIZE(str) - 1 struct prefix_s { const WCHAR text[MAX_PREFIX_LEN]; int length; }prefixes[] = { - {{'p','r','o','s','p','e','r','o',':'}, 9}, - {{'t','e','l','n','e','t',':'}, 7}, - {{'g','o','p','h','e','r',':'}, 7}, - {{'m','a','i','l','t','o',':'}, 7}, - {{'h','t','t','p','s',':'}, 6}, - {{'f','i','l','e',':'}, 5}, - {{'n','e','w','s',':'}, 5}, - {{'w','a','i','s',':'}, 5}, - {{'n','n','t','p',':'}, 5}, - {{'h','t','t','p',':'}, 5}, - {{'w','w','w','.'}, 4}, - {{'f','t','p',':'}, 4}, + {X(L"prospero:")}, + {X(L"telnet:")}, + {X(L"gopher:")}, + {X(L"mailto:")}, + {X(L"https:")}, + {X(L"file:")}, + {X(L"news:")}, + {X(L"wais:")}, + {X(L"nntp:")}, + {X(L"http:")}, + {X(L"www.")}, + {X(L"ftp:")}, }; +#undef X WCHAR bufferW[MAX_PREFIX_LEN + 1]; unsigned int i; -- 2.26.2

2 1

[PATCH] riched20: Use wide-char string literals.
by Michael Stefaniuc 19 Nov '20

19 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 18 ++++++------------ dlls/riched20/paint.c | 6 ++---- dlls/riched20/para.c | 15 +++++---------- dlls/riched20/richole.c | 3 +-- dlls/riched20/run.c | 3 +-- dlls/riched20/table.c | 6 ++---- 6 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2f7383e59a1..985bcc3d573 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -244,9 +244,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_RegisterEditorClass(HINSTANCE); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); - -static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; -static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; BOOL me_debug = FALSE; @@ -2222,8 +2219,6 @@ static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, L return 0; } -static const WCHAR rtfW[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; - static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) { EDITSTREAM es; @@ -2278,7 +2273,7 @@ static struct paste_format const WCHAR *name; } paste_formats[] = { - {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, + {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, L"Rich Text Format" }, {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, {{ CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, paste_emf }, {{ 0 }} @@ -3273,9 +3268,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) UnregisterClassA(RICHEDIT_CLASS20A, 0); UnregisterClassA("RichEdit50A", 0); if (ME_ListBoxRegistered) - UnregisterClassW(REListBox20W, 0); + UnregisterClassW(L"REListBox20W", 0); if (ME_ComboBoxRegistered) - UnregisterClassW(REComboBox20W, 0); + UnregisterClassW(L"REComboBox20W", 0); LookupCleanup(); HeapDestroy (me_heap); release_typelib(); @@ -5149,7 +5144,6 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, { ME_Run *run, *next_run; const WCHAR *pStart = buffer; - const WCHAR cr_lf[] = {'\r', '\n', 0}; const WCHAR *str; int nLen; @@ -5172,7 +5166,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, * also uses this function. */ srcChars -= min(nLen, srcChars); nLen = 2; - str = cr_lf; + str = L"\r\n"; } else { @@ -5290,7 +5284,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; wcW.lpfnWndProc = REListWndProc; - wcW.lpszClassName = REListBox20W; + wcW.lpszClassName = L"REListBox20W"; if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; } @@ -5298,7 +5292,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; wcW.lpfnWndProc = REComboWndProc; - wcW.lpszClassName = REComboBox20W; + wcW.lpszClassName = L"REComboBox20W"; if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ffb50d5ceff..2db3a4ea2c1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -972,10 +972,9 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) } if (me_debug) { - static const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; WCHAR buf[128]; POINT pt = c->pt; - wsprintfW(buf, wszRowDebug, no); + wsprintfW( buf, L"row[%d]", no ); pt.y = 12+y; ME_DebugWrite(c->hDC, &pt, buf); } @@ -1006,12 +1005,11 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) } if (me_debug) { - static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; WCHAR buf[2560]; POINT pt; pt.x = c->pt.x + run->pt.x; pt.y = c->pt.y + para->pt.y + run->pt.y; - wsprintfW(buf, wszRunDebug, no, p->member.run.nFlags, get_text( &p->member.run, 0 )); + wsprintfW( buf, L"[%d:%x] %ls", no, p->member.run.nFlags, get_text( &p->member.run, 0 )); ME_DebugWrite(c->hDC, &pt, buf); } break; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index cb98218aeab..29624e6c1df 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -150,7 +150,6 @@ ME_Row *para_end_row( ME_Paragraph *para ) void ME_MakeFirstParagraph(ME_TextEditor *editor) { - static const WCHAR cr_lf[] = {'\r','\n',0}; ME_Context c; CHARFORMAT2W cf; const CHARFORMATW *host_cf; @@ -202,7 +201,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) } eol_len = editor->bEmulateVersion10 ? 2 : 1; - para->text = ME_MakeStringN( cr_lf, eol_len ); + para->text = ME_MakeStringN( L"\r\n", eol_len ); run = run_create( style, MERF_ENDPARA ); run->nCharOfs = 0; @@ -280,7 +279,6 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) /* max 4 Roman letters (representing '8') / decade + '(' + ')' */ ME_String *str = ME_MakeStringEmpty( 20 + 2 ); WCHAR *p; - static const WCHAR fmtW[] = {'%', 'd', 0}; static const WORD letter_base[] = { 1, 26, 26 * 26, 26 * 26 * 26 }; /* roman_base should start on a '5' not a '1', otherwise the 'total' code will need adjusting. 'N' and 'O' are what MS uses for 5000 and 10000, their version doesn't work well above 30000, @@ -309,7 +307,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { case PFN_ARABIC: default: - p += swprintf( p, 20, fmtW, num ); + p += swprintf( p, 20, L"%d", num ); break; case PFN_LCLETTER: @@ -393,9 +391,6 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { ME_Style *style; CHARFORMAT2W cf; - static const WCHAR bullet_font[] = {'S','y','m','b','o','l',0}; - static const WCHAR bullet_str[] = {0xb7, 0}; - static const WCHAR spaceW[] = {' ', 0}; SIZE sz; if (!para->fmt.wNumbering) return; @@ -409,7 +404,7 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { cf.cbSize = sizeof(cf); cf.dwMask = CFM_FACE | CFM_CHARSET; - memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); + lstrcpyW( cf.szFaceName, L"Symbol" ); cf.bCharSet = SYMBOL_CHARSET; style = ME_ApplyStyle( c->editor, style, &cf ); } @@ -426,13 +421,13 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) if (para->fmt.wNumbering != PFN_BULLET) para->para_num.text = para_num_get_str( para, para_num_get_num( para ) ); else - para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); + para->para_num.text = ME_MakeStringConst( L"\x00b7", 1 ); } select_style( c, para->para_num.style ); GetTextExtentPointW( c->hDC, para->para_num.text->szData, para->para_num.text->nLen, &sz ); para->para_num.width = sz.cx; - GetTextExtentPointW( c->hDC, spaceW, 1, &sz ); + GetTextExtentPointW( c->hDC, L" ", 1, &sz ); para->para_num.width += sz.cx; } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5d73731dedb..bedeefe9a63 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -3004,9 +3004,8 @@ static void textfont_reset_to_default(ITextFontImpl *font) font->props[id].l = GetSystemDefaultLCID(); break; case FONT_NAME: { - static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; SysFreeString(font->props[id].str); - font->props[id].str = SysAllocString(sysW); + font->props[id].str = SysAllocString(L"System"); break; } case FONT_WEIGHT: diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index fdda43ba51a..e099c0be6dc 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -665,7 +665,6 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) { - static const WCHAR spaceW[] = {' ',0}; SIZE size; nLen = min( nLen, run->len ); @@ -673,7 +672,7 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i if (run->nFlags & MERF_ENDPARA) { nLen = min( nLen, 1 ); - ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + ME_GetTextExtent( c, L" ", nLen, run->style, &size ); } else if (para->nFlags & MEPF_COMPLEX) { diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 0ce5a2c32c0..c3823e3b493 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -54,8 +54,6 @@ #include "editor.h" #include "rtf.h" -static const WCHAR cr_lf[] = {'\r', '\n', 0}; - static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, const WCHAR *eol_str, int eol_len, int para_flags ) { @@ -75,7 +73,7 @@ ME_Paragraph* table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWSTART ); + para = table_insert_end_para( editor, cursor, L"\r\n", 2, MEPF_ROWSTART ); return para_prev( para ); } @@ -122,7 +120,7 @@ ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWEND ); + para = table_insert_end_para( editor, cursor, L"\r\n", 2, MEPF_ROWEND ); return para_prev( para ); } -- 2.26.2

2 1

[PATCH 4/5] server: Add a sequence number to the shared data.
by Huw Davies 19 Nov '20

19 Nov '20

The client should check that the lower SEQUENCE_MASK_BITS are zero before reading the data and confirm that the number is unchanged when it's finished. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- server/protocol.def | 5 +++++ server/queue.c | 46 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/server/protocol.def b/server/protocol.def index d61d7f3c549..007e712ccbc 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -805,9 +805,14 @@ struct shared_cursor struct desktop_shared_memory { + unsigned int seq; /* sequence number - server updating if (seq_no & SEQUENCE_MASK) != 0 */ struct shared_cursor cursor; /* global cursor information */ }; +/* Bits that must be clear for client to read */ +#define SEQUENCE_MASK_BITS 4 +#define SEQUENCE_MASK ((1UL << SEQUENCE_MASK_BITS) - 1) + /****************************************************************/ /* Request declarations */ diff --git a/server/queue.c b/server/queue.c index f6664509ee3..7bf4ea2dea4 100644 --- a/server/queue.c +++ b/server/queue.c @@ -371,16 +371,60 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour return msg; } +#if defined(__i386__) || defined(__x86_64__) + +#define SHARED_WRITE_BEGIN( x ) \ + do { \ + volatile unsigned int __seq = *(x); \ + assert( (__seq & SEQUENCE_MASK) != SEQUENCE_MASK ); \ + *(x) = ++__seq; \ + } while(0) + +#define SHARED_WRITE_END( x ) \ + do { \ + volatile unsigned int __seq = *(x); \ + assert( (__seq & SEQUENCE_MASK) != 0 ); \ + if ((__seq & SEQUENCE_MASK) > 1) __seq--; \ + else __seq += SEQUENCE_MASK; \ + *(x) = __seq; \ + } while(0) + +#else + +#define SHARED_WRITE_BEGIN( x ) \ + do { \ + assert( (*(x) & SEQUENCE_MASK) != SEQUENCE_MASK ); \ + if ((__atomic_add_fetch( x, 1, __ATOMIC_RELAXED ) & SEQUENCE_MASK) == 1) \ + __atomic_thread_fence( __ATOMIC_RELEASE ); \ + } while(0) + +#define SHARED_WRITE_END( x ) \ + do { \ + assert( (*(x) & SEQUENCE_MASK) != 0 ); \ + if ((*(x) & SEQUENCE_MASK) > 1) \ + __atomic_sub_fetch( x, 1, __ATOMIC_RELAXED ); \ + else { \ + __atomic_thread_fence( __ATOMIC_RELEASE ); \ + __atomic_add_fetch( x, SEQUENCE_MASK, __ATOMIC_RELAXED ); \ + } \ + } while(0) + +#endif + static int update_desktop_cursor_pos( struct desktop *desktop, int x, int y ) { int updated; + unsigned int time = get_tick_count(); x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); y = max( min( y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); updated = (desktop->shared->cursor.x != x || desktop->shared->cursor.y != y); + + SHARED_WRITE_BEGIN( &desktop->shared->seq ); desktop->shared->cursor.x = x; desktop->shared->cursor.y = y; - desktop->shared->cursor.last_change = get_tick_count(); + desktop->shared->cursor.last_change = time; + SHARED_WRITE_END( &desktop->shared->seq ); return updated; } -- 2.23.0

1 0

[PATCH 2/5] server: Use the helper to update the cursor last change time.
by Huw Davies 19 Nov '20

19 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- server/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index 7e7e6fbdf29..935475b4c09 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1737,7 +1737,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons WM_MOUSEHWHEEL /* 0x1000 = MOUSEEVENTF_HWHEEL */ }; - desktop->cursor.last_change = get_tick_count(); + update_desktop_cursor_pos( desktop, desktop->cursor.x, desktop->cursor.y ); /* Update last change time */ flags = input->mouse.flags; time = input->mouse.time; if (!time) time = desktop->cursor.last_change; -- 2.23.0

1 0

[PATCH 1/5] server: Create a desktop shared mapping.
by Huw Davies 19 Nov '20

19 Nov '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- server/directory.c | 17 +++++++++++++++++ server/file.h | 6 ++++++ server/mapping.c | 19 ++++++++++++++++++- server/protocol.def | 5 +++++ server/user.h | 28 +++++++++++++++------------- server/winstation.c | 22 ++++++++++++++++++++++ 6 files changed, 83 insertions(+), 14 deletions(-) diff --git a/server/directory.c b/server/directory.c index 6f8fb179808..a54ca0e91f3 100644 --- a/server/directory.c +++ b/server/directory.c @@ -38,6 +38,7 @@ #include "process.h" #include "file.h" #include "unicode.h" +#include "user.h" #define HASH_SIZE 7 /* default hash size */ @@ -240,6 +241,22 @@ struct object_type *get_object_type( const struct unicode_str *name ) return type; } +struct object *create_desktop_map_directory( struct winstation *winstation ) +{ + static const WCHAR dir_desktop_mapsW[] = {'_','_','w','i','n','e','_','d','e','s','k','t','o','p','_','m','a','p','p','i','n','g','s'}; + static const struct unicode_str dir_desktop_maps_str = {dir_desktop_mapsW, sizeof(dir_desktop_mapsW)}; + struct object *root; + struct directory *mapping_root, *ret; + const struct unicode_str winsta_name = {winstation->obj.name->name, winstation->obj.name->len}; + + root = winstation->obj.name->parent; + mapping_root = create_directory( root, &dir_desktop_maps_str, OBJ_OPENIF, HASH_SIZE, NULL ); + ret = create_directory( &mapping_root->obj, &winsta_name, OBJ_OPENIF, HASH_SIZE, NULL ); + release_object( &mapping_root->obj ); + + return &ret->obj; +} + /* Global initialization */ static void create_session( unsigned int id ) diff --git a/server/file.h b/server/file.h index 2fb634fad8d..9c376e4c483 100644 --- a/server/file.h +++ b/server/file.h @@ -151,6 +151,10 @@ extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback f extern void remove_timeout_user( struct timeout_user *user ); extern const char *get_timeout_str( timeout_t timeout ); +/* directory functions */ + +extern struct object *create_desktop_map_directory( struct winstation *winstation ); + /* file functions */ extern struct file *get_file_obj( struct process *process, obj_handle_t handle, @@ -173,6 +177,8 @@ extern void free_mapped_views( struct process *process ); extern int get_page_size(void); extern struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_desktop_mapping( struct object *root, const struct unicode_str *name, + mem_size_t size, const struct security_descriptor *sd, void **ptr ); /* device functions */ diff --git a/server/mapping.c b/server/mapping.c index 769a986ae21..48bc7361977 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -959,7 +959,7 @@ int get_page_size(void) } struct object *create_user_data_mapping( struct object *root, const struct unicode_str *name, - unsigned int attr, const struct security_descriptor *sd ) + unsigned int attr, const struct security_descriptor *sd ) { void *ptr; struct mapping *mapping; @@ -975,6 +975,23 @@ struct object *create_user_data_mapping( struct object *root, const struct unico return &mapping->obj; } +struct object *create_desktop_mapping( struct object *root, const struct unicode_str *name, + mem_size_t size, const struct security_descriptor *sd, void **ptr ) +{ + struct mapping *mapping; + + if (!(mapping = create_mapping( root, name, OBJ_OPENIF, size, SEC_COMMIT, 0, + FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; + *ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); + if (*ptr == MAP_FAILED) + { + release_object( &mapping->obj ); + return NULL; + } + + return &mapping->obj; +} + /* create a file mapping */ DECL_HANDLER(create_mapping) { diff --git a/server/protocol.def b/server/protocol.def index a3708f20705..c1c33d7e3d1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -796,6 +796,11 @@ typedef struct lparam_t info; } cursor_pos_t; +struct desktop_shared_memory +{ + int placeholder; +}; + /****************************************************************/ /* Request declarations */ diff --git a/server/user.h b/server/user.h index 6267f3e2881..9a28ba7f449 100644 --- a/server/user.h +++ b/server/user.h @@ -64,19 +64,21 @@ struct global_cursor struct desktop { - struct object obj; /* object header */ - unsigned int flags; /* desktop flags */ - struct winstation *winstation; /* winstation this desktop belongs to */ - struct list entry; /* entry in winstation list of desktops */ - struct window *top_window; /* desktop window for this desktop */ - struct window *msg_window; /* HWND_MESSAGE top window */ - struct hook_table *global_hooks; /* table of global hooks on this desktop */ - struct list hotkeys; /* list of registered hotkeys */ - struct timeout_user *close_timeout; /* timeout before closing the desktop */ - struct thread_input *foreground_input; /* thread input of foreground thread */ - unsigned int users; /* processes and threads using this desktop */ - struct global_cursor cursor; /* global cursor information */ - unsigned char keystate[256]; /* asynchronous key state */ + struct object obj; /* object header */ + unsigned int flags; /* desktop flags */ + struct winstation *winstation; /* winstation this desktop belongs to */ + struct list entry; /* entry in winstation list of desktops */ + struct window *top_window; /* desktop window for this desktop */ + struct window *msg_window; /* HWND_MESSAGE top window */ + struct hook_table *global_hooks; /* table of global hooks on this desktop */ + struct list hotkeys; /* list of registered hotkeys */ + struct timeout_user *close_timeout; /* timeout before closing the desktop */ + struct thread_input *foreground_input; /* thread input of foreground thread */ + unsigned int users; /* processes and threads using this desktop */ + struct global_cursor cursor; /* global cursor information */ + struct object *shared_mapping; /* desktop shared memory mapping */ + volatile struct desktop_shared_memory *shared; /* desktop shared memory ptr */ + unsigned char keystate[256]; /* asynchronous key state */ }; /* user handles functions */ diff --git a/server/winstation.c b/server/winstation.c index c9c85e50fff..7cf62f27e89 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -210,6 +210,22 @@ struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, u return (struct desktop *)get_handle_obj( process, handle, access, &desktop_ops ); } +static volatile void *init_desktop_mapping( struct desktop *desktop, const struct unicode_str *name ) +{ + struct object *dir = create_desktop_map_directory( desktop->winstation ); + + desktop->shared = NULL; + desktop->shared_mapping = NULL; + + if (!dir) return NULL; + + desktop->shared_mapping = create_desktop_mapping( dir, name, sizeof(struct desktop_shared_memory), + NULL, (void **)&desktop->shared ); + release_object( dir ); + if (desktop->shared) memset( (void *)desktop->shared, 0, sizeof(*desktop->shared) ); + return desktop->shared; +} + /* create a desktop object */ static struct desktop *create_desktop( const struct unicode_str *name, unsigned int attr, unsigned int flags, struct winstation *winstation ) @@ -233,6 +249,11 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned memset( desktop->keystate, 0, sizeof(desktop->keystate) ); list_add_tail( &winstation->desktops, &desktop->entry ); list_init( &desktop->hotkeys ); + if (!init_desktop_mapping( desktop, name )) + { + release_object( desktop ); + return NULL; + } } else clear_error(); } @@ -293,6 +314,7 @@ static void desktop_destroy( struct object *obj ) if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry ); + release_object( desktop->shared_mapping ); release_object( desktop->winstation ); } -- 2.23.0

1 0

[PATCH] mf/samplegrabber: Implement IMFRateSupport.
by Nikolay Sivov 19 Nov '20

19 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 127 ++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 66 +++++++++++++++++++++ 2 files changed, 193 insertions(+) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 566ee2f2930..54e28b466c5 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -18,6 +18,8 @@ #define COBJMACROS +#include <float.h> + #include "mfidl.h" #include "mf_private.h" @@ -61,6 +63,8 @@ struct sample_grabber IMFMediaSink IMFMediaSink_iface; IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; + IMFGetService IMFGetService_iface; + IMFRateSupport IMFRateSupport_iface; IMFStreamSink IMFStreamSink_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; IMFAsyncCallback timer_callback; @@ -117,6 +121,16 @@ static struct sample_grabber *impl_from_IMFMediaEventGenerator(IMFMediaEventGene return CONTAINING_RECORD(iface, struct sample_grabber, IMFMediaEventGenerator_iface); } +static struct sample_grabber *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFGetService_iface); +} + +static struct sample_grabber *impl_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct sample_grabber, IMFRateSupport_iface); +} + static struct sample_grabber *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct sample_grabber, IMFStreamSink_iface); @@ -773,6 +787,14 @@ static HRESULT WINAPI sample_grabber_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &grabber->IMFMediaEventGenerator_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &grabber->IMFGetService_iface; + } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &grabber->IMFRateSupport_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -1249,6 +1271,109 @@ static const IMFClockStateSinkVtbl sample_grabber_clock_sink_vtbl = sample_grabber_clock_sink_OnClockSetRate, }; +static HRESULT WINAPI sample_grabber_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFGetService(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_getservice_AddRef(IMFGetService *iface) +{ + struct sample_grabber *grabber = impl_from_IMFGetService(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_getservice_Release(IMFGetService *iface) +{ + struct sample_grabber *grabber = impl_from_IMFGetService(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_getservice_GetService(IMFGetService *iface, REFGUID service, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMFRateSupport)) + return IMFGetService_QueryInterface(iface, riid, obj); + + return E_NOINTERFACE; + } + + FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); + + return MF_E_UNSUPPORTED_SERVICE; +} + +static const IMFGetServiceVtbl sample_grabber_getservice_vtbl = +{ + sample_grabber_getservice_QueryInterface, + sample_grabber_getservice_AddRef, + sample_grabber_getservice_Release, + sample_grabber_getservice_GetService, +}; + +static HRESULT WINAPI sample_grabber_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj) +{ + struct sample_grabber *grabber = impl_from_IMFRateSupport(iface); + return IMFMediaSink_QueryInterface(&grabber->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI sample_grabber_rate_support_AddRef(IMFRateSupport *iface) +{ + struct sample_grabber *grabber = impl_from_IMFRateSupport(iface); + return IMFMediaSink_AddRef(&grabber->IMFMediaSink_iface); +} + +static ULONG WINAPI sample_grabber_rate_support_Release(IMFRateSupport *iface) +{ + struct sample_grabber *grabber = impl_from_IMFRateSupport(iface); + return IMFMediaSink_Release(&grabber->IMFMediaSink_iface); +} + +static HRESULT WINAPI sample_grabber_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + *rate = 0.0f; + + return S_OK; +} + +static HRESULT WINAPI sample_grabber_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + *rate = direction == MFRATE_REVERSE ? -FLT_MAX : FLT_MAX; + + return S_OK; +} + +static HRESULT WINAPI sample_grabber_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *ret_rate) +{ + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, ret_rate); + + if (ret_rate) + *ret_rate = rate; + + return S_OK; +} + +static const IMFRateSupportVtbl sample_grabber_rate_support_vtbl = +{ + sample_grabber_rate_support_QueryInterface, + sample_grabber_rate_support_AddRef, + sample_grabber_rate_support_Release, + sample_grabber_rate_support_GetSlowestRate, + sample_grabber_rate_support_GetFastestRate, + sample_grabber_rate_support_IsRateSupported, +}; + static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct sample_grabber_activate_context *context = user_context; @@ -1272,6 +1397,8 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; object->IMFClockStateSink_iface.lpVtbl = &sample_grabber_clock_sink_vtbl; object->IMFMediaEventGenerator_iface.lpVtbl = &sample_grabber_sink_events_vtbl; + object->IMFGetService_iface.lpVtbl = &sample_grabber_getservice_vtbl; + object->IMFRateSupport_iface.lpVtbl = &sample_grabber_rate_support_vtbl; object->IMFStreamSink_iface.lpVtbl = &sample_grabber_stream_vtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &sample_grabber_stream_type_handler_vtbl; object->timer_callback.lpVtbl = &sample_grabber_stream_timer_callback_vtbl; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 78a3d75e0a7..2a671225a11 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <float.h> #define COBJMACROS @@ -71,6 +72,21 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +#define check_service_interface(a, b, c, d) check_service_interface_(__LINE__, a, b, c, d) +static void check_service_interface_(unsigned int line, void *iface_ptr, REFGUID service, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = MFGetService(iface, service, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -2097,6 +2113,7 @@ static void test_sample_grabber(void) IMFPresentationTimeSource *time_source; IMFPresentationClock *clock, *clock2; IMFStreamSink *stream, *stream2; + IMFRateSupport *rate_support; IMFMediaEventGenerator *eg; IMFMediaSink *sink, *sink2; DWORD flags, count, id; @@ -2104,6 +2121,7 @@ static void test_sample_grabber(void) IMFMediaEvent *event; ULONG refcount; IUnknown *unk; + float rate; HRESULT hr; GUID guid; @@ -2136,6 +2154,53 @@ static void test_sample_grabber(void) hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + check_interface(sink, &IID_IMFClockStateSink, TRUE); + check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(sink, &IID_IMFGetService, TRUE); + check_interface(sink, &IID_IMFRateSupport, TRUE); + check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + + if (SUCCEEDED(MFGetService((IUnknown *)sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) + { + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -FLT_MAX, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, TRUE, 1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + + IMFRateSupport_Release(rate_support); + } + hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); ok(flags & MEDIASINK_FIXED_STREAMS, "Unexpected flags %#x.\n", flags); @@ -2148,6 +2213,7 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get sink stream, hr %#x.\n", hr); check_interface(stream, &IID_IMFMediaEventGenerator, TRUE); + check_interface(stream, &IID_IMFMediaTypeHandler, TRUE); hr = IMFStreamSink_GetIdentifier(stream, &id); ok(hr == S_OK, "Failed to get stream id, hr %#x.\n", hr); -- 2.29.2

1 0

[PATCH v2] gdi32: Avoid the actual drawing position is inconsistent with the desired position when the width or height is negative.
by Jiangyi Chen 19 Nov '20

19 Nov '20

2 1

[PATCH] winevulkan: Don't support VK_EXT_headless_surface.
by Georg Lehmann 19 Nov '20

19 Nov '20

It's completly broken because the wine drivers only implement VK_KHR_win32_surface. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6675a813c05..056f6aefbcd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -88,6 +88,7 @@ UNSUPPORTED_EXTENSIONS = [ # Instance extensions "VK_KHR_display", # Needs WSI work. "VK_KHR_surface_protected_capabilities", + "VK_EXT_headless_surface", # Needs WSI work. # Device extensions "VK_AMD_display_native_hdr", -- 2.29.2

1 0

[PATCH] gdi32: Avoid the actual drawing position is inconsistent with the desired position when the width or height is negative.
by Jiangyi Chen 19 Nov '20

19 Nov '20

The attachment contains a test program and source code written on the window. Please take a look.

2 1

[PATCH] winepulse.drv: Support older version of the AudioClientProperties structure
by Alistair Leslie-Hughes 19 Nov '20

19 Nov '20

Warframe when using a win10 prefix, uses an xaudio2_9redist.dll which uses the older AudioClientProperties structure (missing the Options member). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cef8a2d4d5b..319904ee55a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2254,13 +2254,17 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface, if(!prop) return E_POINTER; - if(prop->cbSize != sizeof(*prop)) + /* Windows 8 and below doesn't have the Options Field. */ + if(prop->cbSize != sizeof(*prop) && prop->cbSize != FIELD_OFFSET(AudioClientProperties, Options)) + { + WARN("Unsupported Size = %d\n", prop->cbSize); return E_INVALIDARG; - + } + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", prop->bIsOffload, prop->eCategory, - prop->Options); + prop->cbSize == sizeof(*prop) ? prop->Options : 0); if(prop->bIsOffload) return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; -- 2.29.2

1 0

[PATCH] msado15/tests: Add ADORecordsetConstruction tests
by Alistair Leslie-Hughes 19 Nov '20

19 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 346 +++++++++++++++++++++++++++++++++++ 1 file changed, 346 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e95df49c2c2..a905c8d38ac 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -23,6 +23,9 @@ #include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" +#include "msdasql.h" + +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) @@ -288,6 +291,348 @@ static void test_Recordset(void) _Recordset_Release( recordset ); } +/* This interface is queried for but is not documented anywhere. */ +DEFINE_GUID(UKN_INTERFACE, 0x6f1e39e1, 0x05c6, 0x11d0, 0xa7, 0x8b, 0x00, 0xaa, 0x00, 0xa3, 0xf0, 0x0d); + +struct test_rowset +{ + IRowset IRowset_iface; + IRowsetInfo IRowsetInfo_iface; + IColumnsInfo IColumnsInfo_iface; + LONG refs; +}; + +static inline struct test_rowset *impl_from_IRowset( IRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct test_rowset, IRowset_iface ); +} + +static inline struct test_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct test_rowset, IRowsetInfo_iface ); +} + +static inline struct test_rowset *impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct test_rowset, IColumnsInfo_iface ); +} + +static HRESULT WINAPI rowset_info_QueryInterface(IRowsetInfo *iface, REFIID riid, void **obj) +{ + struct test_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, obj); +} + +static ULONG WINAPI rowset_info_AddRef(IRowsetInfo *iface) +{ + struct test_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_info_Release(IRowsetInfo *iface) +{ + struct test_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets1) +{ + ok( count == 2, "got %d\n", count ); + + ok( IsEqualIID(&DBPROPSET_ROWSET, &propertyidsets[0].guidPropertySet), "got %s\n", wine_dbgstr_guid(&propertyidsets[0].guidPropertySet)); + ok( propertyidsets[0].cPropertyIDs == 17, "got %d\n", propertyidsets[0].cPropertyIDs ); + + ok( IsEqualIID(&DBPROPSET_PROVIDERROWSET, &propertyidsets[1].guidPropertySet), "got %s\n", wine_dbgstr_guid(&propertyidsets[1].guidPropertySet)); + ok( propertyidsets[1].cPropertyIDs == 1, "got %d\n", propertyidsets[1].cPropertyIDs ); + + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, + REFIID riid, IUnknown **unk) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID riid, + IUnknown **specification) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static const struct IRowsetInfoVtbl rowset_info = +{ + rowset_info_QueryInterface, + rowset_info_AddRef, + rowset_info_Release, + rowset_info_GetProperties, + rowset_info_GetReferencedRowset, + rowset_info_GetSpecification +}; + +static HRESULT WINAPI column_info_QueryInterface(IColumnsInfo *iface, REFIID riid, void **obj) +{ + struct test_rowset *rowset = impl_from_IColumnsInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, obj); +} + +static ULONG WINAPI column_info_AddRef(IColumnsInfo *iface) +{ + struct test_rowset *rowset = impl_from_IColumnsInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI column_info_Release(IColumnsInfo *iface) +{ + struct test_rowset *rowset = impl_from_IColumnsInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI column_info_GetColumnInfo(IColumnsInfo *This, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + DBCOLUMNINFO *dbcolumn; + *columns = 1; + + *stringsbuffer = CoTaskMemAlloc(sizeof(L"Column1")); + lstrcpyW(*stringsbuffer, L"Column1"); + + dbcolumn = CoTaskMemAlloc(sizeof(DBCOLUMNINFO)); + + dbcolumn->pwszName = *stringsbuffer; + dbcolumn->pTypeInfo = NULL; + dbcolumn->iOrdinal = 1; + dbcolumn->dwFlags = DBCOLUMNFLAGS_MAYBENULL; + dbcolumn->ulColumnSize = 5; + dbcolumn->wType = DBTYPE_I4; + dbcolumn->bPrecision = 1; + dbcolumn->bScale = 1; + dbcolumn->columnid.eKind = DBKIND_NAME; + dbcolumn->columnid.uName.pwszName = *stringsbuffer; + + *colinfo = dbcolumn; + + return S_OK; +} + +static HRESULT WINAPI column_info_MapColumnIDs(IColumnsInfo *This, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static const struct IColumnsInfoVtbl column_info = +{ + column_info_QueryInterface, + column_info_AddRef, + column_info_Release, + column_info_GetColumnInfo, + column_info_MapColumnIDs, +}; + +static HRESULT WINAPI rowset_QueryInterface(IRowset *iface, REFIID riid, void **obj) +{ + struct test_rowset *rowset = impl_from_IRowset( iface ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IRowset) || + IsEqualIID(riid, &IID_IUnknown)) + { + trace("Requested interface IID_IRowset\n"); + *obj = &rowset->IRowset_iface; + } + else if (IsEqualIID(riid, &IID_IRowsetInfo)) + { + trace("Requested interface IID_IRowsetInfo\n"); + *obj = &rowset->IRowsetInfo_iface; + } + else if (IsEqualIID(riid, &IID_IColumnsInfo)) + { + trace("Requested interface IID_IColumnsInfo\n"); + *obj = &rowset->IColumnsInfo_iface; + } + else if (IsEqualIID(riid, &IID_IRowsetLocate)) + { + trace("Requested interface IID_IRowsetLocate\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IDBAsynchStatus)) + { + trace("Requested interface IID_IDBAsynchStatus\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IAccessor)) + { + trace("Requested interface IID_IAccessor\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &UKN_INTERFACE)) + { + trace("Unknown interface\n"); + return E_NOINTERFACE; + } + + if(*obj) { + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; + } + + ok(0, "Unsupported interface %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI rowset_AddRef(IRowset *iface) +{ + struct test_rowset *rowset = impl_from_IRowset( iface ); + return InterlockedIncrement( &rowset->refs );; +} + +static ULONG WINAPI rowset_Release(IRowset *iface) +{ + struct test_rowset *rowset = impl_from_IRowset( iface ); + /* Object not allocated no need to destroy */ + return InterlockedDecrement( &rowset->refs );; +} + +static HRESULT WINAPI rowset_AddRefRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_GetData(IRowset *iface, HROW hRow, HACCESSOR hAccessor, void *pData) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_GetNextRows(IRowset *iface, HCHAPTER hReserved, DBROWOFFSET lRowsOffset, + DBROWCOUNT cRows, DBCOUNTITEM *pcRowObtained, HROW **prghRows) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_ReleaseRows(IRowset *iface, DBCOUNTITEM cRows, const HROW rghRows[], + DBROWOPTIONS rgRowOptions[], DBREFCOUNT rgRefCounts[], DBROWSTATUS rgRowStatus[]) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_RestartPosition(IRowset *iface, HCHAPTER hReserved) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static const struct IRowsetVtbl rowset_vtbl = +{ + rowset_QueryInterface, + rowset_AddRef, + rowset_Release, + rowset_AddRefRows, + rowset_GetData, + rowset_GetNextRows, + rowset_ReleaseRows, + rowset_RestartPosition +}; + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static void test_ADORecordsetConstruction(void) +{ + _Recordset *recordset; + ADORecordsetConstruction *construct; + Fields *fields = NULL; + Field *field; + struct test_rowset testrowset; + IRowset *rowset; + HRESULT hr; + LONG ref, count; + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Recordset_QueryInterface( recordset, &IID_ADORecordsetConstruction, (void**)&construct ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + if (FAILED(hr)) + { + goto done; + } + + testrowset.IRowset_iface.lpVtbl = &rowset_vtbl; + testrowset.IRowsetInfo_iface.lpVtbl = &rowset_info; + testrowset.IColumnsInfo_iface.lpVtbl = &column_info; + testrowset.refs = 1; + + rowset = &testrowset.IRowset_iface; + + ref = get_refcount( rowset ); + ok( ref == 1, "got %d\n", ref ); + hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset ); + todo_wine ok( hr == S_OK, "got %08x\n", hr ); + + ref = get_refcount( rowset ); + ok( ref == 2, "got %d\n", ref ); + + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( fields != NULL, "NULL value\n"); + + ref = get_refcount( rowset ); + ok( ref == 2, "got %d\n", ref ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 1, "got %d\n", count ); + if (count > 0) + { + VARIANT index; + LONG size; + DataTypeEnum type; + + V_VT( &index ) = VT_BSTR; + V_BSTR( &index ) = SysAllocString( L"Column1" ); + + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = Field_get_Type( field, &type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == adInteger, "got %d\n", type ); + size = -1; + hr = Field_get_DefinedSize( field, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 5, "got %d\n", size ); + + VariantClear(&index); + + Field_Release(field); + } + + ref = get_refcount(rowset); + ok( ref == 2, "got %d\n", ref ); + + Fields_Release(fields); + + ADORecordsetConstruction_Release(construct); + +done: + _Recordset_Release( recordset ); +} + static void test_Fields(void) { _Recordset *recordset; @@ -1136,6 +1481,7 @@ START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ADORecordsetConstruction(); test_ConnectionPoint(); test_Fields(); test_Recordset(); -- 2.29.2

2 1

[PATCH v2 1/4] include: Fix DPFLTR_MASK value to 0x80000000.
by Rémi Bernon 19 Nov '20

19 Nov '20

This is most likely a typo from MSDN. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use RtlRaiseException as the exception address, testing shows that the address on Windows varies, and is sometimes around DbgPrint or RtlRaiseException, but nothing matching exactly. Supersedes: 196206-196209 include/dpfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dpfilter.h b/include/dpfilter.h index 5b09dc9c23c..deb8db3fc41 100644 --- a/include/dpfilter.h +++ b/include/dpfilter.h @@ -23,7 +23,7 @@ #define DPFLTR_WARNING_LEVEL 1 #define DPFLTR_TRACE_LEVEL 2 #define DPFLTR_INFO_LEVEL 3 -#define DPFLTR_MASK 0x8000000 +#define DPFLTR_MASK 0x80000000 typedef enum _DPFLTR_TYPE { -- 2.29.2

1 3

[PATCH v2] ntdll: Stub ThreadEnableAlignmentFaultFixup info class.
by Rémi Bernon 19 Nov '20

19 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46216 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Remove unused variables * Query with the same size that succeeds with Set Supersedes: 196211 dlls/ntdll/tests/info.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 11 +++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 70ea7d5146b..5db7a800cbe 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2505,6 +2505,37 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } +static void test_ThreadEnableAlignmentFaultFixup(void) +{ + NTSTATUS status; + ULONG dummy; + + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status ); + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); +} + static DWORD WINAPI start_address_thread(void *arg) { PRTL_THREAD_START_ROUTINE entry; @@ -2774,4 +2805,6 @@ START_TEST(info) test_readvirtualmemory(); test_queryvirtualmemory(); test_NtGetCurrentProcessorNumber(); + + test_ThreadEnableAlignmentFaultFixup(); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a161c5d1c90..6c056497ab7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1093,10 +1093,12 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, if (ret_len) *ret_len = sizeof(BOOLEAN); return STATUS_SUCCESS; + case ThreadEnableAlignmentFaultFixup: + return STATUS_INVALID_INFO_CLASS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadZeroTlsCell: case ThreadPerformanceCount: @@ -1272,11 +1274,16 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadEnableAlignmentFaultFixup: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" ); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: case ThreadDescriptorTableEntry: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadPerformanceCount: case ThreadAmILastThread: -- 2.29.2

1 0

[PATCH] ntdll: Stub ThreadEnableAlignmentFaultFixup info class.
by Rémi Bernon 19 Nov '20

19 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46216 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These games DRMs are just calling this function with an invalid length. It seems harmless as it doesn't prevent them from running, but we can stub it a bit more. dlls/ntdll/tests/info.c | 32 ++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 11 +++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 70ea7d5146b..afc6149277d 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2505,6 +2505,36 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } +static void test_ThreadEnableAlignmentFaultFixup(void) +{ + NTSTATUS status; + HANDLE thread, stop_event; + ULONG dummy; + + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08x\n", status ); + + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, NULL, 1 ); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status ); + dummy = 1; + status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentProcess(), ThreadEnableAlignmentFaultFixup, &dummy, 8 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); +} + static DWORD WINAPI start_address_thread(void *arg) { PRTL_THREAD_START_ROUTINE entry; @@ -2774,4 +2804,6 @@ START_TEST(info) test_readvirtualmemory(); test_queryvirtualmemory(); test_NtGetCurrentProcessorNumber(); + + test_ThreadEnableAlignmentFaultFixup(); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index a161c5d1c90..6c056497ab7 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1093,10 +1093,12 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, if (ret_len) *ret_len = sizeof(BOOLEAN); return STATUS_SUCCESS; + case ThreadEnableAlignmentFaultFixup: + return STATUS_INVALID_INFO_CLASS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadZeroTlsCell: case ThreadPerformanceCount: @@ -1272,11 +1274,16 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadEnableAlignmentFaultFixup: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + FIXME( "ThreadEnableAlignmentFaultFixup stub!\n" ); + return STATUS_SUCCESS; + case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: case ThreadDescriptorTableEntry: - case ThreadEnableAlignmentFaultFixup: case ThreadEventPair_Reusable: case ThreadPerformanceCount: case ThreadAmILastThread: -- 2.29.2

2 1

[PATCH 1/4] include: Fix DPFLTR_MASK value to 0x80000000.
by Rémi Bernon 19 Nov '20

19 Nov '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is most likely a typo from MSDN. Supersedes: 196179 include/dpfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dpfilter.h b/include/dpfilter.h index 5b09dc9c23c..deb8db3fc41 100644 --- a/include/dpfilter.h +++ b/include/dpfilter.h @@ -23,7 +23,7 @@ #define DPFLTR_WARNING_LEVEL 1 #define DPFLTR_TRACE_LEVEL 2 #define DPFLTR_INFO_LEVEL 3 -#define DPFLTR_MASK 0x8000000 +#define DPFLTR_MASK 0x80000000 typedef enum _DPFLTR_TYPE { -- 2.29.2

2 5

[PATCH] d3dx10/tests: Add tests for D3DX10CreateTextureFromMemory.
by Ziqing Hui 19 Nov '20

19 Nov '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 163 ++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+)

1 0

[PATCH 1/2] winemac.drv: Use Metal to get a display's GPU info if possible.
by Brendan Shanks 19 Nov '20

19 Nov '20

Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..1125d29839c 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,21 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (!device || ![device respondsToSelector:@selector(registryID)]) + return -1; + return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,6 +352,11 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** @@ -349,8 +369,16 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /*********************************************************************** -- 2.26.2

2 2

[PATCH 1/5] strmbase: Forbid disconnecting the sink if the filter is not stopped.
by Zebediah Figura 19 Nov '20

19 Nov '20

Addendum to 2a6037e263ff3fae8ca82d90b0b141bea1cd473d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c08f04730e7..d7788cda493 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -887,6 +887,13 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) EnterCriticalSection(&pin->pin.filter->csFilter); + if (pin->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (pin->pin.peer) { if (pin->pFuncsTable->sink_disconnect) -- 2.29.2

2 7

[PATCH] comctl32: Use wide-char string literals.
by Michael Stefaniuc 18 Nov '20

18 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/button.c | 2 +- dlls/comctl32/commctrl.c | 12 ++++++------ dlls/comctl32/listbox.c | 4 ++-- dlls/comctl32/listview.c | 2 +- dlls/comctl32/status.c | 4 ++-- dlls/comctl32/trackbar.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 4f7a3052b10..67bf5ceae48 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2427,7 +2427,7 @@ static void draw_split_button_dropdown_glyph(const BUTTON_INFO *infoPtr, HDC hdc /* infoPtr->glyph is a character code from Marlett */ HFONT font, old_font; LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, - { 'M','a','r','l','e','t','t',0 } }; + L"Marlett" }; if (infoPtr->glyph_size.cy) { /* BCSS_STRETCH preserves aspect ratio, uses minimum as size */ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 6056c0e6cf9..cb9c22a3a88 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -124,12 +124,12 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class) } classes[] = { - { {'B','u','t','t','o','n',0}, BUTTON_Register }, - { {'C','o','m','b','o','B','o','x',0}, COMBO_Register }, - { {'C','o','m','b','o','L','B','o','x',0}, COMBOLBOX_Register }, - { {'E','d','i','t',0}, EDIT_Register }, - { {'L','i','s','t','B','o','x',0}, LISTBOX_Register }, - { {'S','t','a','t','i','c',0}, STATIC_Register }, + { L"Button", BUTTON_Register }, + { L"ComboBox", COMBO_Register }, + { L"ComboLBox", COMBOLBOX_Register }, + { L"Edit", EDIT_Register }, + { L"ListBox", LISTBOX_Register }, + { L"Static", STATIC_Register }, }; int min = 0, max = ARRAY_SIZE(classes) - 1; diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e6c4b2d6d24..b905beee325 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1919,8 +1919,8 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib, /* scan drives */ if (attrib & DDL_DRIVES) { - WCHAR buffer[] = {'[','-','a','-',']',0}; - WCHAR root[] = {'A',':','\\',0}; + WCHAR buffer[] = L"[-a-]"; + WCHAR root[] = L"A:\\"; int drive; for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8e5d6ed4d56..0c80b6164a9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4731,7 +4731,7 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERATOR *subitems, POINT pos, DWORD cdmode) { WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; - static WCHAR callbackW[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; + static WCHAR callbackW[] = L"(callback)"; DWORD cdsubitemmode = CDRF_DODEFAULT; RECT *focus, rcBox; NMLVCUSTOMDRAW nmlvcd; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index b0cc3377986..0c3a90887c8 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -657,12 +657,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) if (infoPtr->hwndToolTip) { INT nTipCount; TTTOOLINFOW ti; - WCHAR wEmpty = 0; + WCHAR wEmpty[] = L""; ZeroMemory (&ti, sizeof(TTTOOLINFOW)); ti.cbSize = sizeof(TTTOOLINFOW); ti.hwnd = infoPtr->Self; - ti.lpszText = &wEmpty; + ti.lpszText = wEmpty; nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0); if (nTipCount < infoPtr->numParts) { diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index e71edc3b882..353e359111f 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1539,12 +1539,12 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) if (infoPtr->hwndToolTip) { TTTOOLINFOW ti; - WCHAR wEmpty = 0; + WCHAR wEmpty[] = L""; ZeroMemory (&ti, sizeof(ti)); ti.cbSize = sizeof(ti); ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; ti.hwnd = hwnd; - ti.lpszText = &wEmpty; + ti.lpszText = wEmpty; SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti); } -- 2.26.2

2 1

[PATCH 1/4] winegstreamer: Introduce audio conversion transform.
by Derek Lesho 18 Nov '20

18 Nov '20

Serves as a wrapper of audioconvert, and roughly fills the roll of Windows' CLSID_CResamplerMediaObject to convert audio to the format accepted by the streaming audio renderer. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/audioconvert.c | 383 +++++++++++++++++++ dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/mfplat.c | 77 ++++ dlls/winegstreamer/winegstreamer_classes.idl | 6 + 5 files changed, 469 insertions(+) create mode 100644 dlls/winegstreamer/audioconvert.c diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index e578d194f7f..0b3229160b9 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -6,6 +6,7 @@ EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase C_SRCS = \ + audioconvert.c \ filter.c \ gst_cbs.c \ gstdemux.c \ diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c new file mode 100644 index 00000000000..f4df1cc4532 --- /dev/null +++ b/dlls/winegstreamer/audioconvert.c @@ -0,0 +1,383 @@ +#include "config.h" + +#include "gst_private.h" + +#include "mfapi.h" +#include "mferror.h" +#include "mfidl.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +static const GUID *raw_types[] = { + &MFAudioFormat_PCM, + &MFAudioFormat_Float, +}; + +struct audio_converter +{ + IMFTransform IMFTransform_iface; + LONG refcount; +}; + +static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) +{ + return CONTAINING_RECORD(iface, struct audio_converter, IMFTransform_iface); +} + +static HRESULT WINAPI audio_converter_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFTransform) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFTransform_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI audio_converter_AddRef(IMFTransform *iface) +{ + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); + ULONG refcount = InterlockedIncrement(&transform->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI audio_converter_Release(IMFTransform *iface) +{ + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); + ULONG refcount = InterlockedDecrement(&transform->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(transform); + } + + return refcount; +} + +static HRESULT WINAPI audio_converter_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, + DWORD *output_minimum, DWORD *output_maximum) +{ + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); + + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; + + return S_OK; +} + +static HRESULT WINAPI audio_converter_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) +{ + TRACE("%p, %p, %p.\n", iface, inputs, outputs); + + *inputs = *outputs = 1; + + return S_OK; +} + +static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, + DWORD output_size, DWORD *outputs) +{ + TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) +{ + FIXME("%p %u %p.\n", converter, id, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) +{ + FIXME("%p %u %p.\n", converter, id, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) +{ + FIXME("%p, %p.\n", iface, attributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, + IMFAttributes **attributes) +{ + FIXME("%p, %u, %p.\n", iface, id, attributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, + IMFAttributes **attributes) +{ + FIXME("%p, %u, %p.\n", iface, id, attributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id) +{ + TRACE("%p, %u.\n", iface, id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) +{ + TRACE("%p, %u, %p.\n", iface, streams, ids); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, + IMFMediaType **type) +{ + IMFMediaType *ret; + HRESULT hr; + + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (index >= ARRAY_SIZE(raw_types)) + return MF_E_NO_MORE_TYPES; + + if (FAILED(hr = MFCreateMediaType(&ret))) + return hr; + + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) + { + IMFMediaType_Release(ret); + return hr; + } + + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_SUBTYPE, raw_types[index]))) + { + IMFMediaType_Release(ret); + return hr; + } + + *type = ret; + + return S_OK; +} + +static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, + IMFMediaType **type) +{ + IMFMediaType *output_type; + HRESULT hr; + + static const DWORD rates[] = {44100, 48000}; + static const DWORD channel_cnts[] = {1, 2, 6}; + static const DWORD sizes[] = {16, 24, 32}; + const GUID *subtype; + DWORD rate, channels, bps; + + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (index >= (2/*rates*/ * 3/*layouts*/ * 3/*bps PCM*/) + (2 * 3)) + return MF_E_NO_MORE_TYPES; + + if (FAILED(hr = MFCreateMediaType(&output_type))) + return hr; + + if (index < 2 * 3 * 3) + { + subtype = &MFAudioFormat_PCM; + rate = rates[index % 2]; + channels = channel_cnts[(index / 2) % 3]; + bps = sizes[(index / (2*3)) % 3]; + } + else + { + index -= (2 * 3 * 3); + subtype = &MFAudioFormat_Float; + bps = 32; + rate = rates[index % 2]; + channels = channel_cnts[(index / 2) % 3]; + } + + + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) + goto fail; + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_SUBTYPE, subtype))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, rate))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_NUM_CHANNELS, channels))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, bps))) + goto fail; + + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, channels * bps / 8))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, rate * channels * bps / 8))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_CHANNEL_MASK, + channels == 1 ? SPEAKER_FRONT_CENTER : + channels == 2 ? SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT : + /*channels == 6*/ 0x3F))) + goto fail; + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE))) + goto fail; + + *type = output_type; + + return S_OK; + fail: + IMFMediaType_Release(output_type); + return hr; +} + +static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, id, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) +{ + FIXME("%p, %u, %p.\n", iface, id, type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) +{ + FIXME("%p, %u, %p.\n", iface, id, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_GetOutputStatus(IMFTransform *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) +{ + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) +{ + TRACE("%p, %u, %p.\n", iface, id, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) +{ + FIXME("%p, %u.\n", iface, message); + + return S_OK; +} + +static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) +{ + FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, + MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) +{ + FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); + + return E_NOTIMPL; +} + +static const IMFTransformVtbl audio_converter_vtbl = +{ + audio_converter_QueryInterface, + audio_converter_AddRef, + audio_converter_Release, + audio_converter_GetStreamLimits, + audio_converter_GetStreamCount, + audio_converter_GetStreamIDs, + audio_converter_GetInputStreamInfo, + audio_converter_GetOutputStreamInfo, + audio_converter_GetAttributes, + audio_converter_GetInputStreamAttributes, + audio_converter_GetOutputStreamAttributes, + audio_converter_DeleteInputStream, + audio_converter_AddInputStreams, + audio_converter_GetInputAvailableType, + audio_converter_GetOutputAvailableType, + audio_converter_SetInputType, + audio_converter_SetOutputType, + audio_converter_GetInputCurrentType, + audio_converter_GetOutputCurrentType, + audio_converter_GetInputStatus, + audio_converter_GetOutputStatus, + audio_converter_SetOutputBounds, + audio_converter_ProcessEvent, + audio_converter_ProcessMessage, + audio_converter_ProcessInput, + audio_converter_ProcessOutput, +}; + +HRESULT audio_converter_create(REFIID riid, void **ret) +{ + struct audio_converter *object; + HRESULT hr; + + TRACE("%s %p\n", debugstr_guid(riid), ret); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; + object->refcount = 1; + + *ret = &object->IMFTransform_iface; + return S_OK; + +failed: + + IMFTransform_Release(&object->IMFTransform_iface); + return hr; +} diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 28e424439d8..7889c996204 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -84,4 +84,6 @@ IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; + #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 3d224a5accc..909fb8b3572 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -405,6 +405,8 @@ failed: static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}}; +static GUID CLSID_WINEAudioConverter = {0x6a170414,0xaad9,0x4693,{0xb8,0x06,0x3a,0x0c,0x47,0xc5,0x70,0xd6}}; + static const struct class_object { const GUID *clsid; @@ -414,6 +416,7 @@ class_objects[] = { { &CLSID_VideoProcessorMFT, &video_processor_create }, { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create }, + { &CLSID_WINEAudioConverter, &audio_converter_create }, }; HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) @@ -442,6 +445,80 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } +static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; +const GUID *audio_converter_supported_types[] = +{ + &MFAudioFormat_PCM, + &MFAudioFormat_Float, +}; + +static const struct mft +{ + const GUID *clsid; + const GUID *category; + LPWSTR name; + const UINT32 flags; + const GUID *major_type; + const UINT32 input_types_count; + const GUID **input_types; + const UINT32 output_types_count; + const GUID **output_types; + IMFAttributes *attributes; +} +mfts[] = +{ + { + &CLSID_WINEAudioConverter, + &MFT_CATEGORY_AUDIO_EFFECT, + audio_converterW, + MFT_ENUM_FLAG_SYNCMFT, + &MFMediaType_Audio, + ARRAY_SIZE(audio_converter_supported_types), + audio_converter_supported_types, + ARRAY_SIZE(audio_converter_supported_types), + audio_converter_supported_types, + NULL + }, +}; + +HRESULT mfplat_DllRegisterServer(void) +{ + unsigned int i; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(mfts); i++) + { + const struct mft *cur = &mfts[i]; + + MFT_REGISTER_TYPE_INFO *input_types, *output_types; + input_types = heap_alloc(cur->input_types_count * sizeof(input_types[0])); + output_types = heap_alloc(cur->output_types_count * sizeof(output_types[0])); + for (i = 0; i < cur->input_types_count; i++) + { + input_types[i].guidMajorType = *(cur->major_type); + input_types[i].guidSubtype = *(cur->input_types[i]); + } + for (i = 0; i < cur->output_types_count; i++) + { + output_types[i].guidMajorType = *(cur->major_type); + output_types[i].guidSubtype = *(cur->output_types[i]); + } + + hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, + input_types, cur->output_types_count, output_types, cur->attributes); + + heap_free(input_types); + heap_free(output_types); + + if (FAILED(hr)) + { + FIXME("Failed to register MFT, hr %#x\n", hr); + return hr; + } + } + return S_OK; +} + static const struct { const GUID *subtype; diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl index 1dc4ba9a10b..cf1fc69f38a 100644 --- a/dlls/winegstreamer/winegstreamer_classes.idl +++ b/dlls/winegstreamer/winegstreamer_classes.idl @@ -61,3 +61,9 @@ coclass VideoProcessorMFT {} uuid(317df618-5e5a-468a-9f15-d827a9a08162) ] coclass GStreamerByteStreamHandler {} + +[ + threading(both), + uuid(6a170414-aad9-4693-b806-3a0c47c570d6) +] +coclass WINEAudioConverter { } -- 2.29.2

2 6

[PATCH] ntdll: Raise debug exceptions when invalid heap is destroyed.
by Rémi Bernon 18 Nov '20

18 Nov '20

And when PEB->BeingDebugged is set to 1. Lords Of The Fallen anti-tamper does this and only continues if a DBG_PRINTEXCEPTION_C is received. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Moved this to ntdll instead as it seems to be happening there as well. This is also more convenient to check the heap flags, but it then makes it not possible to call OutputDebugStrA anymore (I suppose?), so raise a raw DBG_PRINTEXCEPTION_C exception instead. Supersedes: 196174 dlls/ntdll/heap.c | 14 +++++++++ dlls/ntdll/tests/rtl.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1ac0cb24806..b47ed003ce3 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1589,6 +1589,20 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) void *addr; TRACE("%p\n", heap ); + if (!heapPtr && heap && (((HEAP *)heap)->flags & HEAP_VALIDATE_PARAMS) && + NtCurrentTeb()->Peb->BeingDebugged) + { + EXCEPTION_RECORD record; + record.ExceptionCode = DBG_PRINTEXCEPTION_C; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = RtlDestroyHeap; + record.NumberParameters = 2; + record.ExceptionInformation[1] = (ULONG_PTR)"Attempt to destroy an invalid heap\n"; + record.ExceptionInformation[0] = strlen( (char *)record.ExceptionInformation[1] ) + 1; + RtlRaiseException( &record ); + DbgBreakPoint(); + } if (!heapPtr) return heap; if (heap == processHeap) return heap; /* cannot delete the main process heap */ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea05..9f822704d98 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3483,6 +3483,71 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static BOOL test_heap_destroy_dbgstr = FALSE; +static BOOL test_heap_destroy_break = FALSE; + +static LONG CALLBACK test_heap_destroy_except_handler( EXCEPTION_POINTERS *eptrs ) +{ + if (eptrs->ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) + { +#if defined( __i386__ ) + eptrs->ContextRecord->Eip += 1; + test_heap_destroy_break = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; +#elif defined( __x86_64__ ) + eptrs->ContextRecord->Rip += 1; + test_heap_destroy_break = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; +#endif + } + + if (eptrs->ExceptionRecord->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + test_heap_destroy_dbgstr = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; + } + + return (LONG)EXCEPTION_CONTINUE_SEARCH; +} + +/* partially copied from ntdll/heap.c */ +#define HEAP_VALIDATE_PARAMS 0x40000000 + +struct heap +{ + DWORD_PTR unknown1[2]; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + DWORD flags; + DWORD force_flags; + DWORD_PTR unknown8[6]; +}; + +static void test_RtlDestroyHeap(void) +{ + const struct heap invalid = {{0, 0}, {0, HEAP_VALIDATE_PARAMS}, {0, 0, 0, 0}, 0, {0, 0}, {0, 0, 0}, {0, 0}, HEAP_VALIDATE_PARAMS, 0, {0}}; + HANDLE heap = (HANDLE)&invalid, ret; + PEB *Peb = NtCurrentTeb()->Peb; + BOOL debugged; + void *handler = RtlAddVectoredExceptionHandler( TRUE, test_heap_destroy_except_handler ); + + test_heap_destroy_dbgstr = FALSE; + test_heap_destroy_break = FALSE; + debugged = Peb->BeingDebugged; + Peb->BeingDebugged = TRUE; + ret = RtlDestroyHeap( heap ); + ok( ret == heap, "RtlDestroyHeap(%p) returned %p\n", heap, ret ); + ok( test_heap_destroy_dbgstr, "HeapDestroy didn't call OutputDebugStrA\n" ); + ok( test_heap_destroy_break, "HeapDestroy didn't call DbgBreakPoint\n" ); + Peb->BeingDebugged = debugged; + + RtlRemoveVectoredExceptionHandler( handler ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3588,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_RtlDestroyHeap(); } -- 2.29.2

1 0

[PATCH] urlmon: Reimplement canonicalize_ipv6address on top of ntdll functions
by Jacek Caban 18 Nov '20

18 Nov '20

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/uri.c | 25 +++ dlls/urlmon/uri.c | 438 ++-------------------------------------- 2 files changed, 45 insertions(+), 418 deletions(-)

1 0

[PATCH v3] vbscript: Support properties with parameters.
by Robert Wilhelm 18 Nov '20

18 Nov '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++++++ dlls/vbscript/vbdisp.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a9f4c540fcb..8f1c1307794 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -454,7 +454,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 53f36b6e710..ed89906c9cf 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1770,6 +1770,27 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public Property Let Key(oldKey,newKey) + oDict = oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict = uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict = a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f493d420bd..ee4875f4e01 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -197,28 +197,43 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT i; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for(i=1; i < dp.cArgs; i++) { + dp.rgvarg[i]=params->rgvarg[params->cNamedArgs+i-1]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default: -- 2.26.2

2 1

[PATCH] kernel32: Call OutputDebugStringA when invalid heap is destroyed.
by Rémi Bernon 18 Nov '20

18 Nov '20

And when PEB->BeingDebugged is set. Lords Of The Fallen anti-debug does this and only succeeds if an OutputDebugStringA exception is received. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/heap.c | 5 +++ dlls/kernel32/tests/heap.c | 69 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b7bd6f5f91d..121cf931e43 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -135,6 +135,11 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) return TRUE; } if (!RtlDestroyHeap( heap )) return TRUE; + if (NtCurrentTeb()->Peb->BeingDebugged) + { + OutputDebugStringA( "Attempt to destroy an invalid heap\n" ); + DbgBreakPoint(); + } SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fa372b14e21..63d294999d2 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -626,6 +626,74 @@ static void test_HeapCreate(void) ok(HeapDestroy(heap),"HeapDestroy failed\n"); } +static BOOL test_heap_destroy_dbgstr = FALSE; +static BOOL test_heap_destroy_break = FALSE; + +static LONG CALLBACK test_heap_destroy_except_handler( EXCEPTION_POINTERS *eptrs ) +{ + if (eptrs->ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) + { +#if defined( __i386__ ) + eptrs->ContextRecord->Eip += 1; + test_heap_destroy_break = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; +#elif defined( __x86_64__ ) + eptrs->ContextRecord->Rip += 1; + test_heap_destroy_break = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; +#endif + } + + if (eptrs->ExceptionRecord->ExceptionCode == DBG_PRINTEXCEPTION_C) + { + test_heap_destroy_dbgstr = TRUE; + return (LONG)EXCEPTION_CONTINUE_EXECUTION; + } + + return (LONG)EXCEPTION_CONTINUE_SEARCH; +} + +/* partially copied from ntdll/heap.c */ +#define HEAP_VALIDATE_PARAMS 0x40000000 + +struct heap +{ + DWORD_PTR unknown1[2]; + DWORD unknown2[2]; + DWORD_PTR unknown3[4]; + DWORD unknown4; + DWORD_PTR unknown5[2]; + DWORD unknown6[3]; + DWORD_PTR unknown7[2]; + DWORD flags; + DWORD force_flags; + DWORD_PTR unknown8[6]; +}; + +static void test_HeapDestroy( void ) +{ + const struct heap invalid = {{0, 0}, {0, HEAP_VALIDATE_PARAMS}, {0, 0, 0, 0}, 0, {0, 0}, {0, 0, 0}, {0, 0}, HEAP_VALIDATE_PARAMS, 0, {0}}; + HANDLE heap = (HANDLE)&invalid; + PEB *Peb = NtCurrentTeb()->Peb; + BOOL ret, debugged; + + AddVectoredExceptionHandler( TRUE, test_heap_destroy_except_handler ); + + SetLastError( 0xdeadbeef ); + test_heap_destroy_dbgstr = FALSE; + test_heap_destroy_break = FALSE; + debugged = Peb->BeingDebugged; + Peb->BeingDebugged = TRUE; + ret = HeapDestroy( heap ); + ok( !ret, "HeapDestroy with invalid heap succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, + "HeapDestroy error %u, expected ERROR_INVALID_HANDLE\n", GetLastError() ); + ok( test_heap_destroy_dbgstr, "HeapDestroy didn't call OutputDebugStrA\n" ); + ok( test_heap_destroy_break, "HeapDestroy didn't call DbgBreakPoint\n" ); + Peb->BeingDebugged = debugged; + + RemoveVectoredExceptionHandler( test_heap_destroy_except_handler ); +} static void test_GlobalAlloc(void) { @@ -1233,6 +1301,7 @@ START_TEST(heap) test_heap(); test_obsolete_flags(); test_HeapCreate(); + test_HeapDestroy(); test_GlobalAlloc(); test_LocalAlloc(); -- 2.29.2

2 1

[PATCH] winmm/tests: Use a string literal instead of a char array.
by Michael Stefaniuc 18 Nov '20

18 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/mcicda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index f6e126d29d1..73668c21031 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -553,7 +553,7 @@ static void test_openclose(HWND hwnd) MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; MCIERROR err; - char drive[] = {'a',':','\\','X','\0'}; + char drive[] = "a:\\X"; if (ok_open == MCIERR_CANNOT_LOAD_DRIVER) { /* todo_wine Every open below should yield this same error. */ skip("CD-ROM device likely not installed or disabled.\n"); -- 2.26.2

2 1

[PATCH] winmm: Use wide-char string literals.
by Michael Stefaniuc 18 Nov '20

18 Nov '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/driver.c | 12 +++---- dlls/winmm/lolvldrv.c | 5 +-- dlls/winmm/mci.c | 75 +++++++++++++++-------------------------- dlls/winmm/playsound.c | 52 +++++++++------------------- dlls/winmm/tests/wave.c | 7 ++-- dlls/winmm/waveform.c | 3 +- 6 files changed, 52 insertions(+), 102 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 24db0edc37a..0ddc81dc717 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -46,8 +46,6 @@ static CRITICAL_SECTION_DEBUG mmdriver_lock_debug = static CRITICAL_SECTION mmdriver_lock = { &mmdriver_lock_debug, -1, 0, 0, 0, 0 }; static LPWINE_DRIVER lpDrvItemList /* = NULL */; -static const WCHAR HKLM_BASE[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; static void DRIVER_Dump(const char *comment) { @@ -246,12 +244,11 @@ BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz) { HKEY hKey, hSecKey; DWORD bufLen, lRet; - static const WCHAR wszSystemIni[] = {'S','Y','S','T','E','M','.','I','N','I',0}; - WCHAR wsznull = '\0'; TRACE("registry: %s, %s, %p, %d\n", debugstr_w(keyName), debugstr_w(sectName), buf, sz); - lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, HKLM_BASE, 0, KEY_QUERY_VALUE, &hKey); + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", + 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { lRet = RegOpenKeyExW(hKey, sectName, 0, KEY_QUERY_VALUE, &hSecKey); if (lRet == ERROR_SUCCESS) { @@ -266,7 +263,7 @@ BOOL DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz) /* default to system.ini if we can't find it in the registry, * to support native installations where system.ini is still used */ TRACE("system.ini: %s, %s, %p, %d\n", debugstr_w(keyName), debugstr_w(sectName), buf, sz); - return GetPrivateProfileStringW(sectName, keyName, &wsznull, buf, sz / sizeof(WCHAR), wszSystemIni); + return GetPrivateProfileStringW(sectName, keyName, L"", buf, sz / sizeof(WCHAR), L"SYSTEM.INI"); } /************************************************************************** @@ -391,12 +388,11 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar DRIVER_Dump("BEFORE:"); if (lsn == NULL) { - static const WCHAR wszDrivers32[] = {'D','r','i','v','e','r','s','3','2',0}; lstrcpynW(libName, lpDriverName, ARRAY_SIZE(libName)); if ((lpDrv = DRIVER_TryOpenDriver32(libName, lParam))) goto the_end; - lsn = wszDrivers32; + lsn = L"Drivers32"; } if (DRIVER_GetLibName(lpDriverName, lsn, libName, sizeof(libName)) && (lpDrv = DRIVER_TryOpenDriver32(libName, lParam))) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index f03eac61ad8..d5efc7f6b9f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -498,9 +498,6 @@ static void MMDRV_Init(void) char *drvA; HRESULT init_hr, hr; - static const WCHAR wine_info_deviceW[] = {'W','i','n','e',' ', - 'i','n','f','o',' ','d','e','v','i','c','e',0}; - TRACE("()\n"); init_hr = CoInitialize(NULL); @@ -512,7 +509,7 @@ static void MMDRV_Init(void) goto exit; } - hr = IMMDeviceEnumerator_GetDevice(devenum, wine_info_deviceW, &device); + hr = IMMDeviceEnumerator_GetDevice(devenum, L"Wine info device", &device); IMMDeviceEnumerator_Release(devenum); if(FAILED(hr)){ ERR("GetDevice failed: %08x\n", hr); diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 870f5d1ca24..c19ab453290 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -62,12 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mci); #define MCI_MAGIC 0x0001 /* MCI settings */ -static const WCHAR wszHklmMci [] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','M','C','I',0}; -static const WCHAR wszNull [] = {0}; -static const WCHAR wszAll [] = {'A','L','L',0}; -static const WCHAR wszMci [] = {'M','C','I',0}; -static const WCHAR wszOpen [] = {'o','p','e','n',0}; -static const WCHAR wszSystemIni[] = {'s','y','s','t','e','m','.','i','n','i',0}; +static const WCHAR wszHklmMci [] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\MCI"; static WINE_MCIDRIVER *MciDrivers; @@ -114,7 +109,7 @@ static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) if (!lpstrName) return 0; - if (!wcsicmp(lpstrName, wszAll)) + if (!wcsicmp(lpstrName, L"ALL")) return MCI_ALL_DEVICE_ID; EnterCriticalSection(&WINMM_cs); @@ -523,11 +518,9 @@ static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len) { LPCWSTR tmp; HKEY hKey; - static const WCHAR keyW[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'M','C','I',' ','E','x','t','e','n','s','i','o','n','s',0}; if ((tmp = wcsrchr(fileName, '.'))) { - if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, keyW, + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions", 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { DWORD dwLen = len; LONG lRet = RegQueryValueExW( hKey, tmp + 1, 0, 0, (void*)buf, &dwLen ); @@ -668,8 +661,7 @@ static UINT MCI_GetCommandTable(UINT uDevType) str = buf; } } else if (uDevType == 0) { - static const WCHAR wszCore[] = {'C','O','R','E',0}; - str = wszCore; + str = L"CORE"; } uTbl = MCI_NO_COMMAND_TABLE; if (str) { @@ -793,7 +785,7 @@ static BOOL MCI_OpenMciDriver(LPWINE_MCIDRIVER wmd, LPCWSTR drvTyp, DWORD_PTR lp { WCHAR libName[128]; - if (!DRIVER_GetLibName(drvTyp, wszMci, libName, sizeof(libName))) + if (!DRIVER_GetLibName(drvTyp, L"MCI", libName, sizeof(libName))) return FALSE; /* First load driver */ @@ -843,7 +835,7 @@ static DWORD MCI_LoadMciDriver(LPCWSTR _strDevTyp, LPWINE_MCIDRIVER* lpwmd) /* silence warning if all is used... some bogus program use commands like * 'open all'... */ - if (wcsicmp(strDevTyp, wszAll) == 0) { + if (wcsicmp(strDevTyp, L"ALL") == 0) { dwRet = MCIERR_CANNOT_USE_ALL; } else { FIXME("Couldn't load driver for type %s.\n", @@ -1198,11 +1190,6 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD retType, MCI_GENERIC_PARMS *params, LPWSTR lpstrRet, UINT uRetLen) { - static const WCHAR fmt_d [] = {'%','d',0}; - static const WCHAR fmt_d4 [] = {'%','d',' ','%','d',' ','%','d',' ','%','d',0}; - static const WCHAR wszCol3[] = {'%','0','2','d',':','%','0','2','d',':','%','0','2','d',0}; - static const WCHAR wszCol4[] = {'%','0','2','d',':','%','0','2','d',':','%','0','2','d',':','%','0','2','d',0}; - if (lpstrRet) { switch (retType) { case 0: /* nothing to return */ @@ -1213,7 +1200,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret switch (dwRet & 0xFFFF0000ul) { case 0: case MCI_INTEGER_RETURNED: - swprintf(lpstrRet, uRetLen, fmt_d, data); + swprintf(lpstrRet, uRetLen, L"%d", data); break; case MCI_RESOURCE_RETURNED: /* return string which ID is HIWORD(data), @@ -1228,12 +1215,12 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret HIWORD(data), lpstrRet, uRetLen); break; case MCI_COLONIZED3_RETURN: - swprintf(lpstrRet, uRetLen, wszCol3, + swprintf(lpstrRet, uRetLen, L"%02d:%02d:%02d", LOBYTE(LOWORD(data)), HIBYTE(LOWORD(data)), LOBYTE(HIWORD(data))); break; case MCI_COLONIZED4_RETURN: - swprintf(lpstrRet, uRetLen, wszCol4, + swprintf(lpstrRet, uRetLen, L"%02d:%02d:%02d:%02d", LOBYTE(LOWORD(data)), HIBYTE(LOWORD(data)), LOBYTE(HIWORD(data)), HIBYTE(HIWORD(data))); break; @@ -1244,12 +1231,11 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret #ifdef MCI_INTEGER64 case MCI_INTEGER64: { - static const WCHAR fmt_ld [] = {'%','l','d',0}; DWORD_PTR data = *(DWORD_PTR *)(params + 1); switch (dwRet & 0xFFFF0000ul) { case 0: case MCI_INTEGER_RETURNED: - swprintf(lpstrRet, uRetLen, fmt_ld, data); + swprintf(lpstrRet, uRetLen, L"%ld", data); break; case MCI_RESOURCE_RETURNED: /* return string which ID is HIWORD(data), @@ -1264,12 +1250,12 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret HIWORD(data), lpstrRet, uRetLen); break; case MCI_COLONIZED3_RETURN: - swprintf(lpstrRet, uRetLen, wszCol3, + swprintf(lpstrRet, uRetLen, L"%02d:%02d:%02d", LOBYTE(LOWORD(data)), HIBYTE(LOWORD(data)), LOBYTE(HIWORD(data))); break; case MCI_COLONIZED4_RETURN: - swprintf(lpstrRet, uRetLen, wszCol4, + swprintf(lpstrRet, uRetLen, L"%02d:%02d:%02d:%02d", LOBYTE(LOWORD(data)), HIBYTE(LOWORD(data)), LOBYTE(HIWORD(data)), HIBYTE(HIWORD(data))); break; @@ -1287,7 +1273,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret { DWORD *data = (DWORD *)(params + 1); *data = *(LPDWORD)lpstrRet; - swprintf(lpstrRet, uRetLen, fmt_d, *data); + swprintf(lpstrRet, uRetLen, L"%d", *data); break; } default: @@ -1300,7 +1286,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret DWORD *data = (DWORD *)(params + 1); if (dwRet & 0xFFFF0000ul) WARN("Oooch. MCI_STRING and HIWORD(dwRet)=%04x\n", HIWORD(dwRet)); - swprintf(lpstrRet, uRetLen, fmt_d4, data[0], data[1], data[2], data[3]); + swprintf(lpstrRet, uRetLen, L"%d %d %d %d", data[0], data[1], data[2], data[3]); break; } default: FIXME("Unknown MCI return type %d\n", retType); @@ -1323,9 +1309,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, DWORD retType; LPCWSTR lpCmd = 0; WORD wMsg = 0; - static const WCHAR wszNew[] = {'n','e','w',0}; - static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; - static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; union { MCI_GENERIC_PARMS generic; @@ -1358,17 +1341,17 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if ((dwRet = MCI_GetString(&dev, &args))) { goto errCleanUp; } - uDevID = wcsicmp(dev, wszAll) ? 0 : MCI_ALL_DEVICE_ID; + uDevID = wcsicmp(dev, L"ALL") ? 0 : MCI_ALL_DEVICE_ID; /* Determine devType from open */ - if (!wcscmp(verb, wszOpen)) { + if (!wcscmp(verb, L"open")) { LPWSTR tmp; WCHAR buf[128]; /* case dev == 'new' has to be handled */ - if (!wcscmp(dev, wszNew)) { + if (!wcscmp(dev, L"new")) { dev = 0; - if ((devType = wcsstr(args, wszTypeS)) != NULL) { + if ((devType = wcsstr(args, L"type ")) != NULL) { devType += 5; tmp = wcschr(devType, ' '); if (tmp) *tmp = '\0'; @@ -1381,7 +1364,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, goto errCleanUp; } dwFlags |= MCI_OPEN_ELEMENT; - data.open.lpstrElementName = &wszNull[0]; + data.open.lpstrElementName = &L""[0]; } else if ((devType = wcschr(dev, '!')) != NULL) { *devType++ = '\0'; tmp = devType; devType = dev; dev = tmp; @@ -1391,7 +1374,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; data.open.lpstrElementName = dev; - } else if (DRIVER_GetLibName(dev, wszMci, buf, sizeof(buf))) { + } else if (DRIVER_GetLibName(dev, L"MCI", buf, sizeof(buf))) { /* this is the name of a mci driver's type */ tmp = wcschr(dev, ' '); if (tmp) *tmp = '\0'; @@ -1400,7 +1383,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; } else { - if ((devType = wcsstr(args, wszTypeS)) != NULL) { + if ((devType = wcsstr(args, L"type ")) != NULL) { devType += 5; tmp = wcschr(devType, ' '); if (tmp) *tmp = '\0'; @@ -1420,7 +1403,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCIERR_CANNOT_USE_ALL; goto errCleanUp; } - if (!wcsstr(args, wszSAliasS) && !dev) { + if (!wcsstr(args, L" alias ") && !dev) { dwRet = MCIERR_NEW_REQUIRES_ALIAS; goto errCleanUp; } @@ -1444,9 +1427,8 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, break; default: { - static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; WCHAR buf[138], retbuf[6]; - swprintf(buf, ARRAY_SIZE(buf), wszOpenWait, dev); + swprintf(buf, ARRAY_SIZE(buf), L"open %s wait", dev); /* open via mciSendString handles quoting, dev!file syntax and alias creation */ if ((dwRet = mciSendStringW(buf, retbuf, ARRAY_SIZE(retbuf), 0)) != 0) goto errCleanUp; @@ -1537,7 +1519,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, switch (wMsg) { case MCI_OPEN: - if (wcscmp(verb, wszOpen)) { + if (wcscmp(verb, L"open")) { FIXME("Cannot open with command %s\n", debugstr_w(verb)); dwRet = MCIERR_DRIVER_INTERNAL; wMsg = 0; @@ -1795,13 +1777,12 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) if (!strDevTyp[0] && MCI_GetDevTypeFromFileName(lpParms->lpstrElementName, strDevTyp, sizeof(strDevTyp))) { - static const WCHAR wszCdAudio[] = {'C','D','A','U','D','I','O',0}; if (GetDriveTypeW(lpParms->lpstrElementName) != DRIVE_CDROM) { dwRet = MCIERR_EXTENSION_NOT_FOUND; goto errCleanUp; } /* FIXME: this will not work if several CDROM drives are installed on the machine */ - lstrcpyW(strDevTyp, wszCdAudio); + lstrcpyW(strDevTyp, L"CDAUDIO"); } } @@ -1940,7 +1921,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); RegCloseKey( hKey ); } - if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, ARRAY_SIZE(buf), wszSystemIni)) + if (GetPrivateProfileStringW(L"MCI", 0, L"", buf, ARRAY_SIZE(buf), L"system.ini")) for (s = buf; *s; s += lstrlenW(s) + 1) cnt++; } } else { @@ -2018,7 +1999,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm RegCloseKey( hKey ); } if (!s) { - if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, ARRAY_SIZE(buf), wszSystemIni)) { + if (GetPrivateProfileStringW(L"MCI", 0, L"", buf, ARRAY_SIZE(buf), L"system.ini")) { for (p = buf; *p; p += lstrlenW(p) + 1, cnt++) { TRACE("%d: %s\n", cnt, debugstr_w(p)); if (cnt == lpParms->dwNumber - 1) { diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index be3f9d4c80b..d74e5a7af4a 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -55,12 +55,11 @@ static HMMIO get_mmioFromFile(LPCWSTR lpszName) HMMIO ret; WCHAR buf[256]; LPWSTR dummy; - static const WCHAR dotwav[] = {'.','w','a','v',0}; ret = mmioOpenW((LPWSTR)lpszName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (ret != 0) return ret; - if (SearchPathW(NULL, lpszName, dotwav, ARRAY_SIZE(buf), buf, &dummy)) + if (SearchPathW(NULL, lpszName, L".wav", ARRAY_SIZE(buf), buf, &dummy)) { return mmioOpenW(buf, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); @@ -76,21 +75,12 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) HKEY hRegSnd, hRegApp, hScheme, hSnd; DWORD err, type, count; - static const WCHAR wszSounds[] = {'S','o','u','n','d','s',0}; - static const WCHAR wszDefault[] = {'D','e','f','a','u','l','t',0}; - static const WCHAR wszKey[] = {'A','p','p','E','v','e','n','t','s','\\', - 'S','c','h','e','m','e','s','\\', - 'A','p','p','s',0}; - static const WCHAR wszDotDefault[] = {'.','D','e','f','a','u','l','t',0}; - static const WCHAR wszDotCurrent[] = {'.','C','u','r','r','e','n','t',0}; - static const WCHAR wszNull[] = {0}; - TRACE("searching in SystemSound list for %s\n", debugstr_w(lpszName)); - GetProfileStringW(wszSounds, lpszName, wszNull, str, ARRAY_SIZE(str)); + GetProfileStringW(L"Sounds", lpszName, L"", str, ARRAY_SIZE(str)); if (!*str) { if (uFlags & SND_NODEFAULT) goto next; - GetProfileStringW(wszSounds, wszDefault, wszNull, str, ARRAY_SIZE(str)); + GetProfileStringW(L"Sounds", L"Default", L"", str, ARRAY_SIZE(str)); if (!*str) goto next; } for (ptr = str; *ptr && *ptr != ','; ptr++); @@ -102,7 +92,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) * HKCU\AppEvents\Schemes\Apps\.Default * HKCU\AppEvents\Schemes\Apps\<AppName> */ - if (RegOpenKeyW(HKEY_CURRENT_USER, wszKey, &hRegSnd) != 0) goto none; + if (RegOpenKeyW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps", &hRegSnd) != 0) goto none; if (uFlags & SND_APPLICATION) { DWORD len; @@ -124,7 +114,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) } else { - err = RegOpenKeyW(hRegSnd, wszDotDefault, &hRegApp); + err = RegOpenKeyW(hRegSnd, L".Default", &hRegApp); } RegCloseKey(hRegSnd); if (err != 0) goto none; @@ -132,10 +122,10 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) RegCloseKey(hRegApp); if (err != 0) goto none; /* what's the difference between .Current and .Default ? */ - err = RegOpenKeyW(hScheme, wszDotDefault, &hSnd); + err = RegOpenKeyW(hScheme, L".Default", &hSnd); if (err != 0) { - err = RegOpenKeyW(hScheme, wszDotCurrent, &hSnd); + err = RegOpenKeyW(hScheme, L".Current", &hSnd); RegCloseKey(hScheme); if (err != 0) goto none; @@ -279,11 +269,10 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) /* if resource, grab it */ if ((wps->fdwSound & SND_RESOURCE) == SND_RESOURCE) { - static const WCHAR wszWave[] = {'W','A','V','E',0}; HRSRC hRes; HGLOBAL hGlob; - if ((hRes = FindResourceW(wps->hMod, wps->pszSound, wszWave)) == 0 || + if ((hRes = FindResourceW(wps->hMod, wps->pszSound, L"WAVE")) == 0 || (hGlob = LoadResource(wps->hMod, hRes)) == 0) goto errCleanUp; if ((data = LockResource(hGlob)) == NULL) { @@ -310,32 +299,23 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) { if ((wps->fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { - static const WCHAR wszSystemAsterisk[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; - static const WCHAR wszSystemDefault[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t',0}; - static const WCHAR wszSystemExclamation[] = {'S','y','s','t','e','m','E','x','c','l','a','m','a','t','i','o','n',0}; - static const WCHAR wszSystemExit[] = {'S','y','s','t','e','m','E','x','i','t',0}; - static const WCHAR wszSystemHand[] = {'S','y','s','t','e','m','H','a','n','d',0}; - static const WCHAR wszSystemQuestion[] = {'S','y','s','t','e','m','Q','u','e','s','t','i','o','n',0}; - static const WCHAR wszSystemStart[] = {'S','y','s','t','e','m','S','t','a','r','t',0}; - static const WCHAR wszSystemWelcome[] = {'S','y','s','t','e','m','W','e','l','c','o','m','e',0}; - wps->fdwSound &= ~(SND_ALIAS_ID ^ SND_ALIAS); if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMASTERISK) - wps->pszSound = wszSystemAsterisk; + wps->pszSound = L"SystemAsterisk"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMDEFAULT) - wps->pszSound = wszSystemDefault; + wps->pszSound = L"SystemDefault"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMEXCLAMATION) - wps->pszSound = wszSystemExclamation; + wps->pszSound = L"SystemExclamation"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMEXIT) - wps->pszSound = wszSystemExit; + wps->pszSound = L"SystemExit"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMHAND) - wps->pszSound = wszSystemHand; + wps->pszSound = L"SystemHand"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMQUESTION) - wps->pszSound = wszSystemQuestion; + wps->pszSound = L"SystemQuestion"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMSTART) - wps->pszSound = wszSystemStart; + wps->pszSound = L"SystemStart"; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMWELCOME) - wps->pszSound = wszSystemWelcome; + wps->pszSound = L"SystemWelcome"; else goto errCleanUp; } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index eec1ba2a034..819489e5566 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1542,9 +1542,6 @@ static void test_sndPlaySound(void) { BOOL br; - static const WCHAR not_existW[] = {'C',':','\\','n','o','t','_','e','x','i','s','t','.','w','a','v',0}; - static const WCHAR SystemAsteriskW[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; - br = sndPlaySoundA((LPCSTR)SND_ALIAS_SYSTEMASTERISK, SND_ALIAS_ID|SND_SYNC); ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); @@ -1560,13 +1557,13 @@ static void test_sndPlaySound(void) br = sndPlaySoundA("SystemAsterisk", SND_ALIAS|SND_SYNC); ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); - br = sndPlaySoundW(SystemAsteriskW, SND_ALIAS|SND_SYNC); + br = sndPlaySoundW(L"SystemAsterisk", SND_ALIAS|SND_SYNC); ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); br = sndPlaySoundA("C:\not_exist.wav", SND_FILENAME|SND_SYNC); ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); - br = sndPlaySoundW(not_existW, SND_FILENAME|SND_SYNC); + br = sndPlaySoundW(L"C:\\not_exist.wav", SND_FILENAME|SND_SYNC); ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); } diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 39461743c4a..9d58b78c779 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2458,7 +2458,6 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) { HANDLE evt = arg; HRESULT hr; - static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if(FAILED(hr)){ @@ -2480,7 +2479,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) FreeLibraryAndExitThread(g_devthread_module, 1); } - g_devices_hwnd = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, + g_devices_hwnd = CreateWindowW(L"Message", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); if(!g_devices_hwnd){ WARN("CreateWindow failed: %d\n", GetLastError()); -- 2.26.2

3 2

[PATCH 15/15] msvcrt: Lock global locale in _get_current_locale.
by Piotr Caban 18 Nov '20

18 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)

1 0

[PATCH 14/15] msvcrt: Increment refcounts for all locale data in _get_current_locale().
by Piotr Caban 18 Nov '20

18 Nov '20

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 52 ++++++++++++++++-------------------- dlls/msvcrt/locale.c | 19 ++++++++++--- 2 files changed, 39 insertions(+), 32 deletions(-)

1 0

[PATCH 13/15] msvcrt: Simplify category checks in create_locinfo.
by Piotr Caban 18 Nov '20

18 Nov '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 48 ++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 22 deletions(-)

1 0

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-devel