October 2021 - Wine-Commits

Piotr Caban : msvcrt: Don't crash on NULL in fclose.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: bb637469e13fe33220ca8eef95a26608b343d92a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb637469e13fe33220ca8eef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 11 16:15:32 2021 +0200 msvcrt: Don't crash on NULL in fclose. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++++ dlls/msvcrt/tests/file.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0eeaf2a351..da43316ebb8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3616,6 +3616,8 @@ int CDECL fclose(FILE* file) { int ret; + if (!MSVCRT_CHECK_PMT(file != NULL)) return EOF; + _lock_file(file); ret = _fclose_nolock(file); _unlock_file(file); @@ -3630,6 +3632,8 @@ int CDECL _fclose_nolock(FILE* file) { int r, flag; + if (!MSVCRT_CHECK_PMT(file != NULL)) return EOF; + if(!(file->_flag & (_IOREAD | _IOWRT | _IORW))) { file->_flag = 0; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 1d74c6135b8..7a33ae24230 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1878,6 +1878,9 @@ static void test_fopen_fclose_fcloseall( void ) ret = fclose(stream3); ok(ret == EOF, "Closing file '%s' returned %d\n", fname3, ret); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ret = fclose(NULL); + ok(ret == EOF, "Closing NULL file returned %d\n", ret); + ok(errno = EINVAL, "errno = %d\n", errno); /* testing fcloseall() */ numclosed = _fcloseall();

1 0

Alistair Leslie-Hughes : wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http requests.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 64728c618f73fd80993cb5dfa852f608f9b85d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=64728c618f73fd80993cb5df… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 11 16:17:40 2021 +0200 wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http requests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c9c4a060aac..1ca97cf3eb0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2321,6 +2321,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *(PCCERT_CHAIN_CONTEXT *)buffer = CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d1d7e678853..3b8f16a9fb2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6855,6 +6855,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -6886,6 +6887,13 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(chain); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8 */, + "InternetQueryOption failed: %u\n", GetLastError()); + if (ret) CertFreeCertificateChain(chain); + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -7825,6 +7833,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT chain; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -7845,6 +7854,12 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(chain); + SetLastError(0xdeadbeef); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &chain, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), + "InternetQueryOption failed: %u\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses );

1 0

Jacek Caban : win32u: Use syscall interface for some DC functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 277d37bcfbaf81510f4664ff7b3e0c10b38a1b2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=277d37bcfbaf81510f4664ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:49:07 2021 +0200 win32u: Use syscall interface for some DC functions. 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/win32u/gdiobj.c | 7 ------ dlls/win32u/syscall.c | 7 ++++++ dlls/win32u/win32u.spec | 14 +++++------ dlls/win32u/win32u_private.h | 8 ------ dlls/win32u/wrappers.c | 35 -------------------------- dlls/wow64win/gdi.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 9 ++++++- 7 files changed, 82 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=277d37bcfbaf81510f46…

1 0

Jacek Caban : win32u: Use syscall interface for bitmap functions.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: c7171dea29635746524daa3e80ac24acf68d097b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7171dea29635746524daa3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 11 18:48:15 2021 +0200 win32u: Use syscall interface for bitmap functions. 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/win32u/gdiobj.c | 6 ---- dlls/win32u/syscall.c | 6 ++++ dlls/win32u/win32u.spec | 12 +++---- dlls/win32u/win32u_private.h | 9 ------ dlls/win32u/wrappers.c | 33 ------------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 ++++- dlls/wow64win/wow64win_private.h | 12 +++++++ 8 files changed, 99 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7171dea29635746524d…

1 0

Alexandre Julliard : configure: Assume that dlfcn.h is available on Unix.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 2afb4fd044cb7844d7561dd353edd0297b535fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2afb4fd044cb7844d7561dd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:25:10 2021 +0200 configure: Assume that dlfcn.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 21 +++++---------------- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 9e369e943f9..afe2653703c 100755 --- a/configure +++ b/configure @@ -7476,7 +7476,6 @@ for ac_header in \ asm/types.h \ asm/user.h \ dirent.h \ - dlfcn.h \ elf.h \ float.h \ gettext-po.h \ diff --git a/configure.ac b/configure.ac index 7afe8285073..fce0622acd0 100644 --- a/configure.ac +++ b/configure.ac @@ -447,7 +447,6 @@ AC_CHECK_HEADERS(\ asm/types.h \ asm/user.h \ dirent.h \ - dlfcn.h \ elf.h \ float.h \ gettext-po.h \ diff --git a/include/config.h.in b/include/config.h.in index 51fbd3c9cae..d616fb69a0d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -59,9 +59,6 @@ file. */ #undef HAVE_DISKARBITRATION_DISKARBITRATION_H -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - /* Define to 1 if you have the `dlinfo' function. */ #undef HAVE_DLINFO diff --git a/include/wine/port.h b/include/wine/port.h index d162c79d9f5..795a61f741b 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -46,13 +46,10 @@ #if defined(_WIN32) && !defined(__CYGWIN__) -#include <direct.h> #include <errno.h> -#include <io.h> -#include <process.h> -static inline void *dlopen(const char *name, int flags) { return NULL; } -static inline void *dlsym(void *handle, const char *name) { return NULL; } +#define dlopen(name,flags) NULL +#define dlsym(handle,name) NULL static inline int dlclose(void *handle) { return 0; } static inline const char *dlerror(void) { return "No dlopen support on Windows"; } static inline int symlink(const char *from, const char *to) { errno = ENOSYS; return -1; } @@ -67,19 +64,11 @@ static inline int symlink(const char *from, const char *to) { errno = ENOSYS; re #endif #endif -#endif /* _WIN32 */ - -/**************************************************************** - * Macro definitions - */ +#else -#ifdef HAVE_DLFCN_H #include <dlfcn.h> -#else -#define RTLD_LAZY 0x001 -#define RTLD_NOW 0x002 -#define RTLD_GLOBAL 0x100 -#endif + +#endif /* _WIN32 */ /**************************************************************** * Constants

1 0

Alexandre Julliard : strmiids: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 2390075361061de972e7f5fcef8762149ccbc58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2390075361061de972e7f5fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:32:31 2021 +0200 strmiids: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/strmiids/Makefile.in | 0 {dlls => libs}/strmiids/evr.c | 0 {dlls => libs}/strmiids/strmiids.c | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 59381148423..4c61f110d90 100755 --- a/configure +++ b/configure @@ -1620,7 +1620,6 @@ enable_stdole32_tlb enable_sti enable_strmbase enable_strmdll -enable_strmiids enable_svrapi enable_sxs enable_t2embed @@ -1786,6 +1785,7 @@ enable_dxerr8 enable_dxerr9 enable_dxguid enable_mfuuid +enable_strmiids enable_wine enable_loader enable_nls @@ -20680,7 +20680,6 @@ wine_fn_config_makefile dlls/storage.dll16 enable_win16 wine_fn_config_makefile dlls/stress.dll16 enable_win16 wine_fn_config_makefile dlls/strmbase enable_strmbase wine_fn_config_makefile dlls/strmdll enable_strmdll -wine_fn_config_makefile dlls/strmiids enable_strmiids wine_fn_config_makefile dlls/svrapi enable_svrapi wine_fn_config_makefile dlls/sxs enable_sxs wine_fn_config_makefile dlls/sxs/tests enable_tests @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/dxguid enable_dxguid wine_fn_config_makefile libs/mfuuid enable_mfuuid +wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index f0e6c4369ab..b1852a98da8 100644 --- a/configure.ac +++ b/configure.ac @@ -3567,7 +3567,6 @@ WINE_CONFIG_MAKEFILE(dlls/storage.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/stress.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/strmbase) WINE_CONFIG_MAKEFILE(dlls/strmdll) -WINE_CONFIG_MAKEFILE(dlls/strmiids) WINE_CONFIG_MAKEFILE(dlls/svrapi) WINE_CONFIG_MAKEFILE(dlls/sxs) WINE_CONFIG_MAKEFILE(dlls/sxs/tests) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/dxguid) WINE_CONFIG_MAKEFILE(libs/mfuuid) +WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/strmiids/Makefile.in b/libs/strmiids/Makefile.in similarity index 100% rename from dlls/strmiids/Makefile.in rename to libs/strmiids/Makefile.in diff --git a/dlls/strmiids/evr.c b/libs/strmiids/evr.c similarity index 100% rename from dlls/strmiids/evr.c rename to libs/strmiids/evr.c diff --git a/dlls/strmiids/strmiids.c b/libs/strmiids/strmiids.c similarity index 100% rename from dlls/strmiids/strmiids.c rename to libs/strmiids/strmiids.c

1 0

Alexandre Julliard : mfuuid: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: b52b43a7a2ad83a1d95058524c1fc2a00a51050a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52b43a7a2ad83a1d9505852… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:31:59 2021 +0200 mfuuid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/mfuuid/Makefile.in | 0 {dlls => libs}/mfuuid/mfplay.c | 0 {dlls => libs}/mfuuid/mfuuid.c | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index eb6fe85b0b3..59381148423 100755 --- a/configure +++ b/configure @@ -1431,7 +1431,6 @@ enable_mfmediaengine enable_mfplat enable_mfplay enable_mfreadwrite -enable_mfuuid enable_mgmtapi enable_midimap enable_mlang @@ -1786,6 +1785,7 @@ enable_dmoguids enable_dxerr8 enable_dxerr9 enable_dxguid +enable_mfuuid enable_wine enable_loader enable_nls @@ -20383,7 +20383,6 @@ wine_fn_config_makefile dlls/mfplay enable_mfplay wine_fn_config_makefile dlls/mfplay/tests enable_tests wine_fn_config_makefile dlls/mfreadwrite enable_mfreadwrite wine_fn_config_makefile dlls/mfreadwrite/tests enable_tests -wine_fn_config_makefile dlls/mfuuid enable_mfuuid wine_fn_config_makefile dlls/mgmtapi enable_mgmtapi wine_fn_config_makefile dlls/midimap enable_midimap wine_fn_config_makefile dlls/mlang enable_mlang @@ -20922,6 +20921,7 @@ wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/dxerr8 enable_dxerr8 wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/dxguid enable_dxguid +wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index e9286ef7674..f0e6c4369ab 100644 --- a/configure.ac +++ b/configure.ac @@ -3270,7 +3270,6 @@ WINE_CONFIG_MAKEFILE(dlls/mfplay) WINE_CONFIG_MAKEFILE(dlls/mfplay/tests) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite) WINE_CONFIG_MAKEFILE(dlls/mfreadwrite/tests) -WINE_CONFIG_MAKEFILE(dlls/mfuuid) WINE_CONFIG_MAKEFILE(dlls/mgmtapi) WINE_CONFIG_MAKEFILE(dlls/midimap) WINE_CONFIG_MAKEFILE(dlls/mlang) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/dxerr8) WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/dxguid) +WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/mfuuid/Makefile.in b/libs/mfuuid/Makefile.in similarity index 100% rename from dlls/mfuuid/Makefile.in rename to libs/mfuuid/Makefile.in diff --git a/dlls/mfuuid/mfplay.c b/libs/mfuuid/mfplay.c similarity index 100% rename from dlls/mfuuid/mfplay.c rename to libs/mfuuid/mfplay.c diff --git a/dlls/mfuuid/mfuuid.c b/libs/mfuuid/mfuuid.c similarity index 100% rename from dlls/mfuuid/mfuuid.c rename to libs/mfuuid/mfuuid.c

1 0

Alexandre Julliard : dmoguids: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 7f38b342b0231f04910bb3003a575b7d7fc306b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f38b342b0231f04910bb300… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:30:09 2021 +0200 dmoguids: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dmoguids/Makefile.in | 0 {dlls => libs}/dmoguids/dmoguids.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d036396635f..2438099dd8a 100755 --- a/configure +++ b/configure @@ -1274,7 +1274,6 @@ enable_dmband enable_dmcompos enable_dmime enable_dmloader -enable_dmoguids enable_dmscript enable_dmstyle enable_dmsynth @@ -1786,6 +1785,7 @@ enable_xpssvcs enable_fonts enable_include enable_adsiid +enable_dmoguids enable_wine enable_loader enable_nls @@ -20171,7 +20171,6 @@ wine_fn_config_makefile dlls/dmime enable_dmime wine_fn_config_makefile dlls/dmime/tests enable_tests wine_fn_config_makefile dlls/dmloader enable_dmloader wine_fn_config_makefile dlls/dmloader/tests enable_tests -wine_fn_config_makefile dlls/dmoguids enable_dmoguids wine_fn_config_makefile dlls/dmscript enable_dmscript wine_fn_config_makefile dlls/dmscript/tests enable_tests wine_fn_config_makefile dlls/dmstyle enable_dmstyle @@ -20922,6 +20921,7 @@ wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/adsiid enable_adsiid +wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index c9f1179f53a..cfea04f82db 100644 --- a/configure.ac +++ b/configure.ac @@ -3058,7 +3058,6 @@ WINE_CONFIG_MAKEFILE(dlls/dmime) WINE_CONFIG_MAKEFILE(dlls/dmime/tests) WINE_CONFIG_MAKEFILE(dlls/dmloader) WINE_CONFIG_MAKEFILE(dlls/dmloader/tests) -WINE_CONFIG_MAKEFILE(dlls/dmoguids) WINE_CONFIG_MAKEFILE(dlls/dmscript) WINE_CONFIG_MAKEFILE(dlls/dmscript/tests) WINE_CONFIG_MAKEFILE(dlls/dmstyle) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/adsiid) +WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dmoguids/Makefile.in b/libs/dmoguids/Makefile.in similarity index 100% rename from dlls/dmoguids/Makefile.in rename to libs/dmoguids/Makefile.in diff --git a/dlls/dmoguids/dmoguids.c b/libs/dmoguids/dmoguids.c similarity index 100% rename from dlls/dmoguids/dmoguids.c rename to libs/dmoguids/dmoguids.c

1 0

Alexandre Julliard : adsiid: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: 58f267dd967cbf1571e15c70a80f9841a232eb8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f267dd967cbf1571e15c70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:29:36 2021 +0200 adsiid: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/adsiid/Makefile.in | 0 {dlls => libs}/adsiid/adsiid.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index afe2653703c..d036396635f 100755 --- a/configure +++ b/configure @@ -912,7 +912,6 @@ enable_aclui enable_activeds_tlb enable_activeds enable_actxprxy -enable_adsiid enable_adsldp enable_adsldpc enable_advapi32 @@ -1786,6 +1785,7 @@ enable_xpsprint enable_xpssvcs enable_fonts enable_include +enable_adsiid enable_wine enable_loader enable_nls @@ -19737,7 +19737,6 @@ wine_fn_config_makefile dlls/activeds.tlb enable_activeds_tlb wine_fn_config_makefile dlls/activeds enable_activeds wine_fn_config_makefile dlls/activeds/tests enable_tests wine_fn_config_makefile dlls/actxprxy enable_actxprxy -wine_fn_config_makefile dlls/adsiid enable_adsiid wine_fn_config_makefile dlls/adsldp enable_adsldp wine_fn_config_makefile dlls/adsldp/tests enable_tests wine_fn_config_makefile dlls/adsldpc enable_adsldpc @@ -20922,6 +20921,7 @@ wine_fn_config_makefile dlls/xpsprint enable_xpsprint wine_fn_config_makefile dlls/xpssvcs enable_xpssvcs wine_fn_config_makefile fonts enable_fonts wine_fn_config_makefile include enable_include +wine_fn_config_makefile libs/adsiid enable_adsiid wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index fce0622acd0..c9f1179f53a 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,7 +2624,6 @@ WINE_CONFIG_MAKEFILE(dlls/activeds.tlb) WINE_CONFIG_MAKEFILE(dlls/activeds) WINE_CONFIG_MAKEFILE(dlls/activeds/tests) WINE_CONFIG_MAKEFILE(dlls/actxprxy) -WINE_CONFIG_MAKEFILE(dlls/adsiid) WINE_CONFIG_MAKEFILE(dlls/adsldp) WINE_CONFIG_MAKEFILE(dlls/adsldp/tests) WINE_CONFIG_MAKEFILE(dlls/adsldpc) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(dlls/xpsprint) WINE_CONFIG_MAKEFILE(dlls/xpssvcs) WINE_CONFIG_MAKEFILE(fonts) WINE_CONFIG_MAKEFILE(include) +WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/adsiid/Makefile.in b/libs/adsiid/Makefile.in similarity index 100% rename from dlls/adsiid/Makefile.in rename to libs/adsiid/Makefile.in diff --git a/dlls/adsiid/adsiid.c b/libs/adsiid/adsiid.c similarity index 100% rename from dlls/adsiid/adsiid.c rename to libs/adsiid/adsiid.c

1 0

Alexandre Julliard : dxerr9: Move to the libs directory.
by Alexandre Julliard Oct. 11, 2021

Oct. 11, 2021

Module: wine Branch: master Commit: e36fe96fdaddf0afc1129299a5cc260c18f514f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36fe96fdaddf0afc1129299… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 11 11:31:03 2021 +0200 dxerr9: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/dxerr9/Makefile.in | 0 {dlls => libs}/dxerr9/dxerr9.c | 0 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 98285fc0753..72bde82e1a7 100755 --- a/configure +++ b/configure @@ -1300,7 +1300,6 @@ enable_dwmapi enable_dwrite enable_dx8vb enable_dxdiagn -enable_dxerr9 enable_dxgi enable_dxguid enable_dxtrans @@ -1786,6 +1785,7 @@ enable_include enable_adsiid enable_dmoguids enable_dxerr8 +enable_dxerr9 enable_wine enable_loader enable_nls @@ -20212,7 +20212,6 @@ wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb wine_fn_config_makefile dlls/dxdiagn enable_dxdiagn wine_fn_config_makefile dlls/dxdiagn/tests enable_tests -wine_fn_config_makefile dlls/dxerr9 enable_dxerr9 wine_fn_config_makefile dlls/dxgi enable_dxgi wine_fn_config_makefile dlls/dxgi/tests enable_tests wine_fn_config_makefile dlls/dxguid enable_dxguid @@ -20922,6 +20921,7 @@ wine_fn_config_makefile include enable_include wine_fn_config_makefile libs/adsiid enable_adsiid wine_fn_config_makefile libs/dmoguids enable_dmoguids wine_fn_config_makefile libs/dxerr8 enable_dxerr8 +wine_fn_config_makefile libs/dxerr9 enable_dxerr9 wine_fn_config_makefile libs/wine enable_wine wine_fn_config_makefile loader enable_loader wine_fn_config_makefile nls enable_nls diff --git a/configure.ac b/configure.ac index eb4a19fbb30..63c87ef51c8 100644 --- a/configure.ac +++ b/configure.ac @@ -3099,7 +3099,6 @@ WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) WINE_CONFIG_MAKEFILE(dlls/dxdiagn) WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests) -WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxguid) @@ -3809,6 +3808,7 @@ WINE_CONFIG_MAKEFILE(include) WINE_CONFIG_MAKEFILE(libs/adsiid) WINE_CONFIG_MAKEFILE(libs/dmoguids) WINE_CONFIG_MAKEFILE(libs/dxerr8) +WINE_CONFIG_MAKEFILE(libs/dxerr9) WINE_CONFIG_MAKEFILE(libs/wine) WINE_CONFIG_MAKEFILE(loader) WINE_CONFIG_MAKEFILE(nls) diff --git a/dlls/dxerr9/Makefile.in b/libs/dxerr9/Makefile.in similarity index 100% rename from dlls/dxerr9/Makefile.in rename to libs/dxerr9/Makefile.in diff --git a/dlls/dxerr9/dxerr9.c b/libs/dxerr9/dxerr9.c similarity index 100% rename from dlls/dxerr9/dxerr9.c rename to libs/dxerr9/dxerr9.c

1 0