wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Nikolay Sivov : d3d10/effect: Forward to pool effect in GetVariableByIndex().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: d3b18bea30844cb8a37137d2cfd21668fba7db4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b18bea30844cb8a37137d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 21 08:22:16 2021 +0300 d3d10/effect: Forward to pool effect in GetVariableByIndex(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 14 +++++++++----- dlls/d3d10/tests/effect.c | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ebcb5f4145b..672cbae3920 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3223,14 +3223,14 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = impl_from_ID3D10Effect(iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, index %u\n", iface, index); - for (i = 0; i < This->local_buffer_count; ++i) + for (i = 0; i < effect->local_buffer_count; ++i) { - struct d3d10_effect_variable *l = &This->local_buffers[i]; + struct d3d10_effect_variable *l = &effect->local_buffers[i]; if (index < l->type->member_count) { @@ -3242,13 +3242,17 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB index -= l->type->member_count; } - if (index < This->local_variable_count) + if (index < effect->local_variable_count) { - struct d3d10_effect_variable *v = &This->local_variables[index]; + struct d3d10_effect_variable *v = &effect->local_variables[index]; TRACE("Returning variable %p.\n", v); return &v->ID3D10EffectVariable_iface; } + index -= effect->local_variable_count; + + if (effect->pool) + return effect->pool->lpVtbl->GetVariableByIndex(effect->pool, index); WARN("Invalid index specified\n"); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9fbf8b9e865..31edd4a1c48 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6641,33 +6641,24 @@ todo_wine v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 2); hr = v->lpVtbl->GetDesc(v, &var_desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(!strcmp(var_desc.Name, "f1"), "Unexpected name %s.\n", var_desc.Name); - ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); - } + ok(!strcmp(var_desc.Name, "f1"), "Unexpected name %s.\n", var_desc.Name); +todo_wine + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 3); hr = v->lpVtbl->GetDesc(v, &var_desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); - ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); - } + ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); +todo_wine + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 4); hr = v->lpVtbl->GetDesc(v, &var_desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(!strcmp(var_desc.Name, "s_blendstate"), "Unexpected name %s.\n", var_desc.Name); - ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); - } + ok(!strcmp(var_desc.Name, "s_blendstate"), "Unexpected name %s.\n", var_desc.Name); +todo_wine + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc);

1 0

Nikolay Sivov : d3d10/effect: Forward to pool effect in GetVariableByName().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 23c6e537c2829b5d649588f94266c639860d44ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=23c6e537c2829b5d649588f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 21 08:22:15 2021 +0300 d3d10/effect: Forward to pool effect in GetVariableByName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 13 ++++++++----- dlls/d3d10/tests/effect.c | 9 +++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9436d0277f2..ebcb5f4145b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3258,7 +3258,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, const char *name) { - struct d3d10_effect *This = impl_from_ID3D10Effect(iface); + struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -3269,9 +3269,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB return &null_variable.ID3D10EffectVariable_iface; } - for (i = 0; i < This->local_buffer_count; ++i) + for (i = 0; i < effect->local_buffer_count; ++i) { - struct d3d10_effect_variable *l = &This->local_buffers[i]; + struct d3d10_effect_variable *l = &effect->local_buffers[i]; unsigned int j; for (j = 0; j < l->type->member_count; ++j) @@ -3286,9 +3286,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } - for (i = 0; i < This->local_variable_count; ++i) + for (i = 0; i < effect->local_variable_count; ++i) { - struct d3d10_effect_variable *v = &This->local_variables[i]; + struct d3d10_effect_variable *v = &effect->local_variables[i]; if (v->name && !strcmp(v->name, name)) { @@ -3297,6 +3297,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB } } + if (effect->pool) + return effect->pool->lpVtbl->GetVariableByName(effect->pool, name); + WARN("Invalid name specified\n"); return &null_variable.ID3D10EffectVariable_iface; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 3243e7b2713..9fbf8b9e865 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6671,13 +6671,10 @@ todo_wine v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); - ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); - } + ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); +todo_wine + ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR0"); hr = v->lpVtbl->GetDesc(v, &var_desc);

1 0

Paul Gofman : gdi32: Add a semi-stub for D3DKMTOpenAdapterFromDeviceName().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 3ee036245bfb8de6a1432bc03ffc641b00ee197c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ee036245bfb8de6a1432bc0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 21 18:05:13 2021 +0300 gdi32: Add a semi-stub for D3DKMTOpenAdapterFromDeviceName(). Fixes non functional setting page in Resident Evil Village. Signed-off-by: Paul Gofman <pgofman(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/gdi32/driver.c | 20 +++++ dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/Makefile.in | 2 +- dlls/gdi32/tests/driver.c | 99 ++++++++++++++++++++++ include/ntgdi.h | 1 + 6 files changed, 123 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 609f24fcfde..3c5c8d9b670 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 @@ -45,7 +45,7 @@ @ stub D3DKMTInvalidateActiveVidPn @ stub D3DKMTLock @ stub D3DKMTOfferAllocations -@ stub D3DKMTOpenAdapterFromDeviceName +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) gdi32.D3DKMTOpenAdapterFromDeviceName @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) gdi32.D3DKMTOpenAdapterFromGdiDisplayName @ stdcall D3DKMTOpenAdapterFromHdc(ptr) gdi32.D3DKMTOpenAdapterFromHdc @ stub D3DKMTOpenKeyedMutex diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f4a9b09eae5..09e369bf27f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -989,6 +989,26 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) return status; } +/****************************************************************************** + * NtGdiDdDDIOpenAdapterFromDeviceName (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ) +{ + D3DKMT_OPENADAPTERFROMLUID desc_luid; + NTSTATUS status; + + FIXME( "desc %p stub.\n", desc ); + + if (!desc || !desc->pDeviceName) return STATUS_INVALID_PARAMETER; + + memset( &desc_luid, 0, sizeof( desc_luid )); + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &desc_luid ))) return status; + + desc->AdapterLuid = desc_luid.AdapterLuid; + desc->hAdapter = desc_luid.hAdapter; + return STATUS_SUCCESS; +} + /****************************************************************************** * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6dbc8a9bf12..94a5cefdfa4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory @ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) NtGdiDdDDIOpenAdapterFromDeviceName @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 876f6a376a2..3eb478ff765 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = setupapi user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index eb0da18b32e..54144c44e1c 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -29,16 +29,22 @@ #include "winternl.h" #include "dwmapi.h" #include "ddk/d3dkmthk.h" +#include "initguid.h" +#include "setupapi.h" +#include "ntddvdeo.h" #include "wine/test.h" static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFROMDEVICENAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); @@ -789,6 +795,97 @@ static void test_D3DKMTCheckOcclusion(void) DestroyWindow(hwnd); } +static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterface_guid, + NTSTATUS expected_status, BOOL todo) +{ + BYTE iface_detail_buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + 256 * sizeof(WCHAR)]; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_data; + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DEVPROPTYPE type; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + LUID luid; + BOOL ret; + + set = SetupDiGetClassDevsW(devinterface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed, error %u.\n", GetLastError()); + + iface_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_data->cbSize = sizeof(*iface_data); + device_name.pDeviceName = iface_data->DevicePath; + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, NULL, devinterface_guid, i, &iface)) + { + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, iface_data, + sizeof(iface_detail_buffer), NULL, &device_data ); + ok(ret, "Got unexpected ret %d, GetLastError() %u.\n", ret, GetLastError()); + + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + todo_wine_if(todo) ok(status == expected_status, "Got status %#x, expected %#x.\n", status, expected_status); + + if (!status) + { + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0); + ok(ret || GetLastError() == ERROR_NOT_FOUND, "Got unexpected ret %d, GetLastError() %u.\n", + ret, GetLastError()); + + if (ret) + { + ret = RtlEqualLuid( &luid, &device_name.AdapterLuid); + todo_wine ok(ret, "Luid does not match.\n"); + } + else + { + skip("Luid not found.\n"); + } + + close_adapter_desc.hAdapter = device_name.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(!status, "Got unexpected status %#x.\n", status); + } + ++i; + } + if (!i) + win_skip("No devices found.\n"); + + SetupDiDestroyDeviceInfoList( set ); +} + +static void test_D3DKMTOpenAdapterFromDeviceName(void) +{ + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + NTSTATUS status; + + /* Make sure display devices are initialized. */ + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + + status = pD3DKMTOpenAdapterFromDeviceName(NULL); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTOpenAdapterFromDeviceName() is not supported.\n"); + return; + } + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + memset(&device_name, 0, sizeof(device_name)); + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + winetest_push_context("GUID_DEVINTERFACE_DISPLAY_ADAPTER"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DEVINTERFACE_DISPLAY_ADAPTER, STATUS_INVALID_PARAMETER, TRUE); + winetest_pop_context(); + + winetest_push_context("GUID_DISPLAY_DEVICE_ARRIVAL"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DISPLAY_DEVICE_ARRIVAL, STATUS_SUCCESS, FALSE); + winetest_pop_context(); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -799,6 +896,7 @@ START_TEST(driver) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); + pD3DKMTOpenAdapterFromDeviceName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromDeviceName"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); @@ -814,6 +912,7 @@ START_TEST(driver) test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); + test_D3DKMTOpenAdapterFromDeviceName(); FreeLibrary(dwmapi); } diff --git a/include/ntgdi.h b/include/ntgdi.h index e1f31a6bb9d..05fe0191f39 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -442,6 +442,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); NTSTATUS WINAPI NtGdiDdDDIEscape( const D3DKMT_ESCAPE *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( D3DKMT_OPENADAPTERFROMHDC *desc ); +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromDeviceName( D3DKMT_OPENADAPTERFROMDEVICENAME *desc ); NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc );

1 0

Jacek Caban : opencl: Fix compilation on MSVC targets.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: a91d6e9eae71a0ed0ddeac3d571704fd3e47b3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a91d6e9eae71a0ed0ddeac3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 23 16:26:24 2021 +0200 opencl: Fix compilation on MSVC targets. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 6 +++--- dlls/opencl/opencl_types.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 09eba09914e..270f9a3a502 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -513,9 +513,9 @@ open(TYPES, ">$types_file") or die "cannot create $types_file"; print TYPES <<END /* Automatically generated from OpenCL registry files; DO NOT EDIT! */ -typedef int32_t cl_int DECLSPEC_ALIGN(4); -typedef uint32_t cl_uint DECLSPEC_ALIGN(4); -typedef uint64_t cl_ulong DECLSPEC_ALIGN(8); +typedef int32_t DECLSPEC_ALIGN(4) cl_int; +typedef uint32_t DECLSPEC_ALIGN(4) cl_uint; +typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong; END ; diff --git a/dlls/opencl/opencl_types.h b/dlls/opencl/opencl_types.h index 6d6dc0d870c..7acd4a77f76 100644 --- a/dlls/opencl/opencl_types.h +++ b/dlls/opencl/opencl_types.h @@ -1,8 +1,8 @@ /* Automatically generated from OpenCL registry files; DO NOT EDIT! */ -typedef int32_t cl_int DECLSPEC_ALIGN(4); -typedef uint32_t cl_uint DECLSPEC_ALIGN(4); -typedef uint64_t cl_ulong DECLSPEC_ALIGN(8); +typedef int32_t DECLSPEC_ALIGN(4) cl_int; +typedef uint32_t DECLSPEC_ALIGN(4) cl_uint; +typedef uint64_t DECLSPEC_ALIGN(8) cl_ulong; typedef struct _cl_platform_id * cl_platform_id; typedef struct _cl_device_id * cl_device_id;

1 0

Thomas Crider : api-ms-win-core-psapi-ansi-l1-1-0: Add K32GetModuleBaseNameA.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 7f52277e9a0e57a72a5faf7271260c0558142db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f52277e9a0e57a72a5faf72… Author: Thomas Crider <gloriouseggroll(a)gmail.com> Date: Thu Sep 23 15:03:45 2021 +0200 api-ms-win-core-psapi-ansi-l1-1-0: Add K32GetModuleBaseNameA. Needed for Mass Effect Legendary Edition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199 Signed-off-by: Thomas Crider <gloriouseggroll(a)gmail.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-psapi-ansi-l1-1-0.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec index e4f758581f6..7291d8cee94 100644 --- a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec @@ -2,5 +2,6 @@ @ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA @ stdcall K32GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA @ stdcall K32GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA +@ stdcall K32GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA @ stdcall K32GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA

1 0

Thomas Crider : api-ms-win-core-psapi-l1-1-0: Add K32GetModuleBaseNameW and K32GetModuleInformation.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: d67a2da9672c0ec576af00e95490eea94f8e946a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67a2da9672c0ec576af00e9… Author: Thomas Crider <gloriouseggroll(a)gmail.com> Date: Thu Sep 23 15:03:44 2021 +0200 api-ms-win-core-psapi-l1-1-0: Add K32GetModuleBaseNameW and K32GetModuleInformation. Needed for Mass Effect Legendary Edition. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199 Signed-off-by: Thomas Crider <gloriouseggroll(a)gmail.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec index c54c1077843..3b8ad04963c 100644 --- a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec +++ b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec @@ -5,6 +5,8 @@ @ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW @ stdcall K32GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW @ stdcall K32GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW +@ stdcall K32GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW +@ stdcall K32GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation @ stdcall K32GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo @ stdcall K32GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall K32GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo

1 0

Hans Leidekker : winhttp/tests: Add redirect tests.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: ca5850d9207a732e5e17c107ab005db698effa14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca5850d9207a732e5e17c107… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:30 2021 +0200 winhttp/tests: Add redirect tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ab8b444ad3f..7e46a43aa05 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2217,6 +2217,12 @@ static const char switchprotocols[] = "Upgrade: websocket\r\n" "Connection: Upgrade\r\n"; +static const char redirectmsg[] = +"HTTP/1.1 307 Temporary Redirect\r\n" +"Content-Length: 0\r\n" +"Location: /temporary\r\n" +"Connection: close\r\n\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; static const char auth_unseen[] = "Auth Unseen"; @@ -2448,6 +2454,17 @@ static DWORD CALLBACK server_thread(LPVOID param) } else send(c, notokmsg, sizeof(notokmsg) - 1, 0); } + else if (strstr(buffer, "POST /redirect")) + { + send(c, redirectmsg, sizeof redirectmsg - 1, 0); + } + else if (strstr(buffer, "POST /temporary")) + { + char buf[32]; + recv(c, buf, sizeof(buf), 0); + send(c, okmsg, sizeof okmsg - 1, 0); + send(c, page1, sizeof page1 - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -3099,6 +3116,51 @@ static void test_head_request(int port) WinHttpCloseHandle(ses); } +static void test_redirect(int port) +{ + HINTERNET ses, con, req; + char buf[128]; + DWORD size, len, count, status; + BOOL ret; + + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, L"localhost", port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, L"POST", L"/redirect", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, (void *)"data", sizeof("data"), sizeof("data"), 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "failed to get status code %u\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "got %u\n", status); + + count = 0; + ret = WinHttpQueryDataAvailable(req, &count); + ok(ret, "failed to query data available %u\n", GetLastError()); + ok(count == 128, "got %u\n", count); + + len = sizeof(buf); + count = 0; + ret = WinHttpReadData(req, buf, len, &count); + ok(ret, "failed to read data %u\n", GetLastError()); + ok(count == 128, "got %u\n", count); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_websocket(int port) { HINTERNET session, connection, request, socket, socket2; @@ -5522,6 +5584,7 @@ START_TEST (winhttp) test_request_path_escapes(si.port); test_passport_auth(si.port); test_websocket(si.port); + test_redirect(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, L"/quit");

1 0

Hans Leidekker : winhttp: Don't remove content-type/length headers in handle_redirect().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: badc64b42c56f7a16494eedd2a8add9ef3254af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badc64b42c56f7a16494eedd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:29 2021 +0200 winhttp: Don't remove content-type/length headers in handle_redirect(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50272 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0155d5780fe..2c064bb767b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2544,7 +2544,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) struct connect *connect = request->connect; INTERNET_PORT port; WCHAR *hostname = NULL, *location = NULL; - int index; if ((ret = get_redirect_url( request, &location, &len_loc ))) return ret; @@ -2643,10 +2642,6 @@ static DWORD handle_redirect( struct request *request, DWORD status ) else request->path = strdupW( L"/" ); } - /* remove content-type/length headers */ - if ((index = get_header_index( request, L"Content-Type", 0, TRUE )) >= 0) delete_header( request, index ); - if ((index = get_header_index( request, L"Content-Length", 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !wcscmp( request->verb, L"POST" )) { free( request->verb );

1 0

Hans Leidekker : winhttp: Fix return value for relative redirects.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: ec46607ee0b215544aa8acd3c3bb30405ed5579e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec46607ee0b215544aa8acd3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:28 2021 +0200 winhttp: Fix return value for relative redirects. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index dce3232c0e3..0155d5780fe 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2575,6 +2575,7 @@ static DWORD handle_redirect( struct request *request, DWORD status ) } free( request->path ); request->path = path; + ret = ERROR_SUCCESS; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REDIRECT, location, len_loc + 1 ); }

1 0

Hans Leidekker : winhttp: Call drain_content() before clear_response_headers().
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 5da1d5924186312ab2fcdea2f8305c3ce5455950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da1d5924186312ab2fcdea2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 23 14:58:27 2021 +0200 winhttp: Call drain_content() before clear_response_headers(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e229bdbfd31..dce3232c0e3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2082,8 +2082,8 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD int bytes_sent; DWORD ret, len; - clear_response_headers( request ); drain_content( request ); + clear_response_headers( request ); if (session->agent) process_header( request, L"User-Agent", session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021