June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : imagehlp: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 4bc3657962b4988c5f63de9d9f1a5229bd837a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bc3657962b4988c5f63de9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:00:49 2019 +0200 imagehlp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index e8958d9..0e707a5 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -3,6 +3,8 @@ MODULE = imagehlp.dll IMPORTLIB = imagehlp IMPORTS = dbghelp +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ access.c \ imagehlp_main.c \

1 0

Alexandre Julliard : inkobj: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 057447e824af2f87ccdd60c0fe5dc80765e2eb26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057447e824af2f87ccdd60c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:30 2019 +0200 inkobj: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inkobj/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/inkobj/Makefile.in b/dlls/inkobj/Makefile.in index 3025cd7..e5cede5 100644 --- a/dlls/inkobj/Makefile.in +++ b/dlls/inkobj/Makefile.in @@ -1,4 +1,6 @@ MODULE = inkobj.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ inkobj.c

1 0

Zhiyi Zhang : gdi32: Implement D3DKMTCloseAdapter.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 344556f7d5a68dbc988821ca23c68d979fd08b63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=344556f7d5a68dbc988821ca… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 23:18:44 2019 +0800 gdi32: Implement D3DKMTCloseAdapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 24 ++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 365e5d7..87304b7 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -5,7 +5,7 @@ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stdcall D3D11On12CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext @ stub D3DKMTCreateDevice diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 01efc69..da3aad9 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1279,8 +1279,28 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) */ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { - FIXME("(%p): stub\n", desc); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_adapter *adapter; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hAdapter) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + list_remove( &adapter->entry ); + heap_free( adapter ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; } /****************************************************************************** diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 067c162..caded27 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -179,11 +179,11 @@ static void test_D3DKMTCloseAdapter(void) /* Invalid parameters */ status = pD3DKMTCloseAdapter(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); memset(&close_adapter_desc, 0, sizeof(close_adapter_desc)); status = pD3DKMTCloseAdapter(&close_adapter_desc); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } static void test_D3DKMTCreateDevice(void)

1 0

Alexandre Julliard : jsproxy: Build with Windows sockets.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 5831a0bfea22b4375fdf0ee2b6aa35162d553bcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5831a0bfea22b4375fdf0ee2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:21:25 2019 +0200 jsproxy: Build with Windows sockets. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/Makefile.in | 2 +- dlls/jsproxy/main.c | 24 +----------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in index 8ae2a38..07f1fb5 100644 --- a/dlls/jsproxy/Makefile.in +++ b/dlls/jsproxy/Makefile.in @@ -1,5 +1,5 @@ MODULE = jsproxy.dll -IMPORTS = uuid oleaut32 ole32 +IMPORTS = uuid oleaut32 ole32 ws2_32 IMPORTLIB = jsproxy C_SRCS = \ diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 26f43c5..13f34b2 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -21,29 +21,12 @@ #include <stdarg.h> #include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#if defined(__MINGW32__) || defined (_MSC_VER) -# include <ws2tcpip.h> -#else -# define closesocket close -# define ioctlsocket ioctl -#endif #include "windef.h" #include "winbase.h" -#ifndef __MINGW32__ -#define USE_WS_PREFIX -#endif #include "winsock2.h" #include "ws2ipdef.h" +#include "ws2tcpip.h" #include "winnls.h" #include "wininet.h" #define COBJMACROS @@ -327,7 +310,6 @@ static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) { -#ifdef HAVE_GETADDRINFO static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; WCHAR addr[16]; struct addrinfo *ai, *elem; @@ -356,10 +338,6 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) V_VT( result ) = VT_BSTR; V_BSTR( result ) = SysAllocString( addr ); return S_OK; -#else - FIXME("getaddrinfo not found at build time\n"); - return S_FALSE; -#endif } static HRESULT WINAPI dispex_InvokeEx(

1 0

Alexandre Julliard : inseng: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: bca0617fe2c2099e7b3cd758993dbf0ac28bc290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca0617fe2c2099e7b3cd758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:38 2019 +0200 inseng: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/Makefile.in | 2 ++ dlls/inseng/inseng_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 652e06b..797a0d2 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,6 +1,8 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = inseng_main.c IDL_SRCS = inseng_classes.idl diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 93649e2..631a936 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : initpki: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: ccb6c28e4c7488e351a8d9c4ee1e1587682d970c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccb6c28e4c7488e351a8d9c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:22 2019 +0200 initpki: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/initpki/Makefile.in | 2 ++ dlls/initpki/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/initpki/Makefile.in b/dlls/initpki/Makefile.in index f8997f2..c1d2ffc 100644 --- a/dlls/initpki/Makefile.in +++ b/dlls/initpki/Makefile.in @@ -1,4 +1,6 @@ MODULE = initpki.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c index c5def6c..b7260f3 100644 --- a/dlls/initpki/main.c +++ b/dlls/initpki/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : inetcpl: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: e01d9db2748d666e5be3927f72481702420f9738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e01d9db2748d666e5be3927f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:46 2019 +0200 inetcpl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/Makefile.in | 2 ++ dlls/inetcpl.cpl/connections.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index f84c4ce..972c666 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -2,6 +2,8 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ connections.c \ content.c \ diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 2132ac5..c24374f 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <wininet.h> #include <winuser.h> #include <winreg.h> @@ -27,7 +28,6 @@ #include "inetcpl.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); @@ -193,7 +193,7 @@ static void connections_on_initdialog(HWND hwnd) EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), TRUE); } - port = strchrW(address, ':'); + port = wcschr(address, ':'); if(port) { *port = 0;

1 0

Alexandre Julliard : imm32: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 700910be7c02cdd9a05b3e45e90d17479eac40d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=700910be7c02cdd9a05b3e45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:04 2019 +0200 imm32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/Makefile.in | 2 ++ dlls/imm32/imm.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index b190888..cebcf4c 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -2,6 +2,8 @@ MODULE = imm32.dll IMPORTLIB = imm32 IMPORTS = user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ imm.c diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b2ac662..5f68c1d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -33,7 +33,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -318,8 +317,8 @@ static HMODULE load_graphics_driver(void) if (!guid_atom) return 0; memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; - strcatW( key, displayW ); + if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0; + lstrcatW( key, displayW ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); @@ -1643,7 +1642,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !lstrcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE;

1 0

Alexandre Julliard : jscript: Build with msvcrt.
by Alexandre Julliard June 6, 2019

June 6, 2019

Module: wine Branch: master Commit: 29ea8b42dbf6fafc932a9d4ed2db8f8115d735d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29ea8b42dbf6fafc932a9d4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:17:49 2019 +0200 jscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/Makefile.in | 2 ++ dlls/jscript/activex.c | 2 -- dlls/jscript/array.c | 12 ++++------ dlls/jscript/compile.c | 22 +++++++++--------- dlls/jscript/date.c | 59 ++++++++++++++++++++++++------------------------ dlls/jscript/decode.c | 4 ++-- dlls/jscript/dispex.c | 15 ++++++------ dlls/jscript/engine.c | 8 +++---- dlls/jscript/error.c | 8 +++---- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 24 +++++++++----------- dlls/jscript/jscript.h | 12 ++-------- dlls/jscript/json.c | 7 +++--- dlls/jscript/jsstr.h | 2 +- dlls/jscript/jsutils.c | 16 ++++++------- dlls/jscript/lex.c | 50 ++++++++++++++++++++-------------------- dlls/jscript/math.c | 2 -- dlls/jscript/number.c | 2 +- dlls/jscript/object.c | 4 ++-- dlls/jscript/parser.y | 6 ++--- dlls/jscript/regexp.c | 28 +++++++++++------------ dlls/jscript/string.c | 28 +++++++++++------------ 22 files changed, 145 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29ea8b42dbf6fafc932a…

1 0

Piotr Caban : msvcp: Fix _Lockit::_Lockit_ctor and _Lockit:: _Lockit_dtor implementation.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: 2513b09c3cdf8d261f1561c4e99e501f674e5887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2513b09c3cdf8d261f1561c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 18:56:03 2019 +0200 msvcp: Fix _Lockit::_Lockit_ctor and _Lockit::_Lockit_dtor implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/misc.c | 55 ++++++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 4 ++-- 7 files changed, 42 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2513b09c3cdf8d261f15…

1 0