November 2021 - Wine-Commits

Eric Pouech : dbghelp: Always search current directory when loading PE modules.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 8e8243a30899273071b35eb86eff487e2d5763dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e8243a30899273071b35eb8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 16 17:47:02 2021 +0100 dbghelp: Always search current directory when loading PE modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 35db3edf40f..77ae122901a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -791,7 +791,8 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, { assert(name); - if ((hFile = FindExecutableImageExW(name, pcs->search_path, loaded_name, NULL, NULL)) == NULL) + if ((hFile = FindExecutableImageExW(name, pcs->search_path, loaded_name, NULL, NULL)) == NULL && + (hFile = FindExecutableImageExW(name, L".", loaded_name, NULL, NULL)) == NULL) return NULL; opened = TRUE; }

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardLayout implementation from user32.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 563a233284d5a3fc0741af2421e239cd7b6b721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=563a233284d5a3fc0741af24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 16 12:35:43 2021 +0100 win32u: Move NtUserGetKeyboardLayout implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 35 ++++++++-------------------- dlls/user32/message.c | 4 ++-- dlls/user32/misc.c | 4 ++-- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 30 ------------------------ dlls/win32u/input.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 ++++ include/ntuser.h | 30 ++++++++++++++++++++++++ 11 files changed, 106 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=563a233284d5a3fc0741…

1 0

Zebediah Figura : wined3d: Make the "buffer_object" field of struct wined3d_const_bo_addr a wined3d_bo pointer.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: f3647c4b4faf2883548081af6aa9e12c4171a402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3647c4b4faf2883548081af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 15 16:30:18 2021 -0600 wined3d: Make the "buffer_object" field of struct wined3d_const_bo_addr a wined3d_bo pointer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 3 ++- dlls/wined3d/texture.c | 10 +++++++--- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 12811fd1482..e6f5bf108c7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1211,12 +1211,12 @@ static void adapter_vk_flush_bo_address(struct wined3d_context *context, const struct wined3d_const_bo_address *data, size_t size) { struct wined3d_context_vk *context_vk = wined3d_context_vk(context); - struct wined3d_bo_vk *bo; + struct wined3d_bo *bo; - if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + if (!(bo = data->buffer_object)) return; - flush_bo_range(context_vk, bo, (uintptr_t)data->addr, size); + flush_bo_range(context_vk, wined3d_bo_vk(bo), (uintptr_t)data->addr, size); } static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_resource *resource, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b07f1510b74..315ea05260e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1132,12 +1132,12 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi { if (upload_bo->flags & UPLOAD_BO_RENAME_ON_UNMAP) { - wined3d_buffer_set_bo(buffer, context, (struct wined3d_bo *)upload_bo->addr.buffer_object); + wined3d_buffer_set_bo(buffer, context, upload_bo->addr.buffer_object); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); } - if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == (uintptr_t)buffer->buffer_object) + if (upload_bo->addr.buffer_object && upload_bo->addr.buffer_object == buffer->buffer_object) wined3d_context_flush_bo_address(context, &upload_bo->addr, size); else wined3d_buffer_copy_bo_address(buffer, context, offset, &upload_bo->addr, size); diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index e91bff9328b..f7d4d9e8cb3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2748,8 +2748,9 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct struct wined3d_bo_gl *bo; unsigned int i; - if (!(bo = (struct wined3d_bo_gl *)data->buffer_object) || bo->b.coherent) + if (!data->buffer_object || data->buffer_object->coherent) return; + bo = wined3d_bo_gl(data->buffer_object); gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 370eaaf08e5..7e2da350f5a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2476,7 +2476,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, return; } - bo.buffer_object = (struct wined3d_bo *)src_bo_addr->buffer_object; + bo.buffer_object = src_bo_addr->buffer_object; bo.addr = (BYTE *)src_bo_addr->addr + src_box->front * src_slice_pitch; if (dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { @@ -4720,7 +4720,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); - if (!(src_bo = (struct wined3d_bo_vk *)src_bo_addr->buffer_object)) + if (!src_bo_addr->buffer_object) { if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4755,6 +4755,8 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, } else { + src_bo = wined3d_bo_vk(src_bo_addr->buffer_object); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(src_bo->usage) & ~WINED3D_READ_ONLY_ACCESS_FLAGS; @@ -4917,7 +4919,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, /* We need to be outside of a render pass for vkCmdPipelineBarrier() and vkCmdCopyBufferToImage() calls below. */ wined3d_context_vk_end_current_render_pass(context_vk); - if (!(dst_bo = (struct wined3d_bo_vk *)dst_bo_addr->buffer_object)) + if (!dst_bo_addr->buffer_object) { if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) @@ -4930,6 +4932,8 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, } else { + dst_bo = wined3d_bo_vk(dst_bo_addr->buffer_object); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(dst_bo->usage); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 26001775300..098b07ae35b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4613,7 +4613,7 @@ const char *debug_const_bo_address(const struct wined3d_const_bo_address *addres { if (!address) return "(null)"; - return wine_dbg_sprintf("{%#lx:%p}", address->buffer_object, address->addr); + return wine_dbg_sprintf("{%p:%p}", address->buffer_object, address->addr); } const char *debug_bo_address(const struct wined3d_bo_address *address) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0d8001f5cbe..79dbc847249 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1632,7 +1632,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - src.buffer_object = view->counter_bo; + src.buffer_object = (struct wined3d_bo *)view->counter_bo; src.addr = NULL; wined3d_buffer_copy_bo_address(buffer, context, offset, &src, sizeof(uint32_t)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e2b05ded28..826bdc6e4a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1685,7 +1685,7 @@ struct wined3d_bo_address struct wined3d_const_bo_address { - UINT_PTR buffer_object; + struct wined3d_bo *buffer_object; const BYTE *addr; };

1 0

Alexandre Julliard : winebuild: Escape invalid characters in the dll name for static import libraries.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 32cfdb549634dbd8ccf4b36a822905af4cc2c6bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cfdb549634dbd8ccf4b36a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 16:41:16 2021 +0100 winebuild: Escape invalid characters in the dll name for static import libraries. This is necessary for things like vulkan-1.dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 94 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 7972fc7b1d9..8e285b19872 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -212,6 +212,64 @@ static inline ORDDEF *find_export( const char *name, ORDDEF **table, int size ) return res ? *res : NULL; } +static const char valid_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_."; + +/* encode a dll name into a linker-compatible name */ +static char *encode_dll_name( const char *name ) +{ + char *p, *ret; + int len = strlen(name); + + if (strendswith( name, ".dll" )) len -= 4; + if (strspn( name, valid_chars ) >= len) return strmake( "%.*s", len, name ); + + ret = p = xmalloc( len * 4 + 1 ); + for ( ; len > 0; len--, name++) + { + if (!strchr( valid_chars, *name )) p += sprintf( p, "$x%02x", *name ); + else *p++ = *name; + } + *p = 0; + return ret; +} + +/* decode a linker-compatible dll name */ +static char *decode_dll_name( const char **name ) +{ + const char *src = *name; + char *p, *ret; + + ret = p = xmalloc( strlen( src ) + 5 ); + for ( ; *src; src++, p++) + { + if (*src != '$') + { + *p = *src; + } + else if (src[1] == 'x') /* hex escape */ + { + int val = 0; + src += 2; + if (*src >= '0' && *src <= '9') val += *src - '0'; + else if (*src >= 'A' && *src <= 'F') val += *src - 'A' + 10; + else if (*src >= 'a' && *src <= 'f') val += *src - 'a' + 10; + else return NULL; + val *= 16; + src++; + if (*src >= '0' && *src <= '9') val += *src - '0'; + else if (*src >= 'A' && *src <= 'F') val += *src - 'A' + 10; + else if (*src >= 'a' && *src <= 'f') val += *src - 'a' + 10; + else return NULL; + *p = val; + } + else break; /* end of dll name */ + } + *p = 0; + if (!strchr( ret, '.' )) strcpy( p, ".dll" ); + *name = src; + return ret; +} + /* free an import structure */ static void free_imports( struct import *imp ) { @@ -385,21 +443,20 @@ void add_extra_ld_symbol( const char *name ) } /* retrieve an imported dll, adding one if necessary */ -struct import *add_static_import_dll( const char *name ) +static struct import *add_static_import_dll( const char *name ) { struct import *import; - char *dll_name = get_dll_name( name, NULL ); - if ((import = find_import_dll( dll_name ))) return import; + if ((import = find_import_dll( name ))) return import; import = xmalloc( sizeof(*import) ); memset( import, 0, sizeof(*import) ); - import->dll_name = dll_name; - import->full_name = xstrdup( dll_name ); - import->c_name = make_c_identifier( dll_name ); + import->dll_name = xstrdup( name ); + import->full_name = xstrdup( name ); + import->c_name = make_c_identifier( name ); - if (is_delayed_import( dll_name )) + if (is_delayed_import( name )) list_add_tail( &dll_delayed, &import->entry ); else list_add_tail( &dll_imports, &import->entry ); @@ -426,21 +483,21 @@ static void add_import_func( struct import *imp, const char *name, const char *e /* add an import for an undefined function of the form __wine$func$ */ static void add_undef_import( const char *name, int is_ordinal ) { - char *p, *dll_name = xstrdup( name ); + char *dll_name = decode_dll_name( &name ); int ordinal = 0; struct import *import; - if (!(p = strchr( dll_name, '$' ))) return; - *p++ = 0; - while (*p >= '0' && *p <= '9') ordinal = 10 * ordinal + *p++ - '0'; - if (*p != '$') return; - p++; + if (!dll_name) return; + if (*name++ != '$') return; + while (*name >= '0' && *name <= '9') ordinal = 10 * ordinal + *name++ - '0'; + if (*name++ != '$') return; import = add_static_import_dll( dll_name ); if (is_ordinal) - add_import_func( import, NULL, xstrdup( p ), ordinal, 0 ); + add_import_func( import, NULL, xstrdup( name ), ordinal, 0 ); else - add_import_func( import, xstrdup( p ), NULL, ordinal, 0 ); + add_import_func( import, xstrdup( name ), NULL, ordinal, 0 ); + free( dll_name ); } /* check if the spec file exports any stubs */ @@ -1670,14 +1727,9 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec ) /* create a Unix-style import library */ static void build_unix_import_lib( DLLSPEC *spec ) { - static const char valid_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._@"; int i, total; const char *name, *prefix; - char *dll_name = xstrdup( spec->file_name ); - - if (strendswith( dll_name, ".dll" )) dll_name[strlen(dll_name) - 4] = 0; - if (strspn( dll_name, valid_chars ) < strlen( dll_name )) - fatal_error( "%s contains invalid characters\n", spec->file_name ); + char *dll_name = encode_dll_name( spec->file_name ); /* entry points */

1 0

Alexandre Julliard : makefiles: Directly generate resources also for non-registered typelibs.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 04d8725080fdc1c97fcd04065acf6b30f42057a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d8725080fdc1c97fcd0406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 10:22:51 2021 +0100 makefiles: Directly generate resources also for non-registered typelibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml.rc | 3 --- dlls/mshtml/tests/rsrc.rc | 3 --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/action.c | 2 +- dlls/msi/tests/rsrc.rc | 22 ---------------------- dlls/oleaut32/tests/test_reg.idl | 1 + dlls/oleaut32/tests/test_simple.idl | 5 ++++- dlls/oleaut32/tests/test_tlb.idl | 10 ++++++---- dlls/oleaut32/tests/tmarshal.rc | 12 ------------ programs/wscript/Makefile.in | 3 --- programs/wscript/rsrc.rc | 20 -------------------- tools/makedep.c | 28 +++------------------------- tools/widl/widl.c | 1 + tools/widl/write_msft.c | 3 ++- 14 files changed, 18 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04d8725080fdc1c97fcd…

1 0

Alexandre Julliard : oleaut32/tests: Use TYPELIB resource type for all typelibs.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 20eabdf4e9c95a673baa22b11659d77533b7fdfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=20eabdf4e9c95a673baa22b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 10:18:12 2021 +0100 oleaut32/tests: Use TYPELIB resource type for all typelibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.rc | 2 +- dlls/oleaut32/tests/typelib.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.rc b/dlls/oleaut32/tests/tmarshal.rc index 8ddfd8a5295..dbe0b0e28f2 100644 --- a/dlls/oleaut32/tests/tmarshal.rc +++ b/dlls/oleaut32/tests/tmarshal.rc @@ -37,4 +37,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 3 TYPELIB test_reg.tlb /* @makedep: test_simple.tlb */ -4 TL test_simple.tlb +4 TYPELIB test_simple.tlb diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index fd83c3abb8a..ed830f44a94 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -768,7 +768,7 @@ static void test_CreateDispTypeInfo(void) SysFreeString(methdata[3].szName); } -static void write_typelib(int res_no, const WCHAR *filename, const WCHAR *type) +static void write_typelib(int res_no, const WCHAR *filename) { DWORD written; HANDLE file; @@ -778,8 +778,8 @@ static void write_typelib(int res_no, const WCHAR *filename, const WCHAR *type) file = CreateFileW( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); if (file == INVALID_HANDLE_VALUE) return; - res = FindResourceW( GetModuleHandleA(NULL), (const WCHAR *)MAKEINTRESOURCE(res_no), type ); - ok( res != 0, "couldn't find resource %d %s\n", res_no, debugstr_w(type) ); + res = FindResourceW( GetModuleHandleA(NULL), (const WCHAR *)MAKEINTRESOURCE(res_no), L"TYPELIB" ); + ok( res != 0, "couldn't find typelib resource %d\n", res_no ); ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); @@ -813,12 +813,12 @@ static void test_invoke_func(ITypeInfo *typeinfo) ok(hres == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hres); } -static WCHAR *create_test_typelib(int res_no, const WCHAR *type) +static WCHAR *create_test_typelib(int res_no) { static WCHAR filename[MAX_PATH]; GetTempFileNameW(L".", L"tlb", 0, filename); - write_typelib(res_no, filename, type); + write_typelib(res_no, filename); return filename; } @@ -1025,7 +1025,7 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); - filename = create_test_typelib(3, L"TYPELIB"); + filename = create_test_typelib(3); hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -6702,7 +6702,7 @@ static void test_register_typelib(BOOL system_registration) if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64); - filename = create_test_typelib(3, L"TYPELIB"); + filename = create_test_typelib(3); hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib); ok(hr == S_OK, "got %08x\n", hr); @@ -7665,8 +7665,8 @@ static void test_LoadRegTypeLib(void) DeleteFileA("main.manifest"); /* create typelib file */ - write_typelib(1, L"test_actctx_tlb.tlb", L"TYPELIB"); - write_typelib(3, L"test_actctx_tlb2.tlb", L"TYPELIB"); + write_typelib(1, L"test_actctx_tlb.tlb"); + write_typelib(3, L"test_actctx_tlb2.tlb"); hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); @@ -8266,7 +8266,7 @@ static void test_dep(void) { trace("Starting typelib dependency tests\n"); - refFilename = create_test_typelib(4, L"TL"); + refFilename = create_test_typelib(4); hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); ok(hr == S_OK, "got %08x\n", hr); @@ -8345,7 +8345,7 @@ static void test_dep(void) { hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); ok(hr == TYPE_E_CANTLOADLIBRARY, "got: %x\n", hr); - refFilename = create_test_typelib(4, L"TL"); + refFilename = create_test_typelib(4); hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib); ok(hr == S_OK, "got %08x\n", hr); @@ -8561,7 +8561,7 @@ START_TEST(typelib) test_SetDocString(); test_FindName(); - if ((filename = create_test_typelib(2, L"TYPELIB"))) + if ((filename = create_test_typelib(2))) { test_dump_typelib( filename ); DeleteFileW( filename );

1 0

Alistair Leslie-Hughes : msdasql: Add ICommandWithParameters to command interface.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 0d29647f07954ede073d5d7fa62dfa46f5936d32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d29647f07954ede073d5d7f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 16 19:31:36 2021 +1100 msdasql: Add ICommandWithParameters to command interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 62 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 67 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 82693115b8a..3829f8f946f 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -426,6 +426,7 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; + ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -455,6 +456,11 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } +static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -483,6 +489,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &rowset->ICommandWithParameters_iface; + } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -791,6 +801,57 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) @@ -810,6 +871,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; + msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b0e13b72589..37230be04cb 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -193,12 +193,17 @@ static void test_command_interfaces(IUnknown *cmd) ICommandStream *commandstream; IColumnsInfo *colinfo; IMultipleResults *multiple; + ICommandWithParameters *cmdwithparams; IUnknown *unk; hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); ICommandProperties_Release(commandProp); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandWithParameters, (void**)&cmdwithparams); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandWithParameters_Release(cmdwithparams); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); ok(hr == S_OK, "got 0x%08x\n", hr); ICommandText_Release(comand_text);

1 0

Alistair Leslie-Hughes : msdasql: Support NULL dialect in GetCommandText.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: 5f8e3a0c74ac4a9289a4a75720e463c684e88e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f8e3a0c74ac4a9289a4a757… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 16 19:31:37 2021 +1100 msdasql: Support NULL dialect in GetCommandText. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 2 +- dlls/msdasql/tests/provider.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3829f8f946f..196fd1c6b81 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -910,7 +910,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, if (!command->query) return DB_E_NOCOMMAND; - if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (dialect && !IsEqualGUID(&DBGUID_DEFAULT, dialect)) { *dialect = DBGUID_DEFAULT; hr = DB_S_DIALECTIGNORED; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 37230be04cb..a0b11194f2b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -265,6 +265,12 @@ if (0) hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, NULL, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + /* dialect empty value */ hr = ICommandText_GetCommandText(comand_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : makefiles: Use static importlibs on all platforms.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: a9b5bb326a1514e2c4185633ab34b22c9bbc9863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b5bb326a1514e2c4185633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 16 16:57:04 2021 +0100 makefiles: Use static importlibs on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 78 ++++++++++++++++++--------------------------------------- 1 file changed, 25 insertions(+), 53 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d5412eccfa4..9ea46aed8d8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,19 +2189,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - { - if (is_cross || !*dll_ext || submakes[j]->staticimplib) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - { - strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); - if (needs_implib_symlink( submakes[j] )) - strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); - } - break; - } - - if ((lib = get_static_lib( submakes[j], name ))) break; + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + lib = get_static_lib( submakes[j], name ); + if (lib) break; } if (lib) @@ -2588,12 +2579,8 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[4]; - int i, count = 0; - - ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; - if (crosstarget) ext[count++] = "cross.a"; - if (needs_delay_lib( make )) ext[count++] = "delay.a"; + const char *lib, *dst, *ext[2] = { "a", "cross.a" }; + int i, count = 1 + !!crosstarget; for (i = 0; i < count; i++) { @@ -3320,42 +3307,27 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - if (*dll_ext && !make->implib_objs.count) - { - strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); - output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.def", make->importlib ), - strmake( "d%s/lib%s.def", so_dir, make->importlib )); - } - else + + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) { - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) - { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); - } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); + if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" );

1 0

Alistair Leslie-Hughes : include: Add more DBPROPVAL_ defines.
by Alexandre Julliard Nov. 16, 2021

Nov. 16, 2021

Module: wine Branch: master Commit: b2f12a3424064c8d5f87d7b391de7679153c1558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2f12a3424064c8d5f87d7b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 16 19:31:35 2021 +1100 include: Add more DBPROPVAL_ defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index cbdb89d23b2..d5b903138d6 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -569,6 +569,15 @@ cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)" cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_RT_FREETHREAD __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_RT_APTMTTHREAD __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_RT_SINGLETHREAD __MSABI_LONG(0x00000004)") + +cpp_quote("#define DBPROPVAL_LM_NONE __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_LM_READ __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_LM_INTENT __MSABI_LONG(0x00000004)") +cpp_quote("#define DBPROPVAL_LM_RITE __MSABI_LONG(0x00000008)") + cpp_quote("#define DB_MODE_READ 0x01") cpp_quote("#define DB_MODE_WRITE 0x02") cpp_quote("#define DB_MODE_READWRITE 0x03")

1 0