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

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

June 6, 2019

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

1 0

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

June 6, 2019

Module: wine Branch: master Commit: 7fa73a79af933787fe54f69da48ddbdb1c1056be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa73a79af933787fe54f69d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:57 2019 +0200 inetmib1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/Makefile.in | 2 ++ dlls/inetmib1/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/inetmib1/Makefile.in b/dlls/inetmib1/Makefile.in index 25391ff..9ee6216 100644 --- a/dlls/inetmib1/Makefile.in +++ b/dlls/inetmib1/Makefile.in @@ -2,5 +2,7 @@ MODULE = inetmib1.dll IMPORTS = snmpapi DELAYIMPORTS = iphlpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 2f7b9ca..96e3b1f 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <assert.h> #include <stdarg.h> #include <stdlib.h>

1 0

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

June 6, 2019

Module: wine Branch: master Commit: 955549c4cac22985427d69b5b9e6ae3ce490368c URL: https://source.winehq.org/git/wine.git/?a=commit;h=955549c4cac22985427d69b5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 23:19:09 2019 +0800 gdi32: Implement D3DKMTDestroyDevice. 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> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 29 ++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 10 ++++---- include/ddk/d3dkmthk.h | 1 + 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index cb7935b..43452cd 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -22,7 +22,7 @@ @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext @ stdcall D3DKMTDestroyDCFromMemory(ptr) gdi32.D3DKMTDestroyDCFromMemory -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroyKeyedMutex @ stub D3DKMTDestroyOutputDupl @ stub D3DKMTDestroyOverlay diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index e4692ac..01bc8bf 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext -@ stub D3DKMTDestroyDevice +@ stdcall D3DKMTDestroyDevice(ptr) gdi32.D3DKMTDestroyDevice @ stub D3DKMTDestroySynchronizationObject @ stub D3DKMTEscape @ stub D3DKMTGetContextSchedulingPriority diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f57dd12..96c2f1f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1394,3 +1394,32 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) desc->hDevice = device->handle; return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTDestroyDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +{ + NTSTATUS status = STATUS_INVALID_PARAMETER; + struct d3dkmt_device *device; + + TRACE("(%p)\n", desc); + + if (!desc || !desc->hDevice) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( device, &d3dkmt_devices, struct d3dkmt_device, entry ) + { + if (device->handle == desc->hDevice) + { + list_remove( &device->entry ); + heap_free( device ); + status = STATUS_SUCCESS; + break; + } + } + LeaveCriticalSection( &driver_section ); + + return status; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 88fe846..9abd821 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) +@ stdcall D3DKMTDestroyDevice(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index f5c23da..b5f6f75 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,9 +194,9 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTCreateDevice() is unavailable.\n"); return; } @@ -240,17 +240,17 @@ static void test_D3DKMTDestroyDevice(void) if (!pD3DKMTDestroyDevice || pD3DKMTDestroyDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTDestroyDevice() is unavailable.\n"); + win_skip("D3DKMTDestroyDevice() is unavailable.\n"); return; } /* Invalid parameters */ status = pD3DKMTDestroyDevice(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(&destroy_device_desc, 0, sizeof(destroy_device_desc)); status = pD3DKMTDestroyDevice(&destroy_device_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_D3DKMTCheckVidPnExclusiveOwnership(void) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 90bf907..081758b 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -169,6 +169,7 @@ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus

1 0

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

June 6, 2019

Module: wine Branch: master Commit: 733a92df4bdeb1f4592155ee6fb4d5a7542113bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=733a92df4bdeb1f4592155ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 23:18:52 2019 +0800 gdi32: Implement D3DKMTCreateDevice. 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> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 2 +- dlls/gdi32/driver.c | 52 ++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 43186e8..cb7935b 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -12,7 +12,7 @@ @ stub D3DKMTCreateAllocation2 @ stub D3DKMTCreateContext @ stdcall D3DKMTCreateDCFromMemory(ptr) gdi32.D3DKMTCreateDCFromMemory -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateKeyedMutex @ stub D3DKMTCreateKeyedMutex2 @ stub D3DKMTCreateOutputDupl diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 87304b7..e4692ac 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -8,7 +8,7 @@ @ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext -@ stub D3DKMTCreateDevice +@ stdcall D3DKMTCreateDevice(ptr) gdi32.D3DKMTCreateDevice @ stub D3DKMTCreateSynchronizationObject @ stub D3DKMTDestroyAllocation @ stub D3DKMTDestroyContext diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index da3aad9..f57dd12 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -59,10 +59,17 @@ struct d3dkmt_adapter struct list entry; /* List entry */ }; +struct d3dkmt_device +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics device handle*/ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); +static struct list d3dkmt_devices = LIST_INIT( d3dkmt_devices ); const struct gdi_dc_funcs *font_driver = NULL; @@ -1342,3 +1349,48 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI desc->VidPnSourceId = 0; return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTCreateDevice [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + struct d3dkmt_device *device; + BOOL found = FALSE; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &driver_section ); + LIST_FOR_EACH_ENTRY( adapter, &d3dkmt_adapters, struct d3dkmt_adapter, entry ) + { + if (adapter->handle == desc->hAdapter) + { + found = TRUE; + break; + } + } + LeaveCriticalSection( &driver_section ); + + if (!found) + return STATUS_INVALID_PARAMETER; + + if (desc->Flags.LegacyMode || desc->Flags.RequestVSync || desc->Flags.DisableGpuTimeout) + FIXME("Flags unsupported.\n"); + + device = heap_alloc_zero( sizeof( *device ) ); + if (!device) + return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + device->handle = ++handle_start; + list_add_tail( &d3dkmt_devices, &device->entry ); + LeaveCriticalSection( &driver_section ); + + desc->hDevice = device->handle; + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5c17ed9..88fe846 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -82,6 +82,7 @@ @ stdcall CreateSolidBrush(long) @ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) +@ stdcall D3DKMTCreateDevice(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index caded27..f5c23da 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -194,7 +194,7 @@ static void test_D3DKMTCreateDevice(void) D3DKMT_DESTROYDEVICE destroy_device_desc; NTSTATUS status; - if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTCreateDevice || pD3DKMTCreateDevice(NULL) == STATUS_PROCEDURE_NOT_FOUND || !pD3DKMTDestroyDevice) { skip("D3DKMTCreateDevice() or D3DKMTDestroyDevice() is unavailable.\n"); return; diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 5436cb6..90bf907 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -166,6 +166,7 @@ extern "C" #endif /* __cplusplus */ NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); +NTSTATUS WINAPI D3DKMTCreateDevice(D3DKMT_CREATEDEVICE *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc);

1 0

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

June 6, 2019

Module: wine Branch: master Commit: d37030528eef36014b51171fecc9c381b67cb11b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37030528eef36014b51171f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 5 23:18:25 2019 +0800 gdi32: Implement D3DKMTOpenAdapterFromGdiDisplayName. 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> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/d3d11/d3d11.spec | 1 + dlls/gdi32/driver.c | 50 ++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- include/ddk/d3dkmthk.h | 1 + 6 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index e8aa38e..43186e8 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub D3DKMTLock @ stub D3DKMTOfferAllocations @ stub D3DKMTOpenAdapterFromDeviceName -@ stub D3DKMTOpenAdapterFromGdiDisplayName +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex @ stub D3DKMTOpenKeyedMutex2 diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 267778a..365e5d7 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -22,6 +22,7 @@ @ stub D3DKMTGetRuntimeData @ stub D3DKMTGetSharedPrimaryHandle @ stub D3DKMTLock +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stub D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenResource @ stub D3DKMTPresent diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 88f49a0..01efc69 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -41,6 +41,7 @@ #include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(driver); @@ -51,9 +52,18 @@ struct graphics_driver const struct gdi_dc_funcs *funcs; }; +struct d3dkmt_adapter +{ + D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ + INT ordinal; /* Graphics adapter ordinal */ + struct list entry; /* List entry */ +}; + static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +static struct list d3dkmt_adapters = LIST_INIT( d3dkmt_adapters ); + const struct gdi_dc_funcs *font_driver = NULL; static CRITICAL_SECTION driver_section; @@ -1272,3 +1282,43 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) FIXME("(%p): stub\n", desc); return STATUS_SUCCESS; } + +/****************************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + TRACE("(%p) semi-stub\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Support multiple monitors */ + if (lstrcmpiW( desc->DeviceName, display1W )) + { + FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + return STATUS_UNSUCCESSFUL; + } + + adapter = heap_alloc( sizeof( *adapter ) ); + if (!adapter) + return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ + adapter->handle = ++handle_start; + adapter->ordinal = 0; + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + + desc->hAdapter = handle_start; + /* FIXME: Support AdapterLuid */ + desc->AdapterLuid.LowPart = 0; + desc->AdapterLuid.HighPart = 0; + desc->VidPnSourceId = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2d158e0..5c17ed9 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -84,6 +84,7 @@ @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3b8953b..067c162 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -56,7 +56,7 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) if (!pD3DKMTOpenAdapterFromGdiDisplayName || pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromGdiDisplayName() is unavailable.\n"); return; } diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index c873210..5436cb6 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -168,6 +168,7 @@ extern "C" NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); #ifdef __cplusplus }

1 0

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

June 6, 2019

Module: wine Branch: master Commit: 4ce467ff3bb12f68660c1bc6ddb2fae5cfa6bda4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce467ff3bb12f68660c1bc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:21:50 2019 +0200 jsproxy: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/Makefile.in | 2 ++ dlls/jsproxy/main.c | 18 +++++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in index 07f1fb5..3b75db4 100644 --- a/dlls/jsproxy/Makefile.in +++ b/dlls/jsproxy/Makefile.in @@ -2,6 +2,8 @@ MODULE = jsproxy.dll IMPORTS = uuid oleaut32 ole32 ws2_32 IMPORTLIB = jsproxy +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 13f34b2..905d2d9 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <sys/types.h> @@ -35,7 +32,6 @@ #include "activscp.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" static HINSTANCE instance; @@ -275,7 +271,7 @@ static HRESULT WINAPI dispex_GetNameSpaceParent( static HRESULT WINAPI dispex_GetDispID( IDispatchEx *iface, BSTR name, DWORD flags, DISPID *id ) { - if (!strcmpW( name, dns_resolveW )) + if (!lstrcmpW( name, dns_resolveW )) { *id = DISPID_GLOBAL_DNSRESOLVE; return S_OK; @@ -299,9 +295,9 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format ) return ret; } -static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr ) +static void printf_addr( const WCHAR *fmt, WCHAR *buf, SIZE_T size, struct sockaddr_in *addr ) { - sprintfW( buf, fmt, + swprintf( buf, size, fmt, (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 24 & 0xff), (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 16 & 0xff), (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 8 & 0xff), @@ -333,7 +329,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) freeaddrinfo( ai ); return S_FALSE; } - printf_addr( fmtW, addr, (struct sockaddr_in *)elem->ai_addr ); + printf_addr( fmtW, addr, ARRAY_SIZE(addr), (struct sockaddr_in *)elem->ai_addr ); freeaddrinfo( ai ); V_VT( result ) = VT_BSTR; V_BSTR( result ) = SysAllocString( addr ); @@ -412,7 +408,7 @@ static HRESULT WINAPI site_GetItemInfo( IActiveScriptSite *iface, LPCOLESTR name, DWORD mask, IUnknown **item, ITypeInfo **type_info ) { - if (!strcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN) + if (!lstrcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN) { *item = (IUnknown *)&global_dispex; return S_OK; @@ -488,9 +484,9 @@ static BSTR include_pac_utils( const WCHAR *script ) data = LoadResource( hmod, rsrc ); len = MultiByteToWideChar( CP_ACP, 0, data, size, NULL, 0 ); - if (!(ret = SysAllocStringLen( NULL, len + strlenW( script ) + 1 ))) return NULL; + if (!(ret = SysAllocStringLen( NULL, len + lstrlenW( script ) + 1 ))) return NULL; MultiByteToWideChar( CP_ACP, 0, data, size, ret, len ); - strcpyW( ret + len, script ); + lstrcpyW( ret + len, script ); return ret; }

1 0

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

June 6, 2019

Module: wine Branch: master Commit: 0af6002a3bf0ffa498c4de4840a6f4a93ac0bac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af6002a3bf0ffa498c4de48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:13:43 2019 +0200 joy.cpl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/Makefile.in | 2 ++ dlls/joy.cpl/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index df3e3d4..d1b0e45 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,6 +1,8 @@ MODULE = joy.cpl IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 06084f3..4ad9cf8 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -32,7 +32,6 @@ #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "joy.h" WINE_DEFAULT_DEBUG_CHANNEL(joycpl);

1 0

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

June 6, 2019

Module: wine Branch: master Commit: fcc40a07909dc7626b6d1e2ec73f823d828a47e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc40a07909dc7626b6d1e2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 11:14:22 2019 +0200 itss: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/Makefile.in | 2 ++ dlls/itss/chm_lib.c | 25 +++++++++++-------------- dlls/itss/itss.c | 2 -- dlls/itss/lzx.c | 17 ++++------------- dlls/itss/moniker.c | 16 +++++++--------- dlls/itss/protocol.c | 29 ++++++++++++++--------------- dlls/itss/storage.c | 26 ++++++++++++-------------- 7 files changed, 50 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc40a07909dc7626b6d…

1 0

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

June 6, 2019

Module: wine Branch: master Commit: 691fe545125cf9216e70d6e3afc58bd4a7a8c355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=691fe545125cf9216e70d6e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:02:08 2019 +0200 infosoft: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/Makefile.in | 2 ++ dlls/infosoft/infosoft_main.c | 1 - dlls/infosoft/wordbreaker.c | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 359bd80..813e65d 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,6 +1,8 @@ MODULE = infosoft.dll IMPORTS = uuid advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ infosoft_main.c \ wordbreaker.c diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 9524291..1d93b49 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include <stdio.h> diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index ceb9e18..aa432eb 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -29,7 +28,6 @@ #include "winuser.h" #include "ole2.h" #include "indexsrv.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(infosoft); @@ -128,7 +126,7 @@ static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, { case 0: /* skip spaces and punctuation */ - if (!ch || ispunctW(ch) || isspaceW(ch)) + if (!ch || iswpunct(ch) || iswspace(ch)) ts->iCur ++; else state = 1; @@ -136,7 +134,7 @@ static HRESULT WINAPI wb_BreakText( IWordBreaker *iface, case 1: /* find the end of the word */ - if (ch && !ispunctW(ch) && !isspaceW(ch)) + if (ch && !iswpunct(ch) && !iswspace(ch)) len++; else {

1 0

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

June 6, 2019

Module: wine Branch: master Commit: afc721f0f1a0d0bb7fc1e577633d5b5a8ee75da7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afc721f0f1a0d0bb7fc1e577… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 09:01:34 2019 +0200 inetcomm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 2 ++ dlls/inetcomm/mimeintl.c | 3 +-- dlls/inetcomm/mimeole.c | 5 ++--- dlls/inetcomm/protocol.c | 19 +++++++++---------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index 690e302..198ef0b 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -2,6 +2,8 @@ MODULE = inetcomm.dll IMPORTLIB = inetcomm IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ imaptransport.c \ inetcomm_main.c \ diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 07d3ae5..ec7d340 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -34,7 +34,6 @@ #include "mlang.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "inetcomm_private.h" @@ -415,7 +414,7 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE break; case VT_LPWSTR: cpiSource = CP_UNICODE; - src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); + src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR); break; default: return E_INVALIDARG; diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index bb0f9bd..2c481ab 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -37,7 +37,6 @@ #include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "inetcomm_private.h" @@ -3713,13 +3712,13 @@ HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx TRACE("display name %s\n", debugstr_w(display_name)); - len = strlenW(display_name); + len = lstrlenW(display_name); mhtml_url = heap_alloc((len+1)*sizeof(WCHAR) + sizeof(mhtml_prefixW)); if(!mhtml_url) return E_OUTOFMEMORY; memcpy(mhtml_url, mhtml_prefixW, sizeof(mhtml_prefixW)); - strcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); + lstrcpyW(mhtml_url + ARRAY_SIZE(mhtml_prefixW), display_name); HeapFree(GetProcessHeap(), 0, display_name); hres = CreateURLMoniker(NULL, mhtml_url, moniker_new); diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index c6a59fe..e50e5a6 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -26,7 +26,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -70,7 +69,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); @@ -83,20 +82,20 @@ static HRESULT parse_mhtml_url(const WCHAR *url, mhtml_url_t *r) { const WCHAR *p; - if(strncmpiW(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) + if(wcsnicmp(url, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) return E_FAIL; r->mhtml = url + ARRAY_SIZE(mhtml_prefixW); - p = strchrW(r->mhtml, '!'); + p = wcschr(r->mhtml, '!'); if(p) { r->mhtml_len = p - r->mhtml; /* FIXME: We handle '!' and '!x-usc:' in URLs as the same thing. Those should not be the same. */ - if(!strncmpW(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) + if(!wcsncmp(p, mhtml_separatorW, ARRAY_SIZE(mhtml_separatorW))) p += ARRAY_SIZE(mhtml_separatorW); else p++; }else { - r->mhtml_len = strlenW(r->mhtml); + r->mhtml_len = lstrlenW(r->mhtml); } r->location = p; @@ -142,7 +141,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag if(FAILED(hres)) return report_result(protocol, hres); - found = !strcmpW(protocol->location, value.u.pwszVal); + found = !lstrcmpW(protocol->location, value.u.pwszVal); PropVariantClear(&value); }while(!found); }else { @@ -670,14 +669,14 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(FAILED(hres)) return hres; - if(!strncmpiW(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { + if(!wcsnicmp(pwzRelativeUrl, mhtml_prefixW, ARRAY_SIZE(mhtml_prefixW))) { FIXME("Relative URL is mhtml protocol\n"); return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } len += url.mhtml_len; if(*pwzRelativeUrl) - len += strlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); + len += lstrlenW(pwzRelativeUrl) + ARRAY_SIZE(mhtml_separatorW); if(len >= cchResult) { *pcchResult = 0; return E_FAIL; @@ -690,7 +689,7 @@ static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *ifa if(*pwzRelativeUrl) { memcpy(p, mhtml_separatorW, sizeof(mhtml_separatorW)); p += ARRAY_SIZE(mhtml_separatorW); - strcpyW(p, pwzRelativeUrl); + lstrcpyW(p, pwzRelativeUrl); }else { *p = 0; }

1 0