November 2021 - Wine-commits

Thomas Faber : comctl32/tests: Test SB_GETPARTS with large wParam.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 68b48acbc4879127e31114d935232c9a41ac35b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b48acbc4879127e31114d9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Nov 12 10:47:39 2021 -0500 comctl32/tests: Test SB_GETPARTS with large wParam. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/status.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f7eec88c613..5de96c19f03 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -253,7 +253,7 @@ static void test_status_control(void) HWND hWndStatus; int r; int nParts[] = {50, 150, -1}; - int checkParts[] = {0, 0, 0}; + int checkParts[] = {0, 0, 0, 0, 0}; int borders[] = {0, 0, 0}; RECT rc; CHAR charArray[20]; @@ -304,12 +304,20 @@ static void test_status_control(void) expect(5,LOWORD(r)); expect(SBT_NOBORDERS,HIWORD(r)); - /* Get parts and borders */ + /* Get parts */ r = SendMessageA(hWndStatus, SB_GETPARTS, 3, (LPARAM)checkParts); ok(r == 3, "Expected 3, got %d\n", r); expect(50,checkParts[0]); expect(150,checkParts[1]); expect(-1,checkParts[2]); + r = SendMessageA(hWndStatus, SB_GETPARTS, 5, (LPARAM)checkParts); + ok(r == 3, "Expected 3, got %d\n", r); + expect(50,checkParts[0]); + expect(150,checkParts[1]); + expect(-1,checkParts[2]); + expect(0,checkParts[3]); + expect(0,checkParts[4]); + /* Get borders */ r = SendMessageA(hWndStatus, SB_GETBORDERS, 0, (LPARAM)borders); ok(r == TRUE, "Expected TRUE, got %d\n", r); expect(0,borders[0]);

1 0

Doug Lyons : msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 5a514d3f45472ce1a169f33d14cdcfb07c51441e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a514d3f45472ce1a169f33d… Author: Doug Lyons <douglyons(a)douglyons.com> Date: Thu Nov 11 17:32:45 2021 -0500 msvcrt: Do not acquire fd lock in msvcrt_create_io_inherit_block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51647 Signed-off-by: Doug Lyons <douglyons(a)douglyons.com> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 5 ++--- dlls/msvcrt/msvcrt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fd7168991f4..2b0395d7535 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -517,7 +517,7 @@ static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags) * 04 char file flags (wxflag): repeated for each fd * 4+NBFD HANDLE file handle: repeated for each fd */ -unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) +BOOL msvcrt_create_io_inherit_block(WORD *size, BYTE **block) { int fd, last_fd; char* wxflag_ptr; @@ -543,7 +543,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) for (fd = 0; fd < last_fd; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ - fdinfo = get_ioinfo(fd); + fdinfo = get_ioinfo_nolock(fd); if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN) { *wxflag_ptr = fdinfo->wxflag; @@ -554,7 +554,6 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) *wxflag_ptr = 0; *handle_ptr = INVALID_HANDLE_VALUE; } - release_ioinfo(fdinfo); wxflag_ptr++; handle_ptr++; } return TRUE; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f38976197fa..e50f3e6991b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -238,7 +238,7 @@ extern void msvcrt_free_concurrency(void) DECLSPEC_HIDDEN; extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; #endif -extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; +extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; /* run-time error codes */ #define _RT_STACK 0

1 0

Thomas Faber : msvcrt/tests: Show that spawn does not require locking of fds.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: be0684dad50ffbc93b3ded4fbfebf1d1e4690589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0684dad50ffbc93b3ded4f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Nov 11 17:42:58 2021 -0500 msvcrt/tests: Show that spawn does not require locking of fds. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7a33ae24230..ceb2165891f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1565,6 +1565,18 @@ static void test_stdout_handle( STARTUPINFOA *startup, char *cmdline, HANDLE hst DeleteFileA( "fdopen.err" ); } +static unsigned WINAPI read_pipe_thread(void *argument) +{ + unsigned char buffer[2]; + int ret; + int *pipefds = argument; + + ret = _read(pipefds[0], buffer, sizeof(buffer)); + ok(ret == 1, "ret = %d\n", ret); + ok(buffer[0] == 'a', "%x\n", buffer[0]); + return 0; +} + static void test_file_inherit( const char* selfname ) { int fd; @@ -1574,6 +1586,9 @@ static void test_file_inherit( const char* selfname ) STARTUPINFOA startup; SECURITY_ATTRIBUTES sa; HANDLE handles[3]; + HANDLE thread_handle; + int pipefds[2]; + intptr_t ret; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -1582,7 +1597,8 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); @@ -1595,12 +1611,37 @@ static void test_file_inherit( const char* selfname ) arg_v[2] = "inherit_no"; arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; - _spawnvp(_P_WAIT, selfname, arg_v); + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %d, errno %d\n", ret, errno); ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + /* Show that spawn works while a read is active */ + ok(_pipe(pipefds, 1, O_BINARY) == 0, "_pipe() failed\n"); + thread_handle = (HANDLE)_beginthreadex(NULL, 0, read_pipe_thread, pipefds, 0, NULL); + Sleep(100); /* try to make sure the thread is reading */ + fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); + ok(fd != -1, "Couldn't create test file\n"); + arg_v[1] = "tests/file.c"; + arg_v[2] = "inherit"; + arg_v[3] = buffer; sprintf(buffer, "%d", fd); + arg_v[4] = 0; + ret = _spawnvp(_P_WAIT, selfname, arg_v); + ok(ret == 0, "_spawnvp returned %Id, errno %d\n", ret, errno); + ret = tell(fd); + ok(ret == 8, "bad position %Iu expecting 8\n", ret); + lseek(fd, 0, SEEK_SET); + ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); + close (fd); + ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + _write(pipefds[1], "a", 1); + WaitForSingleObject(thread_handle, INFINITE); + CloseHandle(thread_handle); + close(pipefds[0]); + close(pipefds[1]); + /* make file handle inheritable */ sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL;

1 0

Alexandre Julliard : widl: Support loading typelibs stored inside PE files.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: ae44ba97b008ecd8f78d61a29bc21f5325add086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae44ba97b008ecd8f78d61a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 10:26:03 2021 +0100 widl: Support loading typelibs stored inside PE files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49803 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 147 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 93 insertions(+), 54 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 85cb140b7a6..d0fbdcab690 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -239,78 +239,114 @@ unsigned short get_type_vt(type_t *t) return 0; } -static void tlb_read(int fd, void *buf, int count) +static void msft_read_guid(void *data, MSFT_SegDir *segdir, int offset, GUID *guid) { - if(read(fd, buf, count) < count) - error("error while reading importlib.\n"); + memcpy( guid, (char *)data + segdir->pGuidTab.offset + offset, sizeof(*guid) ); } -static void tlb_lseek(int fd, int offset) +static void read_msft_importlib(importlib_t *importlib, void *data, unsigned int size) { - if(lseek(fd, offset, SEEK_SET) == -1) - error("lseek failed\n"); -} - -static void msft_read_guid(int fd, MSFT_SegDir *segdir, int offset, GUID *guid) -{ - tlb_lseek(fd, segdir->pGuidTab.offset+offset); - tlb_read(fd, guid, sizeof(GUID)); -} - -static void read_msft_importlib(importlib_t *importlib, int fd) -{ - MSFT_Header header; - MSFT_SegDir segdir; + MSFT_Header *header = data; + MSFT_SegDir *segdir; int *typeinfo_offs; int i; importlib->allocated = 0; + importlib->version = header->version; - tlb_lseek(fd, 0); - tlb_read(fd, &header, sizeof(header)); - - importlib->version = header.version; - - typeinfo_offs = xmalloc(header.nrtypeinfos*sizeof(INT)); - tlb_read(fd, typeinfo_offs, header.nrtypeinfos*sizeof(INT)); - tlb_read(fd, &segdir, sizeof(segdir)); + typeinfo_offs = (int *)(header + 1); + segdir = (MSFT_SegDir *)(typeinfo_offs + header->nrtypeinfos); - msft_read_guid(fd, &segdir, header.posguid, &importlib->guid); + msft_read_guid(data, segdir, header->posguid, &importlib->guid); - importlib->ntypeinfos = header.nrtypeinfos; + importlib->ntypeinfos = header->nrtypeinfos; importlib->importinfos = xmalloc(importlib->ntypeinfos*sizeof(importinfo_t)); for(i=0; i < importlib->ntypeinfos; i++) { - MSFT_TypeInfoBase base; - MSFT_NameIntro nameintro; + MSFT_TypeInfoBase *base = (MSFT_TypeInfoBase *)((char *)(segdir + 1) + typeinfo_offs[i]); + MSFT_NameIntro *nameintro; int len; - tlb_lseek(fd, sizeof(MSFT_Header) + header.nrtypeinfos*sizeof(INT) + sizeof(MSFT_SegDir) - + typeinfo_offs[i]); - tlb_read(fd, &base, sizeof(base)); - importlib->importinfos[i].importlib = importlib; - importlib->importinfos[i].flags = (base.typekind&0xf)<<24; + importlib->importinfos[i].flags = (base->typekind & 0xf)<<24; importlib->importinfos[i].offset = -1; importlib->importinfos[i].id = i; - if(base.posguid != -1) { + if(base->posguid != -1) { importlib->importinfos[i].flags |= MSFT_IMPINFO_OFFSET_IS_GUID; - msft_read_guid(fd, &segdir, base.posguid, &importlib->importinfos[i].guid); + msft_read_guid(data, segdir, base->posguid, &importlib->importinfos[i].guid); } else memset( &importlib->importinfos[i].guid, 0, sizeof(importlib->importinfos[i].guid)); - tlb_lseek(fd, segdir.pNametab.offset + base.NameOffset); - tlb_read(fd, &nameintro, sizeof(nameintro)); - - len = nameintro.namelen & 0xff; + nameintro = (MSFT_NameIntro *)((char *)data + segdir->pNametab.offset + base->NameOffset); + len = nameintro->namelen & 0xff; importlib->importinfos[i].name = xmalloc(len+1); - tlb_read(fd, importlib->importinfos[i].name, len); + memcpy( importlib->importinfos[i].name, nameintro + 1, len ); importlib->importinfos[i].name[len] = 0; } +} + +static unsigned int rva_to_va( const IMAGE_NT_HEADERS32 *nt, unsigned int rva ) +{ + IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + unsigned int i; + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) + if (sec->VirtualAddress <= rva && sec->VirtualAddress + sec->Misc.VirtualSize > rva) + return sec->PointerToRawData + (rva - sec->VirtualAddress); + error( "no PE section found for addr %x\n", rva ); +} - free(typeinfo_offs); +static void read_pe_importlib(importlib_t *importlib, void *data, unsigned int size) +{ + IMAGE_DOS_HEADER *dos = data; + IMAGE_NT_HEADERS32 *nt; + IMAGE_DATA_DIRECTORY *dir; + IMAGE_RESOURCE_DIRECTORY *root, *resdir; + IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; + IMAGE_RESOURCE_DATA_ENTRY *resdata; + void *ptr; + unsigned int i, va; + + if (dos->e_lfanew < sizeof(*dos) || dos->e_lfanew >= size) error( "not a PE file\n" ); + nt = (IMAGE_NT_HEADERS32 *)((char *)data + dos->e_lfanew); + if (nt->Signature != IMAGE_NT_SIGNATURE) error( "not a PE file\n" ); + if ((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader > (char *)data + size) + error( "invalid PE file\n" ); + switch (nt->OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + dir = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; + break; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + dir = &((IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; + break; + default: + error( "invalid PE file\n" ); + } + if (!dir->VirtualAddress || !dir->Size) error( "resource not found in PE file\n" ); + va = rva_to_va( nt, dir->VirtualAddress ); + if (va + dir->Size > size) error( "invalid resource data in PE file\n" ); + root = resdir = (IMAGE_RESOURCE_DIRECTORY *)((char *)data + va ); + entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); + for (i = 0; i < resdir->NumberOfNamedEntries; i++, entry++) + { + static const WCHAR typelibW[] = {'T','Y','P','E','L','I','B'}; + WCHAR *name = (WCHAR *)((char *)root + entry->NameOffset); + if (name[0] != ARRAY_SIZE(typelibW)) continue; + if (!memcmp( name + 1, typelibW, sizeof(typelibW) )) break; + } + if (i == resdir->NumberOfNamedEntries) error( "typelib resource not found in PE file\n" ); + while (entry->DataIsDirectory) + { + resdir = (IMAGE_RESOURCE_DIRECTORY *)((char *)root + entry->OffsetToDirectory); + entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); + } + resdata = (IMAGE_RESOURCE_DATA_ENTRY *)((char *)root + entry->OffsetToData); + ptr = (char *)data + rva_to_va( nt, resdata->OffsetToData ); + if (memcmp( ptr, "MSFT", 4 )) error( "invalid typelib found in PE file\n" ); + read_msft_importlib( importlib, ptr, resdata->Size ); } static int open_typelib(const char *name) @@ -329,8 +365,8 @@ static int open_typelib(const char *name) static void read_importlib(importlib_t *importlib) { - int fd; - INT magic; + int fd, size; + void *data; fd = open_typelib(importlib->name); @@ -341,17 +377,20 @@ static void read_importlib(importlib_t *importlib) if(fd < 0) error("Could not find importlib %s.\n", importlib->name); - tlb_read(fd, &magic, sizeof(magic)); + size = lseek( fd, 0, SEEK_END ); + data = xmalloc( size ); + lseek( fd, 0, SEEK_SET ); + if (read( fd, data, size) < size) error("error while reading importlib.\n"); + close( fd ); - switch(magic) { - case MSFT_MAGIC: - read_msft_importlib(importlib, fd); - break; - default: - error("Wrong or unsupported typelib magic %x\n", magic); - }; + if (!memcmp( data, "MSFT", 4 )) + read_msft_importlib(importlib, data, size); + else if (!memcmp( data, "MZ", 2 )) + read_pe_importlib(importlib, data, size); + else + error("Wrong or unsupported typelib\n"); - close(fd); + free( data ); } void add_importlib(const char *name, typelib_t *typelib)

1 0

Alexandre Julliard : widl: Search for imported typelibs in the library search path.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: c94f44f9b4559351c0ca86d344fe37aabc15200c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94f44f9b4559351c0ca86d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 12:40:56 2021 +0100 widl: Search for imported typelibs in the library search path. Add a -L option to specify that path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + tools/widl/Makefile.in | 4 +++- tools/widl/typelib.c | 14 ----------- tools/widl/widl.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/widl.h | 1 + tools/widl/widl.man.in | 3 +++ 6 files changed, 71 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2a52ecd09c0..f9fbf7f8d8e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2787,6 +2787,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); output_filenames( target_flags ); output_filename( "--nostdinc" ); + output_filename( "-Ldlls/\\*" ); output_filenames( defines ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 7eb74b813a4..32d27060c22 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -29,6 +29,8 @@ MANPAGES = widl.man.in widl_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" + -DDLLDIR="\"${dlldir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" \ + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" INSTALL_DEV = $(PROGRAMS) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index d0fbdcab690..d47e937d70c 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -349,20 +349,6 @@ static void read_pe_importlib(importlib_t *importlib, void *data, unsigned int s read_msft_importlib( importlib, ptr, resdata->Size ); } -static int open_typelib(const char *name) -{ - char *file_name; - int fd; - - file_name = wpp_find_include(name, NULL); - if(!file_name) - return open(name, O_RDONLY | O_BINARY ); - - fd = open(file_name, O_RDONLY | O_BINARY ); - free(file_name); - return fd; -} - static void read_importlib(importlib_t *importlib) { int fd, size; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 325a55fff8d..2319a495f6a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -55,6 +55,7 @@ static const char usage[] = " -h Generate headers\n" " -H file Name of header file (default is infile.h)\n" " -I directory Add directory to the include search path (multiple -I allowed)\n" +" -L directory Add directory to the library search path (multiple -L allowed)\n" " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" " -N Do not preprocess input\n" @@ -151,6 +152,8 @@ char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; static const char *includedir; +static const char *dlldir; +static struct strarray dlldirs; static char *output_name; static const char *sysroot = ""; @@ -185,7 +188,7 @@ enum { }; static const char short_options[] = - "b:cC:d:D:EhH:I:m:No:O:pP:rsS:tT:uU:VW"; + "b:cC:d:D:EhH:I:L:m:No:O:pP:rsS:tT:uU:VW"; static const struct long_option long_options[] = { { "acf", 1, ACF_OPTION }, { "app_config", 0, APP_CONFIG_OPTION }, @@ -578,6 +581,7 @@ static void init_argv0_dir( const char *argv0 ) #endif if (!dir) return; includedir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_INCLUDEDIR ); + dlldir = strmake( "%s/%s", get_dirname( dir ), BIN_TO_DLLDIR ); #endif } @@ -680,6 +684,9 @@ static void option_callback( int optc, char *optarg ) case 'I': wpp_add_include_path(optarg); break; + case 'L': + strarray_add( &dlldirs, optarg ); + break; case 'm': if (!strcmp( optarg, "32" )) pointer_size = 4; else if (!strcmp( optarg, "64" )) pointer_size = 8; @@ -742,6 +749,61 @@ static void option_callback( int optc, char *optarg ) } } +static const char *get_pe_dir(void) +{ + switch (target_cpu) + { + case CPU_x86: return "/i386-windows"; + case CPU_x86_64: return "/x86_64-windows"; + case CPU_ARM: return "/arm-windows"; + case CPU_ARM64: return "/aarch64-windows"; + default: return ""; + } +} + +int open_typelib( const char *name ) +{ + static const char *default_dirs[] = { DLLDIR, "/usr/lib/wine", "/usr/local/lib/wine" }; + const char *pe_dir = get_pe_dir(); + int fd; + unsigned int i; + +#define TRYOPEN(str) do { \ + char *file = str; \ + if ((fd = open( file, O_RDONLY | O_BINARY )) != -1) return fd; \ + free( file ); } while(0) + + for (i = 0; i < dlldirs.count; i++) + { + if (strendswith( dlldirs.str[i], "/*" )) /* special case for wine build tree */ + { + int namelen = strlen( name ); + if (strendswith( name, ".dll" )) namelen -= 4; + TRYOPEN( strmake( "%.*s/%.*s/%s", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], + namelen, name, name )); + TRYOPEN( strmake( "%.*s/%.*s/%s.fake", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], + namelen, name, name )); + } + else + { + TRYOPEN( strmake( "%s%s/%s", dlldirs.str[i], pe_dir, name )); + TRYOPEN( strmake( "%s/%s", dlldirs.str[i], name )); + } + } + + if (stdinc) + { + if (dlldir) TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + for (i = 0; i < ARRAY_SIZE(default_dirs); i++) + { + if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue; + TRYOPEN( strmake( "%s%s/%s", default_dirs[i], pe_dir, name )); + } + } + error( "cannot find %s\n", name ); +#undef TRYOPEN +} + int main(int argc,char *argv[]) { int i; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 6dc19b3dafa..38ffc477115 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -89,6 +89,7 @@ enum stub_mode MODE_Oif /* new-style fully interpreted stubs */ }; extern enum stub_mode get_stub_mode(void); +extern int open_typelib( const char *name ); extern void write_header(const statement_list_t *stmts); extern void write_id_data(const statement_list_t *stmts); diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 234f512f962..858b04a38e8 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -58,6 +58,9 @@ Use old naming conventions. Generate a type library. The default output filename is \fIinfile\fB.tlb\fR. If the output file name ends in \fB.res\fR, a binary resource file containing the type library is generated instead. +.IP "\fB-L \fIpath\fR" +Add a directory to the library search path for imported typelibs. The +option can be specified multiple times. .PP .B UUID file options: .IP "\fB-u\fR"

1 0

Alexandre Julliard : makefiles: Make importlib dependencies point to their respective dll.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: ef8b871e12a5c03fb678d4286a88e708c00326d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8b871e12a5c03fb678d428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 15:14:12 2021 +0100 makefiles: Make importlib dependencies point to their respective dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 58 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f9fbf7f8d8e..9a9e443456e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -81,6 +81,7 @@ struct incl_file unsigned int files_size; /* total allocated size */ struct incl_file **files; struct strarray dependencies; /* file dependencies */ + struct strarray importlibdeps; /* importlib dependencies */ }; #define FLAG_GENERATED 0x000001 /* generated file */ @@ -1281,6 +1282,24 @@ static struct file *open_src_file( const struct makefile *make, struct incl_file } +/******************************************************************* + * find_importlib_module + */ +static struct makefile *find_importlib_module( const char *name ) +{ + unsigned int i, len; + + for (i = 0; i < subdirs.count; i++) + { + if (strncmp( submakes[i]->obj_dir, "dlls/", 5 )) continue; + len = strlen(submakes[i]->obj_dir); + if (strncmp( submakes[i]->obj_dir + 5, name, len - 5 )) continue; + if (!name[len - 5] || !strcmp( name + len - 5, ".dll" )) return submakes[i]; + } + return NULL; +} + + /******************************************************************* * open_include_file */ @@ -1333,6 +1352,14 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ /* now try in source dir */ if ((file = open_local_file( make, pFile->name, &pFile->filename ))) return file; + /* check for global importlib (module dependency) */ + + if (pFile->type == INCL_IMPORTLIB && find_importlib_module( pFile->name )) + { + pFile->filename = pFile->name; + return NULL; + } + /* check for corresponding idl file in global includes */ if (strendswith( pFile->name, ".h" ) && @@ -1363,16 +1390,6 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } - /* check for corresponding .tlb file in global includes */ - - if (strendswith( pFile->name, ".tlb" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".tlb", ".idl" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } - /* check in global includes source dir */ if ((file = open_global_header( make, pFile->name, &pFile->filename ))) return file; @@ -1907,11 +1924,14 @@ static void get_dependencies( struct incl_file *file, struct incl_file *source ) if (file != source) { if (file->owner == source) return; /* already processed */ - if (file->type == INCL_IMPORTLIB && - !(source->file->flags & (FLAG_IDL_TYPELIB | FLAG_IDL_REGTYPELIB))) - return; /* library is imported only when building a typelib */ + if (file->type == INCL_IMPORTLIB) + { + if (!(source->file->flags & (FLAG_IDL_TYPELIB | FLAG_IDL_REGTYPELIB))) + return; /* library is imported only when building a typelib */ + strarray_add( &source->importlibdeps, file->filename ); + } + else strarray_add( &source->dependencies, file->filename ); file->owner = source; - strarray_add( &source->dependencies, file->filename ); /* sanity checks */ if (!strcmp( file->filename, "include/config.h" ) && @@ -2776,9 +2796,6 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, if (source->file->flags & FLAG_IDL_HEADER) add_install_rule( make, source->name, strmake( "%s.h", obj ), strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); - if (source->file->flags & FLAG_IDL_TYPELIB) - add_install_rule( make, source->name, strmake( "%s.tlb", obj ), - strmake( "d$(includedir)/wine/%s.tlb", get_include_install_path( obj ) )); } if (!targets.count) return; @@ -2796,6 +2813,13 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s", source->filename ); output_filenames( source->dependencies ); + for (i = 0; i < source->importlibdeps.count; i++) + { + struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); + const char *module = submake->module; + if (*dll_ext && !submake->is_cross) module = strmake( "%s.fake", module ); + output_filename( obj_dir_path( submake, module )); + } output( "\n" ); }

1 0

Alexandre Julliard : include: Stop building tlb files in the include directory.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 2a77543c5372de75bf09e96d39808409bd8d837a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a77543c5372de75bf09e96d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 15:17:52 2021 +0100 include: Stop building tlb files in the include directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/stdole2.tlb/Makefile.in | 2 +- dlls/stdole2.tlb/std_ole_v2.idl | 23 ----------------------- {include => dlls/stdole2.tlb}/stdole2.idl | 3 +-- include/Makefile.in | 1 - include/oleacc.idl | 6 ------ 5 files changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in index 60163996d4c..1a254979a54 100644 --- a/dlls/stdole2.tlb/Makefile.in +++ b/dlls/stdole2.tlb/Makefile.in @@ -1,4 +1,4 @@ MODULE = stdole2.tlb RC_SRCS = rsrc.rc -IDL_SRCS = std_ole_v2.idl +IDL_SRCS = stdole2.idl diff --git a/dlls/stdole2.tlb/std_ole_v2.idl b/dlls/stdole2.tlb/std_ole_v2.idl deleted file mode 100644 index 649d1822889..00000000000 --- a/dlls/stdole2.tlb/std_ole_v2.idl +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2003 Robert Shearman - * 2005 Huw Davies - * - * 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 - * - */ - -#pragma makedep regtypelib - -#include "stdole2.idl" diff --git a/include/stdole2.idl b/dlls/stdole2.tlb/stdole2.idl similarity index 99% rename from include/stdole2.idl rename to dlls/stdole2.tlb/stdole2.idl index b65907072db..178d9b71690 100644 --- a/include/stdole2.idl +++ b/dlls/stdole2.tlb/stdole2.idl @@ -19,8 +19,7 @@ */ #if 0 -#pragma makedep install -#pragma makedep typelib +#pragma makedep regtypelib #endif #include <olectl.h> diff --git a/include/Makefile.in b/include/Makefile.in index 114440f8b39..df049fd284f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -683,7 +683,6 @@ SOURCES = \ srcrst.idl \ srrestoreptapi.h \ sspi.h \ - stdole2.idl \ stgprop.h \ sti.h \ storage.h \ diff --git a/include/oleacc.idl b/include/oleacc.idl index 7cf0fa82db4..fd9c0786d1b 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -16,12 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if 0 -#pragma makedep install -#pragma makedep typelib -#pragma makedep header -#endif - import "oaidl.idl"; #ifndef __WIDL__

1 0

Rémi Bernon : dinput: Only call internal poll callback when device is acquired.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 90ebe524da10fa550daf3aa6fe4d70766a8fd69d URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ebe524da10fa550daf3aa6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 14:42:33 2021 +0100 dinput: Only call internal poll callback when device is acquired. Fixes a regression from 53fcfe3834da3c43838cd26bdeb4fdb335542627. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52022 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51956 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 85392c6b30b..a0fc47ec05b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1537,6 +1537,7 @@ static HRESULT WINAPI dinput_device_Poll( IDirectInputDevice8W *iface ) EnterCriticalSection( &impl->crit ); if (!impl->acquired) hr = DIERR_NOTACQUIRED; LeaveCriticalSection( &impl->crit ); + if (FAILED(hr)) return hr; if (impl->vtbl->poll) return impl->vtbl->poll( iface ); return hr;

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for loading manifest from resources.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 6e754202bffb64cd87108ec087970350f9f8cdf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e754202bffb64cd87108ec0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 12 16:49:47 2021 +0300 kernel32/tests: Add a test for loading manifest from resources. To confirm that 2d764e90dd2c624f7a2d863ab29bd418ed33d252 does the right thing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 32 ++++++++++++++++++++++++++++++-- dlls/kernel32/tests/resource.rc | 2 ++ dlls/kernel32/tests/wine_test.manifest | 4 ++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 163ea405222..adf2549bece 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -694,7 +694,7 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, int ok_(__FILE__, line)(detailed_info->lpRootManifestPath != NULL, "detailed_info->lpRootManifestPath == NULL\n"); if(detailed_info->lpRootManifestPath) ok_(__FILE__, line)(!lstrcmpiW(detailed_info->lpRootManifestPath, exinfo->root_manifest_path), - "unexpected detailed_info->lpRootManifestPath\n"); + "unexpected detailed_info->lpRootManifestPath %s\n", wine_dbgstr_w(detailed_info->lpRootManifestPath)); }else { ok_(__FILE__, line)(detailed_info->lpRootManifestPath == NULL, "detailed_info->lpRootManifestPath != NULL\n"); } @@ -2683,7 +2683,8 @@ todo_wine SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); - ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); +todo_wine + ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got error %d\n", GetLastError()); /* load manifest from lpAssemblyDirectory directory */ write_manifest("testdir.manifest", manifest1); @@ -3548,6 +3549,32 @@ static void run_child_process_two_dll(int run) CloseHandle(pi.hProcess); } +static const detailed_info_t detailed_info3 = +{ + 1, 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, exe_path, + ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, + app_dir, +}; + +static void test_manifest_in_module(void) +{ + ACTCTXW ctx; + HANDLE handle; + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + ctx.lpResourceName = (LPWSTR)124; + ctx.hModule = GetModuleHandleW(NULL); + handle = CreateActCtxW(&ctx); + ok(handle != 0, "CreateActCtx error %u\n", GetLastError()); + + test_basic_info(handle, __LINE__); + test_detailed_info(handle, &detailed_info3, __LINE__); + + ReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -3574,6 +3601,7 @@ START_TEST(actctx) return; } + test_manifest_in_module(); test_actctx(); test_create_fail(); test_CreateActCtx(); diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index f40a87819ea..58902e7a015 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -24,3 +24,5 @@ { MENUITEM "foo", 1 } + +124 24 wine_test.manifest diff --git a/dlls/kernel32/tests/wine_test.manifest b/dlls/kernel32/tests/wine_test.manifest new file mode 100644 index 00000000000..de77de3e201 --- /dev/null +++ b/dlls/kernel32/tests/wine_test.manifest @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity version="1.0.0.0" name="Wine.Test"/> +</assembly>

1 0

Dmitry Timoshkov : ntdll: Return correct status when manifest could not be loaded from file.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 33bc90e6873f9663550964df1e2f49515d9c5580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33bc90e6873f9663550964df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 12 16:49:49 2021 +0300 ntdll: Return correct status when manifest could not be loaded from file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index adf2549bece..e103dfdcf2b 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2683,7 +2683,6 @@ todo_wine SetLastError(0xdeadbeef); handle = CreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got error %d\n", GetLastError()); /* load manifest from lpAssemblyDirectory directory */ diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f9afb655885..ca38f37e673 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3020,7 +3020,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } - else status = STATUS_RESOURCE_TYPE_NOT_FOUND; + else status = STATUS_RESOURCE_NAME_NOT_FOUND; RtlFreeUnicodeString( &nameW ); return status; }

1 0