December 2018 - Wine-Commits

Nikolay Sivov : windowscodecs: Fix return values for scaler's CopyPalette( ).
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 8d75d949a6b36d4fce944272b058cd2290da48f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d75d949a6b36d4fce944272… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:36:41 2018 +0300 windowscodecs: Fix return values for scaler's CopyPalette(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 3789831..eedc1bb 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -163,7 +163,7 @@ static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, return E_INVALIDARG; if (!This->source) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_PALETTEUNAVAILABLE; return IWICBitmapSource_CopyPalette(This->source, pIPalette); } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 2b5c373..d4b5979 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1084,6 +1084,7 @@ static void test_bitmap_scaler(void) { WICPixelFormatGUID pixel_format; IWICBitmapScaler *scaler; + IWICPalette *palette; double res_x, res_y; IWICBitmap *bitmap; UINT width, height; @@ -1148,6 +1149,15 @@ static void test_bitmap_scaler(void) ok(width == 123, "Unexpected width %u.\n", width); ok(height == 321, "Unexpected height %u.\n", height); + hr = IWICBitmapScaler_CopyPalette(scaler, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -1224,6 +1234,12 @@ static void test_bitmap_scaler(void) ok(hr == S_OK, "Failed to get scaler resolution, hr %#x.\n", hr); ok(res_x == 0.0 && res_y == 0.0, "Unexpected resolution %f x %f.\n", res_x, res_y); + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "Failed to create a palette, hr %#x.\n", hr); + hr = IWICBitmapScaler_CopyPalette(scaler, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#x.\n", hr); + IWICPalette_Release(palette); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap);

1 0

Hans Leidekker : webservices: Properly check the input buffer type in WsMoveReader.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 29ab52044505000bbd2ca381a278fdc096eb28b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29ab52044505000bbd2ca381… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:27 2018 +0100 webservices: Properly check the input buffer type in WsMoveReader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ba6a951..9a9d491 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -653,6 +653,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!reader) return E_INVALIDARG; @@ -3582,7 +3583,7 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found return E_INVALIDARG; } - if (!reader->input_type) hr = WS_E_INVALID_OPERATION; + if (reader->input_type != WS_XML_READER_INPUT_TYPE_BUFFER) hr = WS_E_INVALID_OPERATION; else hr = read_move_to( reader, move, found ); LeaveCriticalSection( &reader->cs ); @@ -6982,8 +6983,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { if (input->inputType == WS_XML_READER_INPUT_TYPE_BUFFER) { - WS_XML_READER_TEXT_ENCODING *text = (WS_XML_READER_TEXT_ENCODING *)encoding; - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + const WS_XML_READER_TEXT_ENCODING *text = (const WS_XML_READER_TEXT_ENCODING *)encoding; + const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; if (text->charSet != WS_CHARSET_AUTO) reader->input_charset = text->charSet; else reader->input_charset = detect_charset( buf->encodedData, buf->encodedDataSize, &offset ); } @@ -6993,7 +6994,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * } case WS_XML_READER_ENCODING_TYPE_BINARY: { - WS_XML_READER_BINARY_ENCODING *bin = (WS_XML_READER_BINARY_ENCODING *)encoding; + const WS_XML_READER_BINARY_ENCODING *bin = (const WS_XML_READER_BINARY_ENCODING *)encoding; reader->input_enc = WS_XML_READER_ENCODING_TYPE_BINARY; reader->input_charset = 0; reader->dict_static = bin->staticDictionary ? bin->staticDictionary : &dict_builtin_static.dict; @@ -7010,13 +7011,13 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * { case WS_XML_READER_INPUT_TYPE_BUFFER: { - WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; + const WS_XML_READER_BUFFER_INPUT *buf = (const WS_XML_READER_BUFFER_INPUT *)input; set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); break; } case WS_XML_READER_INPUT_TYPE_STREAM: { - WS_XML_READER_STREAM_INPUT *stream = (WS_XML_READER_STREAM_INPUT *)input; + const WS_XML_READER_STREAM_INPUT *stream = (const WS_XML_READER_STREAM_INPUT *)input; if (!reader->stream_buf && !(reader->stream_buf = heap_alloc( STREAM_BUFSIZE ))) { hr = E_OUTOFMEMORY;

1 0

Roderick Colenbrander : ntdll: Print FIXME on systems supporting more CPU cores than supported.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 3c329e28d9ffabacdf1a3075a1dab27f68b1a9fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c329e28d9ffabacdf1a3075… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:17 2018 -0800 ntdll: Print FIXME on systems supporting more CPU cores than supported. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index db51a98..dcf9123 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1634,6 +1634,44 @@ static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR * const mask) return TRUE; } +/* Helper function for counting number of elements in interval lists as used by + * the Linux kernel. The format is comma separated list of intervals of which + * each interval has the format of "begin-end" where begin and end are decimal + * numbers. E.g. "0-7", "0-7,16-23" + * + * Example files include: + * - /sys/devices/system/cpu/online + * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_list + * - /sys/devices/system/cpu/cpu0/topology/thread_siblings_list. + */ +static BOOL sysfs_count_list_elements(const char *filename, DWORD *result) +{ + FILE *f; + + f = fopen(filename, "r"); + if (!f) + return FALSE; + + while (!feof(f)) + { + char op; + DWORD beg, end; + + if (!fscanf(f, "%u%c ", &beg, &op)) + break; + + if(op == '-') + fscanf(f, "%u%c ", &end, &op); + else + end = beg; + + *result += end - beg + 1; + } + + fclose(f); + return TRUE; +} + /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) @@ -1643,10 +1681,24 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** static const char numa_info[] = "/sys/devices/system/node/node%u/cpumap"; FILE *fcpu_list, *fnuma_list, *f; - DWORD len = 0, beg, end, i, j, r, num_cpus = 0; + DWORD len = 0, beg, end, i, j, r, num_cpus = 0, max_cpus = 0; char op, name[MAX_PATH]; ULONG_PTR all_cpus_mask = 0; + /* On systems with a large number of CPU cores (32 or 64 depending on 32-bit or 64-bit), + * we have issues parsing processor information: + * - ULONG_PTR masks as used in data structures can't hold all cores. Requires splitting + * data appropriately into "processor groups". We are hard coding 1. + * - Thread affinity code in wineserver and our CPU parsing code here work independently. + * So far the Windows mask applied directly to Linux, but process groups break that. + * (NUMA systems you may have multiple non-full groups.) + */ + if(sysfs_count_list_elements("/sys/devices/system/cpu/present", &max_cpus) && max_cpus > MAXIMUM_PROCESSORS) + { + FIXME("Improve CPU info reporting: system supports %u logical cores, but only %u supported!\n", + max_cpus, MAXIMUM_PROCESSORS); + } + fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); if(!fcpu_list) return STATUS_NOT_IMPLEMENTED;

1 0

Alex Henrie : cryptui: Turn static variable 'import_filters' into a constant.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: d141f9585abe410156be02ec3f809a2cfaa9feb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d141f9585abe410156be02ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:50 2018 -0700 cryptui: Turn static variable 'import_filters' into a constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b62ce9e..1fbe63e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4905,7 +4905,7 @@ static const WCHAR filter_cms[] = { '*','.','s','p','c',';','*','.', 'p','7','b',0 }; static const WCHAR filter_all[] = { '*','.','*',0 }; -static struct StringToFilter +static const struct { int id; DWORD allowFlags;

1 0

Zebediah Figura : ntdll: Use a critical section to ensure that RtlWaitOnAddress compares and queues atomically.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 6060d2703c2e1382f076ad40ea43980781eaca2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6060d2703c2e1382f076ad40… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 19:03:57 2018 -0600 ntdll: Use a critical section to ensure that RtlWaitOnAddress compares and queues atomically. Currently a wake may occur between calling compare_addr() and performing the select request; in that case the thread will never be woken. Prevent this by taking a CS around both operations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46099 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index e1a48d7..62cb3cd 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1961,6 +1961,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, return status; } +static RTL_CRITICAL_SECTION addr_section; +static RTL_CRITICAL_SECTION_DEBUG addr_section_debug = +{ + 0, 0, &addr_section, + { &addr_section_debug.ProcessLocksList, &addr_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": addr_section") } +}; +static RTL_CRITICAL_SECTION addr_section = { &addr_section_debug, -1, 0, 0, 0, 0 }; + static BOOL compare_addr( const void *addr, const void *cmp, SIZE_T size ) { switch (size) @@ -2004,8 +2013,12 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size for (;;) { + RtlEnterCriticalSection( &addr_section ); if (!compare_addr( addr, cmp, size )) + { + RtlLeaveCriticalSection( &addr_section ); return STATUS_SUCCESS; + } SERVER_START_REQ( select ) { @@ -2021,6 +2034,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size call = reply->call; } SERVER_END_REQ; + + RtlLeaveCriticalSection( &addr_section ); + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); if (ret != STATUS_USER_APC) break; if (invoke_apc( &call, &result )) @@ -2043,7 +2059,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size */ void WINAPI RtlWakeAddressAll( const void *addr ) { + RtlEnterCriticalSection( &addr_section ); while (NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ) == STATUS_SUCCESS) {} + RtlLeaveCriticalSection( &addr_section ); } /*********************************************************************** @@ -2051,5 +2069,7 @@ void WINAPI RtlWakeAddressAll( const void *addr ) */ void WINAPI RtlWakeAddressSingle( const void *addr ) { + RtlEnterCriticalSection( &addr_section ); NtReleaseKeyedEvent( 0, addr, 0, &zero_timeout ); + RtlLeaveCriticalSection( &addr_section ); }

1 0

Frédéric Fauberteau : wineserver: Support debug registers on NetBSD.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 708a2c991f8efab99663adaa2bbb963b9dff4f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=708a2c991f8efab99663adaa… Author: Frédéric Fauberteau <triaxx(a)NetBSD.org> Date: Tue Dec 4 12:54:43 2018 +0100 wineserver: Support debug registers on NetBSD. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46229 Signed-off-by: Frédéric Fauberteau <triaxx(a)NetBSD.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/ptrace.c b/server/ptrace.c index 4eda8eb..808328e 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -720,6 +720,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.i386_regs.dr3 = DBREG_DRX((&dbregs), 3); context->debug.i386_regs.dr6 = DBREG_DRX((&dbregs), 6); context->debug.i386_regs.dr7 = DBREG_DRX((&dbregs), 7); +#elif defined(__NetBSD__) + context->debug.i386_regs.dr0 = dbregs.dr[0]; + context->debug.i386_regs.dr1 = dbregs.dr[1]; + context->debug.i386_regs.dr2 = dbregs.dr[2]; + context->debug.i386_regs.dr3 = dbregs.dr[3]; + context->debug.i386_regs.dr6 = dbregs.dr[6]; + context->debug.i386_regs.dr7 = dbregs.dr[7]; #else context->debug.i386_regs.dr0 = dbregs.dr0; context->debug.i386_regs.dr1 = dbregs.dr1; @@ -754,6 +761,15 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign DBREG_DRX((&dbregs), 5) = 0; DBREG_DRX((&dbregs), 6) = context->debug.i386_regs.dr6; DBREG_DRX((&dbregs), 7) = context->debug.i386_regs.dr7; +#elif defined(__NetBSD__) + dbregs.dr[0] = context->debug.i386_regs.dr0; + dbregs.dr[1] = context->debug.i386_regs.dr1; + dbregs.dr[2] = context->debug.i386_regs.dr2; + dbregs.dr[3] = context->debug.i386_regs.dr3; + dbregs.dr[4] = 0; + dbregs.dr[5] = 0; + dbregs.dr[6] = context->debug.i386_regs.dr6; + dbregs.dr[7] = context->debug.i386_regs.dr7; #else dbregs.dr0 = context->debug.i386_regs.dr0; dbregs.dr1 = context->debug.i386_regs.dr1;

1 0

Alex Henrie : oledb32: Make constant 'hexchars' static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: a4adc1d7a809edcdea4e282aeb71ed73cf01483f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4adc1d7a809edcdea4e282a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:57 2018 -0700 oledb32: Make constant 'hexchars' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 971e6d9..f18c756 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -638,7 +638,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = E_OUTOFMEMORY; else { - const char hexchars[] = "0123456789ABCDEF"; + static const char hexchars[] = "0123456789ABCDEF"; WCHAR *s = *d; unsigned char *p = src; while (src_len > 0)

1 0

Alex Henrie : wineandroid.drv: Turn variable 'options' into a static constant.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 6367203572458fb5d680a6c298b82e13ff040102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6367203572458fb5d680a6c2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:43:00 2018 -0700 wineandroid.drv: Turn variable 'options' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 8f428a8..3968536 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -287,8 +287,8 @@ static SLObjectItf outputmix; HRESULT AUDDRV_Init(void) { + static const SLEngineOption options[] = { {SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE} }; SLresult sr; - SLEngineOption options[] = { {SL_ENGINEOPTION_THREADSAFE, SL_BOOLEAN_TRUE} }; sr = pslCreateEngine(&sl, 1, options, 0, NULL, NULL); if(sr != SL_RESULT_SUCCESS){

1 0

Ken Thomases : loader: Move some code in preparation for adding the Mac preloader.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: bd2d795240d996f6cc8884b33e28ea15c2d47afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2d795240d996f6cc8884b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 3 10:46:50 2018 -0600 loader: Move some code in preparation for adding the Mac preloader. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 288 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 140 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 644244b..bf1e658 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -93,6 +93,14 @@ #include "main.h" +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ); + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ); + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); + +static void preload_reserve( const char *str ); + /* ELF definitions */ #define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref) #define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0) @@ -559,85 +567,6 @@ static inline void *wld_memset( void *dest, int val, size_t len ) return dest; } -/* - * wld_printf - just the basics - * - * %x prints a hex number - * %s prints a string - * %p prints a pointer - */ -static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) -{ - static const char hex_chars[16] = "0123456789abcdef"; - const char *p = fmt; - char *str = buffer; - int i; - - while( *p ) - { - if( *p == '%' ) - { - p++; - if( *p == 'x' ) - { - unsigned int x = va_arg( args, unsigned int ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if (p[0] == 'l' && p[1] == 'x') - { - unsigned long x = va_arg( args, unsigned long ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - p++; - } - else if( *p == 'p' ) - { - unsigned long x = (unsigned long)va_arg( args, void * ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if( *p == 's' ) - { - char *s = va_arg( args, char * ); - while(*s) - *str++ = *s++; - } - else if( *p == 0 ) - break; - p++; - } - *str++ = *p++; - } - *str = 0; - return str - buffer; -} - -static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); -} - -static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); - wld_exit(1); -} - #ifdef DUMP_AUX_INFO /* * Dump interesting bits of the ELF auxv_t structure that is passed @@ -1120,67 +1049,6 @@ found: return (void *)(symtab[idx].st_value + map->l_addr); } -/* - * preload_reserve - * - * Reserve a range specified in string format - */ -static void preload_reserve( const char *str ) -{ - const char *p; - unsigned long result = 0; - void *start = NULL, *end = NULL; - int i, first = 1; - - for (p = str; *p; p++) - { - if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; - else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; - else if (*p == '-') - { - if (!first) goto error; - start = (void *)(result & ~page_mask); - result = 0; - first = 0; - } - else goto error; - } - if (!first) end = (void *)((result + page_mask) & ~page_mask); - else if (result) goto error; /* single value '0' is allowed */ - - /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); - start = end = NULL; - } - - /* check for overlap with low memory areas */ - for (i = 0; preload_info[i].size; i++) - { - if ((char *)preload_info[i].addr > (char *)0x00110000) break; - if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) - { - start = end = NULL; - break; - } - if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) - start = (char *)preload_info[i].addr + preload_info[i].size; - } - - while (preload_info[i].size) i++; - preload_info[i].addr = start; - preload_info[i].size = (char *)end - (char *)start; - return; - -error: - fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); -} - /* check if address is in one of the reserved ranges */ static int is_addr_reserved( const void *addr ) { @@ -1374,3 +1242,143 @@ void* wld_start( void **stack ) return (void *)ld_so_map.l_entry; } + +/* + * wld_printf - just the basics + * + * %x prints a hex number + * %s prints a string + * %p prints a pointer + */ +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) +{ + static const char hex_chars[16] = "0123456789abcdef"; + const char *p = fmt; + char *str = buffer; + int i; + + while( *p ) + { + if( *p == '%' ) + { + p++; + if( *p == 'x' ) + { + unsigned int x = va_arg( args, unsigned int ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if (p[0] == 'l' && p[1] == 'x') + { + unsigned long x = va_arg( args, unsigned long ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + p++; + } + else if( *p == 'p' ) + { + unsigned long x = (unsigned long)va_arg( args, void * ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if( *p == 's' ) + { + char *s = va_arg( args, char * ); + while(*s) + *str++ = *s++; + } + else if( *p == 0 ) + break; + p++; + } + *str++ = *p++; + } + *str = 0; + return str - buffer; +} + +static void wld_printf(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); +} + +static void fatal_error(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); + wld_exit(1); +} + +/* + * preload_reserve + * + * Reserve a range specified in string format + */ +static void preload_reserve( const char *str ) +{ + const char *p; + unsigned long result = 0; + void *start = NULL, *end = NULL; + int i, first = 1; + + for (p = str; *p; p++) + { + if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; + else if (*p == '-') + { + if (!first) goto error; + start = (void *)(result & ~page_mask); + result = 0; + first = 0; + } + else goto error; + } + if (!first) end = (void *)((result + page_mask) & ~page_mask); + else if (result) goto error; /* single value '0' is allowed */ + + /* sanity checks */ + if (end <= start) start = end = NULL; + else if ((char *)end > preloader_start && + (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + start = end = NULL; + } + + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } + + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; + return; + +error: + fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); +}

1 0

Sebastian Lackner : loader: Implement preloader for macOS.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: a0ab2a7b0c9c28588714372cf1b19a06dd706b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0ab2a7b0c9c28588714372c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 3 10:46:51 2018 -0600 loader: Implement preloader for macOS. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 46 ++++- configure.ac | 21 ++- dlls/ntdll/virtual.c | 12 +- libs/wine/config.c | 2 +- loader/Makefile.in | 9 +- loader/main.c | 46 +---- loader/preloader.c | 62 ++----- loader/preloader.h | 66 ++++++++ loader/preloader_mac.c | 450 +++++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 616 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0ab2a7b0c9c28588714…

1 0

Roderick Colenbrander : ntdll: Fix parsing thread_siblings bitmaps on high core count systems.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: b9af36933fdf47cbbe139626e98750da72142dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9af36933fdf47cbbe139626… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:16 2018 -0800 ntdll: Fix parsing thread_siblings bitmaps on high core count systems. Linux compiled for a high number of CPU cores, the bitmap is broken into sections of 32-bit by commas. Handle parsing this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45453 Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0e11e0e..db51a98 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1704,13 +1704,8 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** /* Mask of logical threads sharing same physical core in kernel core numbering. */ sprintf(name, core_info, i, "thread_siblings"); - f = fopen(name, "r"); - if(f) - { - fscanf(f, "%lx", &thread_mask); - fclose(f); - } - else thread_mask = 1<<i; + if(!sysfs_parse_bitmap(name, &thread_mask)) + thread_mask = 1<<i; if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, phys_core, thread_mask)) { fclose(fcpu_list);

1 0

Roderick Colenbrander : ntdll: Parse sysfs cpu_shared_map using helper function.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: ed75a7b3443e79f9d63e97eeebcce2d2f40c507b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed75a7b3443e79f9d63e97ee… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:15 2018 -0800 ntdll: Parse sysfs cpu_shared_map using helper function. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index aa6f846..0e11e0e 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1604,6 +1604,36 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT } #ifdef linux +/* Helper function for counting bitmap values as commonly used by the Linux kernel + * for storing CPU masks in sysfs. The format is comma separated lists of hex values + * each max 32-bit e.g. "00ff" or even "00,00000000,0000ffff". + * + * Example files include: + * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map + * - /sys/devices/system/cpu/cpu0/topology/thread_siblings + */ +static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR * const mask) +{ + FILE *f; + DWORD r; + + f = fopen(filename, "r"); + if (!f) + return FALSE; + + while (!feof(f)) + { + char op; + if (!fscanf(f, "%x%c ", &r, &op)) + break; + + *mask = (sizeof(ULONG_PTR)>sizeof(int) ? *mask<<(8*sizeof(DWORD)) : 0) + r; + } + + fclose(f); + return TRUE; +} + /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) @@ -1693,15 +1723,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** ULONG_PTR mask = 0; sprintf(name, cache_info, i, j, "shared_cpu_map"); - f = fopen(name, "r"); - if(!f) continue; - while(!feof(f)) - { - if(!fscanf(f, "%x%c ", &r, &op)) - break; - mask = (sizeof(ULONG_PTR)>sizeof(int) ? mask<<(8*sizeof(DWORD)) : 0) + r; - } - fclose(f); + if(!sysfs_parse_bitmap(name, &mask)) continue; sprintf(name, cache_info, i, j, "level"); f = fopen(name, "r");

1 0

Pierre Schweitzer : mpr: Implement remembered connection enumeration.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 9988bb5e0729178b527052803d3ad670e5e0b46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9988bb5e0729178b52705280… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Dec 1 13:23:06 2018 +0100 mpr: Implement remembered connection enumeration. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 207 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9988bb5e0729178b5270…

1 0

Alex Henrie : cryptui: Have a single empty wide string at the top of main.c.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 9b69fe2332e76984929f9aea49bc779035049513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b69fe2332e76984929f9aea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:01 2018 -0700 cryptui: Have a single empty wide string at the top of main.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 1fbe63e..a100419 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptui); static HINSTANCE hInstance; +static const WCHAR empty[] = {0}; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -804,8 +806,6 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, static void cert_mgr_clear_cert_selection(HWND hwnd) { - WCHAR empty[] = { 0 }; - EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), FALSE); @@ -1166,7 +1166,6 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case LVN_ITEMCHANGED: { - WCHAR empty[] = { 0 }; NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp; HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0);

1 0

Alex Henrie : uxtheme: Turn a variable and a constant into static constants.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 53c8abbf8aecf96ef5d239984c6054a56f5a64cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c8abbf8aecf96ef5d23998… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:59 2018 -0700 uxtheme: Turn a variable and a constant into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/metric.c | 6 +++--- dlls/uxtheme/system.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 5f6c36f..073422f 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -165,9 +165,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue) */ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) { - PTHEME_PROPERTY tp; - int i, id = -1; - int metricMap[] = { + static const int metricMap[] = { SM_CXVSCROLL, TMT_SCROLLBARWIDTH, SM_CYHSCROLL, TMT_SCROLLBARHEIGHT, SM_CXSIZE, TMT_CAPTIONBARWIDTH, @@ -179,6 +177,8 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) SM_CXMENUSIZE, TMT_MENUBARWIDTH, SM_CYMENUSIZE, TMT_MENUBARHEIGHT }; + PTHEME_PROPERTY tp; + int i, id = -1; if(hTheme) { for(i=0; i<ARRAY_SIZE(metricMap); i+=2) { diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index db49754..c898ad3 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -813,7 +813,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName, LPWSTR pszValueBuff, int cchMaxValChars) { - const WORD wDocToRes[] = { + static const WORD wDocToRes[] = { TMT_DISPLAYNAME,5000, TMT_TOOLTIP,5001, TMT_COMPANY,5002,

1 0

Alex Henrie : qcap: Make constants 'msg' and 'VFWIndex' static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 6a1a2e8288be541f906a4b718cca8cf771cbc291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1a2e8288be541f906a4b71… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:58 2018 -0700 qcap: Make constants 'msg' and 'VFWIndex' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b4b7b96..80b0fe8 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -915,7 +915,7 @@ error: Capture * qcap_driver_init( IPin *pOut, USHORT card ) { - const char msg[] = + static const char msg[] = "The v4l headers were not available at compile time,\n" "so video capture support is not available.\n"; MESSAGE(msg); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ca804fe..6297a80 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -524,10 +524,10 @@ static HRESULT WINAPI PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog ) { + static const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; VfwCapture *This = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; - const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; TRACE("%p/%p-> (%p, %p)\n", iface, This, pPropBag, pErrorLog);

1 0

Alex Henrie : inetcomm: Make several constants static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 11f8826c135a220c20900224b00ce3a45f5469f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f8826c135a220c20900224… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:54 2018 -0700 inetcomm: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/smtptransport.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index af11308..d71061e 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -281,7 +281,7 @@ static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBu HRESULT hr; const char *pszHello; char *pszCommand; - const char szHostName[] = "localhost"; /* FIXME */ + static const char szHostName[] = "localhost"; /* FIXME */ TRACE("\n"); @@ -483,7 +483,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) { - const char szCommandFormat[] = "RCPT TO: <%s>\n"; + static const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); @@ -659,10 +659,10 @@ static HRESULT WINAPI SMTPTransport_InitNew(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, LPSMTPMESSAGE pMessage) { + static const char szCommandFormat[] = "MAIL FROM: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; ULONG i, size; LPSTR pszFromAddress = NULL; - const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -723,8 +723,8 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom) { + static const char szCommandFormat[] = "MAIL FROM: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -750,8 +750,8 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo) { + static const char szCommandFormat[] = "RCPT TO: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -777,9 +777,9 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) { + static const char szCommandFormat[] = "EHLO %s\n"; + static const char szHostname[] = "localhost"; /* FIXME */ SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "EHLO %s\n"; - const char szHostname[] = "localhost"; /* FIXME */ char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); HRESULT hr; @@ -801,9 +801,9 @@ static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) { + static const char szCommandFormat[] = "HELO %s\n"; + static const char szHostname[] = "localhost"; /* FIXME */ SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "HELO %s\n"; - const char szHostname[] = "localhost"; /* FIXME */ char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); HRESULT hr; @@ -826,8 +826,8 @@ static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, LPSTR pszAuthType) { + static const char szCommandFormat[] = "AUTH %s\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "AUTH %s\n"; char *szCommand; int len; HRESULT hr;

1 0

Alex Henrie : comctl32: Make constant 'mdays' static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: baf6adfef766cece78b4ddf593a55de767a6de16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf6adfef766cece78b4ddf5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:48 2018 -0700 comctl32: Make constant 'mdays' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 3fb7600..dd34c22 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -213,7 +213,7 @@ static inline int MONTHCAL_MonthDiff(const SYSTEMTIME *left, const SYSTEMTIME *r /* January is 1, December is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + static const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */

1 0

Hans Leidekker : webservices: Implement WsFillBody.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: d00aa4db48b3b575f791fe41d30fd997a6b65e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00aa4db48b3b575f791fe41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:26 2018 +0100 webservices: Implement WsFillBody. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e28baa2..ada549c 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -999,6 +999,33 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des } /************************************************************************** + * WsFillBody [webservices.@] + */ +HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFillReader( msg->reader_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + +/************************************************************************** * WsInitializeMessage [webservices.@] */ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 30c97e3..adad68d 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -43,7 +43,7 @@ @ stub WsEndReaderCanonicalization @ stub WsEndWriterCanonicalization @ stdcall WsFileTimeToDateTime(ptr ptr ptr) -@ stub WsFillBody +@ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody diff --git a/include/webservices.h b/include/webservices.h index 6cafcc6..69e3c8a 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1622,6 +1622,7 @@ HRESULT WINAPI WsDateTimeToFileTime(const WS_DATETIME*, FILETIME*, WS_ERROR*); HRESULT WINAPI WsDecodeUrl(const WS_STRING*, ULONG, WS_HEAP*, WS_URL**, WS_ERROR*); HRESULT WINAPI WsEncodeUrl(const WS_URL*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); HRESULT WINAPI WsFileTimeToDateTime(const FILETIME*, WS_DATETIME*, WS_ERROR*); +HRESULT WINAPI WsFillBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*);

1 0

Alex Henrie : dinput: Turn two variables into static constants.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 2ad7ecc6cdce22c4b4bbeea82fb7ff1f022fbcfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad7ecc6cdce22c4b4bbeea8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:52 2018 -0700 dinput: Turn two variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9f426f3..0ec1ceb 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -766,11 +766,11 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + static const DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; + static const DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); unsigned int i, j; BOOL has_actions = FALSE; - DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; - DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags);

1 0

Alex Henrie : browseui: Have a single empty wide string at the top of progressdlg.c.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: be8870d5ea54865ba24a222cd5eec0d548b780cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8870d5ea54865ba24a222c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:00 2018 -0700 browseui: Have a single empty wide string at the top of progressdlg.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/progressdlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index e10d8bd..61078a1 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -89,9 +89,10 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); } +static const WCHAR empty_string[] = {0}; + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - static const WCHAR empty_string[] = {0}; IMalloc *malloc; ULONG cb; @@ -132,15 +133,13 @@ static void set_progress_marquee(ProgressDialog *This) static void update_dialog(ProgressDialog *This, DWORD dwUpdate) { - WCHAR empty[] = {0}; - if (dwUpdate & UPDATE_TITLE) SetWindowTextW(This->hwnd, This->title); if (dwUpdate & UPDATE_LINE1) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty : This->lines[0])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty_string : This->lines[0])); if (dwUpdate & UPDATE_LINE2) - SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty : This->lines[1])); + SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty_string : This->lines[1])); if (dwUpdate & UPDATE_LINE3) SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2]));

1 0

Alex Henrie : comdlg32: Turn several variables into static constants.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: fedd1cb3d31ddd5170073762142f5a6c0220a68f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fedd1cb3d31ddd5170073762… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:49 2018 -0700 comdlg32: Turn several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/printdlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 429903b..69e9aeb 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2618,9 +2618,9 @@ static WCHAR get_decimal_sep(void) static void size2str(const pagesetup_data *data, DWORD size, LPWSTR strout) { - WCHAR integer_fmt[] = {'%','d',0}; - WCHAR hundredths_fmt[] = {'%','d','%','c','%','0','2','d',0}; - WCHAR thousandths_fmt[] = {'%','d','%','c','%','0','3','d',0}; + 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 */

1 0

Zebediah Figura : ntdll: Call the select request directly in RtlWaitOnAddress().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 0ea963a4063395a7a4611b435eb74b5cf0830116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ea963a4063395a7a4611b43… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 19:03:56 2018 -0600 ntdll: Call the select request directly in RtlWaitOnAddress(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/server.c | 4 +-- dlls/ntdll/sync.c | 86 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 70 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index fdb443b..1630978 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -104,6 +104,8 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; +extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; +extern BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ec03445..38356f4 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -349,7 +349,7 @@ void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sig * * Wait for a reply on the waiting pipe of the current thread. */ -static int wait_select_reply( void *cookie ) +int wait_select_reply( void *cookie ) { int signaled; struct wake_up_reply reply; @@ -386,7 +386,7 @@ static int wait_select_reply( void *cookie ) * * Invoke a single APC. Return TRUE if a user APC has been run. */ -static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) +BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { BOOL user_apc = FALSE; SIZE_T size; diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 0c373a4..e1a48d7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1961,35 +1961,81 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, return status; } -/*********************************************************************** - * RtlWaitOnAddress (NTDLL.@) - */ -NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, - const LARGE_INTEGER *timeout ) +static BOOL compare_addr( const void *addr, const void *cmp, SIZE_T size ) { switch (size) { case 1: - if (*(const UCHAR *)addr != *(const UCHAR *)cmp) - return STATUS_SUCCESS; - break; + return (*(const UCHAR *)addr == *(const UCHAR *)cmp); case 2: - if (*(const USHORT *)addr != *(const USHORT *)cmp) - return STATUS_SUCCESS; - break; + return (*(const USHORT *)addr == *(const USHORT *)cmp); case 4: - if (*(const ULONG *)addr != *(const ULONG *)cmp) - return STATUS_SUCCESS; - break; + return (*(const ULONG *)addr == *(const ULONG *)cmp); case 8: - if (*(const ULONG64 *)addr != *(const ULONG64 *)cmp) - return STATUS_SUCCESS; - break; - default: - return STATUS_INVALID_PARAMETER; + return (*(const ULONG64 *)addr == *(const ULONG64 *)cmp); } - return NtWaitForKeyedEvent( 0, addr, 0, timeout ); + return FALSE; +} + +/*********************************************************************** + * RtlWaitOnAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size, + const LARGE_INTEGER *timeout ) +{ + select_op_t select_op; + NTSTATUS ret; + int cookie; + BOOL user_apc = FALSE; + obj_handle_t apc_handle = 0; + apc_call_t call; + apc_result_t result; + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + + if (size != 1 && size != 2 && size != 4 && size != 8) + return STATUS_INVALID_PARAMETER; + + select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; + select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); + select_op.keyed_event.key = wine_server_client_ptr( addr ); + + memset( &result, 0, sizeof(result) ); + + for (;;) + { + if (!compare_addr( addr, cmp, size )) + return STATUS_SUCCESS; + + SERVER_START_REQ( select ) + { + req->flags = SELECT_INTERRUPTIBLE; + req->cookie = wine_server_client_ptr( &cookie ); + req->prev_apc = apc_handle; + req->timeout = abs_timeout; + wine_server_add_data( req, &result, sizeof(result) ); + wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); + ret = wine_server_call( req ); + abs_timeout = reply->timeout; + apc_handle = reply->apc_handle; + call = reply->call; + } + SERVER_END_REQ; + if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + if (ret != STATUS_USER_APC) break; + if (invoke_apc( &call, &result )) + { + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; + size = 0; + } + } + + if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; + + return ret; } /***********************************************************************

1 0

Michael Müller : ntdll: Add stub for RtlGetUnloadEventTraceEx.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 33b566c3d5350aa1ec80207dcf17e78d6c06cc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b566c3d5350aa1ec80207d… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 4 01:15:59 2018 -0700 ntdll: Add stub for RtlGetUnloadEventTraceEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44897 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3741eb9..c2e2fb1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -681,6 +681,7 @@ # @ stub RtlGetSetBootStatusData @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() +@ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e80aa5e..393bd27 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1680,6 +1680,20 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) } /********************************************************************* + * RtlGetUnloadEventTraceEx [NTDLL.@] + */ +void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) +{ + static ULONG dummy_size, dummy_count; + + FIXME("(%p, %p, %p): stub!\n", size, count, trace); + + if (size) *size = &dummy_size; + if (count) *count = &dummy_count; + if (trace) *trace = NULL; +} + +/********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size,

1 0

Kai Krakow : avrt: Add AVRT_PRIORITY_VERYLOW to avrt.h.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: ac516a700c67d4a6c28938a0e10909c3670f4289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac516a700c67d4a6c28938a0… Author: Kai Krakow <kai(a)kaishome.de> Date: Tue Dec 4 01:55:12 2018 +0100 avrt: Add AVRT_PRIORITY_VERYLOW to avrt.h. According to current Windows 10 headers, this priority is supported now. Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/avrt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/avrt.h b/include/avrt.h index 2d0ab09..9d12c1b 100644 --- a/include/avrt.h +++ b/include/avrt.h @@ -28,7 +28,8 @@ extern "C" { typedef enum _AVRT_PRIORITY { - AVRT_PRIORITY_LOW = -1, + AVRT_PRIORITY_VERYLOW = -2, + AVRT_PRIORITY_LOW, AVRT_PRIORITY_NORMAL, AVRT_PRIORITY_HIGH, AVRT_PRIORITY_CRITICAL

1 0

Nikolay Sivov : shlwapi: Forward SHEnumValue() to shcore.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 9f349eb978590cc74c0178517e735377b5bad53e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f349eb978590cc74c017851… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:50 2018 +0300 shlwapi: Forward SHEnumValue() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 45 --------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 5faad4a..ffc1c30 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1667,51 +1667,6 @@ LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey, } /************************************************************************* - * SHEnumValueA [SHLWAPI.@] - * - * Enumerate values in a registry key. - * - * PARAMS - * hKey [I] Handle to registry key - * dwIndex [I] Index of key to enumerate - * lpszValue [O] Pointer updated with the values name - * pwLen [O] Pointer updated with the values length - * pwType [O] Pointer updated with the values type - * pvData [O] Pointer updated with the values data - * pcbData [O] Pointer updated with the values size - * - * RETURNS - * Success: ERROR_SUCCESS. Output parameters are updated. - * Failure: An error code from RegEnumValueA(). - */ -LONG WINAPI SHEnumValueA(HKEY hKey, DWORD dwIndex, LPSTR lpszValue, - LPDWORD pwLen, LPDWORD pwType, - LPVOID pvData, LPDWORD pcbData) -{ - TRACE("(hkey=%p,%d,%s,%p,%p,%p,%p)\n", hKey, dwIndex, - debugstr_a(lpszValue), pwLen, pwType, pvData, pcbData); - - return RegEnumValueA(hKey, dwIndex, lpszValue, pwLen, NULL, - pwType, pvData, pcbData); -} - -/************************************************************************* - * SHEnumValueW [SHLWAPI.@] - * - * See SHEnumValueA. - */ -LONG WINAPI SHEnumValueW(HKEY hKey, DWORD dwIndex, LPWSTR lpszValue, - LPDWORD pwLen, LPDWORD pwType, - LPVOID pvData, LPDWORD pcbData) -{ - TRACE("(hkey=%p,%d,%s,%p,%p,%p,%p)\n", hKey, dwIndex, - debugstr_w(lpszValue), pwLen, pwType, pvData, pcbData); - - return RegEnumValueW(hKey, dwIndex, lpszValue, pwLen, NULL, - pwType, pvData, pcbData); -} - -/************************************************************************* * @ [SHLWAPI.205] * * Get a value from the registry. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f8ffd36..31fb6ad 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -698,8 +698,8 @@ @ stdcall SHDeleteValueW(long wstr wstr) @ stdcall SHEnumKeyExA(long long str ptr) @ stdcall SHEnumKeyExW(long long wstr ptr) -@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) -@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shcore.SHEnumValueA +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW @ stdcall SHGetInverseCMAP ( ptr long ) @ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef @ stdcall SHGetValueA ( long str str ptr ptr ptr )

1 0

Nikolay Sivov : shlwapi: Forward SHRegGetIntW() to shcore.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: c05b54d9a96c1ad41fa10d0c0f1c3ce12c6e3f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05b54d9a96c1ad41fa10d0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:52 2018 +0300 shlwapi: Forward SHRegGetIntW() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 31 ------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index e59d162..fa091ab 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -2132,37 +2132,6 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD */ /************************************************************************* - * @ [SHLWAPI.280] - * - * Read an integer value from the registry, falling back to a default. - * - * PARAMS - * hKey [I] Registry key to read from - * lpszValue [I] Value name to read - * iDefault [I] Default value to return - * - * RETURNS - * The value contained in the given registry value if present, otherwise - * iDefault. - */ -int WINAPI SHRegGetIntW(HKEY hKey, LPCWSTR lpszValue, int iDefault) -{ - TRACE("(%p,%s,%d)\n", hKey, debugstr_w(lpszValue), iDefault); - - if (hKey) - { - WCHAR szBuff[32]; - DWORD dwSize = sizeof(szBuff); - szBuff[0] = '\0'; - SHQueryValueExW(hKey, lpszValue, 0, 0, szBuff, &dwSize); - - if(*szBuff >= '0' && *szBuff <= '9') - return StrToIntW(szBuff); - } - return iDefault; -} - -/************************************************************************* * @ [SHLWAPI.343] * * Create or open an explorer ClassId Key. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 37ca328..4c31724 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -277,7 +277,7 @@ 277 stub -noname SHDialogBox 278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) -280 stdcall -ordinal SHRegGetIntW(ptr wstr long) +280 stdcall -ordinal SHRegGetIntW(ptr wstr long) shcore.SHRegGetIntW 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) 283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long)

1 0

Nikolay Sivov : shlwapi: Forward SHDeleteEmptyKey() to shcore.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: a587b7938b24d8d9e0c7b9ae88c65af85a2dc8f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a587b7938b24d8d9e0c7b9ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:48 2018 +0300 shlwapi: Forward SHDeleteEmptyKey() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 4 +- dlls/shcore/shcore.spec | 4 +- dlls/shlwapi/reg.c | 68 ---------------------- dlls/shlwapi/shlwapi.spec | 4 +- 4 files changed, 6 insertions(+), 74 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec index a4a50b3..4ed7f84 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec @@ -19,8 +19,8 @@ @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx @ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW @ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef -@ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA -@ stdcall SHDeleteEmptyKeyW(long ptr) shlwapi.SHDeleteEmptyKeyW +@ stdcall SHDeleteEmptyKeyA(long str) shlwapi.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long wstr) shlwapi.SHDeleteEmptyKeyW @ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA @ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW @ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6ad1297..4c27179 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -40,8 +40,8 @@ @ stdcall SHCreateThread(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) @ stub SHCreateThreadWithHandle -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) +@ stdcall SHDeleteEmptyKeyA(long str) +@ stdcall SHDeleteEmptyKeyW(long wstr) @ stdcall SHDeleteKeyA(long str) @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 1633519..370161d 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1591,74 +1591,6 @@ DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) } /************************************************************************* - * SHDeleteEmptyKeyA [SHLWAPI.@] - * - * Delete a registry key with no sub keys. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key to delete - * - * RETURNS - * Success: ERROR_SUCCESS. The key is deleted. - * Failure: If the key is not empty, returns ERROR_KEY_HAS_CHILDREN. Otherwise - * returns an error code from RegOpenKeyExA(), RegQueryInfoKeyA() or - * RegDeleteKeyA(). - */ -DWORD WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_a(lpszSubKey)); - - dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - dwRet = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, &dwKeyCount, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hSubKey); - if(!dwRet) - { - if (!dwKeyCount) - dwRet = RegDeleteKeyA(hKey, lpszSubKey); - else - dwRet = ERROR_KEY_HAS_CHILDREN; - } - } - return dwRet; -} - -/************************************************************************* - * SHDeleteEmptyKeyW [SHLWAPI.@] - * - * See SHDeleteEmptyKeyA. - */ -DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p, %s)\n", hKey, debugstr_w(lpszSubKey)); - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - RegCloseKey(hSubKey); - if(!dwRet) - { - if (!dwKeyCount) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - else - dwRet = ERROR_KEY_HAS_CHILDREN; - } - } - return dwRet; -} - -/************************************************************************* * SHDeleteOrphanKeyA [SHLWAPI.@] * * Delete a registry key with no sub keys or values. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 30c34cb..a51088d 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -688,8 +688,8 @@ @ stdcall SHCreateStreamOnFileW(wstr long ptr) shcore.SHCreateStreamOnFileW @ stdcall SHCreateStreamWrapper(ptr ptr long ptr) @ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef -@ stdcall SHDeleteEmptyKeyA(long ptr) -@ stdcall SHDeleteEmptyKeyW(long ptr) +@ stdcall SHDeleteEmptyKeyA(long str) shcore.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long wstr) shcore.SHDeleteEmptyKeyW @ stdcall SHDeleteKeyA(long str) @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteOrphanKeyA(long str)

1 0

Hans Leidekker : bcrypt: Support retrieving properties from key handles.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: dc97df72ff24b40a8d95dbf5bc94967ed5b783cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc97df72ff24b40a8d95dbf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 08:59:20 2018 +0100 bcrypt: Support retrieving properties from key handles. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 10 ++++ dlls/bcrypt/bcrypt_main.c | 130 +++++++++++++++++++++++++----------------- dlls/bcrypt/tests/bcrypt.c | 31 +++++++++- 3 files changed, 117 insertions(+), 54 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index a40f9d1..593e784 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -198,9 +198,19 @@ struct key } u; }; #else +struct key_symmetric +{ + enum mode_id mode; +}; + struct key { struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; }; #endif diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2b9ae0b..0c68a4f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -413,6 +413,63 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_AES; + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_ECB: str = BCRYPT_CHAIN_MODE_ECB; break; + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: str = BCRYPT_CHAIN_MODE_GCM; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (strlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) + { + BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; + if (mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(*tag_length); + if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (tag_length) + { + tag_length->dwMinLength = 12; + tag_length->dwMaxLength = 16; + tag_length->dwIncrement = 1; + } + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -424,59 +481,7 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR switch (alg->id) { case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) - { - *ret_size = sizeof(ULONG); - if (size < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - if (buf) - *(ULONG *)buf = BLOCK_LENGTH_AES; - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - const WCHAR *mode; - switch (alg->mode) - { - case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; - case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; - default: return STATUS_NOT_IMPLEMENTED; - } - - *ret_size = 64; - if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) - { - BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; - *ret_size = sizeof(*key_lengths); - if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (key_lengths) - { - key_lengths->dwMinLength = 128; - key_lengths->dwMaxLength = 256; - key_lengths->dwIncrement = 64; - } - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) - { - BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; - if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; - *ret_size = sizeof(*tag_length); - if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (tag_length) - { - tag_length->dwMinLength = 12; - tag_length->dwMaxLength = 16; - tag_length->dwIncrement = 1; - } - return STATUS_SUCCESS; - } - break; + return get_aes_property( alg->mode, prop, buf, size, ret_size ); default: break; @@ -533,6 +538,20 @@ static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, U return status; } +static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + switch (key->alg_id) + { + case ALG_ID_AES: + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; + return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); + + default: + FIXME( "unsupported algorithm %u\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) { struct object *object = handle; @@ -549,6 +568,11 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu const struct algorithm *alg = (const struct algorithm *)object; return get_alg_property( alg, prop, buffer, count, res ); } + case MAGIC_KEY: + { + const struct key *key = (const struct key *)object; + return get_key_property( key, prop, buffer, count, res ); + } case MAGIC_HASH: { const struct hash *hash = (const struct hash *)object; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6865e87..c3f8f3d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -507,7 +507,8 @@ static void test_BCryptGenerateSymmetricKey(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key, key2; - UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; + UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16], mode[64]; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; @@ -608,6 +609,27 @@ static void test_BCryptGenerateSymmetricKey(void) ok(size == 16, "got %u\n", size); ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "wrong mode\n"); + + len = 0; + size = 0; + ret = pBCryptGetProperty(key, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 16, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); @@ -855,6 +877,9 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; @@ -1108,6 +1133,7 @@ static void test_BCryptDecrypt(void) {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -1242,6 +1268,9 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_lengths, sizeof(tag_lengths), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1;

1 0

Zebediah Figura : setupapi: Implement SetupDiDeleteDeviceInfo().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 03e9ef38a7d16920f60b6c17d711588ac25e53ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9ef38a7d16920f60b6c17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:16 2018 -0600 setupapi: Implement SetupDiDeleteDeviceInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43211 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 17 ++++++++++++++ dlls/setupapi/stubs.c | 12 ---------- dlls/setupapi/tests/devinst.c | 52 +++++++++++++++++++++++++++++-------------- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index db0b72f..5685dc3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1575,6 +1575,23 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) } /*********************************************************************** + * SetupDiDeleteDeviceInfo (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + delete_device(device); + + return TRUE; +} + +/*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 7c3413a..61ce005 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -612,18 +612,6 @@ BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DAT } /*********************************************************************** - * SetupDiDeleteDeviceInfo (SETUPAPI.@) - */ - -BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) - { - FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - -/*********************************************************************** * SetupDiDrawMiniIcon (SETUPAPI.@) */ INT WINAPI SetupDiDrawMiniIcon(HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index edb660e..55fe104 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -337,13 +337,21 @@ static void test_device_info(void) check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\0002"); check_device_info(set, 3, &guid, NULL); + ret = SetupDiEnumDeviceInfo(set, 0, &ret_device); + ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInfo(set, &ret_device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0002"); + check_device_info(set, 2, &guid, NULL); + ret = SetupDiRemoveDevice(set, &device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); - check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); - check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0001"); - ret = SetupDiEnumDeviceInfo(set, 2, &ret_device); + ret = SetupDiEnumDeviceInfo(set, 1, &ret_device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); ok(IsEqualGUID(&ret_device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&ret_device.ClassGuid)); @@ -353,7 +361,7 @@ static void test_device_info(void) ok(ret_device.DevInst == device.DevInst, "Expected device node %#x, got %#x.\n", device.DevInst, ret_device.DevInst); - check_device_info(set, 3, &guid, NULL); + check_device_info(set, 2, &guid, NULL); SetupDiDestroyDeviceInfoList(set); @@ -469,7 +477,7 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; - char id[30]; + int i = 0; SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); @@ -497,30 +505,40 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); - ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0002", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0003", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = SetupDiEnumDeviceInfo(set, 0, &device); - ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); - ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); - ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); - ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); - - ret = SetupDiRemoveDevice(set, &device); - ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\0002"); + check_device_info(set, 2, &guid, NULL); - ret = SetupDiEnumDeviceInfo(set, 1, &device); - ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } SetupDiDestroyDeviceInfoList(set); }

1 0

Zebediah Figura : setupapi: Get rid of the redundant cDevices parameter to struct device.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: ac1d89fa13013e7b1c867450370ade6a38af417c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1d89fa13013e7b1c867450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:15 2018 -0600 setupapi: Get rid of the redundant cDevices parameter to struct device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7638a8b..db0b72f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -104,7 +104,6 @@ struct DeviceInfoSet DWORD magic; /* if is equal to SETUP_DEVICE_INFO_SET_MAGIC struct is okay */ GUID ClassGuid; HWND hwndParent; - DWORD cDevices; struct list devices; }; @@ -670,7 +669,6 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); - set->cDevices++; SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, @@ -1289,7 +1287,6 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, memcpy(&list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, sizeof(list->ClassGuid)); - list->cDevices = 0; list_init(&list->devices); return list; @@ -1475,7 +1472,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const if ((flags & DICD_GENERATE_ID)) { static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','d',0}; - DWORD devId; + int instance_id, highest_id = -1; if (strchrW(name, '\\')) { @@ -1483,29 +1480,20 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const return FALSE; } - if (set->cDevices) + LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { - DWORD highestDevID = 0; - - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) - { - const WCHAR *devName = strrchrW(device->instanceId, '\\'); - DWORD id; - - if (devName) - devName++; - else - devName = device->instanceId; - id = SETUPDI_DevNameToDevID(devName); - if (id != 0xffffffff && id > highestDevID) - highestDevID = id; - } - devId = highestDevID + 1; + const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + + if (instance_str) + instance_str++; + else + instance_str = device->instanceId; + instance_id = SETUPDI_DevNameToDevID(instance_str); + if (instance_id != 0xffffffff && instance_id > highest_id) + highest_id = instance_id; } - else - devId = 0; - if (snprintfW(id, ARRAY_SIZE(id), formatW, name, devId) == -1) + if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) { SetLastError(ERROR_INVALID_DEVINST_NAME); return FALSE; @@ -1646,22 +1634,17 @@ BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA return FALSE; } - if (index >= set->cDevices) - { - SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; - } - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { if (i++ == index) { copy_device_data(device_data, device); - break; + return TRUE; } } - return TRUE; + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; } /***********************************************************************

1 0

Nikolay Sivov : shlwapi: Forward SHEnumKeyEx() to shcore.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 8bda7744e05e764bed39543d06241a86afd90d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bda7744e05e764bed39543d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:51 2018 +0300 shlwapi: Forward SHEnumKeyEx() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 36 ------------------------------------ dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index ffc1c30..e59d162 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1631,42 +1631,6 @@ DWORD WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue) } /************************************************************************* - * SHEnumKeyExA [SHLWAPI.@] - * - * Enumerate sub keys in a registry key. - * - * PARAMS - * hKey [I] Handle to registry key - * dwIndex [I] Index of key to enumerate - * lpszSubKey [O] Pointer updated with the subkey name - * pwLen [O] Pointer updated with the subkey length - * - * RETURNS - * Success: ERROR_SUCCESS. lpszSubKey and pwLen are updated. - * Failure: An error code from RegEnumKeyExA(). - */ -LONG WINAPI SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey, - LPDWORD pwLen) -{ - TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen); - - return RegEnumKeyExA(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL); -} - -/************************************************************************* - * SHEnumKeyExW [SHLWAPI.@] - * - * See SHEnumKeyExA. - */ -LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey, - LPDWORD pwLen) -{ - TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen); - - return RegEnumKeyExW(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL); -} - -/************************************************************************* * @ [SHLWAPI.205] * * Get a value from the registry. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 31fb6ad..37ca328 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -696,8 +696,8 @@ @ stdcall SHDeleteOrphanKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) @ stdcall SHDeleteValueW(long wstr wstr) -@ stdcall SHEnumKeyExA(long long str ptr) -@ stdcall SHEnumKeyExW(long long wstr ptr) +@ stdcall SHEnumKeyExA(long long str ptr) shcore.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shcore.SHEnumKeyExW @ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shcore.SHEnumValueA @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW @ stdcall SHGetInverseCMAP ( ptr long )

1 0

Nikolay Sivov : shlwapi: Forward SHDeleteKey() to shcore.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 5f42d67dc5453a47e0c62fc43d7120e8ed9b0db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f42d67dc5453a47e0c62fc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:49 2018 +0300 shlwapi: Forward SHDeleteKey() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 77 ----------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +-- 2 files changed, 2 insertions(+), 79 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 370161d..5faad4a 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1514,83 +1514,6 @@ DWORD WINAPI SHQueryValueExW(HKEY hKey, LPCWSTR lpszValue, } /************************************************************************* - * SHDeleteKeyA [SHLWAPI.@] - * - * Delete a registry key and any sub keys/values present - * - * This function forwards to the unicode version directly, to avoid - * handling subkeys that are not representable in ASCII. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key to delete - * - * RETURNS - * Success: ERROR_SUCCESS. The key is deleted. - * Failure: An error code from RegOpenKeyExA(), RegQueryInfoKeyA(), - * RegEnumKeyExA() or RegDeleteKeyA(). - */ -DWORD WINAPI SHDeleteKeyA(HKEY hKey, LPCSTR lpszSubKey) -{ - WCHAR subkeyW[MAX_PATH]; - - MultiByteToWideChar (CP_ACP, 0, lpszSubKey, -1, subkeyW, ARRAY_SIZE(subkeyW)); - return SHDeleteKeyW(hKey, subkeyW); -} - -/************************************************************************* - * SHDeleteKeyW [SHLWAPI.@] - * - * See SHDeleteKeyA. - */ -DWORD WINAPI SHDeleteKeyW(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwMaxSubkeyLen = 0, dwSize; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey)); - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if(!dwRet) - { - /* Find the maximum subkey length so that we can allocate a buffer */ - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); - if(!dwRet) - { - dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > ARRAY_SIZE(szNameBuf)) - /* Name too big: alloc a buffer for it */ - lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubkeyLen*sizeof(WCHAR)); - - if(!lpszName) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - else - { - while (dwRet == ERROR_SUCCESS) - { - dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); - if (dwRet == ERROR_SUCCESS || dwRet == ERROR_MORE_DATA) - dwRet = SHDeleteKeyW(hSubKey, lpszName); - } - if (dwRet == ERROR_NO_MORE_ITEMS) - dwRet = ERROR_SUCCESS; - - if (lpszName != szNameBuf) - HeapFree(GetProcessHeap(), 0, lpszName); /* Free buffer if allocated */ - } - } - - RegCloseKey(hSubKey); - if(!dwRet) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - } - return dwRet; -} - -/************************************************************************* * SHDeleteOrphanKeyA [SHLWAPI.@] * * Delete a registry key with no sub keys or values. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a51088d..f8ffd36 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -690,8 +690,8 @@ @ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef @ stdcall SHDeleteEmptyKeyA(long str) shcore.SHDeleteEmptyKeyA @ stdcall SHDeleteEmptyKeyW(long wstr) shcore.SHDeleteEmptyKeyW -@ stdcall SHDeleteKeyA(long str) -@ stdcall SHDeleteKeyW(long wstr) +@ stdcall SHDeleteKeyA(long str) shcore.SHDeleteKeyA +@ stdcall SHDeleteKeyW(long wstr) shcore.SHDeleteKeyW @ stdcall SHDeleteOrphanKeyA(long str) @ stdcall SHDeleteOrphanKeyW(long wstr) @ stdcall SHDeleteValueA(long str str)

1 0

Zebediah Figura : setupapi: Implement SetupDiDeleteDeviceInterfaceData().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: d6a504eaf030a9eb33046761610a1b6ba9e8e505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a504eaf030a9eb33046761… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:14 2018 -0600 setupapi: Implement SetupDiDeleteDeviceInterfaceData(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++------ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 82a45b4..7638a8b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -576,6 +576,16 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } +static void delete_device_iface(struct device_iface *iface) +{ + list_remove(&iface->entry); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); + heap_free(iface->refstr); + heap_free(iface->symlink); + heap_free(iface); +} + static void remove_device(struct device *device) { WCHAR id[MAX_DEVICE_ID_LEN], *p; @@ -622,12 +632,7 @@ static void delete_device(struct device *device) LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { - list_remove(&iface->entry); - RegCloseKey(iface->refstr_key); - RegCloseKey(iface->class_key); - heap_free(iface->refstr); - heap_free(iface->symlink); - heap_free(iface); + delete_device_iface(iface); } free_devnode(device->devnode); list_remove(&device->entry); @@ -1599,6 +1604,23 @@ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_D } /*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) +{ + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + delete_device_iface(iface); + + return TRUE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 99509e1..0b44e18 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -302,7 +302,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 29f12c3..edb660e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -650,6 +650,15 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); check_device_iface(set, &device, &guid2, 1, 0, NULL); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + + check_device_iface(set, &device, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } @@ -862,14 +871,28 @@ static void test_register_device_iface(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "removed", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "deleted", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 1, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 2, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + set2 = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ok(set2 != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_iface(set2, NULL, &guid, 0, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"); - check_device_iface(set2, NULL, &guid, 1, 0, NULL); + check_device_iface(set2, NULL, &guid, 1, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\deleted"); + check_device_iface(set2, NULL, &guid, 2, 0, NULL); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError());

1 0

Józef Kucia : tests: Introduce common header for d3d12 crosstests.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: fa997de83d615793af3643494df15a604866ebd5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa997de83d615793af36434… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:58 2018 +0100 tests: Introduce common header for d3d12 crosstests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 41 +------------------------------ tests/d3d12_crosstest.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 6 ++--- 3 files changed, 67 insertions(+), 43 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6f45ac9..8f9e2c6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16,46 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Hack for MinGW-w64 headers. - * - * We want to use WIDL C inline wrappers because some methods - * in D3D12 interfaces return aggregate objects. Unfortunately, - * WIDL C inline wrappers are broken when used with MinGW-w64 - * headers because FORCEINLINE expands to extern inline - * which leads to the "multiple storage classes in declaration - * specifiers" compiler error. - */ -#ifdef __MINGW32__ -# include <_mingw.h> -# ifdef __MINGW64_VERSION_MAJOR -# undef __forceinline -# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) -# endif - -# define _HRESULT_DEFINED -typedef int HRESULT; -#endif - -#define COBJMACROS -#define INITGUID -#include "vkd3d_test.h" -#include "vkd3d_windows.h" -#define WIDL_C_INLINE_WRAPPERS -#include "vkd3d_d3d12.h" - -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - -#ifdef _WIN32 -# include "vkd3d_dxgi1_4.h" -#else -# include <pthread.h> -# include "vkd3d_utils.h" -#endif - -#include "d3d12_test_utils.h" +#include "d3d12_crosstest.h" struct vec2 { diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h new file mode 100644 index 0000000..daf156b --- /dev/null +++ b/tests/d3d12_crosstest.h @@ -0,0 +1,63 @@ +/* + * Copyright 2016-2018 Józef Kucia 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 + */ + +#ifndef __VKD3D_D3D12_CROSSTEST_H +#define __VKD3D_D3D12_CROSSTEST_H + +/* Hack for MinGW-w64 headers. + * + * We want to use WIDL C inline wrappers because some methods + * in D3D12 interfaces return aggregate objects. Unfortunately, + * WIDL C inline wrappers are broken when used with MinGW-w64 + * headers because FORCEINLINE expands to extern inline + * which leads to the "multiple storage classes in declaration + * specifiers" compiler error. + */ +#ifdef __MINGW32__ +# include <_mingw.h> +# ifdef __MINGW64_VERSION_MAJOR +# undef __forceinline +# define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) +# endif + +# define _HRESULT_DEFINED +typedef int HRESULT; +#endif + +#define COBJMACROS +#define INITGUID +#include "vkd3d_test.h" +#include "vkd3d_windows.h" +#define WIDL_C_INLINE_WRAPPERS +#include "vkd3d_d3d12.h" + +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + +#ifdef _WIN32 +# include "vkd3d_dxgi1_4.h" +#else +# include <pthread.h> +# include "vkd3d_utils.h" +#endif + +#include "d3d12_test_utils.h" + +#endif /* __VKD3D_D3D12_CROSSTEST_H */ diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index c2e7a3d..02c5a74 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __VKD3D_D3D12_TEST_H -#define __VKD3D_D3D12_TEST_H +#ifndef __VKD3D_D3D12_TEST_UTILS_H +#define __VKD3D_D3D12_TEST_UTILS_H #define wait_queue_idle(a, b) wait_queue_idle_(__LINE__, a, b) static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue); @@ -769,4 +769,4 @@ static inline D3D12_GPU_DESCRIPTOR_HANDLE get_gpu_sampler_handle(struct test_con return get_gpu_handle(context->device, heap, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, offset); } -#endif /* __VKD3D_D3D12_TEST_H */ +#endif /* __VKD3D_D3D12_TEST_UTILS_H */

1 0

Józef Kucia : tests: Move more helpers to d3d12_test_utils.h.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 8477606e1c41e1766d2ef8482be222d51e6a0201 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8477606e1c41e1766d2ef84… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:59 2018 +0100 tests: Move more helpers to d3d12_test_utils.h. We should move the implementation to a C file. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 40 ---------------------------------------- tests/d3d12_test_utils.h | 46 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8f9e2c6..e48750b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -173,18 +173,6 @@ static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resourc ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } -#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) -static void reset_command_list_(unsigned int line, - ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) -{ - HRESULT hr; - - hr = ID3D12CommandAllocator_Reset(allocator); - ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); - hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); - ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); -} - #ifdef _WIN32 static HANDLE create_event(void) { @@ -354,21 +342,6 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm ID3D12Fence_Release(fence); } -#define update_buffer_data(a, b, c, d) update_buffer_data_(__LINE__, a, b, c, d) -static void update_buffer_data_(unsigned int line, ID3D12Resource *buffer, - size_t offset, size_t size, const void *data) -{ - D3D12_RANGE range; - HRESULT hr; - void *ptr; - - range.Begin = range.End = 0; - hr = ID3D12Resource_Map(buffer, 0, &range, &ptr); - ok_(line)(SUCCEEDED(hr), "Failed to map buffer, hr %#x.\n", hr); - memcpy((BYTE *)ptr + offset, data, size); - ID3D12Resource_Unmap(buffer, 0, NULL); -} - #define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *device, size_t size, D3D12_RESOURCE_FLAGS resource_flags, D3D12_RESOURCE_STATES initial_resource_state) @@ -377,19 +350,6 @@ static ID3D12Resource *create_default_buffer_(unsigned int line, ID3D12Device *d resource_flags, initial_resource_state); } -#define create_upload_buffer(a, b, c) create_upload_buffer_(__LINE__, a, b, c) -static ID3D12Resource *create_upload_buffer_(unsigned int line, ID3D12Device *device, - size_t size, const void *data) -{ - ID3D12Resource *buffer; - - buffer = create_buffer_(line, device, D3D12_HEAP_TYPE_UPLOAD, size, - D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_GENERIC_READ); - if (data) - update_buffer_data_(line, buffer, 0, size, data); - return buffer; -} - static void copy_sub_resource_data(const D3D12_MEMCPY_DEST *dst, const D3D12_SUBRESOURCE_DATA *src, unsigned int row_count, unsigned int slice_count, size_t row_size) { diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 02c5a74..d4265fc 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -81,6 +81,18 @@ static void exec_command_list(ID3D12CommandQueue *queue, ID3D12GraphicsCommandLi ID3D12CommandQueue_ExecuteCommandLists(queue, 1, lists); } +#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) +static inline void reset_command_list_(unsigned int line, + ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) +{ + HRESULT hr; + + hr = ID3D12CommandAllocator_Reset(allocator); + ok_(line)(SUCCEEDED(hr), "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); + ok_(line)(SUCCEEDED(hr), "Failed to reset command list, hr %#x.\n", hr); +} + #define create_buffer(a, b, c, d, e) create_buffer_(__LINE__, a, b, c, d, e) static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, D3D12_HEAP_TYPE heap_type, size_t size, D3D12_RESOURCE_FLAGS resource_flags, @@ -121,6 +133,34 @@ static ID3D12Resource *create_readback_buffer_(unsigned int line, ID3D12Device * D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST); } +#define update_buffer_data(a, b, c, d) update_buffer_data_(__LINE__, a, b, c, d) +static inline void update_buffer_data_(unsigned int line, ID3D12Resource *buffer, + size_t offset, size_t size, const void *data) +{ + D3D12_RANGE range; + HRESULT hr; + void *ptr; + + range.Begin = range.End = 0; + hr = ID3D12Resource_Map(buffer, 0, &range, &ptr); + ok_(line)(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + memcpy((BYTE *)ptr + offset, data, size); + ID3D12Resource_Unmap(buffer, 0, NULL); +} + +#define create_upload_buffer(a, b, c) create_upload_buffer_(__LINE__, a, b, c) +static inline ID3D12Resource *create_upload_buffer_(unsigned int line, ID3D12Device *device, + size_t size, const void *data) +{ + ID3D12Resource *buffer; + + buffer = create_buffer_(line, device, D3D12_HEAP_TYPE_UPLOAD, size, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_GENERIC_READ); + if (data) + update_buffer_data_(line, buffer, 0, size, data); + return buffer; +} + #define create_cpu_descriptor_heap(a, b, c) create_cpu_descriptor_heap_(__LINE__, a, b, c) static inline ID3D12DescriptorHeap *create_cpu_descriptor_heap_(unsigned int line, ID3D12Device *device, D3D12_DESCRIPTOR_HEAP_TYPE heap_type, unsigned int descriptor_count) @@ -377,7 +417,7 @@ static void check_readback_data_uint_(unsigned int line, struct resource_readbac } #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) -static void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, +static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, unsigned int expected, unsigned int max_diff) { @@ -617,7 +657,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex } #define init_test_context(context, desc) init_test_context_(__LINE__, context, desc) -static bool init_test_context_(unsigned int line, struct test_context *context, +static inline bool init_test_context_(unsigned int line, struct test_context *context, const struct test_context_desc *desc) { D3D12_COMMAND_QUEUE_DESC command_queue_desc; @@ -687,7 +727,7 @@ static bool init_test_context_(unsigned int line, struct test_context *context, } #define destroy_test_context(context) destroy_test_context_(__LINE__, context) -static void destroy_test_context_(unsigned int line, struct test_context *context) +static inline void destroy_test_context_(unsigned int line, struct test_context *context) { ULONG refcount;

1 0

Józef Kucia : tests: Introduce parse_args() helper function.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 96f9b1b7717a07337b5f2c00a7c9fe2322e90b6d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=96f9b1b7717a07337b5f2c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:02 2018 +0100 tests: Introduce parse_args() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 21 +-------------------- tests/d3d12_crosstest.h | 23 +++++++++++++++++++++++ tests/d3d12_invalid_usage.c | 21 +-------------------- 3 files changed, 25 insertions(+), 40 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3123018..aee2ccc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21809,26 +21809,7 @@ static void test_primitive_restart(void) START_TEST(d3d12) { - bool enable_debug_layer = false; - ID3D12Debug *debug; - unsigned int i; - - for (i = 1; i < argc; ++i) - { - if (!strcmp(argv[i], "--validate")) - enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); - } - - if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) - { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); - } - + parse_args(argc, argv); print_adapter_info(); run_test(test_create_device); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ddba9fe..8f522e8 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -316,4 +316,27 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } +static void parse_args(int argc, char **argv) +{ + bool enable_debug_layer = false; + ID3D12Debug *debug; + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = true; + else if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + + if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + } +} + #endif /* __VKD3D_D3D12_CROSSTEST_H */ diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index ce354b8..4093542 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -152,26 +152,7 @@ static void test_invalid_texture_resource_barriers(void) START_TEST(d3d12_invalid_usage) { - bool enable_debug_layer = false; - ID3D12Debug *debug; - unsigned int i; - - for (i = 1; i < argc; ++i) - { - if (!strcmp(argv[i], "--validate")) - enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); - } - - if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) - { - ID3D12Debug_EnableDebugLayer(debug); - ID3D12Debug_Release(debug); - } - + parse_args(argc, argv); print_adapter_info(); run_test(test_invalid_texture_resource_barriers);

1 0

Józef Kucia : tests: Move some helpers to d3d12_crosstest.h.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 55587f30b77ae85ed97f3b94faeccdd6a8497260 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=55587f30b77ae85ed97f3b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:00 2018 +0100 tests: Move some helpers to d3d12_crosstest.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 256 ------------------------------------------------ tests/d3d12_crosstest.h | 256 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 256 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=55587f30b77ae85ed97…

1 0

Józef Kucia : vkd3d: Add asserts for indirect draw arguments.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: c15ab6a51cf93d36884758a499a91acfd7578517 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c15ab6a51cf93d36884758a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:55 2018 +0100 vkd3d: Add asserts for indirect draw arguments. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 937c7e3..06823c8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4087,6 +4087,10 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndEvent(ID3D12GraphicsCommandL FIXME("iface %p stub!\n", iface); } +STATIC_ASSERT(sizeof(VkDispatchIndirectCommand) == sizeof(D3D12_DISPATCH_ARGUMENTS)); +STATIC_ASSERT(sizeof(VkDrawIndexedIndirectCommand) == sizeof(D3D12_DRAW_INDEXED_ARGUMENTS)); +STATIC_ASSERT(sizeof(VkDrawIndirectCommand) == sizeof(D3D12_DRAW_ARGUMENTS)); + static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsCommandList *iface, ID3D12CommandSignature *command_signature, UINT max_command_count, ID3D12Resource *arg_buffer, UINT64 arg_buffer_offset, ID3D12Resource *count_buffer, UINT64 count_buffer_offset)

1 0

Józef Kucia : vkd3d: Get rid of asserts from d3d12_device_CopyDescriptors().
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 3e8d0e7a6a65953ee0a2de9e32b69d80fe72a510 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e8d0e7a6a65953ee0a2de9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:54 2018 +0100 vkd3d: Get rid of asserts from d3d12_device_CopyDescriptors(). Do not require that source range sizes match destination range sizes. It works on Windows even though D3D12 validation layers throw errors about size mismatches. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cf40e7a..9e36828 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1997,17 +1997,14 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } - assert(dst_range_idx < dst_descriptor_range_count); - assert(dst_idx < dst_range_size); + if (dst_range_idx >= dst_descriptor_range_count) + break; d3d12_desc_copy(dst++, src++, device); ++dst_idx; } } - - assert(dst_idx == dst_range_size); - assert(dst_range_idx == dst_descriptor_range_count - 1); } static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device *iface,

1 0

Józef Kucia : tests: Move invalid usage tests to separate unit.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 03eba4b0ad9d10ec19c3d53db67f11291859b96a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=03eba4b0ad9d10ec19c3d53… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:01 2018 +0100 tests: Move invalid usage tests to separate unit. Ideally, tests should not produce Vulkan validation errors. Move tests which explicitly test invalid usage of D3D12 and are expected to produce validation errors to a separate file. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +- tests/d3d12.c | 133 --------------------------------- tests/d3d12_invalid_usage.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 180 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=03eba4b0ad9d10ec19c…

1 0

Józef Kucia : tests: Introduce enable_d3d12_debug_layer() helper function.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: e62e1dadb5fdbb821d198620cded9e8d17136d8b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e62e1dadb5fdbb821d19862… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:56:03 2018 +0100 tests: Introduce enable_d3d12_debug_layer() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 1 + tests/d3d12_crosstest.h | 17 +++++++++++++---- tests/d3d12_invalid_usage.c | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aee2ccc..1598910 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21810,6 +21810,7 @@ static void test_primitive_restart(void) START_TEST(d3d12) { parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); print_adapter_info(); run_test(test_create_device); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 8f522e8..ececd78 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -318,6 +318,19 @@ static ID3D12Device *create_device(void) static void parse_args(int argc, char **argv) { + unsigned int i; + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } +} + +static void enable_d3d12_debug_layer(int argc, char **argv) +{ bool enable_debug_layer = false; ID3D12Debug *debug; unsigned int i; @@ -326,10 +339,6 @@ static void parse_args(int argc, char **argv) { if (!strcmp(argv[i], "--validate")) enable_debug_layer = true; - else if (!strcmp(argv[i], "--warp")) - use_warp_device = true; - else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) - use_adapter_idx = atoi(argv[++i]); } if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 4093542..5f764eb 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -153,6 +153,7 @@ static void test_invalid_texture_resource_barriers(void) START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); + enable_d3d12_debug_layer(argc, argv); print_adapter_info(); run_test(test_invalid_texture_resource_barriers);

1 0

Józef Kucia : tests: Add test for indirect indexed draw commands.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 599ff571f9f9bb080ef70b3b3af0c8723e97e8da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=599ff571f9f9bb080ef70b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:57 2018 +0100 tests: Add test for indirect indexed draw commands. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 143 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=599ff571f9f9bb080ef…

1 0

Józef Kucia : vkd3d: Validate that command signature contains exactly one dispatch/ draw command.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: vkd3d Branch: master Commit: 9eaa64137673c8a049c4cdf2364c8eb67b1bbde9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9eaa64137673c8a049c4cdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 4 15:55:56 2018 +0100 vkd3d: Validate that command signature contains exactly one dispatch/draw command. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 20 ++++++++++++++++++++ tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 06823c8..a175091 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4850,6 +4850,26 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ struct d3d12_command_signature **signature) { struct d3d12_command_signature *object; + unsigned int i; + + for (i = 0; i < desc->NumArgumentDescs; ++i) + { + const D3D12_INDIRECT_ARGUMENT_DESC *argument_desc = &desc->pArgumentDescs[i]; + switch (argument_desc->Type) + { + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW: + case D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED: + case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: + if (i != desc->NumArgumentDescs - 1) + { + WARN("Draw/dispatch must be the last element of a command signature.\n"); + return E_INVALIDARG; + } + break; + default: + break; + } + } if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/tests/d3d12.c b/tests/d3d12.c index 7ad0303..4344aa9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1685,6 +1685,56 @@ static void test_create_command_queue(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_command_signature(void) +{ + D3D12_INDIRECT_ARGUMENT_DESC argument_desc[3]; + D3D12_COMMAND_SIGNATURE_DESC signature_desc; + ID3D12CommandSignature *command_signature; + ID3D12Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + signature_desc.ByteStride = 1024; + signature_desc.NumArgumentDescs = ARRAY_SIZE(argument_desc); + signature_desc.pArgumentDescs = argument_desc; + signature_desc.NodeMask = 0; + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(argument_desc); ++i) + argument_desc[i].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + argument_desc[0].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH; + argument_desc[1].Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + signature_desc.NumArgumentDescs = 2; + hr = ID3D12Device_CreateCommandSignature(device, &signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&command_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_committed_resource(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -22116,6 +22166,7 @@ START_TEST(d3d12) run_test(test_create_command_allocator); run_test(test_create_command_list); run_test(test_create_command_queue); + run_test(test_create_command_signature); run_test(test_create_committed_resource); run_test(test_create_heap); run_test(test_create_placed_resource);

1 0

Alex Henrie : shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 8d4bfa751d1380fb6f929739173adbf39954a1f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d4bfa751d1380fb6f929739… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:05:13 2018 -0700 shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shlinstobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 9c3232c..6f6786b 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -361,8 +361,8 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - const WCHAR wszInitPropertyBag[] = + static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; + static const WCHAR wszInitPropertyBag[] = { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance;

1 0

Alex Henrie : vbscript: Make constant 'html_delimiterW' static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 36f25a4b8a9f0f80815f4c9d9305369f2e03f46b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f25a4b8a9f0f80815f4c9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:05:47 2018 -0700 vbscript: Make constant 'html_delimiterW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e8ecf4d..0201099 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -969,7 +969,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { - const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code);

1 0

Alex Henrie : winex11.drv: Make several constants static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: b43204bc4a7496ce0d232745ce9fe93054702152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b43204bc4a7496ce0d232745… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:07:56 2018 -0700 winex11.drv: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7a9a3a7..61730ce 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -485,9 +485,9 @@ static void disable_system_cursors(void) */ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { - const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; - const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; + static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; + static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices;

1 0

Alex Henrie : winex11.drv: Correct spelling of "plug-n-play".
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 3f69b7ecc8ae9e2f0574ca0dacff191b79c11f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f69b7ecc8ae9e2f0574ca0d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:07:57 2018 -0700 winex11.drv: Correct spelling of "plug-n-play". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 61730ce..48fcb22 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -487,7 +487,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_NON_PLUG_N_PLAY[] = {'n','o','n','-','p','l','u','g','-','n','-','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; @@ -549,7 +549,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysDevice.PKTDATA = PK_CONTEXT | PK_STATUS | PK_SERIAL_NUMBER| PK_TIME | PK_CURSOR | PK_BUTTONS | PK_X | PK_Y | PK_NORMAL_PRESSURE | PK_ORIENTATION; - strcpyW(gSysDevice.PNPID, SZ_NON_PLUGINPLAY); + strcpyW(gSysDevice.PNPID, SZ_NON_PLUG_N_PLAY); devices = pXListInputDevices(data->display, &num_devices); if (!devices)

1 0

Józef Kucia : wined3d: Lock wined3d mutex in wined3d_swapchain_present().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 9042fbe1e4838136bd68905df13fb3264af9a64d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9042fbe1e4838136bd68905d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 14:41:05 2018 +0100 wined3d: Lock wined3d mutex in wined3d_swapchain_present(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 7 +------ dlls/d3d9/swapchain.c | 7 +------ dlls/dxgi/swapchain.c | 7 +------ dlls/wined3d/swapchain.c | 5 +++++ 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6e8b98e..c9abfff 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -88,7 +88,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); @@ -99,12 +98,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChai if (dirty_region) FIXME("Ignoring dirty_region %p.\n", dirty_region); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + return wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, 0); - wined3d_mutex_unlock(); - - return hr; } static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 1279663..00ead0f 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -140,7 +140,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); - HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), @@ -152,12 +151,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai if (dirty_region) FIXME("Ignoring dirty_region %p.\n", dirty_region); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, + return wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, swapchain->swap_interval, flags); - wined3d_mutex_unlock(); - - return hr; } static HRESULT WINAPI d3d9_swapchain_GetFrontBufferData(IDirect3DSwapChain9Ex *iface, IDirect3DSurface9 *surface) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4dfa068..5aa2525 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -602,7 +602,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface UINT sync_interval, UINT flags, const DXGI_PRESENT_PARAMETERS *present_parameters) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); @@ -624,11 +623,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - wined3d_mutex_lock(); - hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } static BOOL STDMETHODCALLTYPE d3d11_swapchain_IsTemporaryMonoSupported(IDXGISwapChain1 *iface) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 344a186..3a7039d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -164,9 +164,12 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, if (flags) FIXME("Ignoring flags %#x.\n", flags); + wined3d_mutex_lock(); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL.\n"); + wined3d_mutex_unlock(); return WINED3DERR_INVALIDCALL; } @@ -186,6 +189,8 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, dst_rect, dst_window_override, swap_interval, flags); + wined3d_mutex_unlock(); + return WINED3D_OK; }

1 0

Józef Kucia : wined3d: Lock wined3d mutex in wined3d_get_adapter_identifier().
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 6dddb88ebe05680b9e161d033af2151a945cd77f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dddb88ebe05680b9e161d03… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 3 14:41:06 2018 +0100 wined3d: Lock wined3d mutex in wined3d_get_adapter_identifier(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 2 -- dlls/d3d9/directx.c | 6 +----- dlls/dxgi/adapter.c | 12 ++---------- dlls/wined3d/directx.c | 16 +++++++++++----- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index df5e7d6..385c70d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -132,9 +132,7 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.device_name = NULL; /* d3d9 only */ adapter_id.device_name_size = 0; /* d3d9 only */ - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d8->wined3d, adapter, flags, &adapter_id); - wined3d_mutex_unlock(); identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index dd6e0bd..242e36d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,9 +137,7 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName); - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - wined3d_mutex_unlock(); identifier->DriverVersion = adapter_id.driver_version; identifier->VendorId = adapter_id.vendor_id; @@ -544,11 +542,9 @@ static HRESULT WINAPI d3d9_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUI adapter_id.description_size = 0; adapter_id.device_name_size = 0; - wined3d_mutex_lock(); hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, 0, &adapter_id); - wined3d_mutex_unlock(); - memcpy(luid, &adapter_id.adapter_luid, sizeof(*luid)); + *luid = adapter_id.adapter_luid; return hr; } diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 4371ae7..31baae6 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -158,11 +158,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ adapter_id.description_size = sizeof(description); adapter_id.device_name_size = 0; - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; if (!MultiByteToWideChar(CP_ACP, 0, description, -1, desc->Description, 128)) @@ -311,11 +307,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryVideoMemoryInfo(IWineDXGIAdap adapter_id.description_size = 0; adapter_id.device_name_size = 0; - wined3d_mutex_lock(); - hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) return hr; switch (segment_group) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9aa9fa..544c76e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1155,8 +1155,6 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, return WINED3D_OK; } -/* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER, - and fields being inserted in the middle, a new structure is used in place */ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { @@ -1166,8 +1164,10 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", wined3d, adapter_idx, flags, identifier); + wined3d_mutex_lock(); + if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; + goto fail; adapter = &wined3d->adapters[adapter_idx]; @@ -1194,7 +1194,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_name_size, NULL, NULL)) { ERR("Failed to convert device name, last error %#x.\n", GetLastError()); - return WINED3DERR_INVALIDCALL; + goto fail; } } @@ -1206,11 +1206,17 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->revision = 0; memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; - memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); + identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); + wined3d_mutex_unlock(); + return WINED3D_OK; + +fail: + wined3d_mutex_unlock(); + return WINED3DERR_INVALIDCALL; } HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx,

1 0